rust: revert llvm changes

extra/rust/build

@@ -1,7 +1,6 @@
 #!/bin/sh -e
 
 patch -p1 < musl-libressl.patch
-patch -p1 < rust-fix-llvm-9.patch
 
 # 'rust' checksums files in 'vendor/', but we patch a few files.
 for vendor in libc openssl-sys; do
@@ -11,8 +10,6 @@ done
 cat > config.toml <<EOF
 [llvm]
 link-shared = true
-thin-lto = false
-optimize = true
 
 [build]
 build = "x86_64-unknown-linux-musl"
@@ -42,8 +39,6 @@ llvm-config = "/usr/bin/llvm-config"
 crt-static = false
 EOF
 
-export RUSTFLAGS="-C link-args=-lffi"
-
 python3 ./x.py build -j "$(nproc)"
 DESTDIR="$1" python3 ./x.py install
 

extra/rust/patches/rust-fix-llvm-9.patch

@@ -1,26 +0,0 @@
-From 04304fcd16e40c936dc5ba71c9ac3c445597f8bb Mon Sep 17 00:00:00 2001
-From: Nikita Popov <nikita.ppv@gmail.com>
-Date: Sat, 6 Jul 2019 19:02:48 +0200
-Subject: [PATCH] Pass GUIDPreservedSymbols to
- thinLTOResolvePrevailingInIndex()
-
----
- src/rustllvm/PassWrapper.cpp | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/rustllvm/PassWrapper.cpp b/src/rustllvm/PassWrapper.cpp
-index 0ebef82d3768..cea88f14dcc6 100644
---- a/src/rustllvm/PassWrapper.cpp
-+++ b/src/rustllvm/PassWrapper.cpp
-@@ -913,7 +913,10 @@ LLVMRustCreateThinLTOData(LLVMRustThinLTOModule *modules,
-                               GlobalValue::LinkageTypes NewLinkage) {
-     ResolvedODR[ModuleIdentifier][GUID] = NewLinkage;
-   };
--#if LLVM_VERSION_GE(8, 0)
-+#if LLVM_VERSION_GE(9, 0)
-+  thinLTOResolvePrevailingInIndex(Ret->Index, isPrevailing, recordNewLinkage,
-+                                  Ret->GUIDPreservedSymbols);
-+#elif LLVM_VERSION_GE(8, 0)
-   thinLTOResolvePrevailingInIndex(Ret->Index, isPrevailing, recordNewLinkage);
- #else
-   thinLTOResolveWeakForLinkerInIndex(Ret->Index, isPrevailing, recordNewLinkage);

extra/rust/sources

@@ -1,3 +1,2 @@
 https://static.rust-lang.org/dist/rustc-1.37.0-src.tar.gz
 patches/musl-libressl.patch
-patches/rust-fix-llvm-9.patch

extra/rust/version

@@ -1 +1 @@
-1.37.0 2
+1.37.0 1