From 89f39913aaa805ab8bbf7bceb6cc9a7586d5631e Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 5 Jun 2020 14:01:38 +0300 Subject: [PATCH] rust: bump to 1.44.0 --- extra/rust/build | 2 +- extra/rust/checksums | 9 ++- extra/rust/patches/llvm10.patch | 40 ----------- extra/rust/sources | 9 ++- extra/rust/version | 2 +- testing/rust/build | 67 ------------------ testing/rust/checksums | 6 -- testing/rust/depends | 7 -- testing/rust/patches/libressl-3.1.X.patch | 17 ----- testing/rust/patches/musl.patch | 82 ----------------------- testing/rust/sources | 6 -- testing/rust/version | 1 - 12 files changed, 10 insertions(+), 238 deletions(-) delete mode 100644 extra/rust/patches/llvm10.patch delete mode 100755 testing/rust/build delete mode 100644 testing/rust/checksums delete mode 100644 testing/rust/depends delete mode 100644 testing/rust/patches/libressl-3.1.X.patch delete mode 100644 testing/rust/patches/musl.patch delete mode 100644 testing/rust/sources delete mode 100644 testing/rust/version diff --git a/extra/rust/build b/extra/rust/build index 96c7a499..bb3a84b4 100755 --- a/extra/rust/build +++ b/extra/rust/build @@ -8,7 +8,7 @@ done # bootstrap library to allow for the removal of the internet # connection requirement per build. { - mkdir -p "${cache_dir:=build/cache/2020-03-12}" + mkdir -p "${cache_dir:=build/cache/2020-05-07}" for tarball in *.tar.xz\?no-extract; do mv -f "$tarball" "$cache_dir/${tarball%%\?no-extract}" diff --git a/extra/rust/checksums b/extra/rust/checksums index 69641d56..902e8d09 100644 --- a/extra/rust/checksums +++ b/extra/rust/checksums @@ -1,7 +1,6 @@ -eb0a103c67c4565403d9e6f84a1c708982a5e9e5b3c0d831e4d6f6451795d106 rustc-1.43.1-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 +b32fa7d6bd6ff9286aab2aa7ca696d1da921614cefc10f617aef68d9bce9118a rustc-1.44.0-src.tar.xz +f3b55147ff6e01448699eaf0875d7956ea38eeef42a19cda9d555e814470e823 rust-std-1.43.1-x86_64-unknown-linux-musl.tar.xz?no-extract +be982dc01b5c86a3f2b0b99a2ca0e13b3cea698ee6f1db9fa024de5c8b35a75d rustc-1.43.1-x86_64-unknown-linux-musl.tar.xz?no-extract +653cb60214d6f1000c9a7775111dccd093c0118e7f7bf5f2f1f53a7e5e2420b3 cargo-0.44.0-x86_64-unknown-linux-musl.tar.xz?no-extract abb2acdfc50880da504225dd068f5ea381997cac9ebd23f371290aa8f29d438f musl.patch -722f672f3a96ad1916d47a88b922579456b3af2cdc37096ce98a093f3589a4fb llvm10.patch 903880513dc61427bfedcd99c9b8a4b8156952b9cc5c486e29e5d5a2a77b484a libressl-3.1.X.patch diff --git a/extra/rust/patches/llvm10.patch b/extra/rust/patches/llvm10.patch deleted file mode 100644 index 4efb2636..00000000 --- a/extra/rust/patches/llvm10.patch +++ /dev/null @@ -1,40 +0,0 @@ -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 diff --git a/extra/rust/sources b/extra/rust/sources index a47400bf..825ef433 100644 --- a/extra/rust/sources +++ b/extra/rust/sources @@ -1,7 +1,6 @@ -https://static.rust-lang.org/dist/rustc-1.43.1-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 +https://static.rust-lang.org/dist/rustc-1.44.0-src.tar.xz +https://static.rust-lang.org/dist/2020-05-07/rust-std-1.43.1-x86_64-unknown-linux-musl.tar.xz?no-extract +https://static.rust-lang.org/dist/2020-05-07/rustc-1.43.1-x86_64-unknown-linux-musl.tar.xz?no-extract +https://static.rust-lang.org/dist/2020-05-07/cargo-0.44.0-x86_64-unknown-linux-musl.tar.xz?no-extract patches/musl.patch -patches/llvm10.patch patches/libressl-3.1.X.patch diff --git a/extra/rust/version b/extra/rust/version index 6e671cf6..fdfa1c06 100644 --- a/extra/rust/version +++ b/extra/rust/version @@ -1 +1 @@ -1.43.1 2 +1.44.0 1 diff --git a/testing/rust/build b/testing/rust/build deleted file mode 100755 index bb3a84b4..00000000 --- a/testing/rust/build +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/sh -e - -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-05-07}" - - for tarball in *.tar.xz\?no-extract; do - mv -f "$tarball" "$cache_dir/${tarball%%\?no-extract}" - done -} - -# 'rust' checksums files in 'vendor/', but we patch a few. -for vendor in libc openssl-sys; do - sed -i 's/\("files":{\)[^}]*/\1/' "vendor/$vendor/.cargo-checksum.json" -done - -cat > config.toml < ('3', '0', '0'), - (3, 0, 1) => ('3', '0', '1'), - (3, 0, _) => ('3', '0', 'x'), -+ (3, 1, 0) => ('3', '1', '0'), -+ (3, 1, 1) => ('3', '1', '0'), -+ (3, 1, _) => ('3', '1', 'x'), -+ (3, 2, 0) => ('3', '2', '0'), -+ (3, 2, 1) => ('3', '2', '0'), -+ (3, 2, _) => ('3', '2', 'x'), - _ => version_error(), - }; - diff --git a/testing/rust/patches/musl.patch b/testing/rust/patches/musl.patch deleted file mode 100644 index 04c246ca..00000000 --- a/testing/rust/patches/musl.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs -index eced035..f988315 100644 ---- a/src/bootstrap/compile.rs -+++ b/src/bootstrap/compile.rs -@@ -132,7 +132,7 @@ fn copy_third_party_objects( - // with a glibc-targeting toolchain, given we have the appropriate startup - // files. As those shipped with glibc won't work, copy the ones provided by - // musl so we have them on linux-gnu hosts. -- if target.contains("musl") { -+ if target.contains("noop") { - let srcdir = builder.musl_root(target).unwrap().join("lib"); - for &obj in &["crt1.o", "crti.o", "crtn.o"] { - copy_and_stamp(&srcdir, obj); -diff --git a/src/bootstrap/sanity.rs b/src/bootstrap/sanity.rs -index 8ff7056..53c0194 100644 ---- a/src/bootstrap/sanity.rs -+++ b/src/bootstrap/sanity.rs -@@ -205,7 +205,7 @@ pub fn check(build: &mut Build) { - } - - // Make sure musl-root is valid -- if target.contains("musl") { -+ if target.contains("noop") { - // If this is a native target (host is also musl) and no musl-root is given, - // fall back to the system toolchain in /usr before giving up - if build.musl_root(*target).is_none() && build.config.build == *target { -diff --git a/src/librustc_target/spec/linux_musl_base.rs b/src/librustc_target/spec/linux_musl_base.rs -index e294e63..17fecb3 100644 ---- a/src/librustc_target/spec/linux_musl_base.rs -+++ b/src/librustc_target/spec/linux_musl_base.rs -@@ -26,7 +26,7 @@ pub fn opts() -> TargetOptions { - base.post_link_objects_crt.push("crtn.o".to_string()); - - // These targets statically link libc by default -- base.crt_static_default = true; -+ base.crt_static_default = false; - // These targets allow the user to choose between static and dynamic linking. - base.crt_static_respected = true; - - -diff --git a/src/libunwind/build.rs b/src/libunwind/build.rs -index a24808b..25300a5 100644 ---- a/src/libunwind/build.rs -+++ b/src/libunwind/build.rs -@@ -10,7 +10,7 @@ fn main() { - // Build the unwinding from libunwind C/C++ source code. - llvm_libunwind::compile(); - } else if target.contains("linux") { -- if target.contains("musl") { -+ if target.contains("noop") { - // linking for musl is handled in lib.rs - llvm_libunwind::compile(); - } else if !target.contains("android") { - -diff --git a/src/libunwind/lib.rs b/src/libunwind/lib.rs -index 18d41be..6fddd6d 100644 ---- a/src/libunwind/lib.rs -+++ b/src/libunwind/lib.rs -@@ -18,7 +18,7 @@ cfg_if::cfg_if! { - } - } - --#[cfg(target_env = "musl")] -+#[cfg(target_env = "noop")] - #[link(name = "unwind", kind = "static", cfg(target_feature = "crt-static"))] - #[link(name = "gcc_s", cfg(not(target_feature = "crt-static")))] - extern "C" {} - -diff --git a/vendor/libc/src/unix/mod.rs b/vendor/libc/src/unix/mod.rs -index 238da24..71d4f31 100644 ---- a/vendor/libc/src/unix/mod.rs -+++ b/vendor/libc/src/unix/mod.rs -@@ -298,7 +298,7 @@ cfg_if! { - } else if #[cfg(feature = "std")] { - // cargo build, don't pull in anything extra as the libstd dep - // already pulls in all libs. -- } else if #[cfg(target_env = "musl")] { -+ } else if #[cfg(target_env = "noop")] { - #[cfg_attr(feature = "rustc-dep-of-std", - link(name = "c", kind = "static", - cfg(target_feature = "crt-static")))] - diff --git a/testing/rust/sources b/testing/rust/sources deleted file mode 100644 index 825ef433..00000000 --- a/testing/rust/sources +++ /dev/null @@ -1,6 +0,0 @@ -https://static.rust-lang.org/dist/rustc-1.44.0-src.tar.xz -https://static.rust-lang.org/dist/2020-05-07/rust-std-1.43.1-x86_64-unknown-linux-musl.tar.xz?no-extract -https://static.rust-lang.org/dist/2020-05-07/rustc-1.43.1-x86_64-unknown-linux-musl.tar.xz?no-extract -https://static.rust-lang.org/dist/2020-05-07/cargo-0.44.0-x86_64-unknown-linux-musl.tar.xz?no-extract -patches/musl.patch -patches/libressl-3.1.X.patch diff --git a/testing/rust/version b/testing/rust/version deleted file mode 100644 index fdfa1c06..00000000 --- a/testing/rust/version +++ /dev/null @@ -1 +0,0 @@ -1.44.0 1