forked from kiss-community/repo
rust: bump to 1.43.0
This commit is contained in:
parent
40313a2380
commit
af3a734066
@ -1,12 +1,14 @@
|
||||
#!/bin/sh -e
|
||||
|
||||
patch -p1 < musl.patch
|
||||
for patch in *.patch; do
|
||||
patch -p1 < "$patch"
|
||||
done
|
||||
|
||||
# This package mimics the download process of rust's 'x.py'
|
||||
# bootstrap library to allow for the removal of the internet
|
||||
# connection requirement per build.
|
||||
{
|
||||
mkdir -p "${cache_dir:=build/cache/2020-02-27}"
|
||||
mkdir -p "${cache_dir:=build/cache/2020-03-12}"
|
||||
|
||||
for tarball in *.tar.xz\?no-extract; do
|
||||
mv -f "$tarball" "$cache_dir/${tarball%%\?no-extract}"
|
||||
|
@ -1,5 +1,6 @@
|
||||
aa5b4c0f2bac33cc26a11523fce9b0f120d2eff510ed148ae7c586501481ed04 rustc-1.42.0-src.tar.xz
|
||||
82b2ce7da86132beeab1a00e52c3a748d52206af4cdd82de6586b13e819ceba7 rust-std-1.41.1-x86_64-unknown-linux-musl.tar.xz?no-extract
|
||||
af9b1797ce5ae20bceabc3e5e67a9aca507bcfca3100d916783bd82273924d46 rustc-1.41.1-x86_64-unknown-linux-musl.tar.xz?no-extract
|
||||
4f36ad854709cfaa85bf98d05cb9ecbcc2ee3a2698af99bfff0e04cd941bea56 cargo-0.42.0-x86_64-unknown-linux-musl.tar.xz?no-extract
|
||||
d0899933840369f07394b211cb0b53a5cd4634907633f0bee541133c8b75e309 rustc-1.43.0-src.tar.xz
|
||||
f429e81c3266bdcc038b6c2c2e5f51c64f75a85b46749e2cf5b93556f17b63a1 rust-std-1.42.0-x86_64-unknown-linux-musl.tar.xz?no-extract
|
||||
79029296fbd91c19c2ad080a52c62963eb127227c59005645b86b5aa9aa310b8 rustc-1.42.0-x86_64-unknown-linux-musl.tar.xz?no-extract
|
||||
705e648c727c50b3815a7be4a18a5886cb9f68e69df990710e938678080264a0 cargo-0.43.0-x86_64-unknown-linux-musl.tar.xz?no-extract
|
||||
abb2acdfc50880da504225dd068f5ea381997cac9ebd23f371290aa8f29d438f musl.patch
|
||||
722f672f3a96ad1916d47a88b922579456b3af2cdc37096ce98a093f3589a4fb llvm10.patch
|
||||
|
40
extra/rust/patches/llvm10.patch
Normal file
40
extra/rust/patches/llvm10.patch
Normal file
@ -0,0 +1,40 @@
|
||||
Note from Wyvertux: This patch applies to 1.43.0 AND if LLVM is LLVM 10.
|
||||
|
||||
Applied to master branch by Nikita Popov.
|
||||
|
||||
diff --git a/src/rustllvm/PassWrapper.cpp b/src/rustllvm/PassWrapper.cpp
|
||||
index 90d24d20737db..9e8614e3b6d34 100644
|
||||
--- a/src/rustllvm/PassWrapper.cpp
|
||||
+++ b/src/rustllvm/PassWrapper.cpp
|
||||
@@ -67,7 +67,11 @@ extern "C" void LLVMInitializePasses() {
|
||||
}
|
||||
|
||||
extern "C" void LLVMTimeTraceProfilerInitialize() {
|
||||
-#if LLVM_VERSION_GE(9, 0)
|
||||
+#if LLVM_VERSION_GE(10, 0)
|
||||
+ timeTraceProfilerInitialize(
|
||||
+ /* TimeTraceGranularity */ 0,
|
||||
+ /* ProcName */ "rustc");
|
||||
+#elif LLVM_VERSION_GE(9, 0)
|
||||
timeTraceProfilerInitialize();
|
||||
#endif
|
||||
}
|
||||
|
||||
diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp
|
||||
index 25cfee3373dc4..799adb418822d 100644
|
||||
--- a/src/rustllvm/RustWrapper.cpp
|
||||
+++ b/src/rustllvm/RustWrapper.cpp
|
||||
@@ -1333,8 +1333,13 @@ extern "C" LLVMValueRef LLVMRustBuildMemSet(LLVMBuilderRef B,
|
||||
LLVMValueRef Dst, unsigned DstAlign,
|
||||
LLVMValueRef Val,
|
||||
LLVMValueRef Size, bool IsVolatile) {
|
||||
+#if LLVM_VERSION_GE(10, 0)
|
||||
+ return wrap(unwrap(B)->CreateMemSet(
|
||||
+ unwrap(Dst), unwrap(Val), unwrap(Size), MaybeAlign(DstAlign), IsVolatile));
|
||||
+#else
|
||||
return wrap(unwrap(B)->CreateMemSet(
|
||||
unwrap(Dst), unwrap(Val), unwrap(Size), DstAlign, IsVolatile));
|
||||
+#endif
|
||||
}
|
||||
|
||||
extern "C" LLVMValueRef
|
@ -1,5 +1,6 @@
|
||||
https://static.rust-lang.org/dist/rustc-1.42.0-src.tar.xz
|
||||
https://static.rust-lang.org/dist/2020-02-27/rust-std-1.41.1-x86_64-unknown-linux-musl.tar.xz?no-extract
|
||||
https://static.rust-lang.org/dist/2020-02-27/rustc-1.41.1-x86_64-unknown-linux-musl.tar.xz?no-extract
|
||||
https://static.rust-lang.org/dist/2020-02-27/cargo-0.42.0-x86_64-unknown-linux-musl.tar.xz?no-extract
|
||||
https://static.rust-lang.org/dist/rustc-1.43.0-src.tar.xz
|
||||
https://static.rust-lang.org/dist/2020-03-12/rust-std-1.42.0-x86_64-unknown-linux-musl.tar.xz?no-extract
|
||||
https://static.rust-lang.org/dist/2020-03-12/rustc-1.42.0-x86_64-unknown-linux-musl.tar.xz?no-extract
|
||||
https://static.rust-lang.org/dist/2020-03-12/cargo-0.43.0-x86_64-unknown-linux-musl.tar.xz?no-extract
|
||||
patches/musl.patch
|
||||
patches/llvm10.patch
|
||||
|
@ -1 +1 @@
|
||||
1.42.0 2
|
||||
1.43.0 1
|
||||
|
Loading…
Reference in New Issue
Block a user