Merge branch 'master' into beta

2020-03-30 10:23:23 -07:00 · 2020-03-30 10:23:23 -07:00 · 785d55c34d
parent f3956f2ed3 3d7a297b89
commit 785d55c34d
8 changed files with 84 additions and 202 deletions
--- a/.gitignore
+++ b/.gitignore
@ -244,3 +244,20 @@
 /rust-1.39.0-powerpc64-unknown-linux-gnu.tar.xz
 /rust-1.39.0-s390x-unknown-linux-gnu.tar.xz
 /rust-1.39.0-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.41.0-src.tar.xz
+/rust-1.40.0-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.40.0-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.40.0-i686-unknown-linux-gnu.tar.xz
+/rust-1.40.0-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.40.0-powerpc64-unknown-linux-gnu.tar.xz
+/rust-1.40.0-s390x-unknown-linux-gnu.tar.xz
+/rust-1.40.0-x86_64-unknown-linux-gnu.tar.xz
+/rustc-1.41.1-src.tar.xz
+/rustc-1.42.0-src.tar.xz
+/rust-1.41.1-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.41.1-armv7-unknown-linux-gnueabihf.tar.xz
+/rust-1.41.1-i686-unknown-linux-gnu.tar.xz
+/rust-1.41.1-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.41.1-powerpc64-unknown-linux-gnu.tar.xz
+/rust-1.41.1-s390x-unknown-linux-gnu.tar.xz
+/rust-1.41.1-x86_64-unknown-linux-gnu.tar.xz
--- a/0001-Drop-cfg-bootstrap-code.patch
+++ b/0001-Drop-cfg-bootstrap-code.patch
@ -0,0 +1,25 @@
+From 31dcdc9e13c324d33a18db3aed7f4b3208ff3744 Mon Sep 17 00:00:00 2001
+From: Mark Rousskov <mark.simulacrum@gmail.com>
+Date: Fri, 31 Jan 2020 12:30:17 -0500
+Subject: [PATCH] Drop cfg(bootstrap) code
+
+---
+ src/bootstrap/lib.rs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
+index 1fee3fd9ac1d..637323331f58 100644
+--- a/src/bootstrap/lib.rs
+++ b/src/bootstrap/lib.rs
+@@ -1026,7 +1026,7 @@ impl Build {
+     }
+ 
+     fn llvm_link_tools_dynamically(&self, target: Interned<String>) -> bool {
+-        (target.contains("linux-gnu") || target.contains("apple-darwin"))
+        target.contains("linux-gnu") || target.contains("apple-darwin")
+     }
+ 
+     /// Returns the `version` string associated with this compiler for Rust
+-- 
+2.24.1
+
--- a/0001-Fix-compiletest-fallout-from-stage0-bump.patch
+++ b/0001-Fix-compiletest-fallout-from-stage0-bump.patch
@ -1,24 +0,0 @@
-From 241d2e765dc7401e642812e43b75dbc3950f2c98 Mon Sep 17 00:00:00 2001
-From: Mark Rousskov <mark.simulacrum@gmail.com>
-Date: Wed, 18 Dec 2019 13:28:14 -0500
-Subject: [PATCH] Fix compiletest fallout from stage0 bump
-
---
- src/tools/compiletest/src/main.rs | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/tools/compiletest/src/main.rs b/src/tools/compiletest/src/main.rs
-index 15f8abd75d59..32965bbb292d 100644
--- a/src/tools/compiletest/src/main.rs
-+++ b/src/tools/compiletest/src/main.rs
-@@ -569,6 +569,7 @@ pub fn test_opts(config: &Config) -> test::TestOpts {
-         list: false,
-         options: test::Options::new(),
-         time_options: None,
-+        force_run_in_process: false,
-     }
- }
- 
-- 
-2.24.1
-
--- a/0001-Update-the-barrier-cache-during-ARM-EHABI-unwinding.patch
+++ b/0001-Update-the-barrier-cache-during-ARM-EHABI-unwinding.patch
@ -1,52 +0,0 @@
-From b6fd4598c5367e78b5841fd99412484f0e86fc21 Mon Sep 17 00:00:00 2001
-From: Amanieu d'Antras <amanieu@gmail.com>
-Date: Wed, 1 Jan 2020 17:11:45 +0100
-Subject: [PATCH] Update the barrier cache during ARM EHABI unwinding
-
---
- src/libpanic_unwind/gcc.rs | 8 +++++++-
- src/libunwind/libunwind.rs | 2 ++
- 2 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/src/libpanic_unwind/gcc.rs b/src/libpanic_unwind/gcc.rs
-index 4f572fe21b30..328d0d4ce7be 100644
--- a/src/libpanic_unwind/gcc.rs
-+++ b/src/libpanic_unwind/gcc.rs
-@@ -187,7 +187,13 @@ cfg_if::cfg_if! {
-                 match eh_action {
-                     EHAction::None |
-                     EHAction::Cleanup(_) => return continue_unwind(exception_object, context),
-                    EHAction::Catch(_) => return uw::_URC_HANDLER_FOUND,
-+                    EHAction::Catch(_) => {
-+                        // EHABI requires the personality routine to update the
-+                        // SP value in the barrier cache of the exception object.
-+                        (*exception_object).private[5] =
-+                            uw::_Unwind_GetGR(context, uw::UNWIND_SP_REG);
-+                        return uw::_URC_HANDLER_FOUND;
-+                    }
-                     EHAction::Terminate => return uw::_URC_FAILURE,
-                 }
-             } else {
-diff --git a/src/libunwind/libunwind.rs b/src/libunwind/libunwind.rs
-index 0b39503c0d03..30658ce328d8 100644
--- a/src/libunwind/libunwind.rs
-+++ b/src/libunwind/libunwind.rs
-@@ -23,6 +23,7 @@ pub type _Unwind_Word = uintptr_t;
- pub type _Unwind_Ptr = uintptr_t;
- pub type _Unwind_Trace_Fn = extern "C" fn(ctx: *mut _Unwind_Context, arg: *mut c_void)
-                                           -> _Unwind_Reason_Code;
-+
- #[cfg(target_arch = "x86")]
- pub const unwinder_private_data_size: usize = 5;
- 
-@@ -151,6 +152,7 @@ if #[cfg(all(any(target_os = "ios", target_os = "netbsd", not(target_arch = "arm
-     use _Unwind_VRS_DataRepresentation::*;
- 
-     pub const UNWIND_POINTER_REG: c_int = 12;
-+    pub const UNWIND_SP_REG: c_int = 13;
-     pub const UNWIND_IP_REG: c_int = 15;
- 
-     #[cfg_attr(all(feature = "llvm-libunwind",
-- 
-2.24.1
-
--- a/rust-pr68019-in-tree-compiletest.patch
+++ b/rust-pr68019-in-tree-compiletest.patch
@ -1,97 +0,0 @@
-From ed8e55fe8d732d8a87343441db3bfbb974f043df Mon Sep 17 00:00:00 2001
-From: Josh Stone <jistone@redhat.com>
-Date: Wed, 8 Jan 2020 09:44:45 -0800
-Subject: [PATCH 1/2] Remove obsolete llvm_tools flag
-
---
- src/bootstrap/tool.rs | 12 +-----------
- 1 file changed, 1 insertion(+), 11 deletions(-)
-
-diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs
-index 815498047fd5..f785a0989a36 100644
--- a/src/bootstrap/tool.rs
-+++ b/src/bootstrap/tool.rs
-@@ -293,7 +293,6 @@ fn rustbook_features() -> Vec<String> {
- macro_rules! bootstrap_tool {
-     ($(
-         $name:ident, $path:expr, $tool_name:expr
-        $(,llvm_tools = $llvm:expr)*
-         $(,is_external_tool = $external:expr)*
-         $(,features = $features:expr)*
-         ;
-@@ -305,15 +304,6 @@ macro_rules! bootstrap_tool {
-             )+
-         }
- 
-        impl Tool {
-            /// Whether this tool requires LLVM to run
-            pub fn uses_llvm_tools(&self) -> bool {
-                match self {
-                    $(Tool::$name => false $(|| $llvm)*,)+
-                }
-            }
-        }
-
-         impl<'a> Builder<'a> {
-             pub fn tool_exe(&self, tool: Tool) -> PathBuf {
-                 match tool {
-@@ -381,7 +371,7 @@ bootstrap_tool!(
-     Tidy, "src/tools/tidy", "tidy";
-     Linkchecker, "src/tools/linkchecker", "linkchecker";
-     CargoTest, "src/tools/cargotest", "cargotest";
-    Compiletest, "src/tools/compiletest", "compiletest", llvm_tools = true;
-+    Compiletest, "src/tools/compiletest", "compiletest";
-     BuildManifest, "src/tools/build-manifest", "build-manifest";
-     RemoteTestClient, "src/tools/remote-test-client", "remote-test-client";
-     RustInstaller, "src/tools/rust-installer", "fabricate", is_external_tool = true;
-- 
-2.24.1
-
-
-From cc4688d66d75e149a0136f701045cbf7ee672725 Mon Sep 17 00:00:00 2001
-From: Josh Stone <jistone@redhat.com>
-Date: Wed, 8 Jan 2020 10:04:18 -0800
-Subject: [PATCH 2/2] Build compiletest with in-tree libtest
-
---
- src/bootstrap/tool.rs | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs
-index f785a0989a36..73a4dda74e88 100644
--- a/src/bootstrap/tool.rs
-+++ b/src/bootstrap/tool.rs
-@@ -294,6 +294,7 @@ macro_rules! bootstrap_tool {
-     ($(
-         $name:ident, $path:expr, $tool_name:expr
-         $(,is_external_tool = $external:expr)*
-+        $(,is_unstable_tool = $unstable:expr)*
-         $(,features = $features:expr)*
-         ;
-     )+) => {
-@@ -344,7 +345,12 @@ macro_rules! bootstrap_tool {
-                     compiler: self.compiler,
-                     target: self.target,
-                     tool: $tool_name,
-                    mode: Mode::ToolBootstrap,
-+                    mode: if false $(|| $unstable)* {
-+                        // use in-tree libraries for unstable features
-+                        Mode::ToolStd
-+                    } else {
-+                        Mode::ToolBootstrap
-+                    },
-                     path: $path,
-                     is_optional_tool: false,
-                     source_type: if false $(|| $external)* {
-@@ -371,7 +377,7 @@ bootstrap_tool!(
-     Tidy, "src/tools/tidy", "tidy";
-     Linkchecker, "src/tools/linkchecker", "linkchecker";
-     CargoTest, "src/tools/cargotest", "cargotest";
-    Compiletest, "src/tools/compiletest", "compiletest";
-+    Compiletest, "src/tools/compiletest", "compiletest", is_unstable_tool = true;
-     BuildManifest, "src/tools/build-manifest", "build-manifest";
-     RemoteTestClient, "src/tools/remote-test-client", "remote-test-client";
-     RustInstaller, "src/tools/rust-installer", "fabricate", is_external_tool = true;
-- 
-2.24.1
-
--- a/rust.spec
+++ b/rust.spec
@ -9,10 +9,10 @@
 # e.g. 1.10.0 wants rustc: 1.9.0-2016-05-24
 # or nightly wants some beta-YYYY-MM-DD
 # Note that cargo matches the program version here, not its crate version.
-%global bootstrap_rust 1.40.0
-%global bootstrap_cargo 1.40.0
-%global bootstrap_channel 1.40.0
-%global bootstrap_date 2019-12-16
+%global bootstrap_rust 1.41.0
+%global bootstrap_cargo 1.41.0
+%global bootstrap_channel 1.41.1
+%global bootstrap_date 2020-02-27

 # Only the specified arches will use bootstrap binaries.
 #global bootstrap_arches %%{rust_arches}
@ -48,8 +48,8 @@
 %endif

 Name:           rust
-Version:        1.41.0
-Release:        0.beta.3%{?dist}
+Version:        1.42.0
+Release:        1%{?dist}
 Summary:        The Rust Programming Language
 License:        (ASL 2.0 or MIT) and (BSD and MIT)
 # ^ written as: (rust itself) and (bundled libraries)
@ -67,15 +67,9 @@ Source0:        https://static.rust-lang.org/dist/%{rustc_package}.tar.xz
 # We do have the necessary fix in our LLVM 7.
 Patch1:         rust-pr57840-llvm7-debuginfo-variants.patch

-# Fix compiletest with newer (local-rebuild) libtest
-# https://github.com/rust-lang/rust/commit/241d2e765dc7401e642812e43b75dbc3950f2c98
-Patch2:         0001-Fix-compiletest-fallout-from-stage0-bump.patch
-# https://github.com/rust-lang/rust/pull/68019
-Patch3:         rust-pr68019-in-tree-compiletest.patch
-
-# Fix ARM unwinding for foreign-exceptions
-# https://github.com/rust-lang/rust/pull/67779
-Patch4:         0001-Update-the-barrier-cache-during-ARM-EHABI-unwinding.patch
+# Fix 1.42 bootstrapping itself
+# https://github.com/rust-lang/rust/issues/69953
+Patch2:         0001-Drop-cfg-bootstrap-code.patch

 # Get the Rust triple for any arch.
 %{lua: function rust_triple(arch)
@ -163,6 +157,9 @@ BuildRequires:  cmake >= 2.8.11
 %if 0%{?epel}
 %global llvm llvm7.0
 %endif
+%if 0%{?fedora} >= 32
+%global llvm llvm9.0
+%endif
 %if %defined llvm
 %global llvm_root %{_libdir}/%{llvm}
 %else
@ -184,7 +181,6 @@ BuildRequires:  gdb

 # TODO: work on unbundling these!
 Provides:       bundled(libbacktrace) = 8.1.0
-Provides:       bundled(miniz) = 2.0.7

 # Virtual provides for folks who attempt "dnf install rustc"
 Provides:       rustc = %{version}-%{release}
@ -224,6 +220,10 @@ Requires:       /usr/bin/cc
 %if "%{llvm_root}" == "%{_prefix}" || 0%{?scl:1}
 %global llvm_has_filecheck 1
 %endif
+%if "%{llvm_root}" != "%{_prefix}"
+# https://github.com/rust-lang/rust/issues/68714
+%global library_path $(%{llvm_root}/bin/llvm-config --libdir)
+%endif
 %endif

 %description
@ -298,7 +298,7 @@ Summary:        Rust's package manager and build tool
 Provides:       bundled(libgit2) = 0.28.2
 %endif
 %if %with bundled_libssh2
-Provides:       bundled(libssh2) = 1.8.1~dev
+Provides:       bundled(libssh2) = 1.9.0~dev
 %endif
 # For tests:
 BuildRequires:  git
@ -344,7 +344,7 @@ Summary:        Rust Language Server for IDE integration
 Provides:       bundled(libgit2) = 0.28.2
 %endif
 %if %with bundled_libssh2
-Provides:       bundled(libssh2) = 1.8.1~dev
+Provides:       bundled(libssh2) = 1.9.0~dev
 %endif
 Requires:       rust-analysis
 # /usr/bin/rls is dynamically linked against internal rustc libs
@ -408,8 +408,6 @@ test -f '%{local_rust_root}/bin/rustc'

 %patch1 -p1 -R
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1

 %if "%{python}" == "python3"
 sed -i.try-py3 -e '/try python2.7/i try python3 "$@"' ./configure
@ -477,6 +475,7 @@ export LIBSSH2_SYS_USE_PKG_CONFIG=1
 %endif

 %{?cmake_path:export PATH=%{cmake_path}:$PATH}
+%{?library_path:export LIBRARY_PATH="%{library_path}"}
 %{?rustflags:export RUSTFLAGS="%{rustflags}"}

 # We're going to override --libdir when configuring to get rustlib into a
@ -527,6 +526,7 @@ export LIBSSH2_SYS_USE_PKG_CONFIG=1

 %install
 %{?cmake_path:export PATH=%{cmake_path}:$PATH}
+%{?library_path:export LIBRARY_PATH="%{library_path}"}
 %{?rustflags:export RUSTFLAGS="%{rustflags}"}

 DESTDIR=%{buildroot} %{python} ./x.py install
@ -597,6 +597,7 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py*

 %check
 %{?cmake_path:export PATH=%{cmake_path}:$PATH}
+%{?library_path:export LIBRARY_PATH="%{library_path}"}
 %{?rustflags:export RUSTFLAGS="%{rustflags}"}

 # The results are not stable on koji, so mask errors and just log it.
@ -715,6 +716,18 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py*


 %changelog
+* Thu Mar 12 2020 Josh Stone <jistone@redhat.com> - 1.42.0-1
+- Update to 1.42.0.
+
+* Thu Feb 27 2020 Josh Stone <jistone@redhat.com> - 1.41.1-1
+- Update to 1.41.1.
+
+* Thu Feb 20 2020 Josh Stone <jistone@redhat.com> - 1.41.0-2
+- Rebuild with llvm9.0
+
+* Thu Jan 30 2020 Josh Stone <jistone@redhat.com> - 1.41.0-1
+- Update to 1.41.0.
+
 * Thu Jan 16 2020 Josh Stone <jistone@redhat.com> - 1.40.0-3
 - Build compiletest with in-tree libtest

--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (rustc-1.40.0-src.tar.xz) = b5ac3079acefb62d3c985b77f624d7fb68de23a59396fed9ccb292db61641c064f3146ee54d3cf59067b17ebfaadd14a6b2b466def60316bb5b13ba3aef01e1f
+SHA512 (rustc-1.42.0-src.tar.xz) = 589bfdc92deedd33b8ea0df7f7c64c2a9a085fbea64936eff92f81e812309c060ed7a7adc96f6010d7adf62a68434a230da0f6c5b3540df4e0a5c6de05a31b16
--- a/16
+++ b/16
@ -1,8 +1,8 @@
-SHA512 (rustc-1.40.0-src.tar.xz) = b5ac3079acefb62d3c985b77f624d7fb68de23a59396fed9ccb292db61641c064f3146ee54d3cf59067b17ebfaadd14a6b2b466def60316bb5b13ba3aef01e1f
-SHA512 (rust-1.39.0-aarch64-unknown-linux-gnu.tar.xz) = ad37a8454acb8985a5c2b42d7f8bc4212651a16fb5af6b4314dd97faa47de79893f2f74b516af89cd7e77ef3db64247c4764585eb0a17ac328c9cba5e5b9c407
-SHA512 (rust-1.39.0-armv7-unknown-linux-gnueabihf.tar.xz) = db2b001a5587e2d5c8cdcb53c974f2332e76f58e362cba55fc971d7244754f1fa0b7e708ad7e73e7250652b442f06929dc1e8981536d7d76850b45ade275d406
-SHA512 (rust-1.39.0-i686-unknown-linux-gnu.tar.xz) = 930546e79c0b1105eb0604ae33ccdbd8b00b56e56d069f19f0d802093a052fd3f940eaf1390cdecd79833b0c70457ebfee2ce3b9674fff72df1367076584394a
-SHA512 (rust-1.39.0-powerpc64le-unknown-linux-gnu.tar.xz) = e15585150370514e580e171faa749218aeef04ce0493f5ad3928a0cb6cd0bddbf7c75ba8ed0783a2c954bbd7166e0445b4c33be4ab48479b0104f032b3d4b0af
-SHA512 (rust-1.39.0-powerpc64-unknown-linux-gnu.tar.xz) = ff99ad6b120631346af8afac092f8b620e50fb8e118ef1e0ff5668103c01f4b9f082fae72e31a767be35d0647fd9fecc7e6b7b215bb1906e06b20bf3e2685619
-SHA512 (rust-1.39.0-s390x-unknown-linux-gnu.tar.xz) = d2b588f802d4fbe153dbd88cb745d34d1f5434cb3134cc9e091ebfb336a48b4c886cd80311cf92b5e1c6a16374302853a67e8a0576b02a89dbcf61d27919a045
-SHA512 (rust-1.39.0-x86_64-unknown-linux-gnu.tar.xz) = 02ca6c821877379d8bd0bcc38281a87e6f86bdbae1270da19e41336cc3a812d9c11c1e976655c192c39153f92cda90ddbd7b4b0bcb4f6787d6d354d2be827a8a
+SHA512 (rustc-1.42.0-src.tar.xz) = 589bfdc92deedd33b8ea0df7f7c64c2a9a085fbea64936eff92f81e812309c060ed7a7adc96f6010d7adf62a68434a230da0f6c5b3540df4e0a5c6de05a31b16
+SHA512 (rust-1.41.1-aarch64-unknown-linux-gnu.tar.xz) = 54eac5c380b418c1714931ead7d6284b225bb427fcc501e147240000b71d31b667e308aea7f38f3299b1311ab04f19011b914d37a4581c7a64028965569cd58e
+SHA512 (rust-1.41.1-armv7-unknown-linux-gnueabihf.tar.xz) = 400bf8d013fe5030243bc0ccb7066ea3d03a2c10727e04b6830ab91dfe9b04f78cfef10794a1c7bb6276fb00c86f1e1c42a74faba19f3125859b3464726d01c2
+SHA512 (rust-1.41.1-i686-unknown-linux-gnu.tar.xz) = c6d74b2653c537043eb2ea721095ff053def592b4c330bdc104690cfb51d648f515288cc0451743d94260f18a55d6757bcb8eb1e6c0217da3498d08b681ca6af
+SHA512 (rust-1.41.1-powerpc64le-unknown-linux-gnu.tar.xz) = 1b2bf6d35321dd0a0fc9735005317f09f8b9a81b520612484530e29156ea254d5cada583e44f7e4a840edde09d70c34f7ead1208d8aa6037c652540dfa38cede
+SHA512 (rust-1.41.1-powerpc64-unknown-linux-gnu.tar.xz) = 50367685783085cc384be944d4321dfde850f3a0e94de0625a08f17160af2c0b795276f96574d1bea84092cbc1cd3cde619d97fe2e37b07ead17f49164e1c995
+SHA512 (rust-1.41.1-s390x-unknown-linux-gnu.tar.xz) = f809adc626876df5c6e050362d59189ede5e3991ac41fd129922540abeb728f618e1a3f3925cee34895de5e037141aabb1f8c2b94d4069945d174e38446e8153
+SHA512 (rust-1.41.1-x86_64-unknown-linux-gnu.tar.xz) = c75d4a18cf9300c6ab480d34c5e4b41be971535931455239330cb2a0e927bcf9cf102498cad5dd1d5d802fd1d9c9d214b80e8ff15aa6be68d3e7f41420cad666