This repository has been archived by the owner on Apr 26, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 100
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
86a56da
commit 3e9982e
Showing
6 changed files
with
35 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,3 @@ | ||
120e7020d065499cc6b28759ff04153bfdc2ac9b5adeb252331a4eb87cbe38c3 rustc-1.37.0-src.tar.gz | ||
0341881feff659cf705671d663157113fdc752d9bfb0cdfd5fc75daa65bdf1d5 musl-libressl.patch | ||
a86b97ec4431b77488ab0b14306e9876f4f10a39ed626bee405713c1e4ef29c0 rust-fix-llvm-9.patch |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
cmake make | ||
curl make | ||
libffi | ||
libressl | ||
llvm | ||
python make | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
1.37.0 1 | ||
1.37.0 2 |