diff --git a/extra/rust/build b/extra/rust/build index f01d3d39..5f909bcf 100755 --- a/extra/rust/build +++ b/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 < -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 163985be..64261c5c 100644 --- a/extra/rust/sources +++ b/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 diff --git a/extra/rust/version b/extra/rust/version index 494c44cf..0d2987c6 100644 --- a/extra/rust/version +++ b/extra/rust/version @@ -1 +1 @@ -1.37.0 2 +1.37.0 1