import UBI rust-1.75.0-1.module+el8.10.0+21160+cc6a0df8

.gitignore

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

.rust.metadata

@@ -1 +1,2 @@
-24243dbbeb70be8370fddc4a83e68a1ad228c4ed SOURCES/rustc-1.43.1-src.tar.xz
+9ad7bb54dc9572c103b855cdcc823addbb34d15d SOURCES/rustc-1.75.0-src.tar.xz
+55eaa32c99cc8ec970f2db2d340a605724589f9b SOURCES/wasi-libc-bd950eb128bff337153de217b11270f948d04bb4.tar.gz

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

@@ -0,0 +1,53 @@
+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-Use-lld-provided-by-system.patch

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

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

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

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

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

@@ -1,32 +0,0 @@
-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;
- }
- 
- // FIXME(eddyb) maybe precompute this? Right now it's computed once

SOURCES/rust-pr70123-ensure-llvm-is-in-the-link-path.patch

@@ -1,210 +0,0 @@
-commit 9423c4f0dda638ec2a925140850b85e8d3e6d455 (from bee074f032970fd1b59650c04a70e75eeee9c63b)
-Merge: bee074f03297 3a2a4429a288
-Author: Mazdak Farrokhzad <twingoow@gmail.com>
-Date:   Mon Mar 23 10:29:13 2020 +0100
-
-    Rollup merge of #70123 - cuviper:library-path, r=Mark-Simulacrum
-    
-    Ensure LLVM is in the link path for rustc tools
-    
-    The build script for `rustc_llvm` outputs LLVM information in `cargo:rustc-link-lib` and `cargo:rustc-link-search` so the compiler can be linked correctly. However, while the lib is carried along in metadata, the search paths are not. So when cargo is invoked again later for rustc _tools_, they'll also try to link with LLVM, but the necessary paths may be left out.
-    
-    Rustbuild can use the environment to set the LLVM link path for tools -- `LIB` for MSVC toolchains and `LIBRARY_PATH` for everyone else.
-    
-    Fixes #68714.
-
-diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
-index 602e4511ea58..dd519506d42a 100644
---- a/src/bootstrap/builder.rs
-+++ b/src/bootstrap/builder.rs
-@@ -11,7 +11,7 @@ use std::path::{Path, PathBuf};
- use std::process::Command;
- use std::time::{Duration, Instant};
- 
--use build_helper::t;
-+use build_helper::{output, t};
- 
- use crate::cache::{Cache, Interned, INTERNER};
- use crate::check;
-@@ -23,7 +23,7 @@ use crate::install;
- use crate::native;
- use crate::test;
- use crate::tool;
--use crate::util::{self, add_lib_path, exe, libdir};
-+use crate::util::{self, add_dylib_path, add_link_lib_path, exe, libdir};
- use crate::{Build, DocTests, GitRepo, Mode};
- 
- pub use crate::Compiler;
-@@ -660,7 +660,7 @@ impl<'a> Builder<'a> {
-             return;
-         }
- 
--        add_lib_path(vec![self.rustc_libdir(compiler)], &mut cmd.command);
-+        add_dylib_path(vec![self.rustc_libdir(compiler)], &mut cmd.command);
-     }
- 
-     /// Gets a path to the compiler specified.
-@@ -698,6 +698,20 @@ impl<'a> Builder<'a> {
-         cmd
-     }
- 
-+    /// Return the path to `llvm-config` for the target, if it exists.
-+    ///
-+    /// Note that this returns `None` if LLVM is disabled, or if we're in a
-+    /// check build or dry-run, where there's no need to build all of LLVM.
-+    fn llvm_config(&self, target: Interned<String>) -> Option<PathBuf> {
-+        if self.config.llvm_enabled() && self.kind != Kind::Check && !self.config.dry_run {
-+            let llvm_config = self.ensure(native::Llvm { target });
-+            if llvm_config.is_file() {
-+                return Some(llvm_config);
-+            }
-+        }
-+        None
-+    }
-+
-     /// Prepares an invocation of `cargo` to be run.
-     ///
-     /// This will create a `Command` that represents a pending execution of
-@@ -1034,6 +1048,17 @@ impl<'a> Builder<'a> {
-                 .env("RUSTC_SNAPSHOT_LIBDIR", self.rustc_libdir(compiler));
-         }
- 
-+        // Tools that use compiler libraries may inherit the `-lLLVM` link
-+        // requirement, but the `-L` library path is not propagated across
-+        // separate Cargo projects. We can add LLVM's library path to the
-+        // platform-specific environment variable as a workaround.
-+        if mode == Mode::ToolRustc {
-+            if let Some(llvm_config) = self.llvm_config(target) {
-+                let llvm_libdir = output(Command::new(&llvm_config).arg("--libdir"));
-+                add_link_lib_path(vec![llvm_libdir.trim().into()], &mut cargo);
-+            }
-+        }
-+
-         if self.config.incremental {
-             cargo.env("CARGO_INCREMENTAL", "1");
-         } else {
-diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
-index 65a00db33949..ad494b88b3af 100644
---- a/src/bootstrap/compile.rs
-+++ b/src/bootstrap/compile.rs
-@@ -451,44 +451,6 @@ impl Step for Rustc {
-             false,
-         );
- 
--        // We used to build librustc_codegen_llvm as a separate step,
--        // which produced a dylib that the compiler would dlopen() at runtime.
--        // This meant that we only needed to make sure that libLLVM.so was
--        // installed by the time we went to run a tool using it - since
--        // librustc_codegen_llvm was effectively a standalone artifact,
--        // other crates were completely oblivious to its dependency
--        // on `libLLVM.so` during build time.
--        //
--        // However, librustc_codegen_llvm is now built as an ordinary
--        // crate during the same step as the rest of the compiler crates.
--        // This means that any crates depending on it will see the fact
--        // that it uses `libLLVM.so` as a native library, and will
--        // cause us to pass `-llibLLVM.so` to the linker when we link
--        // a binary.
--        //
--        // For `rustc` itself, this works out fine.
--        // During the `Assemble` step, we call `dist::maybe_install_llvm_dylib`
--        // to copy libLLVM.so into the `stage` directory. We then link
--        // the compiler binary, which will find `libLLVM.so` in the correct place.
--        //
--        // However, this is insufficient for tools that are build against stage0
--        // (e.g. stage1 rustdoc). Since `Assemble` for stage0 doesn't actually do anything,
--        // we won't have `libLLVM.so` in the stage0 sysroot. In the past, this wasn't
--        // a problem - we would copy the tool binary into its correct stage directory
--        // (e.g. stage1 for a stage1 rustdoc built against a stage0 compiler).
--        // Since libLLVM.so wasn't resolved until runtime, it was fine for it to
--        // not exist while we were building it.
--        //
--        // To ensure that we can still build stage1 tools against a stage0 compiler,
--        // we explicitly copy libLLVM.so into the stage0 sysroot when building
--        // the stage0 compiler. This ensures that tools built against stage0
--        // will see libLLVM.so at build time, making the linker happy.
--        if compiler.stage == 0 {
--            builder.info(&format!("Installing libLLVM.so to stage 0 ({})", compiler.host));
--            let sysroot = builder.sysroot(compiler);
--            dist::maybe_install_llvm_dylib(builder, compiler.host, &sysroot);
--        }
--
-         builder.ensure(RustcLink {
-             compiler: builder.compiler(compiler.stage, builder.config.build),
-             target_compiler: compiler,
-diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs
-index 67e0ed5c5802..c8ccba467e50 100644
---- a/src/bootstrap/tool.rs
-+++ b/src/bootstrap/tool.rs
-@@ -12,7 +12,7 @@ use crate::channel;
- use crate::channel::GitInfo;
- use crate::compile;
- use crate::toolstate::ToolState;
--use crate::util::{add_lib_path, exe, CiEnv};
-+use crate::util::{add_dylib_path, exe, CiEnv};
- use crate::Compiler;
- use crate::Mode;
- 
-@@ -388,7 +388,7 @@ pub struct ErrorIndex {
- impl ErrorIndex {
-     pub fn command(builder: &Builder<'_>, compiler: Compiler) -> Command {
-         let mut cmd = Command::new(builder.ensure(ErrorIndex { compiler }));
--        add_lib_path(
-+        add_dylib_path(
-             vec![PathBuf::from(&builder.sysroot_libdir(compiler, compiler.host))],
-             &mut cmd,
-         );
-@@ -689,7 +689,7 @@ impl<'a> Builder<'a> {
-             }
-         }
- 
--        add_lib_path(lib_paths, &mut cmd);
-+        add_dylib_path(lib_paths, &mut cmd);
-         cmd
-     }
- }
-diff --git a/src/bootstrap/util.rs b/src/bootstrap/util.rs
-index eac790fe504b..2bc6f1939d97 100644
---- a/src/bootstrap/util.rs
-+++ b/src/bootstrap/util.rs
-@@ -40,7 +40,7 @@ pub fn libdir(target: &str) -> &'static str {
- }
- 
- /// Adds a list of lookup paths to `cmd`'s dynamic library lookup path.
--pub fn add_lib_path(path: Vec<PathBuf>, cmd: &mut Command) {
-+pub fn add_dylib_path(path: Vec<PathBuf>, cmd: &mut Command) {
-     let mut list = dylib_path();
-     for path in path {
-         list.insert(0, path);
-@@ -72,6 +72,31 @@ pub fn dylib_path() -> Vec<PathBuf> {
-     env::split_paths(&var).collect()
- }
- 
-+/// Adds a list of lookup paths to `cmd`'s link library lookup path.
-+pub fn add_link_lib_path(path: Vec<PathBuf>, cmd: &mut Command) {
-+    let mut list = link_lib_path();
-+    for path in path {
-+        list.insert(0, path);
-+    }
-+    cmd.env(link_lib_path_var(), t!(env::join_paths(list)));
-+}
-+
-+/// Returns the environment variable which the link library lookup path
-+/// resides in for this platform.
-+fn link_lib_path_var() -> &'static str {
-+    if cfg!(target_env = "msvc") { "LIB" } else { "LIBRARY_PATH" }
-+}
-+
-+/// Parses the `link_lib_path_var()` environment variable, returning a list of
-+/// paths that are members of this lookup path.
-+fn link_lib_path() -> Vec<PathBuf> {
-+    let var = match env::var_os(link_lib_path_var()) {
-+        Some(v) => v,
-+        None => return vec![],
-+    };
-+    env::split_paths(&var).collect()
-+}
-+
- /// `push` all components to `buf`. On windows, append `.exe` to the last component.
- pub fn push_exe_path(mut buf: PathBuf, components: &[&str]) -> PathBuf {
-     let (&file, components) = components.split_last().expect("at least one component required");

SOURCES/rust-pr70163-prepare-for-llvm-10-upgrade.patch

@@ -1,175 +0,0 @@
-commit 374ab25585f0a817fe7bd6986737f12347b12d0b (from 1add455ec6f81045e7651c6225902823f5d4fbfa)
-Merge: 1add455ec6f8 497f879b1e24
-Author: bors <bors@rust-lang.org>
-Date:   Tue Mar 24 12:42:54 2020 +0000
-
-    Auto merge of #70163 - nikic:llvm-10-preparation, r=cuviper
-    
-    Prepare for LLVM 10 upgrade
-    
-    This is #67759 minus the submodule update.
-    
-     * Fix two compatibility issues in the rustllvm wrapper.
-     * Update data layout strings in tests.
-     * Fix LLVM version comparison (this become a problem because the major version has two digits now).
-    
-    r? @cuviper
-
-diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
-index aa1d1b7c4241..b52fbe4666eb 100644
---- a/src/bootstrap/test.rs
-+++ b/src/bootstrap/test.rs
-@@ -1141,6 +1141,8 @@ impl Step for Compiletest {
-             let llvm_config = builder.ensure(native::Llvm { target: builder.config.build });
-             if !builder.config.dry_run {
-                 let llvm_version = output(Command::new(&llvm_config).arg("--version"));
-+                // Remove trailing newline from llvm-config output.
-+                let llvm_version = llvm_version.trim_end();
-                 cmd.arg("--llvm-version").arg(llvm_version);
-             }
-             if !builder.is_rust_llvm(target) {
-diff --git a/src/rustllvm/PassWrapper.cpp b/src/rustllvm/PassWrapper.cpp
-index 90d24d20737d..9e8614e3b6d3 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 25cfee3373dc..799adb418822 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/src/test/run-make-fulldeps/target-specs/my-awesome-platform.json b/src/test/run-make-fulldeps/target-specs/my-awesome-platform.json
-index 8d028280a8da..00de3de05f07 100644
---- a/src/test/run-make-fulldeps/target-specs/my-awesome-platform.json
-+++ b/src/test/run-make-fulldeps/target-specs/my-awesome-platform.json
-@@ -1,5 +1,5 @@
- {
--    "data-layout": "e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128",
-+    "data-layout": "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-f64:32:64-f80:32-n8:16:32-S128",
-     "linker-flavor": "gcc",
-     "llvm-target": "i686-unknown-linux-gnu",
-     "target-endian": "little",
-diff --git a/src/test/run-make-fulldeps/target-specs/my-x86_64-unknown-linux-gnu-platform.json b/src/test/run-make-fulldeps/target-specs/my-x86_64-unknown-linux-gnu-platform.json
-index 48040ae3da0e..6d5e964ed4fe 100644
---- a/src/test/run-make-fulldeps/target-specs/my-x86_64-unknown-linux-gnu-platform.json
-+++ b/src/test/run-make-fulldeps/target-specs/my-x86_64-unknown-linux-gnu-platform.json
-@@ -1,6 +1,6 @@
- {
-     "pre-link-args": {"gcc": ["-m64"]},
--    "data-layout": "e-m:e-i64:64-f80:128-n8:16:32:64-S128",
-+    "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
-     "linker-flavor": "gcc",
-     "llvm-target": "x86_64-unknown-linux-gnu",
-     "target-endian": "little",
-diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs
-index 2a24a8c3c948..cb648db8830e 100644
---- a/src/tools/compiletest/src/header.rs
-+++ b/src/tools/compiletest/src/header.rs
-@@ -191,6 +191,7 @@ impl EarlyProps {
-                 return true;
-             }
-             if let Some(ref actual_version) = config.llvm_version {
-+                let actual_version = version_to_int(actual_version);
-                 if line.starts_with("min-llvm-version") {
-                     let min_version = line
-                         .trim_end()
-@@ -199,7 +200,7 @@ impl EarlyProps {
-                         .expect("Malformed llvm version directive");
-                     // Ignore if actual version is smaller the minimum required
-                     // version
--                    &actual_version[..] < min_version
-+                    actual_version < version_to_int(min_version)
-                 } else if line.starts_with("min-system-llvm-version") {
-                     let min_version = line
-                         .trim_end()
-@@ -208,7 +209,7 @@ impl EarlyProps {
-                         .expect("Malformed llvm version directive");
-                     // Ignore if using system LLVM and actual version
-                     // is smaller the minimum required version
--                    config.system_llvm && &actual_version[..] < min_version
-+                    config.system_llvm && actual_version < version_to_int(min_version)
-                 } else if line.starts_with("ignore-llvm-version") {
-                     // Syntax is: "ignore-llvm-version <version1> [- <version2>]"
-                     let range_components = line
-@@ -219,15 +220,15 @@ impl EarlyProps {
-                         .take(3) // 3 or more = invalid, so take at most 3.
-                         .collect::<Vec<&str>>();
-                     match range_components.len() {
--                        1 => &actual_version[..] == range_components[0],
-+                        1 => actual_version == version_to_int(range_components[0]),
-                         2 => {
--                            let v_min = range_components[0];
--                            let v_max = range_components[1];
-+                            let v_min = version_to_int(range_components[0]);
-+                            let v_max = version_to_int(range_components[1]);
-                             if v_max < v_min {
-                                 panic!("Malformed LLVM version range: max < min")
-                             }
-                             // Ignore if version lies inside of range.
--                            &actual_version[..] >= v_min && &actual_version[..] <= v_max
-+                            actual_version >= v_min && actual_version <= v_max
-                         }
-                         _ => panic!("Malformed LLVM version directive"),
-                     }
-@@ -238,6 +239,20 @@ impl EarlyProps {
-                 false
-             }
-         }
-+
-+        fn version_to_int(version: &str) -> u32 {
-+            let version_without_suffix = version.split('-').next().unwrap();
-+            let components: Vec<u32> = version_without_suffix
-+                .split('.')
-+                .map(|s| s.parse().expect("Malformed version component"))
-+                .collect();
-+            match components.len() {
-+                1 => components[0] * 10000,
-+                2 => components[0] * 10000 + components[1] * 100,
-+                3 => components[0] * 10000 + components[1] * 100 + components[2],
-+                _ => panic!("Malformed version"),
-+            }
-+        }
-     }
- }
- 
-diff --git a/src/tools/compiletest/src/header/tests.rs b/src/tools/compiletest/src/header/tests.rs
-index 6c478f7e29da..31d991e0c2f8 100644
---- a/src/tools/compiletest/src/header/tests.rs
-+++ b/src/tools/compiletest/src/header/tests.rs
-@@ -122,9 +122,8 @@ fn llvm_version() {
-     config.llvm_version = Some("9.3.1-rust-1.43.0-dev".to_owned());
-     assert!(!parse_rs(&config, "// min-llvm-version 9.2").ignore);
- 
--    // FIXME.
--    // config.llvm_version = Some("10.0.0-rust".to_owned());
--    // assert!(!parse_rs(&config, "// min-llvm-version 9.0").ignore);
-+    config.llvm_version = Some("10.0.0-rust".to_owned());
-+    assert!(!parse_rs(&config, "// min-llvm-version 9.0").ignore);
- }
- 
- #[test]

SOURCES/rust-pr70591-ensure-llvm-is-in-the-link-path.patch

@@ -1,40 +0,0 @@
-commit 6067315d58ff3d49b305ae3c99810656856c8e21
-Author: Josh Stone <jistone@redhat.com>
-Date:   Mon Mar 30 14:03:39 2020 -0700
-
-    Ensure LLVM is in the link path for "fulldeps" tests
-    
-    This is a follow-up to #70123, which added `llvm-config --libdir` to the
-    `LIBRARY_PATH` for rustc tools. We need the same for "run-make-fulldeps"
-    and "ui-fulldeps" tests which depend on compiler libraries, implicitly
-    needing to link to `-lLLVM` as well.
-
-diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
-index 5b946b05735d..2499856235f1 100644
---- a/src/bootstrap/test.rs
-+++ b/src/bootstrap/test.rs
-@@ -21,7 +21,7 @@ use crate::flags::Subcommand;
- use crate::native;
- use crate::tool::{self, SourceType, Tool};
- use crate::toolstate::ToolState;
--use crate::util::{self, dylib_path, dylib_path_var};
-+use crate::util::{self, add_link_lib_path, dylib_path, dylib_path_var};
- use crate::Crate as CargoCrate;
- use crate::{envify, DocTests, GitRepo, Mode};
- 
-@@ -1178,6 +1178,15 @@ impl Step for Compiletest {
-                 cmd.arg("--system-llvm");
-             }
- 
-+            // Tests that use compiler libraries may inherit the `-lLLVM` link
-+            // requirement, but the `-L` library path is not propagated across
-+            // separate compilations. We can add LLVM's library path to the
-+            // platform-specific environment variable as a workaround.
-+            if !builder.config.dry_run && suite.ends_with("fulldeps") {
-+                let llvm_libdir = output(Command::new(&llvm_config).arg("--libdir"));
-+                add_link_lib_path(vec![llvm_libdir.trim().into()], &mut cmd);
-+            }
-+
-             // Only pass correct values for these flags for the `run-make` suite as it
-             // requires that a C++ compiler was configured which isn't always the case.
-             if !builder.config.dry_run && suite == "run-make-fulldeps" {

SOURCES/rust-pr71782-Use-a-non-existent-test-path.patch

@@ -1,56 +0,0 @@
-From fbd3fbdb24563a9d8fd3651f6bdc90bbbbd81d3e Mon Sep 17 00:00:00 2001
-From: Josh Stone <jistone@redhat.com>
-Date: Fri, 1 May 2020 16:50:10 -0700
-Subject: [PATCH] Use a non-existent test path instead of clobbering /dev/null
-
----
- src/test/ui/non-ice-error-on-worker-io-fail.rs     | 10 +++++++---
- src/test/ui/non-ice-error-on-worker-io-fail.stderr |  2 +-
- 2 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/src/test/ui/non-ice-error-on-worker-io-fail.rs b/src/test/ui/non-ice-error-on-worker-io-fail.rs
-index 8af17742850d..30779fc65c0f 100644
---- a/src/test/ui/non-ice-error-on-worker-io-fail.rs
-+++ b/src/test/ui/non-ice-error-on-worker-io-fail.rs
-@@ -4,8 +4,12 @@
- //
- // An attempt to `-o` into a directory we cannot write into should indeed
- // be an error; but not an ICE.
-+//
-+// However, some folks run tests as root, which can write `/dev/` and end
-+// up clobbering `/dev/null`. Instead we'll use a non-existent path, which
-+// also used to ICE, but even root can't magically write there.
- 
--// compile-flags: -o /dev/null
-+// compile-flags: -o /does-not-exist/output
- 
- // The error-pattern check occurs *before* normalization, and the error patterns
- // are wildly different between build environments. So this is a cop-out (and we
-@@ -15,10 +19,10 @@
- // error-pattern: error
- 
- // On Mac OS X, we get an error like the below
--// normalize-stderr-test "failed to write bytecode to /dev/null.non_ice_error_on_worker_io_fail.*" -> "io error modifying /dev/"
-+// normalize-stderr-test "failed to write bytecode to /does-not-exist/output.non_ice_error_on_worker_io_fail.*" -> "io error modifying /does-not-exist/"
- 
- // On Linux, we get an error like the below
--// normalize-stderr-test "couldn't create a temp dir.*" -> "io error modifying /dev/"
-+// normalize-stderr-test "couldn't create a temp dir.*" -> "io error modifying /does-not-exist/"
- 
- // ignore-tidy-linelength
- // ignore-windows - this is a unix-specific test
-diff --git a/src/test/ui/non-ice-error-on-worker-io-fail.stderr b/src/test/ui/non-ice-error-on-worker-io-fail.stderr
-index f732abc52b71..edadecf273a7 100644
---- a/src/test/ui/non-ice-error-on-worker-io-fail.stderr
-+++ b/src/test/ui/non-ice-error-on-worker-io-fail.stderr
-@@ -1,6 +1,6 @@
- warning: ignoring --out-dir flag due to -o flag
- 
--error: io error modifying /dev/
-+error: io error modifying /does-not-exist/
- 
- error: aborting due to previous error
- 
--- 
-2.26.2
-

SOURCES/rustc-1.42.0-disable-libssh2.patch

@@ -1,42 +0,0 @@
---- rustc-1.42.0-src/Cargo.lock.orig	2020-03-09 15:11:17.000000000 -0700
-+++ rustc-1.42.0-src/Cargo.lock	2020-04-02 16:39:22.268896227 -0700
-@@ -1796,7 +1796,6 @@
- dependencies = [
-  "cc",
-  "libc",
-- "libssh2-sys",
-  "libz-sys",
-  "openssl-sys",
-  "pkg-config",
-@@ -1813,20 +1812,6 @@
- ]
- 
- [[package]]
--name = "libssh2-sys"
--version = "0.2.14"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "36aa6e813339d3a063292b77091dfbbb6152ff9006a459895fa5bebed7d34f10"
--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.42.0-src/vendor/git2/Cargo.toml.orig	2020-03-09 17:00:19.000000000 -0700
-+++ rustc-1.42.0-src/vendor/git2/Cargo.toml	2020-04-02 16:38:46.163664007 -0700
-@@ -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

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

@@ -0,0 +1,42 @@
+--- ./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" ] }