.gitignore

@@ -1,2 +1 @@
-SOURCES/rustc-1.75.0-src.tar.xz
-SOURCES/wasi-libc-bd950eb128bff337153de217b11270f948d04bb4.tar.gz
+SOURCES/rustc-1.40.0-src.tar.xz

.rust.metadata

@@ -1,2 +1 @@
-9ad7bb54dc9572c103b855cdcc823addbb34d15d SOURCES/rustc-1.75.0-src.tar.xz
-55eaa32c99cc8ec970f2db2d340a605724589f9b SOURCES/wasi-libc-bd950eb128bff337153de217b11270f948d04bb4.tar.gz
+34aa1c281487724648b39439bc512f958a3da4ad SOURCES/rustc-1.40.0-src.tar.xz

SOURCES/0001-Compiletest-bump-to-stage0-bootstrap-libtest.patch

@@ -0,0 +1,32 @@
+From f6832adadb84364ce0c81fa02910b3706f441abc Mon Sep 17 00:00:00 2001
+From: Mark Rousskov <mark.simulacrum@gmail.com>
+Date: Wed, 6 Nov 2019 15:17:02 -0500
+Subject: [PATCH] Compiletest bump to stage0 bootstrap libtest
+
+---
+ src/tools/compiletest/src/main.rs | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/tools/compiletest/src/main.rs b/src/tools/compiletest/src/main.rs
+index 34435819a2c4..b115539b4af3 100644
+--- a/src/tools/compiletest/src/main.rs
++++ b/src/tools/compiletest/src/main.rs
+@@ -568,6 +568,7 @@ pub fn test_opts(config: &Config) -> test::TestOpts {
+         skip: vec![],
+         list: false,
+         options: test::Options::new(),
++        time_options: None,
+     }
+ }
+ 
+@@ -703,6 +704,7 @@ pub fn make_test(config: &Config, testpaths: &TestPaths) -> Vec<test::TestDescAn
+                     ignore,
+                     should_panic,
+                     allow_fail: false,
++                    test_type: test::TestType::Unknown,
+                 },
+                 testfn: make_test_closure(config, early_props.ignore, testpaths, revision),
+             }
+-- 
+2.24.1
+

SOURCES/0001-Let-environment-variables-override-some-default-CPUs.patch

@@ -1,53 +0,0 @@
-From 184d61d2c12aa2db01de9a14ccb2be0cfae5039b Mon Sep 17 00:00:00 2001
-From: Josh Stone <jistone@redhat.com>
-Date: Fri, 9 Jun 2023 15:23:08 -0700
-Subject: [PATCH] Let environment variables override some default CPUs
-
----
- .../src/spec/targets/powerpc64le_unknown_linux_gnu.rs           | 2 +-
- .../rustc_target/src/spec/targets/s390x_unknown_linux_gnu.rs    | 2 +-
- .../rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs   | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/compiler/rustc_target/src/spec/targets/powerpc64le_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/powerpc64le_unknown_linux_gnu.rs
-index 194c3170e683..9806ca78297c 100644
---- a/compiler/rustc_target/src/spec/targets/powerpc64le_unknown_linux_gnu.rs
-+++ b/compiler/rustc_target/src/spec/targets/powerpc64le_unknown_linux_gnu.rs
-@@ -2,7 +2,7 @@
- 
- pub fn target() -> Target {
-     let mut base = base::linux_gnu::opts();
--    base.cpu = "ppc64le".into();
-+    base.cpu = option_env!("RUSTC_TARGET_CPU_PPC64LE").unwrap_or("ppc64le").into();
-     base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m64"]);
-     base.max_atomic_width = Some(64);
-     base.stack_probes = StackProbeType::Inline;
-diff --git a/compiler/rustc_target/src/spec/targets/s390x_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/s390x_unknown_linux_gnu.rs
-index 6fc410eb2235..c8f84edb9715 100644
---- a/compiler/rustc_target/src/spec/targets/s390x_unknown_linux_gnu.rs
-+++ b/compiler/rustc_target/src/spec/targets/s390x_unknown_linux_gnu.rs
-@@ -5,7 +5,7 @@ pub fn target() -> Target {
-     let mut base = base::linux_gnu::opts();
-     base.endian = Endian::Big;
-     // z10 is the oldest CPU supported by LLVM
--    base.cpu = "z10".into();
-+    base.cpu = option_env!("RUSTC_TARGET_CPU_S390X").unwrap_or("z10").into();
-     // FIXME: The ABI implementation in cabi_s390x.rs is for now hard-coded to assume the no-vector
-     // ABI. Pass the -vector feature string to LLVM to respect this assumption. On LLVM < 16, we
-     // also strip v128 from the data_layout below to match the older LLVM's expectation.
-diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs
-index 80e267c163fa..8436a00e66d5 100644
---- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs
-+++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs
-@@ -2,7 +2,7 @@
- 
- pub fn target() -> Target {
-     let mut base = base::linux_gnu::opts();
--    base.cpu = "x86-64".into();
-+    base.cpu = option_env!("RUSTC_TARGET_CPU_X86_64").unwrap_or("x86-64").into();
-     base.plt_by_default = false;
-     base.max_atomic_width = Some(64);
-     base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m64"]);
--- 
-2.41.0
-

SOURCES/0001-Update-the-barrier-cache-during-ARM-EHABI-unwinding.patch

@@ -0,0 +1,52 @@
+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
+

SOURCES/0001-Use-lld-provided-by-system.patch

@@ -1,53 +0,0 @@
-From 61b5cc96337da2121221dd1bcdb63fd36551d065 Mon Sep 17 00:00:00 2001
-From: Josh Stone <jistone@redhat.com>
-Date: Wed, 1 Nov 2023 15:21:15 -0700
-Subject: [PATCH] Use lld provided by system
-
----
- compiler/rustc_target/src/spec/base/wasm.rs                   | 3 +--
- compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs | 2 +-
- compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs | 1 +
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/compiler/rustc_target/src/spec/base/wasm.rs b/compiler/rustc_target/src/spec/base/wasm.rs
-index 87ade9e58cf4..2ddff95febab 100644
---- a/compiler/rustc_target/src/spec/base/wasm.rs
-+++ b/compiler/rustc_target/src/spec/base/wasm.rs
-@@ -91,8 +91,7 @@ macro_rules! args {
-         // arguments just yet
-         limit_rdylib_exports: false,
- 
--        // we use the LLD shipped with the Rust toolchain by default
--        linker: Some("rust-lld".into()),
-+        linker: Some("lld".into()),
-         linker_flavor: LinkerFlavor::WasmLld(Cc::No),
- 
-         pre_link_args,
-diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs
-index 9aa95a35f8e5..a9172f9441b7 100644
---- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs
-+++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs
-@@ -17,7 +17,7 @@ pub fn target() -> Target {
-         static_position_independent_executables: true,
-         relro_level: RelroLevel::Full,
-         linker_flavor: LinkerFlavor::Gnu(Cc::No, Lld::Yes),
--        linker: Some("rust-lld".into()),
-+        linker: Some("lld".into()),
-         features:
-             "-mmx,-sse,-sse2,-sse3,-ssse3,-sse4.1,-sse4.2,-3dnow,-3dnowa,-avx,-avx2,+soft-float"
-                 .into(),
-diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs
-index 5abfb8162f70..13cb43bda1a4 100644
---- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs
-+++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs
-@@ -16,6 +16,7 @@ pub fn target() -> Target {
-     base.plt_by_default = false;
-     base.max_atomic_width = Some(64);
-     base.entry_abi = Conv::X86_64Win64;
-+    base.linker = Some("lld".into());
- 
-     // We disable MMX and SSE for now, even though UEFI allows using them. Problem is, you have to
-     // enable these CPU features explicitly before their first use, otherwise their instructions
--- 
-2.41.0
-

SOURCES/0001-bootstrap-allow-disabling-target-self-contained.patch

@@ -1,102 +0,0 @@
-From df0d6f1d8b46db82d7599ca8eff6e8f844cf52f2 Mon Sep 17 00:00:00 2001
-From: Josh Stone <jistone@redhat.com>
-Date: Thu, 28 Sep 2023 18:14:28 -0700
-Subject: [PATCH 1/2] bootstrap: allow disabling target self-contained
-
----
- config.example.toml                           | 5 +++++
- src/bootstrap/src/core/build_steps/compile.rs | 4 ++++
- src/bootstrap/src/core/config/config.rs       | 8 ++++++++
- src/bootstrap/src/lib.rs                      | 5 +++++
- 4 files changed, 22 insertions(+)
-
-diff --git a/config.example.toml b/config.example.toml
-index e5df28a49af6..2fcd8b8cb057 100644
---- a/config.example.toml
-+++ b/config.example.toml
-@@ -807,6 +807,11 @@ change-id = 116881
- # target triples containing `-none`, `nvptx`, `switch`, or `-uefi`.
- #no-std = <platform-specific> (bool)
- 
-+# Copy libc and CRT objects into the target lib/self-contained/ directory.
-+# Enabled by default on `musl`, `wasi`, and `windows-gnu` targets. Other
-+# targets may ignore this setting if they have nothing to be contained.
-+#self-contained = <platform-specific> (bool)
-+
- # =============================================================================
- # Distribution options
- #
-diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs
-index 7021a9543582..11555c65ca87 100644
---- a/src/bootstrap/src/core/build_steps/compile.rs
-+++ b/src/bootstrap/src/core/build_steps/compile.rs
-@@ -302,6 +302,10 @@ fn copy_self_contained_objects(
-     compiler: &Compiler,
-     target: TargetSelection,
- ) -> Vec<(PathBuf, DependencyType)> {
-+    if builder.self_contained(target) != Some(true) {
-+        return vec![];
-+    }
-+
-     let libdir_self_contained = builder.sysroot_libdir(*compiler, target).join("self-contained");
-     t!(fs::create_dir_all(&libdir_self_contained));
-     let mut target_deps = vec![];
-diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
-index 0a9175aa3ea5..a2e028b25036 100644
---- a/src/bootstrap/src/core/config/config.rs
-+++ b/src/bootstrap/src/core/config/config.rs
-@@ -533,6 +533,7 @@ pub struct Target {
-     pub wasi_root: Option<PathBuf>,
-     pub qemu_rootfs: Option<PathBuf>,
-     pub no_std: bool,
-+    pub self_contained: bool,
- }
- 
- impl Target {
-@@ -541,6 +542,9 @@ pub fn from_triple(triple: &str) -> Self {
-         if triple.contains("-none") || triple.contains("nvptx") || triple.contains("switch") {
-             target.no_std = true;
-         }
-+        if triple.contains("-musl") || triple.contains("-wasi") || triple.contains("-windows-gnu") {
-+            target.self_contained = true;
-+        }
-         target
-     }
- }
-@@ -1051,6 +1055,7 @@ struct TomlTarget {
-         wasi_root: Option<String> = "wasi-root",
-         qemu_rootfs: Option<String> = "qemu-rootfs",
-         no_std: Option<bool> = "no-std",
-+        self_contained: Option<bool> = "self-contained",
-     }
- }
- 
-@@ -1600,6 +1605,9 @@ fn get_table(option: &str) -> Result<TomlConfig, toml::de::Error> {
-                 if let Some(s) = cfg.no_std {
-                     target.no_std = s;
-                 }
-+                if let Some(s) = cfg.self_contained {
-+                    target.self_contained = s;
-+                }
-                 target.cc = cfg.cc.map(PathBuf::from);
-                 target.cxx = cfg.cxx.map(PathBuf::from);
-                 target.ar = cfg.ar.map(PathBuf::from);
-diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs
-index 33b8f1a7ce72..f36e53187576 100644
---- a/src/bootstrap/src/lib.rs
-+++ b/src/bootstrap/src/lib.rs
-@@ -1335,6 +1335,11 @@ fn no_std(&self, target: TargetSelection) -> Option<bool> {
-         self.config.target_config.get(&target).map(|t| t.no_std)
-     }
- 
-+    /// Returns `true` if this is a self-contained `target`, if defined
-+    fn self_contained(&self, target: TargetSelection) -> Option<bool> {
-+        self.config.target_config.get(&target).map(|t| t.self_contained)
-+    }
-+
-     /// Returns `true` if the target will be tested using the `remote-test-client`
-     /// and `remote-test-server` binaries.
-     fn remote_tested(&self, target: TargetSelection) -> bool {
--- 
-2.41.0
-

SOURCES/0001-bootstrap-only-show-PGO-warnings-when-verbose.patch

@@ -1,33 +0,0 @@
-From 776146e9ebb6bbe17a37bfad955f3dac95317275 Mon Sep 17 00:00:00 2001
-From: Josh Stone <jistone@redhat.com>
-Date: Thu, 16 Nov 2023 10:42:23 -0800
-Subject: [PATCH] bootstrap: only show PGO warnings when verbose
-
-Building rustc with `--rust-profile-use` is currently dumping a lot of
-warnings of "no profile data available for function" from `rustc_smir`
-and `stable_mir`. These simply aren't exercised by the current profile-
-gathering steps, but that's to be expected for new or experimental
-functionality. I think for most people, these warnings will be just
-noise, so it makes sense to only have them in verbose builds.
----
- src/bootstrap/src/core/build_steps/compile.rs | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs
-index af69860df1c5..51e4195827fc 100644
---- a/src/bootstrap/src/core/build_steps/compile.rs
-+++ b/src/bootstrap/src/core/build_steps/compile.rs
-@@ -887,7 +887,9 @@ fn run(self, builder: &Builder<'_>) {
-         } else if let Some(path) = &builder.config.rust_profile_use {
-             if compiler.stage == 1 {
-                 cargo.rustflag(&format!("-Cprofile-use={path}"));
--                cargo.rustflag("-Cllvm-args=-pgo-warn-missing-function");
-+                if builder.is_verbose() {
-+                    cargo.rustflag("-Cllvm-args=-pgo-warn-missing-function");
-+                }
-                 true
-             } else {
-                 false
--- 
-2.43.0
-

SOURCES/0002-set-an-external-library-path-for-wasm32-wasi.patch

@@ -1,78 +0,0 @@
-From 79bb610c8fc5d9df7dd4720ae847b8f17e7b1ad4 Mon Sep 17 00:00:00 2001
-From: Josh Stone <jistone@redhat.com>
-Date: Thu, 28 Sep 2023 18:18:16 -0700
-Subject: [PATCH 2/2] set an external library path for wasm32-wasi
-
----
- compiler/rustc_codegen_ssa/src/back/link.rs           | 9 +++++++++
- compiler/rustc_target/src/spec/mod.rs                 | 2 ++
- compiler/rustc_target/src/spec/targets/wasm32_wasi.rs | 6 +++++-
- 3 files changed, 16 insertions(+), 1 deletion(-)
-
-diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs
-index dd9d277fb775..3d0f0502f255 100644
---- a/compiler/rustc_codegen_ssa/src/back/link.rs
-+++ b/compiler/rustc_codegen_ssa/src/back/link.rs
-@@ -1496,6 +1496,12 @@ fn get_object_file_path(sess: &Session, name: &str, self_contained: bool) -> Pat
-             return file_path;
-         }
-     }
-+    if let Some(lib_path) = &sess.target.options.external_lib_path {
-+        let file_path = Path::new(lib_path.as_ref()).join(name);
-+        if file_path.exists() {
-+            return file_path;
-+        }
-+    }
-     for search_path in fs.search_paths() {
-         let file_path = search_path.dir.join(name);
-         if file_path.exists() {
-@@ -1982,6 +1988,9 @@ fn add_library_search_dirs(cmd: &mut dyn Linker, sess: &Session, self_contained:
-         let lib_path = sess.target_filesearch(PathKind::All).get_self_contained_lib_path();
-         cmd.include_path(&fix_windows_verbatim_for_gcc(&lib_path));
-     }
-+    if let Some(lib_path) = &sess.target.options.external_lib_path {
-+        cmd.include_path(Path::new(lib_path.as_ref()));
-+    }
- }
- 
- /// Add options making relocation sections in the produced ELF files read-only
-diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs
-index f04799482c83..25410b37ba24 100644
---- a/compiler/rustc_target/src/spec/mod.rs
-+++ b/compiler/rustc_target/src/spec/mod.rs
-@@ -1874,6 +1874,7 @@ pub struct TargetOptions {
-     /// Objects to link before and after all other object code.
-     pub pre_link_objects: CrtObjects,
-     pub post_link_objects: CrtObjects,
-+    pub external_lib_path: Option<StaticCow<str>>,
-     /// Same as `(pre|post)_link_objects`, but when self-contained linking mode is enabled.
-     pub pre_link_objects_self_contained: CrtObjects,
-     pub post_link_objects_self_contained: CrtObjects,
-@@ -2352,6 +2353,7 @@ fn default() -> TargetOptions {
-             relro_level: RelroLevel::None,
-             pre_link_objects: Default::default(),
-             post_link_objects: Default::default(),
-+            external_lib_path: None,
-             pre_link_objects_self_contained: Default::default(),
-             post_link_objects_self_contained: Default::default(),
-             link_self_contained: LinkSelfContainedDefault::False,
-diff --git a/compiler/rustc_target/src/spec/targets/wasm32_wasi.rs b/compiler/rustc_target/src/spec/targets/wasm32_wasi.rs
-index 6dbcb01ea436..2151f86d0648 100644
---- a/compiler/rustc_target/src/spec/targets/wasm32_wasi.rs
-+++ b/compiler/rustc_target/src/spec/targets/wasm32_wasi.rs
-@@ -86,7 +86,11 @@ pub fn target() -> Target {
-     options.post_link_objects_self_contained = crt_objects::post_wasi_self_contained();
- 
-     // FIXME: Figure out cases in which WASM needs to link with a native toolchain.
--    options.link_self_contained = LinkSelfContainedDefault::True;
-+    options.link_self_contained = LinkSelfContainedDefault::False;
-+
-+    options.pre_link_objects = options.pre_link_objects_self_contained.clone();
-+    options.post_link_objects = options.post_link_objects_self_contained.clone();
-+    options.external_lib_path = Some("/usr/wasm32-wasi/lib/wasm32-wasi".into());
- 
-     // Right now this is a bit of a workaround but we're currently saying that
-     // the target by default has a static crt which we're taking as a signal
--- 
-2.41.0
-

SOURCES/macros.rust-toolset

@@ -1,181 +0,0 @@
-# Explicitly use bindir tools, in case others are in the PATH,
-# like the rustup shims in a user's ~/.cargo/bin/.
-#
-# Since cargo 1.31, install only uses $CARGO_HOME/config, ignoring $PWD.
-#   https://github.com/rust-lang/cargo/issues/6397
-# But we can set CARGO_HOME locally, which is a good idea anyway to make sure
-# it never writes to ~/.cargo during rpmbuild.
-%__cargo /usr/bin/env CARGO_HOME=.cargo RUSTFLAGS='%{build_rustflags}' /usr/bin/cargo
-%__rustc /usr/bin/rustc
-%__rustdoc /usr/bin/rustdoc
-
-# rustflags_opt_level: default optimization level
-#
-# It corresponds to the "-Copt-level" rustc command line option.
-%rustflags_opt_level 3
-
-# rustflags_debuginfo: default verbosity of debug information
-#
-# It corresponds to the "-Cdebuginfo" rustc command line option.
-# In some cases, it might be required to override this macro with "1" or even
-# "0", if memory usage gets too high during builds on some resource-constrained
-# architectures (most likely on 32-bit architectures), which will however
-# reduce the quality of the produced debug symbols.
-%rustflags_debuginfo 2
-
-# rustflags_codegen_units: default number of parallel code generation units
-#
-# The default value of "1" results in generation of better code, but comes at
-# the cost of longer build times.
-%rustflags_codegen_units 1
-
-# build_rustflags: default compiler flags for rustc (RUSTFLAGS)
-#
-# -Copt-level: set optimization level (default: highest optimization level)
-# -Cdebuginfo: set debuginfo verbosity (default: full debug information)
-# -Ccodegen-units: set number of parallel code generation units (default: 1)
-#
-# ref. https://doc.rust-lang.org/rustc/codegen-options/index.html
-%build_rustflags %{shrink:
-  -Copt-level=%rustflags_opt_level
-  -Cdebuginfo=%rustflags_debuginfo
-  -Ccodegen-units=%rustflags_codegen_units
-}
-
-# __cargo_common_opts: common command line flags for cargo
-#
-# _smp_mflags: run builds and tests in parallel
-%__cargo_common_opts %{?_smp_mflags}
-
-%cargo_prep(V:) (\
-%{__mkdir} -p .cargo \
-cat > .cargo/config << EOF \
-[build]\
-rustc = "%{__rustc}"\
-rustdoc = "%{__rustdoc}"\
-\
-[env]\
-CFLAGS = "%{build_cflags}"\
-CXXFLAGS = "%{build_cxxflags}"\
-LDFLAGS = "%{build_ldflags}"\
-\
-[install]\
-root = "%{buildroot}%{_prefix}"\
-\
-[term]\
-verbose = true\
-EOF\
-%if 0%{-V:1}\
-%{__tar} -xoaf %{S:%{-V*}}\
-cat >> .cargo/config << EOF \
-\
-[source.crates-io]\
-replace-with = "vendored-sources"\
-\
-[source.vendored-sources]\
-directory = "./vendor"\
-EOF\
-%endif\
-)
-
-# __cargo_parse_opts: function-like macro which parses common flags into the
-#       equivalent command-line flags for cargo
-%__cargo_parse_opts(naf:) %{shrink:\
-%{-f:%{-a:%{error:Can't specify both -f(%{-f*}) and -a}}} \
-  %{-n:--no-default-features}                             \
-  %{-a:--all-features}                                    \
-  %{-f:--features %{-f*}}                                 \
-  %{nil}
-}
-
-# NB: cargo_build/test/install do not use the -n/-a/-f argument parsing like
-# Fedora's rust-packaging, because that change would break anyone that's
-# already passing arguments directly to cargo after the macro. Instead, one can
-# explicitly use --no-default-features, --all-features, or --features XYZ.
-
-# cargo_build: builds the crate with cargo
-%cargo_build \
-%{shrink:\
-  %{__cargo} build                                   \
-    %{__cargo_common_opts}                           \
-    --release                                        \
-}
-
-# cargo_test: runs the test suite with cargo
-#
-# To pass command-line arguments to the cargo test runners directly (for
-# example, to skip certain tests during package builds), the
-# "cargo test" argument parsing need to be bypassed,
-# i.e. "%%cargo_test -- --skip foo" for skipping all tests with names that
-# match "foo".
-%cargo_test \
-%{shrink:\
-  %{__cargo} test                                    \
-    %{__cargo_common_opts}                           \
-    --release                                        \
-    --no-fail-fast                                   \
-}
-
-# cargo_install: install files into the buildroot
-#
-# For "binary" crates, this macro installs all "bin" build targets to _bindir
-# inside the buildroot. The "--no-track" option prevents the creation of the
-# "$CARGO_HOME/.crates.toml" file, which is used to keep track of which version
-# of a specific binary has been installed, but which conflicts between builds
-# of different Rust applications and is not needed when building RPM packages.
-%cargo_install \
-%{shrink:                                                         \
-  %{__cargo} install                                              \
-    %{__cargo_common_opts}                                        \
-    --no-track                                                    \
-    --path .                                                      \
-}                                                                 \
-
-# cargo_license: print license information for all crate dependencies
-#
-# The "no-build,no-dev,no-proc-macro" argument results in only crates which are
-# linked into the final binary to be considered.
-#
-# Additionally, deprecated SPDX syntax ("/" instead of "OR") is normalized
-# before sorting the results to ensure reproducible output of this macro.
-#
-# This macro must be called with the same feature flags as other cargo macros,
-# in particular, "cargo_build", otherwise its output will be incomplete.
-#
-# The "cargo tree" command called by this macro will fail if there are missing
-# (optional) dependencies.
-%cargo_license(naf:)\
-%{shrink:\
-    %{__cargo} tree                                                 \
-    --workspace                                                     \
-    --offline                                                       \
-    --edges no-build,no-dev,no-proc-macro                           \
-    --no-dedupe                                                     \
-    --target all                                                    \
-    %{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}}                \
-    --prefix none                                                   \
-    --format "{l}: {p}"                                             \
-    | sed -e "s: ($(pwd)[^)]*)::g" -e "s: / :/:g" -e "s:/: OR :g"   \
-    | sort -u
-}
-
-# cargo_license_summary: print license summary for all crate dependencies
-#
-# This macro works in the same way as cargo_license, except that it only prints
-# a list of licenses, and not the complete license information for every crate
-# in the dependency tree. This is useful for determining the correct License
-# tag for packages that contain compiled Rust binaries.
-%cargo_license_summary(naf:)\
-%{shrink:\
-    %{__cargo} tree                                                 \
-    --workspace                                                     \
-    --offline                                                       \
-    --edges no-build,no-dev,no-proc-macro                           \
-    --no-dedupe                                                     \
-    --target all                                                    \
-    %{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}}                \
-    --prefix none                                                   \
-    --format "# {l}"                                                \
-    | sed -e "s: / :/:g" -e "s:/: OR :g"                            \
-    | sort -u                                                       \
-}

SOURCES/rust-pr57840-llvm7-debuginfo-variants.patch

@@ -0,0 +1,32 @@
+commit ab998a2eeb2bcdc69ce70c814af97f0d1302a404 (from d17f62d857c70508efbf60be41135880bcd2e062)
+Merge: d17f62d857c7 9452a8dfa3ba
+Author: Mazdak Farrokhzad <twingoow@gmail.com>
+Date:   Thu Jan 24 00:20:00 2019 +0100
+
+    Rollup merge of #57840 - tromey:fix-issue-57762, r=nikic
+    
+    Fix issue 57762
+    
+    against a stock LLVM 7.  LLVM 7 was released without a necessary fix
+    for a bug in the DWARF discriminant code.
+    
+    This patch changes rustc to use the fallback mode on (non-Rust) LLVM 7.
+    
+    Closes #57762
+
+diff --git a/src/librustc_codegen_llvm/debuginfo/metadata.rs b/src/librustc_codegen_llvm/debuginfo/metadata.rs
+index 6deedd0b5ea3..9f63038c3623 100644
+--- a/src/librustc_codegen_llvm/debuginfo/metadata.rs
++++ b/src/librustc_codegen_llvm/debuginfo/metadata.rs
+@@ -1164,7 +1164,10 @@ fn use_enum_fallback(cx: &CodegenCx) -> bool {
+     // On MSVC we have to use the fallback mode, because LLVM doesn't
+     // lower variant parts to PDB.
+     return cx.sess().target.target.options.is_like_msvc
+-        || llvm_util::get_major_version() < 7;
++        // LLVM version 7 did not release with an important bug fix;
++        // but the required patch is in the LLVM 8.  Rust LLVM reports
++        // 8 as well.
++        || llvm_util::get_major_version() < 8;
+ }
+ 
+ // Describes the members of an enum value: An enum is described as a union of

SOURCES/rust-pr66317-bindir-relative.patch

@@ -0,0 +1,39 @@
+diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
+index 2748903f2d47..10d02d6db829 100644
+--- a/src/bootstrap/builder.rs
++++ b/src/bootstrap/builder.rs
+@@ -1231,7 +1231,8 @@ impl<'a> Builder<'a> {
+             cargo.arg("--frozen");
+         }
+ 
+-        cargo.env("RUSTC_INSTALL_BINDIR", &self.config.bindir);
++        // Try to use a sysroot-relative bindir, in case it was configured absolutely.
++        cargo.env("RUSTC_INSTALL_BINDIR", self.config.bindir_relative());
+ 
+         self.ci_env.force_coloring_in_ci(&mut cargo);
+ 
+diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
+index d1bdfa0a7676..0c03b95c7b25 100644
+--- a/src/bootstrap/config.rs
++++ b/src/bootstrap/config.rs
+@@ -647,6 +647,20 @@ impl Config {
+         config
+     }
+ 
++    /// Try to find the relative path of `bindir`, otherwise return it in full.
++    pub fn bindir_relative(&self) -> &Path {
++        let bindir = &self.bindir;
++        if bindir.is_absolute() {
++            // Try to make it relative to the prefix.
++            if let Some(prefix) = &self.prefix {
++                if let Ok(stripped) = bindir.strip_prefix(prefix) {
++                    return stripped;
++                }
++            }
++        }
++        bindir
++    }
++
+     /// Try to find the relative path of `libdir`.
+     pub fn libdir_relative(&self) -> Option<&Path> {
+         let libdir = self.libdir.as_ref()?;

SOURCES/rust-pr68019-in-tree-compiletest.patch

@@ -0,0 +1,97 @@
+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
+

SOURCES/rustc-1.39.0-disable-libssh2.patch

@@ -0,0 +1,42 @@
+--- rustc-1.39.0-src/Cargo.lock.orig	2019-11-04 07:45:21.000000000 -0800
++++ rustc-1.39.0-src/Cargo.lock	2019-11-08 13:25:37.743377197 -0800
+@@ -1697,7 +1697,6 @@
+ dependencies = [
+  "cc",
+  "libc",
+- "libssh2-sys",
+  "libz-sys",
+  "openssl-sys",
+  "pkg-config",
+@@ -1714,20 +1713,6 @@
+ ]
+ 
+ [[package]]
+-name = "libssh2-sys"
+-version = "0.2.11"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "126a1f4078368b163bfdee65fbab072af08a1b374a5551b21e87ade27b1fbf9d"
+-dependencies = [
+- "cc",
+- "libc",
+- "libz-sys",
+- "openssl-sys",
+- "pkg-config",
+- "vcpkg",
+-]
+-
+-[[package]]
+ name = "libz-sys"
+ version = "1.0.25"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+--- rustc-1.39.0-src/vendor/git2/Cargo.toml.orig	2019-11-04 09:34:41.000000000 -0800
++++ rustc-1.39.0-src/vendor/git2/Cargo.toml	2019-11-08 13:25:13.174904479 -0800
+@@ -55,7 +55,7 @@
+ version = "0.1.39"
+ 
+ [features]
+-default = ["ssh", "https", "ssh_key_from_memory"]
++default = ["https"]
+ https = ["libgit2-sys/https", "openssl-sys", "openssl-probe"]
+ ssh = ["libgit2-sys/ssh"]
+ ssh_key_from_memory = ["libgit2-sys/ssh_key_from_memory"]

SOURCES/rustc-1.70.0-rust-gdb-substitute-path.patch

@@ -1,21 +0,0 @@
-diff --git a/src/etc/rust-gdb b/src/etc/rust-gdb
-index 9abed30ea6f7..e4bf55df3688 100755
---- a/src/etc/rust-gdb
-+++ b/src/etc/rust-gdb
-@@ -13,8 +13,6 @@ fi
- # Find out where the pretty printer Python module is
- RUSTC_SYSROOT="$("$RUSTC" --print=sysroot)"
- GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc"
--# Get the commit hash for path remapping
--RUSTC_COMMIT_HASH="$("$RUSTC" -vV | sed -n 's/commit-hash: \([a-zA-Z0-9_]*\)/\1/p')"
- 
- # Run GDB with the additional arguments that load the pretty printers
- # Set the environment variable `RUST_GDB` to overwrite the call to a
-@@ -23,6 +21,6 @@ RUST_GDB="${RUST_GDB:-gdb}"
- PYTHONPATH="$PYTHONPATH:$GDB_PYTHON_MODULE_DIRECTORY" exec ${RUST_GDB} \
-   --directory="$GDB_PYTHON_MODULE_DIRECTORY" \
-   -iex "add-auto-load-safe-path $GDB_PYTHON_MODULE_DIRECTORY" \
--  -iex "set substitute-path /rustc/$RUSTC_COMMIT_HASH $RUSTC_SYSROOT/lib/rustlib/src/rust" \
-+  -iex "set substitute-path @BUILDDIR@ $RUSTC_SYSROOT/lib/rustlib/src/rust" \
-   "$@"
-  

SOURCES/rustc-1.75.0-disable-libssh2.patch

@@ -1,42 +0,0 @@
---- ./rustc-beta-src/src/tools/cargo/Cargo.lock.orig	2023-11-12 12:24:35.000000000 -0800
-+++ rustc-beta-src/src/tools/cargo/Cargo.lock	2023-11-14 17:01:32.010125953 -0800
-@@ -2027,7 +2027,6 @@
- dependencies = [
-  "cc",
-  "libc",
-- "libssh2-sys",
-  "libz-sys",
-  "openssl-sys",
-  "pkg-config",
-@@ -2060,20 +2059,6 @@
- ]
- 
- [[package]]
--name = "libssh2-sys"
--version = "0.3.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee"
--dependencies = [
-- "cc",
-- "libc",
-- "libz-sys",
-- "openssl-sys",
-- "pkg-config",
-- "vcpkg",
--]
--
--[[package]]
- name = "libz-sys"
- version = "1.1.9"
- source = "registry+https://github.com/rust-lang/crates.io-index"
---- ./rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2023-11-14 17:01:32.010125953 -0800
-+++ rustc-beta-src/src/tools/cargo/Cargo.toml	2023-11-14 17:02:44.645097701 -0800
-@@ -40,7 +40,7 @@
- curl-sys = "0.4.68"
- filetime = "0.2.22"
- flate2 = { version = "1.0.28", default-features = false, features = ["zlib"] }
--git2 = "0.18.1"
-+git2 = { version = "0.18.1", default-features = false, features = ["https"] }
- git2-curl = "0.19.0"
- gix = { version = "0.55.2", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] }
- gix-features-for-configuration-only = { version = "0.35.0", package = "gix-features", features = [ "parallel" ] }