import UBI rust-1.71.1-1.el9

.gitignore

@@ -1,2 +1,2 @@
-SOURCES/rustc-1.66.1-src.tar.xz
+SOURCES/rustc-1.71.1-src.tar.xz
-SOURCES/wasi-libc-wasi-sdk-17.tar.gz
+SOURCES/wasi-libc-wasi-sdk-20.tar.gz

.rust.metadata

@@ -1,2 +1,2 @@
-a8cc02cc11a942bddf67f1cfdcdd2bd867296f8e SOURCES/rustc-1.66.1-src.tar.xz
+ffa03139b447604322d689eefe4e157a49c39f51 SOURCES/rustc-1.71.1-src.tar.xz
-1f4561760c6c7e9f9f30c8cf0d156b8d551e04e2 SOURCES/wasi-libc-wasi-sdk-17.tar.gz
+8678e3510c88ef1de4d8c2940fa8ddad8f4eb084 SOURCES/wasi-libc-wasi-sdk-20.tar.gz

SOURCES/0001-Allow-using-external-builds-of-the-compiler-rt-profi.patch

@@ -0,0 +1,142 @@
+From f2fd2d01f96b50b039402c9ab4278230687f7922 Mon Sep 17 00:00:00 2001
+From: Josh Stone <jistone@redhat.com>
+Date: Tue, 25 Jul 2023 13:11:50 -0700
+Subject: [PATCH] Allow using external builds of the compiler-rt profile lib
+
+This changes the bootstrap config `target.*.profiler` from a plain bool
+to also allow a string, which will be used as a path to the pre-built
+profiling runtime for that target. Then `profiler_builtins/build.rs`
+reads that in a `LLVM_PROFILER_RT_LIB` environment variable.
+---
+ config.example.toml                |  6 ++++--
+ library/profiler_builtins/build.rs |  6 ++++++
+ src/bootstrap/compile.rs           |  4 ++++
+ src/bootstrap/config.rs            | 30 ++++++++++++++++++++++++------
+ 4 files changed, 38 insertions(+), 8 deletions(-)
+
+diff --git a/config.example.toml b/config.example.toml
+index d0eaa9fd7ffa..e0e991e679af 100644
+--- a/config.example.toml
++++ b/config.example.toml
+@@ -745,8 +745,10 @@ changelog-seen = 2
+ # This option will override the same option under [build] section.
+ #sanitizers = build.sanitizers (bool)
+ 
+-# Build the profiler runtime for this target(required when compiling with options that depend
+-# on this runtime, such as `-C profile-generate` or `-C instrument-coverage`).
++# When true, build the profiler runtime for this target(required when compiling
++# with options that depend on this runtime, such as `-C profile-generate` or
++# `-C instrument-coverage`). This may also be given a path to an existing build
++# of the profiling runtime library from LLVM's compiler-rt.
+ # This option will override the same option under [build] section.
+ #profiler = build.profiler (bool)
+ 
+diff --git a/library/profiler_builtins/build.rs b/library/profiler_builtins/build.rs
+index 1b1f11798d74..d14d0b82229a 100644
+--- a/library/profiler_builtins/build.rs
++++ b/library/profiler_builtins/build.rs
+@@ -6,6 +6,12 @@
+ use std::path::Path;
+ 
+ fn main() {
++    println!("cargo:rerun-if-env-changed=LLVM_PROFILER_RT_LIB");
++    if let Ok(rt) = env::var("LLVM_PROFILER_RT_LIB") {
++        println!("cargo:rustc-link-lib=static:+verbatim={rt}");
++        return;
++    }
++
+     let target = env::var("TARGET").expect("TARGET was not set");
+     let cfg = &mut cc::Build::new();
+ 
+diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
+index 33addb90da37..1d8b3c6e5435 100644
+--- a/src/bootstrap/compile.rs
++++ b/src/bootstrap/compile.rs
+@@ -305,6 +305,10 @@ pub fn std_cargo(builder: &Builder<'_>, target: TargetSelection, stage: u32, car
+         cargo.env("MACOSX_DEPLOYMENT_TARGET", target);
+     }
+ 
++    if let Some(path) = builder.config.profiler_path(target) {
++        cargo.env("LLVM_PROFILER_RT_LIB", path);
++    }
++
+     // Determine if we're going to compile in optimized C intrinsics to
+     // the `compiler-builtins` crate. These intrinsics live in LLVM's
+     // `compiler-rt` repository, but our `src/llvm-project` submodule isn't
+diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
+index e192cda9a9a7..a4803db0a470 100644
+--- a/src/bootstrap/config.rs
++++ b/src/bootstrap/config.rs
+@@ -467,7 +467,7 @@ pub struct Target {
+     pub linker: Option<PathBuf>,
+     pub ndk: Option<PathBuf>,
+     pub sanitizers: Option<bool>,
+-    pub profiler: Option<bool>,
++    pub profiler: Option<StringOrBool>,
+     pub rpath: Option<bool>,
+     pub crt_static: Option<bool>,
+     pub musl_root: Option<PathBuf>,
+@@ -796,9 +796,9 @@ struct Dist {
+     }
+ }
+ 
+-#[derive(Debug, Deserialize)]
++#[derive(Clone, Debug, Deserialize)]
+ #[serde(untagged)]
+-enum StringOrBool {
++pub enum StringOrBool {
+     String(String),
+     Bool(bool),
+ }
+@@ -809,6 +809,12 @@ fn default() -> StringOrBool {
+     }
+ }
+ 
++impl StringOrBool {
++    fn is_string_or_true(&self) -> bool {
++        matches!(self, Self::String(_) | Self::Bool(true))
++    }
++}
++
+ define_config! {
+     /// TOML representation of how the Rust build is configured.
+     struct Rust {
+@@ -880,7 +886,7 @@ struct TomlTarget {
+         llvm_libunwind: Option<String> = "llvm-libunwind",
+         android_ndk: Option<String> = "android-ndk",
+         sanitizers: Option<bool> = "sanitizers",
+-        profiler: Option<bool> = "profiler",
++        profiler: Option<StringOrBool> = "profiler",
+         rpath: Option<bool> = "rpath",
+         crt_static: Option<bool> = "crt-static",
+         musl_root: Option<String> = "musl-root",
+@@ -1744,12 +1750,24 @@ pub fn any_sanitizers_enabled(&self) -> bool {
+         self.target_config.values().any(|t| t.sanitizers == Some(true)) || self.sanitizers
+     }
+ 
++    pub fn profiler_path(&self, target: TargetSelection) -> Option<&str> {
++        match self.target_config.get(&target)?.profiler.as_ref()? {
++            StringOrBool::String(s) => Some(s),
++            StringOrBool::Bool(_) => None,
++        }
++    }
++
+     pub fn profiler_enabled(&self, target: TargetSelection) -> bool {
+-        self.target_config.get(&target).map(|t| t.profiler).flatten().unwrap_or(self.profiler)
++        self.target_config
++            .get(&target)
++            .and_then(|t| t.profiler.as_ref())
++            .map(StringOrBool::is_string_or_true)
++            .unwrap_or(self.profiler)
+     }
+ 
+     pub fn any_profiler_enabled(&self) -> bool {
+-        self.target_config.values().any(|t| t.profiler == Some(true)) || self.profiler
++        self.target_config.values().any(|t| matches!(&t.profiler, Some(p) if p.is_string_or_true()))
++            || self.profiler
+     }
+ 
+     pub fn rpath_enabled(&self, target: TargetSelection) -> bool {
+-- 
+2.41.0
+

SOURCES/0001-Improve-generating-Custom-entry-function.patch

@@ -1,302 +0,0 @@
-From 9f0a8620bd7d325e6d42417b08daff3e55cb88f6 Mon Sep 17 00:00:00 2001
-From: Ayush Singh <ayushsingh1325@gmail.com>
-Date: Sat, 5 Nov 2022 14:36:38 +0530
-Subject: [PATCH] Improve generating Custom entry function
-
-This commit is aimed at making compiler generated entry functions
-(Basically just C `main` right now) more generic so other targets can do
-similar things for custom entry. This was initially implemented as part
-of https://github.com/rust-lang/rust/pull/100316.
-
-Currently, this moves the entry function name and Call convention to the
-target spec.
-
-Signed-off-by: Ayush Singh <ayushsingh1325@gmail.com>
----
- compiler/rustc_codegen_llvm/src/abi.rs        | 40 +++++++++++--------
- compiler/rustc_codegen_llvm/src/context.rs    | 10 ++++-
- compiler/rustc_codegen_llvm/src/declare.rs    | 22 ++++++++++
- .../src/back/symbol_export.rs                 |  3 +-
- compiler/rustc_target/src/abi/call/mod.rs     | 28 +++++++++++++
- compiler/rustc_target/src/json.rs             | 25 ++++++++++++
- compiler/rustc_target/src/spec/mod.rs         | 27 +++++++++++++
- 7 files changed, 135 insertions(+), 20 deletions(-)
-
-diff --git a/compiler/rustc_codegen_llvm/src/abi.rs b/compiler/rustc_codegen_llvm/src/abi.rs
-index d478efc863a9..a6fd2a7de6bd 100644
---- a/compiler/rustc_codegen_llvm/src/abi.rs
-+++ b/compiler/rustc_codegen_llvm/src/abi.rs
-@@ -398,23 +398,7 @@ fn ptr_to_llvm_type(&self, cx: &CodegenCx<'ll, 'tcx>) -> &'ll Type {
-     }
- 
-     fn llvm_cconv(&self) -> llvm::CallConv {
--        match self.conv {
--            Conv::C | Conv::Rust | Conv::CCmseNonSecureCall => llvm::CCallConv,
--            Conv::RustCold => llvm::ColdCallConv,
--            Conv::AmdGpuKernel => llvm::AmdGpuKernel,
--            Conv::AvrInterrupt => llvm::AvrInterrupt,
--            Conv::AvrNonBlockingInterrupt => llvm::AvrNonBlockingInterrupt,
--            Conv::ArmAapcs => llvm::ArmAapcsCallConv,
--            Conv::Msp430Intr => llvm::Msp430Intr,
--            Conv::PtxKernel => llvm::PtxKernel,
--            Conv::X86Fastcall => llvm::X86FastcallCallConv,
--            Conv::X86Intr => llvm::X86_Intr,
--            Conv::X86Stdcall => llvm::X86StdcallCallConv,
--            Conv::X86ThisCall => llvm::X86_ThisCall,
--            Conv::X86VectorCall => llvm::X86_VectorCall,
--            Conv::X86_64SysV => llvm::X86_64_SysV,
--            Conv::X86_64Win64 => llvm::X86_64_Win64,
--        }
-+        self.conv.into()
-     }
- 
-     fn apply_attrs_llfn(&self, cx: &CodegenCx<'ll, 'tcx>, llfn: &'ll Value) {
-@@ -596,3 +580,25 @@ fn get_param(&mut self, index: usize) -> Self::Value {
-         llvm::get_param(self.llfn(), index as c_uint)
-     }
- }
-+
-+impl From<Conv> for llvm::CallConv {
-+    fn from(conv: Conv) -> Self {
-+        match conv {
-+            Conv::C | Conv::Rust | Conv::CCmseNonSecureCall => llvm::CCallConv,
-+            Conv::RustCold => llvm::ColdCallConv,
-+            Conv::AmdGpuKernel => llvm::AmdGpuKernel,
-+            Conv::AvrInterrupt => llvm::AvrInterrupt,
-+            Conv::AvrNonBlockingInterrupt => llvm::AvrNonBlockingInterrupt,
-+            Conv::ArmAapcs => llvm::ArmAapcsCallConv,
-+            Conv::Msp430Intr => llvm::Msp430Intr,
-+            Conv::PtxKernel => llvm::PtxKernel,
-+            Conv::X86Fastcall => llvm::X86FastcallCallConv,
-+            Conv::X86Intr => llvm::X86_Intr,
-+            Conv::X86Stdcall => llvm::X86StdcallCallConv,
-+            Conv::X86ThisCall => llvm::X86_ThisCall,
-+            Conv::X86VectorCall => llvm::X86_VectorCall,
-+            Conv::X86_64SysV => llvm::X86_64_SysV,
-+            Conv::X86_64Win64 => llvm::X86_64_Win64,
-+        }
-+    }
-+}
-diff --git a/compiler/rustc_codegen_llvm/src/context.rs b/compiler/rustc_codegen_llvm/src/context.rs
-index 79ddfd884dfa..f3ef618fff54 100644
---- a/compiler/rustc_codegen_llvm/src/context.rs
-+++ b/compiler/rustc_codegen_llvm/src/context.rs
-@@ -570,8 +570,14 @@ fn apply_target_cpu_attr(&self, llfn: &'ll Value) {
-     }
- 
-     fn declare_c_main(&self, fn_type: Self::Type) -> Option<Self::Function> {
--        if self.get_declared_value("main").is_none() {
--            Some(self.declare_cfn("main", llvm::UnnamedAddr::Global, fn_type))
-+        let entry_name = self.sess().target.entry_name.as_ref();
-+        if self.get_declared_value(entry_name).is_none() {
-+            Some(self.declare_entry_fn(
-+                entry_name,
-+                self.sess().target.entry_abi.into(),
-+                llvm::UnnamedAddr::Global,
-+                fn_type,
-+            ))
-         } else {
-             // If the symbol already exists, it is an error: for example, the user wrote
-             // #[no_mangle] extern "C" fn main(..) {..}
-diff --git a/compiler/rustc_codegen_llvm/src/declare.rs b/compiler/rustc_codegen_llvm/src/declare.rs
-index f79ef11720df..dc21a02cec44 100644
---- a/compiler/rustc_codegen_llvm/src/declare.rs
-+++ b/compiler/rustc_codegen_llvm/src/declare.rs
-@@ -90,6 +90,28 @@ pub fn declare_cfn(
-         declare_raw_fn(self, name, llvm::CCallConv, unnamed, visibility, fn_type)
-     }
- 
-+    /// Declare an entry Function
-+    ///
-+    /// The ABI of this function can change depending on the target (although for now the same as
-+    /// `declare_cfn`)
-+    ///
-+    /// If there’s a value with the same name already declared, the function will
-+    /// update the declaration and return existing Value instead.
-+    pub fn declare_entry_fn(
-+        &self,
-+        name: &str,
-+        callconv: llvm::CallConv,
-+        unnamed: llvm::UnnamedAddr,
-+        fn_type: &'ll Type,
-+    ) -> &'ll Value {
-+        let visibility = if self.tcx.sess.target.default_hidden_visibility {
-+            llvm::Visibility::Hidden
-+        } else {
-+            llvm::Visibility::Default
-+        };
-+        declare_raw_fn(self, name, callconv, unnamed, visibility, fn_type)
-+    }
-+
-     /// Declare a Rust function.
-     ///
-     /// If there’s a value with the same name already declared, the function will
-diff --git a/compiler/rustc_codegen_ssa/src/back/symbol_export.rs b/compiler/rustc_codegen_ssa/src/back/symbol_export.rs
-index 752f6b1ef40c..22f534d909ab 100644
---- a/compiler/rustc_codegen_ssa/src/back/symbol_export.rs
-+++ b/compiler/rustc_codegen_ssa/src/back/symbol_export.rs
-@@ -180,7 +180,8 @@ fn exported_symbols_provider_local<'tcx>(
-         .collect();
- 
-     if tcx.entry_fn(()).is_some() {
--        let exported_symbol = ExportedSymbol::NoDefId(SymbolName::new(tcx, "main"));
-+        let exported_symbol =
-+            ExportedSymbol::NoDefId(SymbolName::new(tcx, tcx.sess.target.entry_name.as_ref()));
- 
-         symbols.push((
-             exported_symbol,
-diff --git a/compiler/rustc_target/src/abi/call/mod.rs b/compiler/rustc_target/src/abi/call/mod.rs
-index 9e5f0e4d158b..c622bd36b00c 100644
---- a/compiler/rustc_target/src/abi/call/mod.rs
-+++ b/compiler/rustc_target/src/abi/call/mod.rs
-@@ -3,6 +3,7 @@
- use crate::spec::{self, HasTargetSpec};
- use rustc_span::Symbol;
- use std::fmt;
-+use std::str::FromStr;
- 
- mod aarch64;
- mod amdgpu;
-@@ -735,6 +736,33 @@ pub fn adjust_for_foreign_abi<C>(
-     }
- }
- 
-+impl FromStr for Conv {
-+    type Err = String;
-+
-+    fn from_str(s: &str) -> Result<Self, Self::Err> {
-+        match s {
-+            "C" => Ok(Conv::C),
-+            "Rust" => Ok(Conv::Rust),
-+            "RustCold" => Ok(Conv::Rust),
-+            "ArmAapcs" => Ok(Conv::ArmAapcs),
-+            "CCmseNonSecureCall" => Ok(Conv::CCmseNonSecureCall),
-+            "Msp430Intr" => Ok(Conv::Msp430Intr),
-+            "PtxKernel" => Ok(Conv::PtxKernel),
-+            "X86Fastcall" => Ok(Conv::X86Fastcall),
-+            "X86Intr" => Ok(Conv::X86Intr),
-+            "X86Stdcall" => Ok(Conv::X86Stdcall),
-+            "X86ThisCall" => Ok(Conv::X86ThisCall),
-+            "X86VectorCall" => Ok(Conv::X86VectorCall),
-+            "X86_64SysV" => Ok(Conv::X86_64SysV),
-+            "X86_64Win64" => Ok(Conv::X86_64Win64),
-+            "AmdGpuKernel" => Ok(Conv::AmdGpuKernel),
-+            "AvrInterrupt" => Ok(Conv::AvrInterrupt),
-+            "AvrNonBlockingInterrupt" => Ok(Conv::AvrNonBlockingInterrupt),
-+            _ => Err(format!("'{}' is not a valid value for entry function call convetion.", s)),
-+        }
-+    }
-+}
-+
- // Some types are used a lot. Make sure they don't unintentionally get bigger.
- #[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
- mod size_asserts {
-diff --git a/compiler/rustc_target/src/json.rs b/compiler/rustc_target/src/json.rs
-index b5d926352122..75bb76a9de08 100644
---- a/compiler/rustc_target/src/json.rs
-+++ b/compiler/rustc_target/src/json.rs
-@@ -89,3 +89,28 @@ fn to_json(&self) -> Json {
-         }
-     }
- }
-+
-+impl ToJson for crate::abi::call::Conv {
-+    fn to_json(&self) -> Json {
-+        let s = match self {
-+            Self::C => "C",
-+            Self::Rust => "Rust",
-+            Self::RustCold => "RustCold",
-+            Self::ArmAapcs => "ArmAapcs",
-+            Self::CCmseNonSecureCall => "CCmseNonSecureCall",
-+            Self::Msp430Intr => "Msp430Intr",
-+            Self::PtxKernel => "PtxKernel",
-+            Self::X86Fastcall => "X86Fastcall",
-+            Self::X86Intr => "X86Intr",
-+            Self::X86Stdcall => "X86Stdcall",
-+            Self::X86ThisCall => "X86ThisCall",
-+            Self::X86VectorCall => "X86VectorCall",
-+            Self::X86_64SysV => "X86_64SysV",
-+            Self::X86_64Win64 => "X86_64Win64",
-+            Self::AmdGpuKernel => "AmdGpuKernel",
-+            Self::AvrInterrupt => "AvrInterrupt",
-+            Self::AvrNonBlockingInterrupt => "AvrNonBlockingInterrupt",
-+        };
-+        Json::String(s.to_owned())
-+    }
-+}
-diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs
-index 72b088d663b1..617de46a55aa 100644
---- a/compiler/rustc_target/src/spec/mod.rs
-+++ b/compiler/rustc_target/src/spec/mod.rs
-@@ -34,6 +34,7 @@
- //! the target's settings, though `target-feature` and `link-args` will *add*
- //! to the list specified by the target, rather than replace.
- 
-+use crate::abi::call::Conv;
- use crate::abi::Endian;
- use crate::json::{Json, ToJson};
- use crate::spec::abi::{lookup as lookup_abi, Abi};
-@@ -1668,6 +1669,14 @@ pub struct TargetOptions {
-     /// Whether the target supports stack canary checks. `true` by default,
-     /// since this is most common among tier 1 and tier 2 targets.
-     pub supports_stack_protector: bool,
-+
-+    // The name of entry function.
-+    // Default value is "main"
-+    pub entry_name: StaticCow<str>,
-+
-+    // The ABI of entry function.
-+    // Default value is `Conv::C`, i.e. C call convention
-+    pub entry_abi: Conv,
- }
- 
- /// Add arguments for the given flavor and also for its "twin" flavors
-@@ -1884,6 +1893,8 @@ fn default() -> TargetOptions {
-             c_enum_min_bits: 32,
-             generate_arange_section: true,
-             supports_stack_protector: true,
-+            entry_name: "main".into(),
-+            entry_abi: Conv::C,
-         }
-     }
- }
-@@ -2401,6 +2412,18 @@ macro_rules! key {
-                     }
-                 }
-             } );
-+            ($key_name:ident, Conv) => ( {
-+                let name = (stringify!($key_name)).replace("_", "-");
-+                obj.remove(&name).and_then(|o| o.as_str().and_then(|s| {
-+                    match Conv::from_str(s) {
-+                        Ok(c) => {
-+                            base.$key_name = c;
-+                            Some(Ok(()))
-+                        }
-+                        Err(e) => Some(Err(e))
-+                    }
-+                })).unwrap_or(Ok(()))
-+            } );
-         }
- 
-         if let Some(j) = obj.remove("target-endian") {
-@@ -2520,6 +2543,8 @@ macro_rules! key {
-         key!(c_enum_min_bits, u64);
-         key!(generate_arange_section, bool);
-         key!(supports_stack_protector, bool);
-+        key!(entry_name);
-+        key!(entry_abi, Conv)?;
- 
-         if base.is_builtin {
-             // This can cause unfortunate ICEs later down the line.
-@@ -2770,6 +2795,8 @@ macro_rules! target_option_val {
-         target_option_val!(c_enum_min_bits);
-         target_option_val!(generate_arange_section);
-         target_option_val!(supports_stack_protector);
-+        target_option_val!(entry_name);
-+        target_option_val!(entry_abi);
- 
-         if let Some(abi) = self.default_adjusted_cabi {
-             d.insert("default-adjusted-cabi".into(), Abi::name(abi).to_json());
--- 
-2.38.1
-

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

@@ -0,0 +1,53 @@
+From 6e2adb05860b72610291d3b0e8bd525c44cb0cc9 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
+
+---
+ compiler/rustc_target/src/spec/powerpc64le_unknown_linux_gnu.rs | 2 +-
+ compiler/rustc_target/src/spec/s390x_unknown_linux_gnu.rs       | 2 +-
+ compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs      | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/compiler/rustc_target/src/spec/powerpc64le_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/powerpc64le_unknown_linux_gnu.rs
+index fd896e086b54..08d0c43d20b4 100644
+--- a/compiler/rustc_target/src/spec/powerpc64le_unknown_linux_gnu.rs
++++ b/compiler/rustc_target/src/spec/powerpc64le_unknown_linux_gnu.rs
+@@ -2,7 +2,7 @@
+ 
+ pub fn target() -> Target {
+     let mut base = super::linux_gnu_base::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/s390x_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/s390x_unknown_linux_gnu.rs
+index f2c722b9a89d..17a14d10b27e 100644
+--- a/compiler/rustc_target/src/spec/s390x_unknown_linux_gnu.rs
++++ b/compiler/rustc_target/src/spec/s390x_unknown_linux_gnu.rs
+@@ -5,7 +5,7 @@ pub fn target() -> Target {
+     let mut base = super::linux_gnu_base::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/x86_64_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs
+index 9af1049b8702..68f876dd18c3 100644
+--- a/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs
++++ b/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs
+@@ -2,7 +2,7 @@
+ 
+ pub fn target() -> Target {
+     let mut base = super::linux_gnu_base::opts();
+-    base.cpu = "x86-64".into();
++    base.cpu = option_env!("RUSTC_TARGET_CPU_X86_64").unwrap_or("x86-64").into();
+     base.max_atomic_width = Some(64);
+     base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m64"]);
+     base.stack_probes = StackProbeType::X86;
+-- 
+2.40.1
+

SOURCES/0001-Mangle-main-as-__main_void-on-wasm32-wasi.patch

@@ -1,34 +0,0 @@
-From 98ae83daae67e9e7663b8345eced1de8c667271f Mon Sep 17 00:00:00 2001
-From: Dan Gohman <dev@sunfishcode.online>
-Date: Thu, 8 Dec 2022 10:35:46 -0800
-Subject: [PATCH] Mangle "main" as "__main_void" on wasm32-wasi
-
-On wasm, the age-old C trick of having a main function which can either have
-no arguments or argc+argv doesn't work, because wasm requires caller and
-callee signatures to match. WASI's current strategy is to have compilers
-mangle main's name to indicate which signature they're using. Rust uses the
-no-argument form, which should be mangled as `__main_void`.
-
-This is needed on wasm32-wasi as of #105395.
----
- compiler/rustc_target/src/spec/wasm32_wasi.rs | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/compiler/rustc_target/src/spec/wasm32_wasi.rs b/compiler/rustc_target/src/spec/wasm32_wasi.rs
-index 6f0bbf0672d4..a0476d542e64 100644
---- a/compiler/rustc_target/src/spec/wasm32_wasi.rs
-+++ b/compiler/rustc_target/src/spec/wasm32_wasi.rs
-@@ -104,6 +104,10 @@ pub fn target() -> Target {
-     // `args::args()` makes the WASI API calls itself.
-     options.main_needs_argc_argv = false;
- 
-+    // And, WASI mangles the name of "main" to distinguish between different
-+    // signatures.
-+    options.entry_name = "__main_void".into();
-+
-     Target {
-         llvm_target: "wasm32-wasi".into(),
-         pointer_width: 32,
--- 
-2.38.1
-

SOURCES/0001-bootstrap-config-fix-version-comparison-bug.patch

@@ -0,0 +1,36 @@
+From a627c8f54cab6880dc7d36c55092a94c6f750a6e Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Thu, 3 Aug 2023 15:05:40 -0700
+Subject: [PATCH] bootstrap: config: fix version comparison bug
+
+Rust requires a previous version of Rust to build, such as the current version, or the
+previous version.  However, the version comparison logic did not take patch releases
+into consideration when doing the version comparison for the current branch, e.g.
+Rust 1.71.1 could not be built by Rust 1.71.0 because it is neither an exact version
+match, or the previous version.
+
+Adjust the version comparison logic to tolerate mismatches in the patch version.
+
+Signed-off-by: Ariadne Conill <ariadne@dereferenced.org>
+(cherry picked from commit 31a81a08786826cc6e832bd0b49fb8b934e29648)
+---
+ src/bootstrap/config.rs | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
+index e192cda9a9a7..2b5d0b94e968 100644
+--- a/src/bootstrap/config.rs
++++ b/src/bootstrap/config.rs
+@@ -1805,7 +1805,8 @@ pub fn check_build_rustc_version(&self) {
+                 .unwrap();
+         if !(source_version == rustc_version
+             || (source_version.major == rustc_version.major
+-                && source_version.minor == rustc_version.minor + 1))
++                && (source_version.minor == rustc_version.minor
++                    || source_version.minor == rustc_version.minor + 1)))
+         {
+             let prev_version = format!("{}.{}.x", source_version.major, source_version.minor - 1);
+             eprintln!(
+-- 
+2.41.0
+

SOURCES/0001-compiletest-set-the-dylib-path-when-gathering-target.patch

@@ -1,185 +0,0 @@
-From 2bdbc5fbf7f84c62f8c7b1007f3b6fd6d3da06f6 Mon Sep 17 00:00:00 2001
-From: Josh Stone <jistone@redhat.com>
-Date: Fri, 14 Oct 2022 16:11:28 -0700
-Subject: [PATCH] compiletest: set the dylib path when gathering target cfg
-
-If the compiler is built with `rpath = false`, then it won't find its
-own libraries unless the library search path is set. We already do that
-while running the actual compiletests, but #100260 added another rustc
-command for getting the target cfg.
-
-    Check compiletest suite=codegen mode=codegen (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
-    thread 'main' panicked at 'error: failed to get cfg info from "[...]/build/x86_64-unknown-linux-gnu/stage1/bin/rustc"
-    --- stdout
-
-    --- stderr
-    [...]/build/x86_64-unknown-linux-gnu/stage1/bin/rustc: error while loading shared libraries: librustc_driver-a2a76dc626cd02d2.so: cannot open shared object file: No such file or directory
-    ', src/tools/compiletest/src/common.rs:476:13
-
-Now the library path is set here as well, so it works without rpath.
-
-(cherry picked from commit f8a0cc2ca8a644ddb63867526711ba17cb7508c8)
----
- src/tools/compiletest/src/common.rs  | 20 +++++++++++---------
- src/tools/compiletest/src/runtest.rs | 27 +++------------------------
- src/tools/compiletest/src/util.rs    | 23 +++++++++++++++++++++++
- 3 files changed, 37 insertions(+), 33 deletions(-)
-
-diff --git a/src/tools/compiletest/src/common.rs b/src/tools/compiletest/src/common.rs
-index 0260f6848386..9a432f11f82f 100644
---- a/src/tools/compiletest/src/common.rs
-+++ b/src/tools/compiletest/src/common.rs
-@@ -2,11 +2,12 @@
- 
- use std::ffi::OsString;
- use std::fmt;
-+use std::iter;
- use std::path::{Path, PathBuf};
- use std::process::Command;
- use std::str::FromStr;
- 
--use crate::util::PathBufExt;
-+use crate::util::{add_dylib_path, PathBufExt};
- use lazycell::LazyCell;
- use test::ColorConfig;
- 
-@@ -385,8 +386,7 @@ pub fn run_enabled(&self) -> bool {
-     }
- 
-     fn target_cfg(&self) -> &TargetCfg {
--        self.target_cfg
--            .borrow_with(|| TargetCfg::new(&self.rustc_path, &self.target, &self.target_rustcflags))
-+        self.target_cfg.borrow_with(|| TargetCfg::new(self))
-     }
- 
-     pub fn matches_arch(&self, arch: &str) -> bool {
-@@ -457,21 +457,23 @@ pub enum Endian {
- }
- 
- impl TargetCfg {
--    fn new(rustc_path: &Path, target: &str, target_rustcflags: &Vec<String>) -> TargetCfg {
--        let output = match Command::new(rustc_path)
-+    fn new(config: &Config) -> TargetCfg {
-+        let mut command = Command::new(&config.rustc_path);
-+        add_dylib_path(&mut command, iter::once(&config.compile_lib_path));
-+        let output = match command
-             .arg("--print=cfg")
-             .arg("--target")
--            .arg(target)
--            .args(target_rustcflags)
-+            .arg(&config.target)
-+            .args(&config.target_rustcflags)
-             .output()
-         {
-             Ok(output) => output,
--            Err(e) => panic!("error: failed to get cfg info from {:?}: {e}", rustc_path),
-+            Err(e) => panic!("error: failed to get cfg info from {:?}: {e}", config.rustc_path),
-         };
-         if !output.status.success() {
-             panic!(
-                 "error: failed to get cfg info from {:?}\n--- stdout\n{}\n--- stderr\n{}",
--                rustc_path,
-+                config.rustc_path,
-                 String::from_utf8(output.stdout).unwrap(),
-                 String::from_utf8(output.stderr).unwrap(),
-             );
-diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
-index 8af5f1da694b..f8903f754f09 100644
---- a/src/tools/compiletest/src/runtest.rs
-+++ b/src/tools/compiletest/src/runtest.rs
-@@ -13,7 +13,7 @@
- use crate::header::TestProps;
- use crate::json;
- use crate::read2::read2_abbreviated;
--use crate::util::{logv, PathBufExt};
-+use crate::util::{add_dylib_path, dylib_env_var, logv, PathBufExt};
- use crate::ColorConfig;
- use regex::{Captures, Regex};
- use rustfix::{apply_suggestions, get_suggestions_from_json, Filter};
-@@ -26,6 +26,7 @@
- use std::hash::{Hash, Hasher};
- use std::io::prelude::*;
- use std::io::{self, BufReader};
-+use std::iter;
- use std::path::{Path, PathBuf};
- use std::process::{Child, Command, ExitStatus, Output, Stdio};
- use std::str;
-@@ -72,19 +73,6 @@ fn disable_error_reporting<F: FnOnce() -> R, R>(f: F) -> R {
-     f()
- }
- 
--/// The name of the environment variable that holds dynamic library locations.
--pub fn dylib_env_var() -> &'static str {
--    if cfg!(windows) {
--        "PATH"
--    } else if cfg!(target_os = "macos") {
--        "DYLD_LIBRARY_PATH"
--    } else if cfg!(target_os = "haiku") {
--        "LIBRARY_PATH"
--    } else {
--        "LD_LIBRARY_PATH"
--    }
--}
--
- /// The platform-specific library name
- pub fn get_lib_name(lib: &str, dylib: bool) -> String {
-     // In some casess (e.g. MUSL), we build a static
-@@ -1811,16 +1799,7 @@ fn compose_and_run(
- 
-         // Need to be sure to put both the lib_path and the aux path in the dylib
-         // search path for the child.
--        let mut path =
--            env::split_paths(&env::var_os(dylib_env_var()).unwrap_or_default()).collect::<Vec<_>>();
--        if let Some(p) = aux_path {
--            path.insert(0, PathBuf::from(p))
--        }
--        path.insert(0, PathBuf::from(lib_path));
--
--        // Add the new dylib search path var
--        let newpath = env::join_paths(&path).unwrap();
--        command.env(dylib_env_var(), newpath);
-+        add_dylib_path(&mut command, iter::once(lib_path).chain(aux_path));
- 
-         let mut child = disable_error_reporting(|| command.spawn())
-             .unwrap_or_else(|_| panic!("failed to exec `{:?}`", &command));
-diff --git a/src/tools/compiletest/src/util.rs b/src/tools/compiletest/src/util.rs
-index e5ff0906be8a..ec36f1e4fb72 100644
---- a/src/tools/compiletest/src/util.rs
-+++ b/src/tools/compiletest/src/util.rs
-@@ -2,6 +2,7 @@
- use std::env;
- use std::ffi::OsStr;
- use std::path::PathBuf;
-+use std::process::Command;
- 
- use tracing::*;
- 
-@@ -111,3 +112,25 @@ fn with_extra_extension<S: AsRef<OsStr>>(&self, extension: S) -> PathBuf {
-         }
-     }
- }
-+
-+/// The name of the environment variable that holds dynamic library locations.
-+pub fn dylib_env_var() -> &'static str {
-+    if cfg!(windows) {
-+        "PATH"
-+    } else if cfg!(target_os = "macos") {
-+        "DYLD_LIBRARY_PATH"
-+    } else if cfg!(target_os = "haiku") {
-+        "LIBRARY_PATH"
-+    } else {
-+        "LD_LIBRARY_PATH"
-+    }
-+}
-+
-+/// Adds a list of lookup paths to `cmd`'s dynamic library lookup path.
-+/// If the dylib_path_var is already set for this cmd, the old value will be overwritten!
-+pub fn add_dylib_path(cmd: &mut Command, paths: impl Iterator<Item = impl Into<PathBuf>>) {
-+    let path_env = env::var_os(dylib_env_var());
-+    let old_paths = path_env.as_ref().map(env::split_paths);
-+    let new_paths = paths.map(Into::into).chain(old_paths.into_iter().flatten());
-+    cmd.env(dylib_env_var(), env::join_paths(new_paths).unwrap());
-+}
--- 
-2.38.1
-

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

@@ -1,18 +0,0 @@
---- rustc-1.61.0-src/src/etc/rust-gdb.orig	2022-05-17 18:29:36.000000000 -0700
-+++ rustc-1.61.0-src/src/etc/rust-gdb	2022-05-18 11:18:13.732709661 -0700
-@@ -14,6 +14,9 @@ fi
- RUSTC_SYSROOT="$("$RUSTC" --print=sysroot)"
- GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc"
- 
-+RUST_STD_BUILD="@BUILDDIR@/library/"
-+RUST_STD_SRC="$RUSTC_SYSROOT/lib/rustlib/src/rust/library/"
-+
- # Run GDB with the additional arguments that load the pretty printers
- # Set the environment variable `RUST_GDB` to overwrite the call to a
- # different/specific command (defaults to `gdb`).
-@@ -21,4 +24,5 @@ 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 $RUST_STD_BUILD $RUST_STD_SRC" \
-   "$@"

SOURCES/rustc-1.65.0-disable-libssh2.patch

@@ -1,43 +0,0 @@
---- rustc-beta-src/Cargo.lock.orig	2022-09-24 10:20:14.000000000 -0700
-+++ rustc-beta-src/Cargo.lock	2022-10-04 10:26:35.490270607 -0700
-@@ -1971,7 +1971,6 @@
- dependencies = [
-  "cc",
-  "libc",
-- "libssh2-sys",
-  "libz-sys",
-  "openssl-sys",
-  "pkg-config",
-@@ -2004,20 +2003,6 @@
- ]
- 
- [[package]]
--name = "libssh2-sys"
--version = "0.2.23"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "b094a36eb4b8b8c8a7b4b8ae43b2944502be3e59cd87687595cf6b0a71b3f4ca"
--dependencies = [
-- "cc",
-- "libc",
-- "libz-sys",
-- "openssl-sys",
-- "pkg-config",
-- "vcpkg",
--]
--
--[[package]]
- name = "libz-sys"
- version = "1.1.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
---- rustc-beta-src/vendor/git2/Cargo.toml.orig	2022-10-04 10:26:35.490270607 -0700
-+++ rustc-beta-src/vendor/git2/Cargo.toml	2022-10-04 10:28:14.002187686 -0700
-@@ -58,9 +58,7 @@
- 
- [features]
- default = [
--    "ssh",
-     "https",
--    "ssh_key_from_memory",
- ]
- https = [
-     "libgit2-sys/https",

SOURCES/rustc-1.65.0-no-default-pie.patch

@@ -1,43 +0,0 @@
---- rustc-beta-src/compiler/rustc_codegen_ssa/src/back/link.rs.orig	2022-09-24 10:20:14.000000000 -0700
-+++ rustc-beta-src/compiler/rustc_codegen_ssa/src/back/link.rs	2022-10-05 11:24:21.759564185 -0700
-@@ -755,7 +755,7 @@
-             && cmd.get_args().iter().any(|e| e.to_string_lossy() == "-no-pie")
-         {
-             info!("linker output: {:?}", out);
--            warn!("Linker does not support -no-pie command line option. Retrying without.");
-+            info!("Linker does not support -no-pie command line option. Retrying without.");
-             for arg in cmd.take_args() {
-                 if arg.to_string_lossy() != "-no-pie" {
-                     cmd.arg(arg);
-@@ -774,7 +774,7 @@
-             && cmd.get_args().iter().any(|e| e.to_string_lossy() == "-static-pie")
-         {
-             info!("linker output: {:?}", out);
--            warn!(
-+            info!(
-                 "Linker does not support -static-pie command line option. Retrying with -static instead."
-             );
-             // Mirror `add_(pre,post)_link_objects` to replace CRT objects.
-@@ -1520,15 +1520,15 @@
- }
- 
- fn link_output_kind(sess: &Session, crate_type: CrateType) -> LinkOutputKind {
--    let kind = match (crate_type, sess.crt_static(Some(crate_type)), sess.relocation_model()) {
-+    // Only use PIE if explicitly specified.
-+    #[allow(rustc::bad_opt_access)]
-+    let explicit_pic =
-+        matches!(sess.opts.cg.relocation_model, Some(RelocModel::Pic | RelocModel::Pie));
-+    let kind = match (crate_type, sess.crt_static(Some(crate_type)), explicit_pic) {
-         (CrateType::Executable, _, _) if sess.is_wasi_reactor() => LinkOutputKind::WasiReactorExe,
--        (CrateType::Executable, false, RelocModel::Pic | RelocModel::Pie) => {
--            LinkOutputKind::DynamicPicExe
--        }
-+        (CrateType::Executable, false, true) => LinkOutputKind::DynamicPicExe,
-         (CrateType::Executable, false, _) => LinkOutputKind::DynamicNoPicExe,
--        (CrateType::Executable, true, RelocModel::Pic | RelocModel::Pie) => {
--            LinkOutputKind::StaticPicExe
--        }
-+        (CrateType::Executable, true, true) => LinkOutputKind::StaticPicExe,
-         (CrateType::Executable, true, _) => LinkOutputKind::StaticNoPicExe,
-         (_, true, _) => LinkOutputKind::StaticDylib,
-         (_, false, _) => LinkOutputKind::DynamicDylib,

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.71.0-disable-http2.patch

@@ -1,6 +1,6 @@
---- rustc-beta-src/Cargo.lock.orig	2022-10-04 10:55:48.797517289 -0700
+--- rustc-beta-src/src/tools/cargo/Cargo.lock.orig	2023-07-07 17:30:04.817452621 -0700
-+++ rustc-beta-src/Cargo.lock	2022-10-04 10:55:48.799517248 -0700
++++ rustc-beta-src/src/tools/cargo/Cargo.lock	2023-07-07 17:30:27.777988139 -0700
-@@ -1026,7 +1026,6 @@
+@@ -734,7 +734,6 @@
  dependencies = [
   "cc",
   "libc",
@@ -8,14 +8,14 @@
   "libz-sys",
   "openssl-sys",
   "pkg-config",
-@@ -1993,16 +1992,6 @@
+@@ -1954,16 +1953,6 @@
- checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a"
+ checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb"
  
  [[package]]
 -name = "libnghttp2-sys"
--version = "0.1.4+1.41.0"
+-version = "0.1.7+1.45.0"
 -source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "03624ec6df166e79e139a2310ca213283d6b3c30810c54844f307086d4488df1"
+-checksum = "57ed28aba195b38d5ff02b9170cbff627e336a20925e43b4945390401c5dc93f"
 -dependencies = [
 - "cc",
 - "libc",
@@ -23,43 +23,22 @@
 -
 -[[package]]
  name = "libz-sys"
- version = "1.1.3"
+ version = "1.1.8"
  source = "registry+https://github.com/rust-lang/crates.io-index"
---- rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2022-10-04 10:55:48.799517248 -0700
+--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2023-07-07 17:30:04.819452581 -0700
-+++ rustc-beta-src/src/tools/cargo/Cargo.toml	2022-10-04 11:00:55.057162743 -0700
++++ rustc-beta-src/src/tools/cargo/Cargo.toml	2023-07-07 17:30:24.133061874 -0700
-@@ -21,7 +21,7 @@
+@@ -118,7 +118,7 @@
- cargo-platform = { path = "crates/cargo-platform", version = "0.1.2" }
+ cargo-util.workspace = true
- cargo-util = { path = "crates/cargo-util", version = "0.2.1" }
+ clap = { workspace = true, features = ["wrap_help"] }
- crates-io = { path = "crates/crates-io", version = "0.34.0" }
+ crates-io.workspace = true
--curl = { version = "0.4.43", features = ["http2"] }
+-curl = { workspace = true, features = ["http2"] }
-+curl = { version = "0.4.43", features = [] }
++curl = { workspace = true, features = [] }
- curl-sys = "0.4.55"
+ curl-sys.workspace = true
- env_logger = "0.9.0"
+ env_logger.workspace = true
- pretty_env_logger = { version = "0.4", optional = true }
+ filetime.workspace = true
---- rustc-beta-src/src/tools/cargo/src/cargo/sources/registry/http_remote.rs.orig	2022-09-24 10:23:17.000000000 -0700
+--- rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs.orig	2023-06-24 10:27:37.000000000 -0700
-+++ rustc-beta-src/src/tools/cargo/src/cargo/sources/registry/http_remote.rs	2022-10-04 10:55:48.799517248 -0700
++++ rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs	2023-07-07 17:30:04.819452581 -0700
-@@ -192,16 +192,8 @@
+@@ -407,16 +407,9 @@
-         }
-         self.fetch_started = true;
- 
--        // We've enabled the `http2` feature of `curl` in Cargo, so treat
--        // failures here as fatal as it would indicate a build-time problem.
--        self.multiplexing = self.config.http_config()?.multiplexing.unwrap_or(true);
--
--        self.multi
--            .pipelining(false, self.multiplexing)
--            .with_context(|| "failed to enable multiplexing/pipelining in curl")?;
--
--        // let's not flood the server with connections
--        self.multi.set_max_host_connections(2)?;
-+        // Multiplexing is disabled because the system libcurl doesn't support it.
-+        self.multiplexing = false;
- 
-         self.config
-             .shell()
---- rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs.orig	2022-09-24 10:23:17.000000000 -0700
-+++ rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs	2022-10-04 10:55:48.800517227 -0700
-@@ -403,16 +403,9 @@
          sources: SourceMap<'cfg>,
          config: &'cfg Config,
      ) -> CargoResult<PackageSet<'cfg>> {
@@ -79,7 +58,30 @@
  
          Ok(PackageSet {
              packages: package_ids
-@@ -658,7 +651,7 @@
+--- rustc-beta-src/src/tools/cargo/src/cargo/sources/registry/http_remote.rs.orig	2023-06-24 10:27:37.000000000 -0700
++++ rustc-beta-src/src/tools/cargo/src/cargo/sources/registry/http_remote.rs	2023-07-07 17:30:04.819452581 -0700
+@@ -229,16 +229,8 @@
+         }
+         self.fetch_started = true;
+ 
+-        // We've enabled the `http2` feature of `curl` in Cargo, so treat
+-        // failures here as fatal as it would indicate a build-time problem.
+-        self.multiplexing = self.config.http_config()?.multiplexing.unwrap_or(true);
+-
+-        self.multi
+-            .pipelining(false, self.multiplexing)
+-            .with_context(|| "failed to enable multiplexing/pipelining in curl")?;
+-
+-        // let's not flood the server with connections
+-        self.multi.set_max_host_connections(2)?;
++        // Multiplexing is disabled because the system libcurl doesn't support it.
++        self.multiplexing = false;
+ 
+         if !self.quiet {
+             self.config
+--- rustc-beta-src/src/tools/cargo/src/cargo/util/network/mod.rs.orig	2023-06-24 10:27:37.000000000 -0700
++++ rustc-beta-src/src/tools/cargo/src/cargo/util/network/mod.rs	2023-07-07 17:30:04.819452581 -0700
+@@ -26,7 +26,7 @@
  macro_rules! try_old_curl {
      ($e:expr, $msg:expr) => {
          let result = $e;

SOURCES/rustc-1.71.0-disable-libssh2.patch

@@ -0,0 +1,42 @@
+--- rustc-beta-src/src/tools/cargo/Cargo.lock.orig	2023-06-24 10:27:37.000000000 -0700
++++ rustc-beta-src/src/tools/cargo/Cargo.lock	2023-07-07 17:12:23.406932870 -0700
+@@ -1942,7 +1942,6 @@
+ dependencies = [
+  "cc",
+  "libc",
+- "libssh2-sys",
+  "libz-sys",
+  "openssl-sys",
+  "pkg-config",
+@@ -1965,20 +1964,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.8"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2023-06-24 10:27:37.000000000 -0700
++++ rustc-beta-src/src/tools/cargo/Cargo.toml	2023-07-07 17:12:00.688392750 -0700
+@@ -31,7 +31,7 @@
+ filetime = "0.2.9"
+ flate2 = { version = "1.0.3", default-features = false, features = ["zlib"] }
+ fwdansi = "1.1.0"
+-git2 = "0.17.1"
++git2 = { version = "0.17.1", default-features = false, features = ["https"] }
+ git2-curl = "0.18.0"
+ gix = { version = "0.44.1", default-features = false, features = ["blocking-http-transport-curl", "progress-tree"] }
+ gix-features-for-configuration-only = { version = "0.29.0", package = "gix-features", features = [ "parallel" ] }

SPECS/rust.spec

@@ -1,4 +1,4 @@
-# Only x86_64 and i686 are Tier 1 platforms at this time.
+# Only x86_64, i686, and aarch64 are Tier 1 platforms at this time.
 # https://doc.rust-lang.org/nightly/rustc/platform-support.html
 %global rust_arches x86_64 i686 aarch64 ppc64le s390x
 
@@ -8,9 +8,9 @@
 # To bootstrap from scratch, set the channel and date from src/stage0.json
 # e.g. 1.59.0 wants rustc: 1.58.0-2022-01-13
 # or nightly wants some beta-YYYY-MM-DD
-%global bootstrap_version 1.65.0
+%global bootstrap_version 1.70.0
-%global bootstrap_channel 1.65.0
+%global bootstrap_channel 1.70.0
-%global bootstrap_date 2022-11-03
+%global bootstrap_date 2023-06-01
 
 # Only the specified arches will use bootstrap binaries.
 # NOTE: Those binaries used to be uploaded with every new release, but that was
@@ -35,7 +35,7 @@
 # src/ci/docker/host-x86_64/dist-various-2/build-wasi-toolchain.sh
 # (updated per https://github.com/rust-lang/rust/pull/96907)
 %global wasi_libc_url https://github.com/WebAssembly/wasi-libc
-%global wasi_libc_ref wasi-sdk-17
+%global wasi_libc_ref wasi-sdk-20
 %global wasi_libc_name wasi-libc-%{wasi_libc_ref}
 %global wasi_libc_source %{wasi_libc_url}/archive/%{wasi_libc_ref}/%{wasi_libc_name}.tar.gz
 %global wasi_libc_dir %{_builddir}/%{wasi_libc_name}
@@ -44,17 +44,17 @@
 %bcond_with llvm_static
 
 # We can also choose to just use Rust's bundled LLVM, in case the system LLVM
-# is insufficient.  Rust currently requires LLVM 12.0+.
+# is insufficient.  Rust currently requires LLVM 14.0+.
-%global min_llvm_version 13.0.0
+%global min_llvm_version 14.0.0
-%global bundled_llvm_version 15.0.2
+%global bundled_llvm_version 16.0.5
 %bcond_with bundled_llvm
 
-# Requires stable libgit2 1.5, and not the next minor soname change.
+# Requires stable libgit2 1.6, and not the next minor soname change.
 # This needs to be consistent with the bindings in vendor/libgit2-sys.
-%global min_libgit2_version 1.5.0
+%global min_libgit2_version 1.6.4
-%global next_libgit2_version 1.6.0~
+%global next_libgit2_version 1.7.0~
-%global bundled_libgit2_version 1.5.0
+%global bundled_libgit2_version 1.6.4
-%if 0%{?fedora} >= 99
+%if 0%{?fedora} >= 38
 %bcond_with bundled_libgit2
 %else
 %bcond_without bundled_libgit2
@@ -83,8 +83,8 @@
 %endif
 
 Name:           rust
-Version:        1.66.1
+Version:        1.71.1
-Release:        2%{?dist}
+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)
@@ -104,19 +104,18 @@ Source1:        %{wasi_libc_source}
 Patch1:         0001-Use-lld-provided-by-system-for-wasm.patch
 
 # Set a substitute-path in rust-gdb for standard library sources.
-Patch2:         rustc-1.61.0-rust-gdb-substitute-path.patch
+Patch2:         rustc-1.70.0-rust-gdb-substitute-path.patch
 
-# https://github.com/rust-lang/rust/pull/103072
+# Override default target CPUs to match distro settings
-Patch3:         0001-compiletest-set-the-dylib-path-when-gathering-target.patch
+# TODO: upstream this ability into the actual build configuration
+Patch3:         0001-Let-environment-variables-override-some-default-CPUs.patch
 
-# https://github.com/rust-lang/rust/pull/104001
+# Enable the profiler runtime for native hosts
-Patch4:         0001-Improve-generating-Custom-entry-function.patch
+# https://github.com/rust-lang/rust/pull/114069
+Patch4:         0001-Allow-using-external-builds-of-the-compiler-rt-profi.patch
 
-# https://github.com/rust-lang/rust/pull/105468
+# https://github.com/rust-lang/rust/pull/114440
-Patch5:         0001-Mangle-main-as-__main_void-on-wasm32-wasi.patch
+Patch5:         0001-bootstrap-config-fix-version-comparison-bug.patch
-
-# CVE-2023-38497: cargo does not respect the umask when extracting dependencies
-Patch6:         CVE-2023-38497-cargo-umask.patch
 
 ### RHEL-specific patches below ###
 
@@ -124,16 +123,11 @@ Patch6:         CVE-2023-38497-cargo-umask.patch
 Source100:      macros.rust-toolset
 
 # Disable cargo->libgit2->libssh2 on RHEL, as it's not approved for FIPS (rhbz1732949)
-Patch100:       rustc-1.65.0-disable-libssh2.patch
+Patch100:       rustc-1.71.0-disable-libssh2.patch
 
 # libcurl on RHEL7 doesn't have http2, but since cargo requests it, curl-sys
 # will try to build it statically -- instead we turn off the feature.
-Patch101:       rustc-1.65.0-disable-http2.patch
+Patch101:       rustc-1.71.0-disable-http2.patch
-
-# kernel rh1410097 causes too-small stacks for PIE.
-# (affects RHEL6 kernels when building for RHEL7)
-Patch102:       rustc-1.65.0-no-default-pie.patch
-
 
 # Get the Rust triple for any arch.
 %{lua: function rust_triple(arch)
@@ -151,7 +145,14 @@ Patch102:       rustc-1.65.0-no-default-pie.patch
   return arch.."-unknown-linux-"..abi
 end}
 
+# Get the environment form of a Rust triple
+%{lua: function rust_triple_env(triple)
+  local sub = string.gsub(triple, "-", "_")
+  return string.upper(sub)
+end}
+
 %global rust_triple %{lua: print(rust_triple(rpm.expand("%{_target_cpu}")))}
+%global rust_triple_env %{lua: print(rust_triple_env(rpm.expand("%{rust_triple}")))}
 
 %if %defined bootstrap_arches
 # For each bootstrap arch, add an additional binary Source.
@@ -227,7 +228,7 @@ Provides:       bundled(llvm) = %{bundled_llvm_version}
 %else
 BuildRequires:  cmake >= 2.8.11
 %if 0%{?epel} == 7
-%global llvm llvm13
+%global llvm llvm14
 %endif
 %if %defined llvm
 %global llvm_root %{_libdir}/%{llvm}
@@ -264,7 +265,7 @@ Requires:       %{name}-std-static%{?_isa} = %{version}-%{release}
 Requires:       /usr/bin/cc
 
 %if 0%{?epel} == 7
-%global devtoolset_name devtoolset-9
+%global devtoolset_name devtoolset-11
 BuildRequires:  %{devtoolset_name}-binutils
 BuildRequires:  %{devtoolset_name}-gcc
 BuildRequires:  %{devtoolset_name}-gcc-c++
@@ -329,6 +330,15 @@ find '%{buildroot}%{rustlibdir}'/wasm*/lib -type f -regex '.*\\.\\(a\\|rlib\\)'
 %{nil}
 %endif
 
+%if 0%{?fedora} || 0%{?rhel} >= 8
+# For profiler_builtins
+BuildRequires:  compiler-rt
+%endif
+
+# This component was removed as of Rust 1.69.0.
+# https://github.com/rust-lang/rust/pull/101841
+Obsoletes:      %{name}-analysis < 1.69.0~
+
 %description
 Rust is a systems programming language that runs blazingly fast, prevents
 segfaults, and guarantees thread safety.
@@ -338,8 +348,9 @@ This package includes the Rust compiler and documentation generator.
 
 %package std-static
 Summary:        Standard library for Rust
+Provides:       %{name}-std-static-%{rust_triple} = %{version}-%{release}
 Requires:       %{name} = %{version}-%{release}
-Requires:       glibc-devel%{?_isa} >= 2.11
+Requires:       glibc-devel%{?_isa} >= 2.17
 
 %description std-static
 This package includes the standard libraries for building applications
@@ -542,26 +553,13 @@ This package includes source files for the Rust standard library.  It may be
 useful as a reference for code completion tools in various editors.
 
 
-%package analysis
+%if 0%{?rhel}
-Summary:        Compiler analysis data for the Rust standard library
-%if 0%{?rhel} && 0%{?rhel} < 8
-Requires:       %{name}-std-static%{?_isa} = %{version}-%{release}
-%else
-Recommends:     %{name}-std-static%{?_isa} = %{version}-%{release}
-%endif
-
-%description analysis
-This package contains analysis data files produced with rustc's -Zsave-analysis
-feature for the Rust standard library. The RLS (Rust Language Server) uses this
-data to provide information about the Rust standard library.
-
-
-%if 0%{?rhel} && 0%{?rhel} >= 8
 
 %package toolset
 Summary:        Rust Toolset
-Requires:       rust%{?_isa} = %{version}-%{release}
+BuildArch:      noarch
-Requires:       cargo%{?_isa} = %{version}-%{release}
+Requires:       rust = %{version}-%{release}
+Requires:       cargo = %{version}-%{release}
 
 %description toolset
 This is the metapackage for Rust Toolset, bringing in the Rust compiler,
@@ -590,24 +588,19 @@ test -f '%{local_rust_root}/bin/rustc'
 
 %setup -q -n %{rustc_package}
 
-%patch1 -p1
+%patch -P1 -p1
-%patch2 -p1
+%patch -P2 -p1
-%patch3 -p1
+%patch -P3 -p1
-%patch4 -p1
+%patch -P4 -p1
-%patch5 -p1
+%patch -P5 -p1
-%patch6 -p1
 
 %if %with disabled_libssh2
-%patch100 -p1
+%patch -P100 -p1
 %endif
 
 %if %without curl_http2
-%patch101 -p1
+%patch -P101 -p1
-rm -rf vendor/libnghttp2-sys/
+rm -rf vendor/libnghttp2-sys*/
-%endif
-
-%if 0%{?rhel} && 0%{?rhel} < 8
-%patch102 -p1
 %endif
 
 # Use our explicit python3 first
@@ -622,21 +615,21 @@ mkdir -p src/llvm-project/libunwind/
 %endif
 
 # Remove other unused vendored libraries
-rm -rf vendor/curl-sys/curl/
+rm -rf vendor/curl-sys*/curl/
 rm -rf vendor/*jemalloc-sys*/jemalloc/
-rm -rf vendor/libmimalloc-sys/c_src/mimalloc/
+rm -rf vendor/libffi-sys*/libffi/
-rm -rf vendor/libssh2-sys/libssh2/
+rm -rf vendor/libmimalloc-sys*/c_src/mimalloc/
-rm -rf vendor/libz-sys/src/zlib/
+rm -rf vendor/libssh2-sys*/libssh2/
-rm -rf vendor/libz-sys/src/zlib-ng/
+rm -rf vendor/libz-sys*/src/zlib{,-ng}/
-rm -rf vendor/lzma-sys/xz-*/
+rm -rf vendor/lzma-sys*/xz-*/
-rm -rf vendor/openssl-src/openssl/
+rm -rf vendor/openssl-src*/openssl/
 
 %if %without bundled_libgit2
-rm -rf vendor/libgit2-sys/libgit2/
+rm -rf vendor/libgit2-sys*/libgit2/
 %endif
 
 %if %with disabled_libssh2
-rm -rf vendor/libssh2-sys/
+rm -rf vendor/libssh2-sys*/
 %endif
 
 # This only affects the transient rust-installer, but let it use our dynamic xz-libs
@@ -665,9 +658,28 @@ find vendor -name .cargo-checksum.json \
 # it's a shebang and make them executable. Then brp-mangle-shebangs gets upset...
 find -name '*.rs' -type f -perm /111 -exec chmod -v -x '{}' '+'
 
+# The distro flags are only appropriate for the host, not our cross-targets,
+# and they're not as fine-grained as the settings we choose for std vs rustc.
+%if %defined build_rustflags
+%global build_rustflags %{nil}
+%endif
+
+# These are similar to __cflags_arch_* in /usr/lib/rpm/redhat/macros
+%{lua: function rustc_target_cpus()
+  local fedora = tonumber(rpm.expand("0%{?fedora}"))
+  local rhel = tonumber(rpm.expand("0%{?rhel}"))
+  local env =
+    " RUSTC_TARGET_CPU_X86_64=x86-64" .. ((rhel >= 10) and "-v3" or (rhel == 9) and "-v2" or "")
+    .. " RUSTC_TARGET_CPU_PPC64LE=" .. ((rhel >= 9) and "pwr9" or "pwr8")
+    .. " RUSTC_TARGET_CPU_S390X=" ..
+        ((rhel >= 9) and "z14" or (rhel == 8 or fedora >= 38) and "z13" or
+         (fedora >= 26) and "zEC12" or (rhel == 7) and "z196" or "z10")
+  return env
+end}
+
 # Set up shared environment variables for build/install/check
-%global rust_env %{?rustflags:RUSTFLAGS="%{rustflags}"}
+%global rust_env %{?rustflags:RUSTFLAGS="%{rustflags}"} %{lua: print(rustc_target_cpus())}
-%if 0%{?cmake_path:1}
+%if %defined cmake_path
 %global rust_env %{?rust_env} PATH="%{cmake_path}:$PATH"
 %endif
 %if %without disabled_libssh2
@@ -676,7 +688,6 @@ find -name '*.rs' -type f -perm /111 -exec chmod -v -x '{}' '+'
 %endif
 %global export_rust_env %{?rust_env:export %{rust_env}}
 
-
 %build
 %{export_rust_env}
 
@@ -737,6 +748,12 @@ end}
 end}
 %endif
 
+%if 0%{?fedora} || 0%{?rhel} >= 8
+# The exact profiler path is version dependent, and uses LLVM-specific
+# arch names in the filename, but this find is good enough for now...
+PROFILER=$(find %{_libdir}/clang -type f -name 'libclang_rt.profile-*.a')
+%endif
+
 %configure --disable-option-checking \
   --libdir=%{common_libdir} \
   --build=%{rust_triple} --host=%{rust_triple} --target=%{rust_triple} \
@@ -745,6 +762,7 @@ end}
   --set target.%{rust_triple}.cxx=%{__cxx} \
   --set target.%{rust_triple}.ar=%{__ar} \
   --set target.%{rust_triple}.ranlib=%{__ranlib} \
+  ${PROFILER:+--set target.%{rust_triple}.profiler="$PROFILER"} \
   %{?mingw_target_config} \
   %{?wasm_target_config} \
   --python=%{__python3} \
@@ -762,7 +780,7 @@ end}
   --set build.install-stage=2 \
   --set build.test-stage=2 \
   --enable-extended \
-  --tools=analysis,cargo,clippy,rls,rust-analyzer,rustfmt,src \
+  --tools=cargo,clippy,rls,rust-analyzer,rustfmt,src \
   --enable-vendor \
   --enable-verbose-tests \
   --dist-compression-formats=gz \
@@ -777,6 +795,9 @@ for triple in %{?mingw_targets} %{?wasm_targets}; do
 done
 
 %install
+%if 0%{?rhel} && 0%{?rhel} <= 9
+%{?set_build_flags}
+%endif
 %{export_rust_env}
 
 DESTDIR=%{buildroot} %{__python3} ./x.py install
@@ -791,6 +812,9 @@ done
 # These are transient files used by x.py dist and install
 rm -rf ./build/dist/ ./build/tmp/
 
+# Some of the components duplicate-install binaries, leaving backups we don't want
+rm -f %{buildroot}%{_bindir}/*.old
+
 # Make sure the shared libraries are in the proper libdir
 %if "%{_libdir}" != "%{common_libdir}"
 mkdir -p %{buildroot}%{_libdir}
@@ -857,13 +881,16 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*
 # We don't want Rust copies of LLVM tools (rust-lld, rust-llvm-dwp)
 rm -f %{buildroot}%{rustlibdir}/%{rust_triple}/bin/rust-ll*
 
-%if 0%{?rhel} && 0%{?rhel} >= 8
+%if 0%{?rhel}
 # This allows users to build packages using Rust Toolset.
 %{__install} -D -m 644 %{S:100} %{buildroot}%{rpmmacrodir}/macros.rust-toolset
 %endif
 
 
 %check
+%if 0%{?rhel} && 0%{?rhel} <= 9
+%{?set_build_flags}
+%endif
 %{export_rust_env}
 
 # Sanity-check the installed binaries, debuginfo-stripped and all.
@@ -881,7 +908,10 @@ done
 
 # The results are not stable on koji, so mask errors and just log it.
 # Some of the larger test artifacts are manually cleaned to save space.
-%{__python3} ./x.py test --no-fail-fast || :
+
+# Bootstrap is excluded because it's not something we ship, and a lot of its
+# tests are geared toward the upstream CI environment.
+%{__python3} ./x.py test --no-fail-fast --exclude src/bootstrap || :
 rm -rf "./build/%{rust_triple}/test/"
 
 %{__python3} ./x.py test --no-fail-fast cargo || :
@@ -995,16 +1025,7 @@ end}
 %files doc
 %docdir %{_docdir}/%{name}
 %dir %{_docdir}/%{name}
-%dir %{_docdir}/%{name}/html
+%{_docdir}/%{name}/html
-%{_docdir}/%{name}/html/*/
-%{_docdir}/%{name}/html/*.html
-%{_docdir}/%{name}/html/*.css
-%{_docdir}/%{name}/html/*.js
-%{_docdir}/%{name}/html/*.png
-%{_docdir}/%{name}/html/*.svg
-%{_docdir}/%{name}/html/*.woff2
-%license %{_docdir}/%{name}/html/*.txt
-%license %{_docdir}/%{name}/html/*.md
 # former cargo-doc
 %docdir %{_docdir}/cargo
 %dir %{_docdir}/cargo
@@ -1049,20 +1070,36 @@ end}
 %{rustlibdir}/src
 
 
-%files analysis
+%if 0%{?rhel}
-%{rustlibdir}/%{rust_triple}/analysis/
-
-
-%if 0%{?rhel} && 0%{?rhel} >= 8
 %files toolset
 %{rpmmacrodir}/macros.rust-toolset
 %endif
 
 
 %changelog
-* Mon Aug 07 2023 Josh Stone <jistone@redhat.com> - 1.66.1-2
+* Tue Aug 08 2023 Josh Stone <jistone@redhat.com> - 1.71.1-1
-- CVE-2023-38497: fix cargo to respect umask
+- Update to 1.71.1.
-- Resolves: rhbz#2228140
+- Security fix for CVE-2023-38497
+
+* Wed Jul 26 2023 Josh Stone <jistone@redhat.com> - 1.71.0-2
+- Relax the suspicious_double_ref_op lint (rhbz2225471)
+- Enable the profiler runtime for native hosts (rhbz2213875)
+
+* Thu Jul 20 2023 Josh Stone <jistone@redhat.com> - 1.71.0-1
+- Update to 1.71.0.
+
+* Tue Jul 18 2023 Josh Stone <jistone@redhat.com> - 1.70.0-1
+- Update to 1.70.0.
+
+* Wed May 10 2023 Josh Stone <jistone@redhat.com> - 1.69.0-1
+- Update to 1.69.0.
+- Obsolete rust-analysis.
+
+* Tue May 09 2023 Josh Stone <jistone@redhat.com> - 1.68.2-1
+- Update to 1.68.2.
+
+* Mon May 08 2023 Josh Stone <jistone@redhat.com> - 1.67.1-1
+- Update to 1.67.1.
 
 * Wed Jan 11 2023 Josh Stone <jistone@redhat.com> - 1.66.1-1
 - Update to 1.66.1.