From 3e9982ea44de8b4e4e940c7f9dea62f317ae79fd Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Fri, 20 Sep 2019 20:07:55 +0300
Subject: [PATCH] rust: fix build with LLVM 9.0.0

---
 extra/rust/build                         |  5 +++++
 extra/rust/checksums                     |  1 +
 extra/rust/depends                       |  1 +
 extra/rust/patches/rust-fix-llvm-9.patch | 26 ++++++++++++++++++++++++
 extra/rust/sources                       |  1 +
 extra/rust/version                       |  2 +-
 6 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 extra/rust/patches/rust-fix-llvm-9.patch

diff --git a/extra/rust/build b/extra/rust/build
index 5f909bcf..f01d3d39 100755
--- a/extra/rust/build
+++ b/extra/rust/build
@@ -1,6 +1,7 @@
 #!/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
@@ -10,6 +11,8 @@ done
 cat > config.toml <<EOF
 [llvm]
 link-shared = true
+thin-lto = false
+optimize = true
 
 [build]
 build = "x86_64-unknown-linux-musl"
@@ -39,6 +42,8 @@ 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
 
diff --git a/extra/rust/checksums b/extra/rust/checksums
index 36cc9db5..95ad7635 100644
--- a/extra/rust/checksums
+++ b/extra/rust/checksums
@@ -1,2 +1,3 @@
 120e7020d065499cc6b28759ff04153bfdc2ac9b5adeb252331a4eb87cbe38c3  rustc-1.37.0-src.tar.gz
 0341881feff659cf705671d663157113fdc752d9bfb0cdfd5fc75daa65bdf1d5  musl-libressl.patch
+a86b97ec4431b77488ab0b14306e9876f4f10a39ed626bee405713c1e4ef29c0  rust-fix-llvm-9.patch
diff --git a/extra/rust/depends b/extra/rust/depends
index 058f23c8..0223b090 100644
--- a/extra/rust/depends
+++ b/extra/rust/depends
@@ -1,5 +1,6 @@
 cmake  make
 curl   make
+libffi
 libressl
 llvm
 python make
diff --git a/extra/rust/patches/rust-fix-llvm-9.patch b/extra/rust/patches/rust-fix-llvm-9.patch
new file mode 100644
index 00000000..025ab45b
--- /dev/null
+++ b/extra/rust/patches/rust-fix-llvm-9.patch
@@ -0,0 +1,26 @@
+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);
diff --git a/extra/rust/sources b/extra/rust/sources
index 64261c5c..163985be 100644
--- a/extra/rust/sources
+++ b/extra/rust/sources
@@ -1,2 +1,3 @@
 https://static.rust-lang.org/dist/rustc-1.37.0-src.tar.gz
 patches/musl-libressl.patch
+patches/rust-fix-llvm-9.patch
diff --git a/extra/rust/version b/extra/rust/version
index 0d2987c6..494c44cf 100644
--- a/extra/rust/version
+++ b/extra/rust/version
@@ -1 +1 @@
-1.37.0 1
+1.37.0 2