From d6646e5be25482061638d62bad3689e5ce8df721 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 27 Sep 2019 11:02:30 +0300 Subject: [PATCH] clang,llvm,rust: bump to 9.0.0,9.0.0,1.38.0 --- extra/clang/checksums | 2 +- extra/clang/sources | 2 +- extra/clang/version | 2 +- extra/llvm/checksums | 2 +- extra/llvm/sources | 2 +- extra/llvm/version | 2 +- extra/rust/checksums | 4 +- extra/rust/patches/musl-libressl.patch | 78 +++++++++++++++----------- extra/rust/sources | 2 +- extra/rust/version | 2 +- 10 files changed, 54 insertions(+), 44 deletions(-) diff --git a/extra/clang/checksums b/extra/clang/checksums index 05c42374..438e2087 100644 --- a/extra/clang/checksums +++ b/extra/clang/checksums @@ -1,3 +1,3 @@ -70effd69f7a8ab249f66b0a68aba8b08af52aa2ab710dfb8a0fba102685b1646 cfe-8.0.1.src.tar.xz +7ba81eef7c22ca5da688fdf9d88c20934d2d6b40bfe150ffd338900890aa4610 cfe-9.0.0.src.tar.xz afda9a77cb75a47edaeda079498713b22462ec32018ddecd3a7d1e46a72f2c67 cfe-003-fix-unwind-chain-inclusion.patch 4cda0a3b37cc62ea65771675d5621de1e385afae9e4bb0446fff378cacba1a14 cfe-004-add-musl-triples.patch diff --git a/extra/clang/sources b/extra/clang/sources index 4e50e27d..c26a683d 100644 --- a/extra/clang/sources +++ b/extra/clang/sources @@ -1,3 +1,3 @@ -https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/cfe-8.0.1.src.tar.xz +https://releases.llvm.org/9.0.0/cfe-9.0.0.src.tar.xz patches/cfe-003-fix-unwind-chain-inclusion.patch patches/cfe-004-add-musl-triples.patch diff --git a/extra/clang/version b/extra/clang/version index 2bbbe1c8..f8041b0a 100644 --- a/extra/clang/version +++ b/extra/clang/version @@ -1 +1 @@ -8.0.1 1 +9.0.0 1 diff --git a/extra/llvm/checksums b/extra/llvm/checksums index 8acf4ef5..74fbcfb0 100644 --- a/extra/llvm/checksums +++ b/extra/llvm/checksums @@ -1 +1 @@ -44787a6d02f7140f145e2250d56c9f849334e11f9ae379827510ed72f12b75e7 llvm-8.0.1.src.tar.xz +d6a0565cf21f22e9b4353b2eb92622e8365000a9e90a16b09b56f8157eabfe84 llvm-9.0.0.src.tar.xz diff --git a/extra/llvm/sources b/extra/llvm/sources index 320135f3..2aa9c3ce 100644 --- a/extra/llvm/sources +++ b/extra/llvm/sources @@ -1 +1 @@ -https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/llvm-8.0.1.src.tar.xz +https://releases.llvm.org/9.0.0/llvm-9.0.0.src.tar.xz diff --git a/extra/llvm/version b/extra/llvm/version index 2bbbe1c8..f8041b0a 100644 --- a/extra/llvm/version +++ b/extra/llvm/version @@ -1 +1 @@ -8.0.1 1 +9.0.0 1 diff --git a/extra/rust/checksums b/extra/rust/checksums index 36cc9db5..d603abb6 100644 --- a/extra/rust/checksums +++ b/extra/rust/checksums @@ -1,2 +1,2 @@ -120e7020d065499cc6b28759ff04153bfdc2ac9b5adeb252331a4eb87cbe38c3 rustc-1.37.0-src.tar.gz -0341881feff659cf705671d663157113fdc752d9bfb0cdfd5fc75daa65bdf1d5 musl-libressl.patch +644263ca7c7106f8ee8fcde6bb16910d246b30668a74be20b8c7e0e9f4a52d80 rustc-1.38.0-src.tar.gz +9987f344bbce0424199b1fc65dfd3136b7c562520a371f01ce79321dc55019cf musl-libressl.patch diff --git a/extra/rust/patches/musl-libressl.patch b/extra/rust/patches/musl-libressl.patch index c7b2dc42..8aa303fa 100644 --- a/extra/rust/patches/musl-libressl.patch +++ b/extra/rust/patches/musl-libressl.patch @@ -1,7 +1,8 @@ -diff -ruN rustc-1.37.0-src-orig/src/bootstrap/compile.rs rustc-1.37.0-src/src/bootstrap/compile.rs ---- rustc-1.37.0-src-orig/src/bootstrap/compile.rs 2019-08-12 23:27:22.000000000 -0700 -+++ rustc-1.37.0-src/src/bootstrap/compile.rs 2019-08-17 02:56:03.893753627 -0700 -@@ -116,28 +116,6 @@ +diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs +index 4cd793ada..562cf3e05 100644 +--- a/src/bootstrap/compile.rs ++++ b/src/bootstrap/compile.rs +@@ -115,28 +115,6 @@ impl Step for Std { fn copy_third_party_objects(builder: &Builder<'_>, compiler: &Compiler, target: Interned) { let libdir = builder.sysroot_libdir(*compiler, target); @@ -30,10 +31,11 @@ diff -ruN rustc-1.37.0-src-orig/src/bootstrap/compile.rs rustc-1.37.0-src/src/bo // Copies libunwind.a compiled to be linked wit x86_64-fortanix-unknown-sgx. // // This target needs to be linked to Fortanix's port of llvm's libunwind. -diff -ruN rustc-1.37.0-src-orig/src/bootstrap/sanity.rs rustc-1.37.0-src/src/bootstrap/sanity.rs ---- rustc-1.37.0-src-orig/src/bootstrap/sanity.rs 2019-08-12 23:27:22.000000000 -0700 -+++ rustc-1.37.0-src/src/bootstrap/sanity.rs 2019-08-17 03:06:51.725807452 -0700 -@@ -176,34 +176,6 @@ +diff --git a/src/bootstrap/sanity.rs b/src/bootstrap/sanity.rs +index 4e3930c8d..3b1095480 100644 +--- a/src/bootstrap/sanity.rs ++++ b/src/bootstrap/sanity.rs +@@ -187,34 +187,6 @@ pub fn check(build: &mut Build) { } } @@ -68,10 +70,11 @@ diff -ruN rustc-1.37.0-src-orig/src/bootstrap/sanity.rs rustc-1.37.0-src/src/boo if target.contains("msvc") { // There are three builds of cmake on windows: MSVC, MinGW, and // Cygwin. The Cygwin build does not have generators for Visual -diff -ruN rustc-1.37.0-src-orig/src/librustc_target/spec/linux_musl_base.rs rustc-1.37.0-src/src/librustc_target/spec/linux_musl_base.rs ---- rustc-1.37.0-src-orig/src/librustc_target/spec/linux_musl_base.rs 2019-08-12 23:27:22.000000000 -0700 -+++ rustc-1.37.0-src/src/librustc_target/spec/linux_musl_base.rs 2019-08-17 02:56:53.553119774 -0700 -@@ -26,7 +26,7 @@ +diff --git a/src/librustc_target/spec/linux_musl_base.rs b/src/librustc_target/spec/linux_musl_base.rs +index e294e6398..17fecb3b2 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 @@ -80,37 +83,43 @@ diff -ruN rustc-1.37.0-src-orig/src/librustc_target/spec/linux_musl_base.rs rust // These targets allow the user to choose between static and dynamic linking. base.crt_static_respected = true; -diff -ruN rustc-1.37.0-src-orig/src/libunwind/build.rs rustc-1.37.0-src/src/libunwind/build.rs ---- rustc-1.37.0-src-orig/src/libunwind/build.rs 2019-08-12 23:27:22.000000000 -0700 -+++ rustc-1.37.0-src/src/libunwind/build.rs 2019-08-17 03:07:40.245230990 -0700 -@@ -11,9 +11,7 @@ - #[cfg(feature = "llvm-libunwind")] +diff --git a/src/libunwind/build.rs b/src/libunwind/build.rs +index da31a49dd..dd0b89227 100644 +--- a/src/libunwind/build.rs ++++ b/src/libunwind/build.rs +@@ -13,9 +13,7 @@ fn main() { + #[cfg(all(not(bootstrap), feature = "llvm-libunwind"))] llvm_libunwind::compile(); } else if target.contains("linux") { - if target.contains("musl") { - // musl is handled in lib.rs - } else if !target.contains("android") { -+ if !target.contains("android") { ++ if !target.contains("android") { println!("cargo:rustc-link-lib=gcc_s"); } } else if target.contains("freebsd") { -diff -ruN rustc-1.37.0-src-orig/src/libunwind/lib.rs rustc-1.37.0-src/src/libunwind/lib.rs ---- rustc-1.37.0-src-orig/src/libunwind/lib.rs 2019-08-12 23:27:22.000000000 -0700 -+++ rustc-1.37.0-src/src/libunwind/lib.rs 2019-08-17 03:06:59.005720850 -0700 -@@ -21,8 +21,3 @@ - pub use libunwind::*; +diff --git a/src/libunwind/lib.rs b/src/libunwind/lib.rs +index 8d9164471..9a6411c60 100644 +--- a/src/libunwind/lib.rs ++++ b/src/libunwind/lib.rs +@@ -20,11 +20,6 @@ cfg_if::cfg_if! { } } -- + -#[cfg(target_env = "musl")] -#[link(name = "unwind", kind = "static", cfg(target_feature = "crt-static"))] -#[link(name = "gcc_s", cfg(not(target_feature = "crt-static")))] -extern {} -diff -ruN rustc-1.37.0-src-orig/vendor/libc/src/unix/mod.rs rustc-1.37.0-src/vendor/libc/src/unix/mod.rs ---- rustc-1.37.0-src-orig/vendor/libc/src/unix/mod.rs 2019-08-13 01:30:01.000000000 -0700 -+++ rustc-1.37.0-src/vendor/libc/src/unix/mod.rs 2019-08-17 02:56:21.273531120 -0700 -@@ -306,13 +306,6 @@ - } else if #[cfg(feature = "use_std")] { +- + #[cfg(target_os = "redox")] + #[link(name = "gcc_eh", kind = "static-nobundle", cfg(target_feature = "crt-static"))] + #[link(name = "gcc_s", cfg(not(target_feature = "crt-static")))] +diff --git a/vendor/libc/src/unix/mod.rs b/vendor/libc/src/unix/mod.rs +index 8295dfc02..c1740ff5d 100644 +--- a/vendor/libc/src/unix/mod.rs ++++ b/vendor/libc/src/unix/mod.rs +@@ -296,13 +296,6 @@ 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")] { @@ -123,14 +132,15 @@ diff -ruN rustc-1.37.0-src-orig/vendor/libc/src/unix/mod.rs rustc-1.37.0-src/ven } else if #[cfg(target_os = "emscripten")] { #[link(name = "c")] extern {} -diff -ruN rustc-1.37.0-src-orig/vendor/openssl-sys/build/main.rs rustc-1.37.0-src/vendor/openssl-sys/build/main.rs ---- rustc-1.37.0-src-orig/vendor/openssl-sys/build/main.rs 2019-08-13 01:30:02.000000000 -0700 -+++ rustc-1.37.0-src/vendor/openssl-sys/build/main.rs 2019-08-17 02:55:12.634414453 -0700 -@@ -183,27 +183,30 @@ +diff --git a/vendor/openssl-sys/build/main.rs b/vendor/openssl-sys/build/main.rs +index 02b93b90a..ff66ca180 100644 +--- a/vendor/openssl-sys/build/main.rs ++++ b/vendor/openssl-sys/build/main.rs +@@ -183,27 +183,30 @@ See rust-openssl README for more information: if let Some(libressl_version) = libressl_version { println!("cargo:libressl_version_number={:x}", libressl_version); -+ let major = (libressl_version >> 28) as u8; ++ let major = (libressl_version >> 28) as u8; let minor = (libressl_version >> 20) as u8; let fix = (libressl_version >> 12) as u8; - let (minor, fix) = match (minor, fix) { diff --git a/extra/rust/sources b/extra/rust/sources index 64261c5c..c039571b 100644 --- a/extra/rust/sources +++ b/extra/rust/sources @@ -1,2 +1,2 @@ -https://static.rust-lang.org/dist/rustc-1.37.0-src.tar.gz +https://static.rust-lang.org/dist/rustc-1.38.0-src.tar.gz patches/musl-libressl.patch diff --git a/extra/rust/version b/extra/rust/version index 0d2987c6..99afb349 100644 --- a/extra/rust/version +++ b/extra/rust/version @@ -1 +1 @@ -1.37.0 1 +1.38.0 1