diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/.gitignore b/.gitignore index 65f499a..34be546 100644 --- a/.gitignore +++ b/.gitignore @@ -236,3 +236,227 @@ /rust-1.38.0-powerpc64-unknown-linux-gnu.tar.xz /rust-1.38.0-s390x-unknown-linux-gnu.tar.xz /rust-1.38.0-x86_64-unknown-linux-gnu.tar.xz +/rustc-1.40.0-src.tar.xz +/rust-1.39.0-aarch64-unknown-linux-gnu.tar.xz +/rust-1.39.0-armv7-unknown-linux-gnueabihf.tar.xz +/rust-1.39.0-i686-unknown-linux-gnu.tar.xz +/rust-1.39.0-powerpc64le-unknown-linux-gnu.tar.xz +/rust-1.39.0-powerpc64-unknown-linux-gnu.tar.xz +/rust-1.39.0-s390x-unknown-linux-gnu.tar.xz +/rust-1.39.0-x86_64-unknown-linux-gnu.tar.xz +/rustc-1.41.0-src.tar.xz +/rust-1.40.0-aarch64-unknown-linux-gnu.tar.xz +/rust-1.40.0-armv7-unknown-linux-gnueabihf.tar.xz +/rust-1.40.0-i686-unknown-linux-gnu.tar.xz +/rust-1.40.0-powerpc64le-unknown-linux-gnu.tar.xz +/rust-1.40.0-powerpc64-unknown-linux-gnu.tar.xz +/rust-1.40.0-s390x-unknown-linux-gnu.tar.xz +/rust-1.40.0-x86_64-unknown-linux-gnu.tar.xz +/rustc-1.41.1-src.tar.xz +/rustc-1.42.0-src.tar.xz +/rust-1.41.1-aarch64-unknown-linux-gnu.tar.xz +/rust-1.41.1-armv7-unknown-linux-gnueabihf.tar.xz +/rust-1.41.1-i686-unknown-linux-gnu.tar.xz +/rust-1.41.1-powerpc64le-unknown-linux-gnu.tar.xz +/rust-1.41.1-powerpc64-unknown-linux-gnu.tar.xz +/rust-1.41.1-s390x-unknown-linux-gnu.tar.xz +/rust-1.41.1-x86_64-unknown-linux-gnu.tar.xz +/rustc-1.43.0-src.tar.xz +/rust-1.42.0-aarch64-unknown-linux-gnu.tar.xz +/rust-1.42.0-armv7-unknown-linux-gnueabihf.tar.xz +/rust-1.42.0-i686-unknown-linux-gnu.tar.xz +/rust-1.42.0-powerpc64le-unknown-linux-gnu.tar.xz +/rust-1.42.0-powerpc64-unknown-linux-gnu.tar.xz +/rust-1.42.0-s390x-unknown-linux-gnu.tar.xz +/rust-1.42.0-x86_64-unknown-linux-gnu.tar.xz +/rustc-1.43.1-src.tar.xz +/rustc-1.44.0-src.tar.xz +/rust-1.43.1-aarch64-unknown-linux-gnu.tar.xz +/rust-1.43.1-armv7-unknown-linux-gnueabihf.tar.xz +/rust-1.43.1-i686-unknown-linux-gnu.tar.xz +/rust-1.43.1-powerpc64le-unknown-linux-gnu.tar.xz +/rust-1.43.1-powerpc64-unknown-linux-gnu.tar.xz +/rust-1.43.1-s390x-unknown-linux-gnu.tar.xz +/rust-1.43.1-x86_64-unknown-linux-gnu.tar.xz +/rustc-1.44.1-src.tar.xz +/rustc-1.45.0-src.tar.xz +/rust-1.44.0-x86_64-unknown-linux-gnu.tar.xz +/rust-1.44.0-i686-unknown-linux-gnu.tar.xz +/rust-1.44.0-armv7-unknown-linux-gnueabihf.tar.xz +/rust-1.44.0-aarch64-unknown-linux-gnu.tar.xz +/rust-1.44.0-powerpc64-unknown-linux-gnu.tar.xz +/rust-1.44.0-powerpc64le-unknown-linux-gnu.tar.xz +/rust-1.44.0-s390x-unknown-linux-gnu.tar.xz +/rustc-1.45.1-src.tar.xz +/rustc-1.45.2-src.tar.xz +/rustc-1.46.0-src.tar.xz +/rust-1.45.2-aarch64-unknown-linux-gnu.tar.xz +/rust-1.45.2-armv7-unknown-linux-gnueabihf.tar.xz +/rust-1.45.2-i686-unknown-linux-gnu.tar.xz +/rust-1.45.2-powerpc64le-unknown-linux-gnu.tar.xz +/rust-1.45.2-powerpc64-unknown-linux-gnu.tar.xz +/rust-1.45.2-s390x-unknown-linux-gnu.tar.xz +/rust-1.45.2-x86_64-unknown-linux-gnu.tar.xz +/rustc-1.47.0-src.tar.xz +/rust-1.46.0-aarch64-unknown-linux-gnu.tar.xz +/rust-1.46.0-armv7-unknown-linux-gnueabihf.tar.xz +/rust-1.46.0-i686-unknown-linux-gnu.tar.xz +/rust-1.46.0-powerpc64le-unknown-linux-gnu.tar.xz +/rust-1.46.0-powerpc64-unknown-linux-gnu.tar.xz +/rust-1.46.0-s390x-unknown-linux-gnu.tar.xz +/rust-1.46.0-x86_64-unknown-linux-gnu.tar.xz +/rustc-1.48.0-src.tar.xz +/rust-1.47.0-aarch64-unknown-linux-gnu.tar.xz +/rust-1.47.0-armv7-unknown-linux-gnueabihf.tar.xz +/rust-1.47.0-i686-unknown-linux-gnu.tar.xz +/rust-1.47.0-powerpc64le-unknown-linux-gnu.tar.xz +/rust-1.47.0-powerpc64-unknown-linux-gnu.tar.xz +/rust-1.47.0-s390x-unknown-linux-gnu.tar.xz +/rust-1.47.0-x86_64-unknown-linux-gnu.tar.xz +/rustc-1.49.0-src.tar.xz +/rust-1.48.0-aarch64-unknown-linux-gnu.tar.xz +/rust-1.48.0-armv7-unknown-linux-gnueabihf.tar.xz +/rust-1.48.0-i686-unknown-linux-gnu.tar.xz +/rust-1.48.0-powerpc64le-unknown-linux-gnu.tar.xz +/rust-1.48.0-powerpc64-unknown-linux-gnu.tar.xz +/rust-1.48.0-s390x-unknown-linux-gnu.tar.xz +/rust-1.48.0-x86_64-unknown-linux-gnu.tar.xz +/rustc-1.50.0-src.tar.xz +/rust-1.49.0-aarch64-unknown-linux-gnu.tar.xz +/rust-1.49.0-armv7-unknown-linux-gnueabihf.tar.xz +/rust-1.49.0-i686-unknown-linux-gnu.tar.xz +/rust-1.49.0-powerpc64le-unknown-linux-gnu.tar.xz +/rust-1.49.0-s390x-unknown-linux-gnu.tar.xz +/rust-1.49.0-x86_64-unknown-linux-gnu.tar.xz +/rustc-1.51.0-src.tar.xz +/rust-1.50.0-aarch64-unknown-linux-gnu.tar.xz +/rust-1.50.0-armv7-unknown-linux-gnueabihf.tar.xz +/rust-1.50.0-i686-unknown-linux-gnu.tar.xz +/rust-1.50.0-powerpc64le-unknown-linux-gnu.tar.xz +/rust-1.50.0-s390x-unknown-linux-gnu.tar.xz +/rust-1.50.0-x86_64-unknown-linux-gnu.tar.xz +/rustc-1.52.0-src.tar.xz +/rust-1.51.0-aarch64-unknown-linux-gnu.tar.xz +/rust-1.51.0-armv7-unknown-linux-gnueabihf.tar.xz +/rust-1.51.0-i686-unknown-linux-gnu.tar.xz +/rust-1.51.0-powerpc64le-unknown-linux-gnu.tar.xz +/rust-1.51.0-s390x-unknown-linux-gnu.tar.xz +/rust-1.51.0-x86_64-unknown-linux-gnu.tar.xz +/rustc-1.52.1-src.tar.xz +/rustc-1.53.0-src.tar.xz +/rust-1.52.0-aarch64-unknown-linux-gnu.tar.xz +/rust-1.52.0-armv7-unknown-linux-gnueabihf.tar.xz +/rust-1.52.0-i686-unknown-linux-gnu.tar.xz +/rust-1.52.0-powerpc64le-unknown-linux-gnu.tar.xz +/rust-1.52.0-s390x-unknown-linux-gnu.tar.xz +/rust-1.52.0-x86_64-unknown-linux-gnu.tar.xz +/rustc-1.54.0-src.tar.xz +/rust-1.53.0-aarch64-unknown-linux-gnu.tar.xz +/rust-1.53.0-armv7-unknown-linux-gnueabihf.tar.xz +/rust-1.53.0-i686-unknown-linux-gnu.tar.xz +/rust-1.53.0-powerpc64le-unknown-linux-gnu.tar.xz +/rust-1.53.0-powerpc64-unknown-linux-gnu.tar.xz +/rust-1.53.0-s390x-unknown-linux-gnu.tar.xz +/rust-1.53.0-x86_64-unknown-linux-gnu.tar.xz +/rustc-1.55.0-src.tar.xz +/rust-1.54.0-aarch64-unknown-linux-gnu.tar.xz +/rust-1.54.0-armv7-unknown-linux-gnueabihf.tar.xz +/rust-1.54.0-i686-unknown-linux-gnu.tar.xz +/rust-1.54.0-powerpc64le-unknown-linux-gnu.tar.xz +/rust-1.54.0-powerpc64-unknown-linux-gnu.tar.xz +/rust-1.54.0-s390x-unknown-linux-gnu.tar.xz +/rust-1.54.0-x86_64-unknown-linux-gnu.tar.xz +/rustc-1.56.0-src.tar.xz +/rust-1.55.0-aarch64-unknown-linux-gnu.tar.xz +/rust-1.55.0-armv7-unknown-linux-gnueabihf.tar.xz +/rust-1.55.0-i686-unknown-linux-gnu.tar.xz +/rust-1.55.0-powerpc64-unknown-linux-gnu.tar.xz +/rust-1.55.0-powerpc64le-unknown-linux-gnu.tar.xz +/rust-1.55.0-s390x-unknown-linux-gnu.tar.xz +/rust-1.55.0-x86_64-unknown-linux-gnu.tar.xz +/rustc-1.56.1-src.tar.xz +/rustc-1.57.0-src.tar.xz +/wasi-libc-ad5133410f66b93a2381db5b542aad5e0964db96.tar.gz +/rust-1.56.1-aarch64-unknown-linux-gnu.tar.xz +/rust-1.56.1-armv7-unknown-linux-gnueabihf.tar.xz +/rust-1.56.1-i686-unknown-linux-gnu.tar.xz +/rust-1.56.1-powerpc64le-unknown-linux-gnu.tar.xz +/rust-1.56.1-s390x-unknown-linux-gnu.tar.xz +/rust-1.56.1-x86_64-unknown-linux-gnu.tar.xz +/rustc-1.58.0-src.tar.xz +/rust-1.57.0-aarch64-unknown-linux-gnu.tar.xz +/rust-1.57.0-armv7-unknown-linux-gnueabihf.tar.xz +/rust-1.57.0-i686-unknown-linux-gnu.tar.xz +/rust-1.57.0-powerpc64le-unknown-linux-gnu.tar.xz +/rust-1.57.0-s390x-unknown-linux-gnu.tar.xz +/rust-1.57.0-x86_64-unknown-linux-gnu.tar.xz +/rustc-1.58.1-src.tar.xz +/rustc-1.59.0-src.tar.xz +/rust-1.58.0-aarch64-unknown-linux-gnu.tar.xz +/rust-1.58.0-armv7-unknown-linux-gnueabihf.tar.xz +/rust-1.58.0-i686-unknown-linux-gnu.tar.xz +/rust-1.58.0-powerpc64le-unknown-linux-gnu.tar.xz +/rust-1.58.0-s390x-unknown-linux-gnu.tar.xz +/rust-1.58.0-x86_64-unknown-linux-gnu.tar.xz +/rustc-1.60.0-src.tar.xz +/rustc-1.61.0-src.tar.xz +/wasi-libc-9886d3d6200fcc3726329966860fc058707406cd.tar.gz +/rustc-1.62.0-src.tar.xz +/rustc-1.62.1-src.tar.xz +/rustc-1.63.0-src.tar.xz +/rustc-1.64.0-src.tar.xz +/rustc-1.65.0-src.tar.xz +/wasi-libc-wasi-sdk-16.tar.gz +/rustc-1.66.0-src.tar.xz +/wasi-libc-wasi-sdk-17.tar.gz +/rustc-1.66.1-src.tar.xz +/rustc-1.67.0-src.tar.xz +/rustc-1.67.1-src.tar.xz +/rustc-1.68.0-src.tar.xz +/wasi-libc-wasi-sdk-19.tar.gz +/rustc-1.68.1-src.tar.xz +/rustc-1.68.2-src.tar.xz +/rustc-1.69.0-src.tar.xz +/wasi-libc-1dfe5c302d1c5ab621f7abf04620fae92700fd22.tar.gz +/rustc-1.70.0-src.tar.xz +/wasi-libc-wasi-sdk-20.tar.gz +/rustc-1.71.0-src.tar.xz +/rustc-1.71.1-src.tar.xz +/rustc-1.72.0-src.tar.xz +/wasi-libc-7018e24d8fe248596819d2e884761676f3542a04.tar.gz +/rustc-1.72.1-src.tar.xz +/wasi-libc-bd950eb128bff337153de217b11270f948d04bb4.tar.gz +/rustc-1.73.0-src.tar.xz +/rustc-1.74.0-src.tar.xz +/rustc-1.74.1-src.tar.xz +/rustc-1.75.0-src.tar.xz +/rustc-1.76.0-src.tar.xz +/wasi-libc-03b228e46bb02fcc5927253e1b8ad715072b1ae4.tar.gz +/rustc-1.77.0-src.tar.xz +/rustc-1.77.2-src.tar.xz +/rustc-1.78.0-src.tar.xz +/rustc-1.79.0-src.tar.xz +/wasi-libc-wasi-sdk-22.tar.gz +/rustc-1.80.0-src.tar.xz +/rustc-1.80.1-src.tar.xz +/wasi-libc-3f43ea9abb24ed8d24d760989e1d87ea385f8eaa.tar.gz +/rustc-1.81.0-src.tar.xz +/wasi-libc-b9ef79d7dbd47c6c5bafdae760823467c2f60b70.tar.gz +/rustc-1.82.0-src.tar.xz +/wasi-libc-wasi-sdk-24.tar.gz +/rustc-1.83.0-src.tar.xz +/rustc-1.84.0-src.tar.xz +/wasi-libc-wasi-sdk-25.tar.gz +/rustc-1.84.1-src.tar.xz +/rustc-1.85.0-src.tar.xz +/rustc-1.85.1-src.tar.xz +/rustc-1.86.0-src.tar.xz +/wasi-libc-640c0cfc19a96b099e0791824be5ef0105ce2084.tar.gz +/rustc-1.87.0-src.tar.xz +/rustc-1.88.0-src.tar.xz +/wasi-libc-wasi-sdk-27.tar.gz +/rustc-1.89.0-src.tar.xz +/rustc-1.90.0-src.tar.xz +/rustc-1.91.0-src.tar.xz +/rustc-1.91.1-src.tar.xz +/rustc-1.92.0-src.tar.xz diff --git a/0001-Let-environment-variables-override-some-default-CPUs.patch b/0001-Let-environment-variables-override-some-default-CPUs.patch new file mode 100644 index 0000000..fa654c6 --- /dev/null +++ b/0001-Let-environment-variables-override-some-default-CPUs.patch @@ -0,0 +1,53 @@ +From e54c0a4cc8bd8a76b155714b23a61d1d32a8d069 Mon Sep 17 00:00:00 2001 +From: Josh Stone +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 9e406af53b5..9104903673f 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 +@@ -4,7 +4,7 @@ + + pub(crate) 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 cdcf7d62a3e..02f24274ed2 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 +@@ -6,7 +6,7 @@ pub(crate) 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(); + base.max_atomic_width = Some(128); + base.min_global_align = Some(Align::from_bits(16).unwrap()); + base.stack_probes = StackProbeType::Inline; +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 0c8353fad18..c2515e700bb 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 +@@ -4,7 +4,7 @@ + + pub(crate) 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.49.0 + diff --git a/0001-Use-lld-provided-by-system.patch b/0001-Use-lld-provided-by-system.patch new file mode 100644 index 0000000..522865f --- /dev/null +++ b/0001-Use-lld-provided-by-system.patch @@ -0,0 +1,80 @@ +From e9405caf32dfb31bf17c3da0299df515a3755107 Mon Sep 17 00:00:00 2001 +From: Josh Stone +Date: Fri, 16 Aug 2024 10:12:58 -0700 +Subject: [PATCH] Use lld provided by system + +--- + compiler/rustc_target/src/spec/base/wasm.rs | 3 +-- + .../src/spec/targets/aarch64_unknown_none_softfloat.rs | 2 +- + compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs | 1 + + compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs | 2 +- + compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs | 1 + + 5 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/compiler/rustc_target/src/spec/base/wasm.rs b/compiler/rustc_target/src/spec/base/wasm.rs +index 7ede45766ea..b22362227bb 100644 +--- a/compiler/rustc_target/src/spec/base/wasm.rs ++++ b/compiler/rustc_target/src/spec/base/wasm.rs +@@ -81,8 +81,7 @@ macro_rules! args { + // threaded model which will legalize atomics to normal operations. + singlethread: true, + +- // 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/aarch64_unknown_none_softfloat.rs b/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs +index 35a4dd72b86..a9c8fc5edb8 100644 +--- a/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs ++++ b/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs +@@ -15,7 +15,7 @@ pub(crate) fn target() -> Target { + let opts = TargetOptions { + abi: "softfloat".into(), + linker_flavor: LinkerFlavor::Gnu(Cc::No, Lld::Yes), +- linker: Some("rust-lld".into()), ++ linker: Some("lld".into()), + features: "+v8a,+strict-align,-neon,-fp-armv8".into(), + relocation_model: RelocModel::Static, + disable_redzone: true, +diff --git a/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs b/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs +index 327b52389b9..17313d7e8b3 100644 +--- a/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs ++++ b/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs +@@ -9,6 +9,7 @@ pub(crate) fn target() -> Target { + base.max_atomic_width = Some(128); + base.add_pre_link_args(LinkerFlavor::Msvc(Lld::No), &["/machine:arm64"]); + base.features = "+v8a".into(); ++ base.linker = Some("lld".into()); + + Target { + llvm_target: "aarch64-unknown-windows".into(), +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 1a6343595f5..8015b082cd1 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 +@@ -19,7 +19,7 @@ pub(crate) 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()), + rustc_abi: Some(RustcAbi::X86Softfloat), + features: "-mmx,-sse,-sse2,-sse3,-ssse3,-sse4.1,-sse4.2,-avx,-avx2,+soft-float".into(), + supported_sanitizers: SanitizerSet::KCFI | SanitizerSet::KERNELADDRESS, +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 0cf6a879462..3677fc662de 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 +@@ -15,6 +15,7 @@ pub(crate) fn target() -> Target { + base.plt_by_default = false; + base.max_atomic_width = Some(64); + base.entry_abi = CanonAbi::X86(X86Call::Win64); ++ 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.51.0 + diff --git a/0001-bootstrap-allow-disabling-target-self-contained.patch b/0001-bootstrap-allow-disabling-target-self-contained.patch new file mode 100644 index 0000000..54ca101 --- /dev/null +++ b/0001-bootstrap-allow-disabling-target-self-contained.patch @@ -0,0 +1,112 @@ +From 8364de4cb8edab85efcb895824ce06f4a95bd26f Mon Sep 17 00:00:00 2001 +From: Josh Stone +Date: Mon, 18 Aug 2025 17:11:07 -0700 +Subject: [PATCH] bootstrap: allow disabling target self-contained + +--- + bootstrap.example.toml | 5 +++++ + src/bootstrap/src/core/build_steps/compile.rs | 4 ++++ + src/bootstrap/src/core/config/config.rs | 4 ++++ + src/bootstrap/src/core/config/toml/target.rs | 5 +++++ + src/bootstrap/src/lib.rs | 5 +++++ + 5 files changed, 23 insertions(+) + +diff --git a/bootstrap.example.toml b/bootstrap.example.toml +index 6f37e51a47d..ee21bc06bea 100644 +--- a/bootstrap.example.toml ++++ b/bootstrap.example.toml +@@ -1077,3 +1077,8 @@ + # pass `off`: + # - x86_64-unknown-linux-gnu + #default-linker-linux-override = "off" (for most targets) ++ ++# 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 = (bool) +diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs +index 6857a40ada8..9a98323a704 100644 +--- a/src/bootstrap/src/core/build_steps/compile.rs ++++ b/src/bootstrap/src/core/build_steps/compile.rs +@@ -368,6 +368,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_target_libdir(*compiler, target).join("self-contained"); + t!(fs::create_dir_all(&libdir_self_contained)); +diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs +index 4b7ae6df360..6bab269a33c 100644 +--- a/src/bootstrap/src/core/config/config.rs ++++ b/src/bootstrap/src/core/config/config.rs +@@ -864,6 +864,7 @@ pub(crate) fn parse_inner( + runner: target_runner, + optimized_compiler_builtins: target_optimized_compiler_builtins, + jemalloc: target_jemalloc, ++ self_contained: target_self_contained + } = cfg; + + let mut target = Target::from_triple(&triple); +@@ -921,6 +922,9 @@ pub(crate) fn parse_inner( + if let Some(s) = target_no_std { + target.no_std = s; + } ++ if let Some(s) = target_self_contained { ++ target.self_contained = s; ++ } + target.cc = target_cc.map(PathBuf::from); + target.cxx = target_cxx.map(PathBuf::from); + target.ar = target_ar.map(PathBuf::from); +diff --git a/src/bootstrap/src/core/config/toml/target.rs b/src/bootstrap/src/core/config/toml/target.rs +index 4c7afa50b96..83b8a1b50ca 100644 +--- a/src/bootstrap/src/core/config/toml/target.rs ++++ b/src/bootstrap/src/core/config/toml/target.rs +@@ -47,6 +47,7 @@ struct TomlTarget { + runner: Option = "runner", + optimized_compiler_builtins: Option = "optimized-compiler-builtins", + jemalloc: Option = "jemalloc", ++ self_contained: Option = "self-contained", + } + } + +@@ -80,6 +81,7 @@ pub struct Target { + pub codegen_backends: Option>, + pub optimized_compiler_builtins: Option, + pub jemalloc: Option, ++ pub self_contained: bool, + } + + impl Target { +@@ -91,6 +93,9 @@ pub fn from_triple(triple: &str) -> Self { + if triple.contains("emscripten") { + target.runner = Some("node".into()); + } ++ if triple.contains("-musl") || triple.contains("-wasi") || triple.contains("-windows-gnu") { ++ target.self_contained = true; ++ } + target + } + } +diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs +index dd30f05b728..cc89a84071e 100644 +--- a/src/bootstrap/src/lib.rs ++++ b/src/bootstrap/src/lib.rs +@@ -1441,6 +1441,11 @@ fn no_std(&self, target: TargetSelection) -> Option { + 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 { ++ 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.51.0 + diff --git a/0001-only-copy-rustlib-into-stage0-sysroot.patch b/0001-only-copy-rustlib-into-stage0-sysroot.patch new file mode 100644 index 0000000..6cf8aa9 --- /dev/null +++ b/0001-only-copy-rustlib-into-stage0-sysroot.patch @@ -0,0 +1,28 @@ +From 7d83bae4e2577ffa2afaf2fddb6948c1756a403c Mon Sep 17 00:00:00 2001 +From: Paul Murphy +Date: Thu, 10 Jul 2025 09:06:22 -0500 +Subject: [PATCH] only copy rustlib into stage0 sysroot + +Otherwise, much more is copied, and doing so likely runs into +permissions errors if the bootstrap toolchain lives in the host's +sysroot. +--- + src/bootstrap/src/core/build_steps/compile.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs +index 4d0ae54e1ef..4ef70dd9b97 100644 +--- a/src/bootstrap/src/core/build_steps/compile.rs ++++ b/src/bootstrap/src/core/build_steps/compile.rs +@@ -811,7 +811,7 @@ fn run(self, builder: &Builder<'_>) { + let _ = fs::remove_dir_all(sysroot.join("lib/rustlib/src/rust")); + } + +- builder.cp_link_r(&builder.initial_sysroot.join("lib"), &sysroot.join("lib")); ++ builder.cp_link_r(&builder.initial_sysroot.join("lib/rustlib"), &sysroot.join("lib/rustlib")); + } else { + if builder.download_rustc() { + // Ensure there are no CI-rustc std artifacts. +-- +2.49.0 + diff --git a/0002-set-an-external-library-path-for-wasm32-wasi.patch b/0002-set-an-external-library-path-for-wasm32-wasi.patch new file mode 100644 index 0000000..89b148f --- /dev/null +++ b/0002-set-an-external-library-path-for-wasm32-wasi.patch @@ -0,0 +1,112 @@ +From 862d09fe2e8b0f5ce8fe7bfc592cda66a1d74c08 Mon Sep 17 00:00:00 2001 +From: Josh Stone +Date: Mon, 18 Aug 2025 17:13:28 -0700 +Subject: [PATCH 2/2] set an external library path for wasm32-wasi + +--- + compiler/rustc_codegen_ssa/src/back/link.rs | 10 ++++++++++ + compiler/rustc_target/src/spec/json.rs | 4 ++++ + compiler/rustc_target/src/spec/mod.rs | 2 ++ + .../rustc_target/src/spec/targets/wasm32_wasip1.rs | 7 ++++--- + 4 files changed, 20 insertions(+), 3 deletions(-) + +diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs +index 48b01ea2df19..59b87396fed2 100644 +--- a/compiler/rustc_codegen_ssa/src/back/link.rs ++++ b/compiler/rustc_codegen_ssa/src/back/link.rs +@@ -1559,6 +1559,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 sess.target_filesearch().search_paths(PathKind::Native) { + let file_path = search_path.dir.join(name); + if file_path.exists() { +@@ -2140,6 +2146,10 @@ fn add_library_search_dirs( + } + ControlFlow::<()>::Continue(()) + }); ++ ++ 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/json.rs b/compiler/rustc_target/src/spec/json.rs +index f236be92b3b6..eea6e0c203d2 100644 +--- a/compiler/rustc_target/src/spec/json.rs ++++ b/compiler/rustc_target/src/spec/json.rs +@@ -81,6 +81,7 @@ macro_rules! forward_opt { + forward!(linker_is_gnu_json); + forward!(pre_link_objects); + forward!(post_link_objects); ++ forward_opt!(external_lib_path); + forward!(pre_link_objects_self_contained); + forward!(post_link_objects_self_contained); + +@@ -301,6 +302,7 @@ macro_rules! target_option_val { + target_option_val!(linker_is_gnu_json, "linker-is-gnu"); + target_option_val!(pre_link_objects); + target_option_val!(post_link_objects); ++ target_option_val!(external_lib_path); + target_option_val!(pre_link_objects_self_contained, "pre-link-objects-fallback"); + target_option_val!(post_link_objects_self_contained, "post-link-objects-fallback"); + target_option_val!(link_args - pre_link_args_json, "pre-link-args"); +@@ -511,6 +513,8 @@ struct TargetSpecJson { + pre_link_objects: Option, + #[serde(rename = "post-link-objects")] + post_link_objects: Option, ++ #[serde(rename = "external-lib-path")] ++ external_lib_path: Option>, + #[serde(rename = "pre-link-objects-fallback")] + pre_link_objects_self_contained: Option, + #[serde(rename = "post-link-objects-fallback")] +diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs +index 07fb1ce63f7c..c076c2836f84 100644 +--- a/compiler/rustc_target/src/spec/mod.rs ++++ b/compiler/rustc_target/src/spec/mod.rs +@@ -1992,6 +1992,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>, + /// 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, +@@ -2518,6 +2519,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_wasip1.rs b/compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs +index 26add451ed25..3eaf050e6823 100644 +--- a/compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs ++++ b/compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs +@@ -21,11 +21,12 @@ pub(crate) fn target() -> Target { + options.env = "p1".into(); + options.add_pre_link_args(LinkerFlavor::WasmLld(Cc::Yes), &["--target=wasm32-wasip1"]); + +- options.pre_link_objects_self_contained = crt_objects::pre_wasi_self_contained(); +- options.post_link_objects_self_contained = crt_objects::post_wasi_self_contained(); ++ options.pre_link_objects = crt_objects::pre_wasi_self_contained(); ++ options.post_link_objects = 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.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.51.0 + diff --git a/cargo_vendor.attr b/cargo_vendor.attr new file mode 100644 index 0000000..be2d48f --- /dev/null +++ b/cargo_vendor.attr @@ -0,0 +1,2 @@ +%__cargo_vendor_path ^%{_defaultlicensedir}(/[^/]+)+/cargo-vendor.txt$ +%__cargo_vendor_provides %{_rpmconfigdir}/cargo_vendor.prov diff --git a/cargo_vendor.prov b/cargo_vendor.prov new file mode 100755 index 0000000..6efca18 --- /dev/null +++ b/cargo_vendor.prov @@ -0,0 +1,127 @@ +#! /usr/bin/python3 -s +# Stripped down replacement for cargo2rpm parse-vendor-manifest + +import re +import subprocess +import sys +from typing import Optional + + +VERSION_REGEX = re.compile( + r""" + ^ + (?P0|[1-9]\d*) + \.(?P0|[1-9]\d*) + \.(?P0|[1-9]\d*) + (?:-(?P
(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?
+    (?:\+(?P[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$
+    """,
+    re.VERBOSE,
+)
+
+
+class Version:
+    """
+    Version that adheres to the "semantic versioning" format.
+    """
+
+    def __init__(self, major: int, minor: int, patch: int, pre: Optional[str] = None, build: Optional[str] = None):
+        self.major: int = major
+        self.minor: int = minor
+        self.patch: int = patch
+        self.pre: Optional[str] = pre
+        self.build: Optional[str] = build
+
+    @staticmethod
+    def parse(version: str) -> "Version":
+        """
+        Parses a version string and return a `Version` object.
+        Raises a `ValueError` if the string does not match the expected format.
+        """
+
+        match = VERSION_REGEX.match(version)
+        if not match:
+            raise ValueError(f"Invalid version: {version!r}")
+
+        matches = match.groupdict()
+
+        major_str = matches["major"]
+        minor_str = matches["minor"]
+        patch_str = matches["patch"]
+        pre = matches["pre"]
+        build = matches["build"]
+
+        major = int(major_str)
+        minor = int(minor_str)
+        patch = int(patch_str)
+
+        return Version(major, minor, patch, pre, build)
+
+    def to_rpm(self) -> str:
+        """
+        Formats the `Version` object as an equivalent RPM version string.
+        Characters that are invalid in RPM versions are replaced ("-" -> "_")
+
+        Build metadata (the optional `Version.build` attribute) is dropped, so
+        the conversion is not lossless for versions where this attribute is not
+        `None`. However, build metadata is not intended to be part of the
+        version (and is not even considered when doing version comparison), so
+        dropping it when converting to the RPM version format is correct.
+        """
+
+        s = f"{self.major}.{self.minor}.{self.patch}"
+        if self.pre:
+            s += f"~{self.pre.replace('-', '_')}"
+        return s
+
+
+def break_the_build(error: str):
+    """
+    This function writes a string that is an invalid RPM dependency specifier,
+    which causes dependency generators to fail and break the build. The
+    additional error message is printed to stderr.
+    """
+
+    print("*** FATAL ERROR ***")
+    print(error, file=sys.stderr)
+
+ 
+def get_cargo_vendor_txt_paths_from_stdin() -> set[str]:  # pragma nocover
+    """
+    Read lines from standard input and filter out lines that look like paths
+    to `cargo-vendor.txt` files. This is how RPM generators pass lists of files.
+    """
+
+    lines = {line.rstrip("\n") for line in sys.stdin.readlines()}
+    return {line for line in lines if line.endswith("/cargo-vendor.txt")}
+
+
+def action_parse_vendor_manifest():
+    paths = get_cargo_vendor_txt_paths_from_stdin()
+
+    for path in paths:
+        with open(path) as file:
+            manifest = file.read()
+
+        for line in manifest.strip().splitlines():
+            crate, version = line.split(" v")
+            print(f"bundled(crate({crate})) = {Version.parse(version).to_rpm()}")
+
+
+def main():
+    try:
+        action_parse_vendor_manifest()
+        exit(0)
+
+    # print an error message that is not a valid RPM dependency
+    # to cause the generator to break the build
+    except (IOError, ValueError) as exc:
+        break_the_build(str(exc))
+        exit(1)
+
+    break_the_build("Uncaught exception: This should not happen, please report a bug.")
+    exit(1)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/changelog b/changelog
new file mode 100644
index 0000000..9048885
--- /dev/null
+++ b/changelog
@@ -0,0 +1,607 @@
+* Fri Apr 05 2024 Josh Stone  - 1.77.0-3
+- Ensure more consistency in PGO flags -- fixes Cargo tests
+
+* Thu Mar 21 2024 Davide Cavalca  - 1.77.0-2
+- Add build target for aarch64-unknown-none-softfloat
+
+* Thu Mar 21 2024 Nikita Popov  - 1.77.0-1
+- Update to 1.77.0
+
+* Thu Feb 08 2024 Josh Stone  - 1.76.0-1
+- Update to 1.76.0.
+
+* Tue Jan 30 2024 Josh Stone  - 1.75.0-3
+- Consolidate 32-bit build compromises.
+- Update rust-toolset and add rust-srpm-macros for ELN.
+
+* Fri Jan 26 2024 Fedora Release Engineering  - 1.75.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Dec 31 2023 Josh Stone  - 1.75.0-1
+- Update to 1.75.0.
+
+* Thu Dec 07 2023 Josh Stone  - 1.74.1-1
+- Update to 1.74.1.
+
+* Thu Nov 16 2023 Josh Stone  - 1.74.0-1
+- Update to 1.74.0.
+
+* Thu Oct 26 2023 Josh Stone  - 1.73.0-2
+- Use thin-LTO and PGO for rustc itself.
+
+* Thu Oct 05 2023 Josh Stone  - 1.73.0-1
+- Update to 1.73.0.
+- Drop el7 conditionals from the spec.
+
+* Fri Sep 29 2023 Josh Stone  - 1.72.1-3
+- Fix the profiler runtime with compiler-rt-17
+- Switch to unbundled wasi-libc on Fedora
+- Use emmalloc instead of CC0 dlmalloc when bundling wasi-libc
+
+* Mon Sep 25 2023 Josh Stone  - 1.72.1-2
+- Fix LLVM dependency for ELN
+- Add build target for x86_64-unknown-none
+- Add build target for x86_64-unknown-uefi
+
+* Tue Sep 19 2023 Josh Stone  - 1.72.1-1
+- Update to 1.72.1.
+- Migrated to SPDX license
+
+* Thu Aug 24 2023 Josh Stone  - 1.72.0-1
+- Update to 1.72.0.
+
+* Mon Aug 07 2023 Josh Stone  - 1.71.1-1
+- Update to 1.71.1.
+- Security fix for CVE-2023-38497
+
+* Tue Jul 25 2023 Josh Stone  - 1.71.0-3
+- Relax the suspicious_double_ref_op lint
+- Enable the profiler runtime for native hosts
+
+* Fri Jul 21 2023 Fedora Release Engineering  - 1.71.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Mon Jul 17 2023 Josh Stone  - 1.71.0-1
+- Update to 1.71.0.
+
+* Fri Jun 23 2023 Josh Stone  - 1.70.0-2
+- Override default target CPUs to match distro settings
+
+* Thu Jun 01 2023 Josh Stone  - 1.70.0-1
+- Update to 1.70.0.
+
+* Fri May 05 2023 Josh Stone  - 1.69.0-3
+- Fix debuginfo with LLVM 16
+
+* Mon May 01 2023 Josh Stone  - 1.69.0-2
+- Build with LLVM 15 on Fedora 38+
+
+* Thu Apr 20 2023 Josh Stone  - 1.69.0-1
+- Update to 1.69.0.
+- Obsolete rust-analysis.
+
+* Tue Mar 28 2023 Josh Stone  - 1.68.2-1
+- Update to 1.68.2.
+
+* Thu Mar 23 2023 Josh Stone  - 1.68.1-1
+- Update to 1.68.1.
+
+* Thu Mar 09 2023 Josh Stone  - 1.68.0-1
+- Update to 1.68.0.
+
+* Tue Mar 07 2023 David Michael  - 1.67.1-3
+- Add a virtual Provides to rust-std-static containing the target triple.
+
+* Mon Feb 20 2023 Orion Poplawski  - 1.67.1-2
+- Ship rust-toolset for EPEL7
+
+* Thu Feb 09 2023 Josh Stone  - 1.67.1-1
+- Update to 1.67.1.
+
+* Fri Feb 03 2023 Josh Stone  - 1.67.0-3
+- Unbundle libgit2 on Fedora 38.
+
+* Fri Jan 27 2023 Adam Williamson  - 1.67.0-2
+- Backport PR #107360 to fix build of mesa
+- Backport 675fa0b3 to fix bootstrapping failure
+
+* Thu Jan 26 2023 Josh Stone  - 1.67.0-1
+- Update to 1.67.0.
+
+* Fri Jan 20 2023 Fedora Release Engineering  - 1.66.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Tue Jan 10 2023 Josh Stone  - 1.66.1-1
+- Update to 1.66.1.
+- Security fix for CVE-2022-46176
+
+* Thu Dec 15 2022 Josh Stone  - 1.66.0-1
+- Update to 1.66.0.
+
+* Thu Nov 03 2022 Josh Stone  - 1.65.0-1
+- Update to 1.65.0.
+- rust-analyzer now obsoletes rls.
+
+* Thu Sep 22 2022 Josh Stone  - 1.64.0-1
+- Update to 1.64.0.
+- Add rust-analyzer.
+
+* Thu Aug 11 2022 Josh Stone  - 1.63.0-1
+- Update to 1.63.0.
+
+* Sat Jul 23 2022 Fedora Release Engineering  - 1.62.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Tue Jul 19 2022 Josh Stone  - 1.62.1-1
+- Update to 1.62.1.
+
+* Wed Jul 13 2022 Josh Stone  - 1.62.0-2
+- Prevent unsound coercions from functions with opaque return types.
+
+* Thu Jun 30 2022 Josh Stone  - 1.62.0-1
+- Update to 1.62.0.
+
+* Mon May 23 2022 Josh Stone  - 1.61.0-2
+- Add missing target_feature to the list of well known cfg names
+
+* Thu May 19 2022 Josh Stone  - 1.61.0-1
+- Update to 1.61.0.
+- Add rust-toolset for ELN.
+
+* Thu Apr 07 2022 Josh Stone  - 1.60.0-1
+- Update to 1.60.0.
+
+* Fri Mar 25 2022 Josh Stone  - 1.59.0-4
+- Fix the archive index for wasm32-wasi's libc.a
+
+* Fri Mar 04 2022 Stephen Gallagher  - 1.59.0-3
+- Rebuild against the bootstrapped build
+
+* Fri Mar 04 2022 Stephen Gallagher  - 1.59.0-2.1
+- Bootstrapping for Fedora ELN
+
+* Tue Mar 01 2022 Josh Stone  - 1.59.0-2
+- Fix s390x hangs, rhbz#2058803
+
+* Thu Feb 24 2022 Josh Stone  - 1.59.0-1
+- Update to 1.59.0.
+- Revert to libgit2 1.3.x
+
+* Sun Feb 20 2022 Igor Raits  - 1.58.1-2
+- Rebuild for libgit2 1.4.x
+
+* Thu Jan 20 2022 Josh Stone  - 1.58.1-1
+- Update to 1.58.1.
+
+* Thu Jan 13 2022 Josh Stone  - 1.58.0-1
+- Update to 1.58.0.
+
+* Wed Jan 05 2022 Josh Stone  - 1.57.0-2
+- Add rust-std-static-i686-pc-windows-gnu
+- Add rust-std-static-x86_64-pc-windows-gnu
+
+* Thu Dec 02 2021 Josh Stone  - 1.57.0-1
+- Update to 1.57.0, fixes rhbz#2028675.
+- Backport rust#91070, fixes rhbz#1990657
+- Add rust-std-static-wasm32-wasi
+
+* Sun Nov 28 2021 Igor Raits  - 1.56.1-3
+- De-bootstrap (libgit2)
+
+* Sun Nov 28 2021 Igor Raits  - 1.56.1-2
+- Rebuild for libgit2 1.3.x
+
+* Mon Nov 01 2021 Josh Stone  - 1.56.1-1
+- Update to 1.56.1.
+
+* Thu Oct 21 2021 Josh Stone  - 1.56.0-1
+- Update to 1.56.0.
+
+* Tue Sep 14 2021 Sahana Prasad  - 1.55.0-2
+- Rebuilt with OpenSSL 3.0.0
+
+* Thu Sep 09 2021 Josh Stone  - 1.55.0-1
+- Update to 1.55.0.
+- Use llvm-ranlib for wasm rlibs; Fixes rhbz#2002612
+
+* Tue Aug 24 2021 Josh Stone  - 1.54.0-2
+- Build with LLVM 12 on Fedora 35+
+
+* Thu Jul 29 2021 Josh Stone  - 1.54.0-1
+- Update to 1.54.0.
+
+* Fri Jul 23 2021 Fedora Release Engineering  - 1.53.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Thu Jul 08 2021 Josh Stone  - 1.53.0-2
+- Exclude wasm on s390x for lack of lld
+
+* Thu Jun 17 2021 Josh Stone  - 1.53.0-1
+- Update to 1.53.0.
+
+* Wed Jun 02 2021 Josh Stone  - 1.52.1-2
+- Set rust.codegen-units-std=1 for all targets again.
+- Add rust-std-static-wasm32-unknown-unknown.
+- Rebuild f34 with LLVM 12.
+
+* Mon May 10 2021 Josh Stone  - 1.52.1-1
+- Update to 1.52.1.
+
+* Thu May 06 2021 Josh Stone  - 1.52.0-1
+- Update to 1.52.0.
+
+* Fri Apr 16 2021 Josh Stone  - 1.51.0-3
+- Security fixes for CVE-2020-36323, CVE-2021-31162
+
+* Wed Apr 14 2021 Josh Stone  - 1.51.0-2
+- Security fixes for CVE-2021-28876, CVE-2021-28878, CVE-2021-28879
+- Fix bootstrap for stage0 rust 1.51
+
+* Thu Mar 25 2021 Josh Stone  - 1.51.0-1
+- Update to 1.51.0.
+
+* Thu Feb 11 2021 Josh Stone  - 1.50.0-1
+- Update to 1.50.0.
+
+* Wed Jan 27 2021 Fedora Release Engineering  - 1.49.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jan 05 2021 Josh Stone  - 1.49.0-1
+- Update to 1.49.0.
+
+* Tue Dec 29 2020 Igor Raits  - 1.48.0-3
+- De-bootstrap
+
+* Mon Dec 28 2020 Igor Raits  - 1.48.0-2
+- Rebuild for libgit2 1.1.x
+
+* Thu Nov 19 2020 Josh Stone  - 1.48.0-1
+- Update to 1.48.0.
+
+* Sat Oct 10 2020 Jeff Law  - 1.47.0-2
+- Re-enable LTO
+
+* Thu Oct 08 2020 Josh Stone  - 1.47.0-1
+- Update to 1.47.0.
+
+* Fri Aug 28 2020 Fabio Valentini  - 1.46.0-2
+- Fix LTO with doctests (backported cargo PR#8657).
+
+* Thu Aug 27 2020 Josh Stone  - 1.46.0-1
+- Update to 1.46.0.
+
+* Mon Aug 03 2020 Josh Stone  - 1.45.2-1
+- Update to 1.45.2.
+
+* Thu Jul 30 2020 Josh Stone  - 1.45.1-1
+- Update to 1.45.1.
+
+* Wed Jul 29 2020 Fedora Release Engineering  - 1.45.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Thu Jul 16 2020 Josh Stone  - 1.45.0-1
+- Update to 1.45.0.
+
+* Wed Jul 01 2020 Jeff Law  - 1.44.1-2
+- Disable LTO
+
+* Thu Jun 18 2020 Josh Stone  - 1.44.1-1
+- Update to 1.44.1.
+
+* Thu Jun 04 2020 Josh Stone  - 1.44.0-1
+- Update to 1.44.0.
+
+* Thu May 07 2020 Josh Stone  - 1.43.1-1
+- Update to 1.43.1.
+
+* Thu Apr 23 2020 Josh Stone  - 1.43.0-1
+- Update to 1.43.0.
+
+* Thu Mar 12 2020 Josh Stone  - 1.42.0-1
+- Update to 1.42.0.
+
+* Thu Feb 27 2020 Josh Stone  - 1.41.1-1
+- Update to 1.41.1.
+
+* Thu Feb 20 2020 Josh Stone  - 1.41.0-2
+- Rebuild with llvm9.0
+
+* Thu Jan 30 2020 Josh Stone  - 1.41.0-1
+- Update to 1.41.0.
+
+* Thu Jan 16 2020 Josh Stone  - 1.40.0-3
+- Build compiletest with in-tree libtest
+
+* Tue Jan 07 2020 Josh Stone  - 1.40.0-2
+- Fix compiletest with newer (local-rebuild) libtest
+- Fix ARM EHABI unwinding
+
+* Thu Dec 19 2019 Josh Stone  - 1.40.0-1
+- Update to 1.40.0.
+
+* Tue Nov 12 2019 Josh Stone  - 1.39.0-2
+- Fix a couple build and test issues with rustdoc.
+
+* Thu Nov 07 2019 Josh Stone  - 1.39.0-1
+- Update to 1.39.0.
+
+* Fri Sep 27 2019 Josh Stone  - 1.38.0-2
+- Filter the libraries included in rust-std (rhbz1756487)
+
+* Thu Sep 26 2019 Josh Stone  - 1.38.0-1
+- Update to 1.38.0.
+
+* Thu Aug 15 2019 Josh Stone  - 1.37.0-1
+- Update to 1.37.0.
+
+* Fri Jul 26 2019 Fedora Release Engineering  - 1.36.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jul 04 2019 Josh Stone  - 1.36.0-1
+- Update to 1.36.0.
+
+* Wed May 29 2019 Josh Stone  - 1.35.0-2
+- Fix compiletest for rebuild testing.
+
+* Thu May 23 2019 Josh Stone  - 1.35.0-1
+- Update to 1.35.0.
+
+* Tue May 14 2019 Josh Stone  - 1.34.2-1
+- Update to 1.34.2 -- fixes CVE-2019-12083.
+
+* Tue Apr 30 2019 Josh Stone  - 1.34.1-3
+- Set rust.codegen-units-std=1
+
+* Fri Apr 26 2019 Josh Stone  - 1.34.1-2
+- Remove the ThinLTO workaround.
+
+* Thu Apr 25 2019 Josh Stone  - 1.34.1-1
+- Update to 1.34.1.
+- Add a ThinLTO fix for rhbz1701339.
+
+* Thu Apr 11 2019 Josh Stone  - 1.34.0-1
+- Update to 1.34.0.
+
+* Fri Mar 01 2019 Josh Stone  - 1.33.0-2
+- Fix deprecations for self-rebuild
+
+* Thu Feb 28 2019 Josh Stone  - 1.33.0-1
+- Update to 1.33.0.
+
+* Sat Feb 02 2019 Fedora Release Engineering  - 1.32.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Jan 17 2019 Josh Stone  - 1.32.0-1
+- Update to 1.32.0.
+
+* Mon Jan 07 2019 Josh Stone  - 1.31.1-9
+- Update to 1.31.1 for RLS fixes.
+
+* Thu Dec 06 2018 Josh Stone  - 1.31.0-8
+- Update to 1.31.0 -- Rust 2018!
+- clippy/rls/rustfmt are no longer -preview
+
+* Thu Nov 08 2018 Josh Stone  - 1.30.1-7
+- Update to 1.30.1.
+
+* Thu Oct 25 2018 Josh Stone  - 1.30.0-6
+- Update to 1.30.0.
+
+* Mon Oct 22 2018 Josh Stone  - 1.29.2-5
+- Rebuild without bootstrap binaries.
+
+* Sat Oct 20 2018 Josh Stone  - 1.29.2-4
+- Re-bootstrap armv7hl due to rhbz#1639485
+
+* Fri Oct 12 2018 Josh Stone  - 1.29.2-3
+- Update to 1.29.2.
+
+* Tue Sep 25 2018 Josh Stone  - 1.29.1-2
+- Update to 1.29.1.
+- Security fix for str::repeat (pending CVE).
+
+* Thu Sep 13 2018 Josh Stone  - 1.29.0-1
+- Update to 1.29.0.
+- Add a clippy-preview subpackage
+
+* Mon Aug 13 2018 Josh Stone  - 1.28.0-3
+- Use llvm6.0 instead of llvm-7 for now
+
+* Tue Aug 07 2018 Josh Stone  - 1.28.0-2
+- Rebuild for LLVM ppc64/s390x fixes
+
+* Thu Aug 02 2018 Josh Stone  - 1.28.0-1
+- Update to 1.28.0.
+
+* Tue Jul 24 2018 Josh Stone  - 1.27.2-4
+- Update to 1.27.2.
+
+* Sat Jul 14 2018 Fedora Release Engineering  - 1.27.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Jul 10 2018 Josh Stone  - 1.27.1-2
+- Update to 1.27.1.
+- Security fix for CVE-2018-1000622
+
+* Thu Jun 21 2018 Josh Stone  - 1.27.0-1
+- Update to 1.27.0.
+
+* Tue Jun 05 2018 Josh Stone  - 1.26.2-4
+- Rebuild without bootstrap binaries.
+
+* Tue Jun 05 2018 Josh Stone  - 1.26.2-3
+- Update to 1.26.2.
+- Re-bootstrap to deal with LLVM symbol changes.
+
+* Tue May 29 2018 Josh Stone  - 1.26.1-2
+- Update to 1.26.1.
+
+* Thu May 10 2018 Josh Stone  - 1.26.0-1
+- Update to 1.26.0.
+
+* Mon Apr 16 2018 Dan Callaghan  - 1.25.0-3
+- Add cargo, rls, and analysis
+
+* Tue Apr 10 2018 Josh Stone  - 1.25.0-2
+- Filter codegen-backends from Provides too.
+
+* Thu Mar 29 2018 Josh Stone  - 1.25.0-1
+- Update to 1.25.0.
+
+* Thu Mar 01 2018 Josh Stone  - 1.24.1-1
+- Update to 1.24.1.
+
+* Wed Feb 21 2018 Josh Stone  - 1.24.0-3
+- Backport a rebuild fix for rust#48308.
+
+* Mon Feb 19 2018 Josh Stone  - 1.24.0-2
+- rhbz1546541: drop full-bootstrap; cmp libs before symlinking.
+- Backport pr46592 to fix local_rebuild bootstrapping.
+- Backport pr48362 to fix relative/absolute libdir.
+
+* Thu Feb 15 2018 Josh Stone  - 1.24.0-1
+- Update to 1.24.0.
+
+* Mon Feb 12 2018 Iryna Shcherbina  - 1.23.0-4
+- Update Python 2 dependency declarations to new packaging standards
+  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
+
+* Tue Feb 06 2018 Josh Stone  - 1.23.0-3
+- Use full-bootstrap to work around a rebuild issue.
+- Patch binaryen for GCC 8
+
+* Thu Feb 01 2018 Igor Gnatenko  - 1.23.0-2
+- Switch to %%ldconfig_scriptlets
+
+* Mon Jan 08 2018 Josh Stone  - 1.23.0-1
+- Update to 1.23.0.
+
+* Thu Nov 23 2017 Josh Stone  - 1.22.1-1
+- Update to 1.22.1.
+
+* Thu Oct 12 2017 Josh Stone  - 1.21.0-1
+- Update to 1.21.0.
+
+* Mon Sep 11 2017 Josh Stone  - 1.20.0-2
+- ABI fixes for ppc64 and s390x.
+
+* Thu Aug 31 2017 Josh Stone  - 1.20.0-1
+- Update to 1.20.0.
+- Add a rust-src subpackage.
+
+* Thu Aug 03 2017 Fedora Release Engineering  - 1.19.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering  - 1.19.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Mon Jul 24 2017 Josh Stone  - 1.19.0-2
+- Use find-debuginfo.sh --keep-section .rustc
+
+* Thu Jul 20 2017 Josh Stone  - 1.19.0-1
+- Update to 1.19.0.
+
+* Thu Jun 08 2017 Josh Stone  - 1.18.0-1
+- Update to 1.18.0.
+
+* Mon May 08 2017 Josh Stone  - 1.17.0-2
+- Move shared libraries back to libdir and symlink in rustlib
+
+* Thu Apr 27 2017 Josh Stone  - 1.17.0-1
+- Update to 1.17.0.
+
+* Mon Mar 20 2017 Josh Stone  - 1.16.0-3
+- Make rust-lldb arch-specific to deal with lldb deps
+
+* Fri Mar 17 2017 Josh Stone  - 1.16.0-2
+- Limit rust-lldb arches
+
+* Thu Mar 16 2017 Josh Stone  - 1.16.0-1
+- Update to 1.16.0.
+- Use rustbuild instead of the old makefiles.
+- Update bootstrapping to include rust-std and cargo.
+- Add a rust-lldb subpackage.
+
+* Thu Feb 09 2017 Josh Stone  - 1.15.1-1
+- Update to 1.15.1.
+- Require rust-rpm-macros for new crate packaging.
+- Keep shared libraries under rustlib/, only debug-stripped.
+- Merge and clean up conditionals for epel7.
+
+* Fri Dec 23 2016 Josh Stone  - 1.14.0-2
+- Rebuild without bootstrap binaries.
+
+* Thu Dec 22 2016 Josh Stone  - 1.14.0-1
+- Update to 1.14.0.
+- Rewrite bootstrap logic to target specific arches.
+- Bootstrap ppc64, ppc64le, s390x. (thanks to Sinny Kumari for testing!)
+
+* Thu Nov 10 2016 Josh Stone  - 1.13.0-1
+- Update to 1.13.0.
+- Use hardening flags for linking.
+- Split the standard library into its own package
+- Centralize rustlib/ under /usr/lib/ for multilib integration.
+
+* Thu Oct 20 2016 Josh Stone  - 1.12.1-1
+- Update to 1.12.1.
+
+* Fri Oct 14 2016 Josh Stone  - 1.12.0-7
+- Rebuild with LLVM 3.9.
+- Add ncurses-devel for llvm-config's -ltinfo.
+
+* Thu Oct 13 2016 Josh Stone  - 1.12.0-6
+- Rebuild with llvm-static, preparing for 3.9
+
+* Fri Oct 07 2016 Josh Stone  - 1.12.0-5
+- Rebuild with fixed eu-strip (rhbz1380961)
+
+* Fri Oct 07 2016 Josh Stone  - 1.12.0-4
+- Rebuild without bootstrap binaries.
+
+* Thu Oct 06 2016 Josh Stone  - 1.12.0-3
+- Bootstrap aarch64.
+- Use jemalloc's MALLOC_CONF to work around #36944.
+- Apply pr36933 to really disable armv7hl NEON.
+
+* Sat Oct 01 2016 Josh Stone  - 1.12.0-2
+- Protect .rustc from rpm stripping.
+
+* Fri Sep 30 2016 Josh Stone  - 1.12.0-1
+- Update to 1.12.0.
+- Always use --local-rust-root, even for bootstrap binaries.
+- Remove the rebuild conditional - the build system now figures it out.
+- Let minidebuginfo do its thing, since metadata is no longer a note.
+- Let rust build its own compiler-rt builtins again.
+
+* Sat Sep 03 2016 Josh Stone  - 1.11.0-3
+- Rebuild without bootstrap binaries.
+
+* Fri Sep 02 2016 Josh Stone  - 1.11.0-2
+- Bootstrap armv7hl, with backported no-neon patch.
+
+* Wed Aug 24 2016 Josh Stone  - 1.11.0-1
+- Update to 1.11.0.
+- Drop the backported patches.
+- Patch get-stage0.py to trust existing bootstrap binaries.
+- Use libclang_rt.builtins from compiler-rt, dodging llvm-static issues.
+- Use --local-rust-root to make sure the right bootstrap is used.
+
+* Sat Aug 13 2016 Josh Stone  1.10.0-4
+- Rebuild without bootstrap binaries.
+
+* Fri Aug 12 2016 Josh Stone  - 1.10.0-3
+- Initial import into Fedora (#1356907), bootstrapped
+- Format license text as suggested in review.
+- Note how the tests already run in parallel.
+- Undefine _include_minidebuginfo, because it duplicates ".note.rustc".
+- Don't let checks fail the whole build.
+- Note that -doc can't be noarch, as rpmdiff doesn't allow variations.
+
+* Tue Jul 26 2016 Josh Stone  - 1.10.0-2
+- Update -doc directory ownership, and mark its licenses.
+- Package and declare licenses for libbacktrace and hoedown.
+- Set bootstrap_base as a global.
+- Explicitly require python2.
+
+* Thu Jul 14 2016 Josh Stone  - 1.10.0-1
+- Initial package, bootstrapped
diff --git a/gating.yaml b/gating.yaml
new file mode 100644
index 0000000..ce3cdc1
--- /dev/null
+++ b/gating.yaml
@@ -0,0 +1,19 @@
+--- !Policy
+product_versions:
+  - fedora-*
+decision_context: bodhi_update_push_stable
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
+--- !Policy
+product_versions:
+  - rhel-8
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
+--- !Policy
+product_versions:
+  - rhel-9
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
diff --git a/macros.rust-srpm b/macros.rust-srpm
new file mode 100644
index 0000000..45287a8
--- /dev/null
+++ b/macros.rust-srpm
@@ -0,0 +1,62 @@
+# rust_arches: list of architectures where building Rust is supported
+#
+# Since RPM itself now depends on Rust code (via its GPG backend, rpm-sequoia),
+# this list will probably always be a superset of all architectures that are
+# supported by Fedora, which is why it is no longer required to set
+# "ExclusiveArch: rust_arches" for Rust packages in Fedora.
+%rust_arches x86_64 %{ix86} armv7hl aarch64 ppc64 ppc64le riscv64 s390x
+
+# version_no_tilde: lua macro for reconstructing the original crate version
+#       from the RPM version (i.e. replace any "~" characters with "-")
+%version_no_tilde() %{lua:
+    local sep = rpm.expand('%1')
+    local ver = rpm.expand('%2')
+\
+    if sep == '%1' then
+        sep = '-'
+    end
+\
+    if ver == '%2' then
+        ver = rpm.expand('%version')
+    end
+    ver = ver:gsub('~', sep)
+\
+    print(ver)
+}
+
+# __crates_url: default API endpoint for downloading .crate files from crates.io
+%__crates_url https://crates.io/api/v1/crates/
+
+# crates_source: lua macro for constructing the Source URL for a crate
+%crates_source() %{lua:
+    local crate = rpm.expand('%1')
+    local version = rpm.expand('%2')
+    local url = rpm.expand('%__crates_url')
+\
+    -- first argument missing: fall back to %crate
+    if crate == '%1' then
+        crate = rpm.expand('%crate')
+    end
+    -- %crate macro not defined: fall back to %name
+    if crate == '%crate' then
+        crate = rpm.expand('%name')
+    end
+\
+    -- second argument missing: fall back to %crate_version
+    if version == '%2' then
+        version = rpm.expand('%crate_version')
+    end
+    -- %crate_version macro not defined: fall back to %version
+    if version == '%crate_version' then
+        version = rpm.expand('%version')
+    end
+    -- replace '~' with '-' for backwards compatibility
+    -- can be removed in the future
+    version = version:gsub('~', '-')
+\
+    print(url .. crate .. '/' .. version .. '/download#/' .. crate .. '-' .. version .. '.crate')
+}
+
+# __cargo_skip_build: unused macro, set to 0 for backwards compatibility
+%__cargo_skip_build 0
+
diff --git a/macros.rust-toolset b/macros.rust-toolset
new file mode 100644
index 0000000..135b3e2
--- /dev/null
+++ b/macros.rust-toolset
@@ -0,0 +1,256 @@
+# __rustc: path to the default rustc executable
+%__rustc /usr/bin/rustc
+
+# __rustdoc: path to the default rustdoc executable
+%__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)
+# -Cforce-frame-pointers: force inclusion of frame pointers (default: enabled
+#       on x86_64 and aarch64 on Fedora 37+)
+#
+# Additionally, some linker flags are set which correspond to the default
+# Fedora compiler flags for hardening and for embedding package versions into
+# compiled binaries.
+#
+# 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
+  -Cstrip=none
+  %{expr:0%{?_include_frame_pointers} && ("%{_arch}" != "ppc64le" && "%{_arch}" != "s390x" && "%{_arch}" != "i386") ? "-Cforce-frame-pointers=yes" : ""}
+  %[0%{?_package_note_status} ? "-Clink-arg=%_package_note_flags" : ""]
+}
+
+# __cargo: cargo command with environment variables
+#
+# CARGO_HOME: This ensures cargo reads configuration file from .cargo/config.toml,
+#       and prevents writing any files to $HOME during RPM builds.
+%__cargo /usr/bin/env CARGO_HOME=.cargo RUSTFLAGS='%{build_rustflags}' /usr/bin/cargo
+
+# __cargo_common_opts: common command line flags for cargo
+#
+# _smp_mflags: run builds and tests in parallel
+%__cargo_common_opts %{?_smp_mflags}
+
+# cargo_prep: macro to set up build environment for cargo projects
+#
+# This involves four steps:
+# - create the ".cargo" directory if it doesn't exist yet
+# - dump custom cargo configuration into ".cargo/config.toml"
+# - remove "Cargo.lock" if it exists (it breaks builds with custom cargo config)
+# - remove "Cargo.toml.orig" if it exists (it breaks running "cargo package")
+#
+# Options:
+#   -V     - unpack and use vendored sources from Source tarball
+#                    (deprecated; use -v instead)
+#   -v  - use vendored sources from 
+#   -N             - Don't set up any registry. Only set up the build configuration.
+%cargo_prep(V:v:N)\
+%{-v:%{-V:%{error:-v and -V are mutually exclusive!}}}\
+%{-v:%{-N:%{error:-v and -N are mutually exclusive!}}}\
+(\
+set -euo pipefail\
+%{__mkdir} -p target/rpm\
+/usr/bin/ln -s rpm target/release\
+%{__rm} -rf .cargo/\
+%{__mkdir} -p .cargo\
+cat > .cargo/config.toml << EOF\
+[build]\
+rustc = "%{__rustc}"\
+rustdoc = "%{__rustdoc}"\
+\
+[profile.rpm]\
+inherits = "release"\
+opt-level = %{rustflags_opt_level}\
+codegen-units = %{rustflags_codegen_units}\
+debug = %{rustflags_debuginfo}\
+strip = "none"\
+\
+[env]\
+CFLAGS = "%{build_cflags}"\
+CXXFLAGS = "%{build_cxxflags}"\
+LDFLAGS = "%{build_ldflags}"\
+\
+[install]\
+root = "%{buildroot}%{_prefix}"\
+\
+[term]\
+verbose = true\
+EOF\
+%{-V:%{__tar} -xoaf %{S:%{-V*}}}\
+%{!?-N:\
+cat >> .cargo/config.toml << EOF\
+[source.vendored-sources]\
+directory = "%{-v*}%{-V:./vendor}"\
+\
+[source.crates-io]\
+registry = "https://crates.io"\
+replace-with = "vendored-sources"\
+EOF}\
+%{__rm} -f Cargo.toml.orig\
+)
+
+# __cargo_parse_opts: function-like macro which parses common flags into the
+#       equivalent command-line flags for cargo
+%__cargo_parse_opts(naf:) %{shrink:\
+    %{-n:%{-a:%{error:Can't specify both -n and -a}}}           \
+    %{-f:%{-a:%{error:Can't specify both -f(%{-f*}) and -a}}}   \
+    %{-n:--no-default-features}                                 \
+    %{-a:--all-features}                                        \
+    %{-f:--features %{-f*}}                                     \
+    %{nil}                                                      \
+}
+
+# cargo_build: builds the crate with cargo with the specified feature flags
+%cargo_build(naf:)\
+%{shrink:                                               \
+    %{__cargo} build                                    \
+    %{__cargo_common_opts}                              \
+    --profile rpm                                       \
+    %{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}}    \
+    %*                                                  \
+}
+
+# cargo_test: runs the test suite with cargo with the specified feature flags
+#
+# To pass command-line arguments to the cargo test runners directly (for
+# example, to skip certain tests during package builds), both the cargo_test
+# macro argument parsing and "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(naf:)\
+%{shrink:                                               \
+    %{__cargo} test                                     \
+    %{__cargo_common_opts}                              \
+    --profile rpm                                       \
+    --no-fail-fast                                      \
+    %{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}}    \
+    %*                                                  \
+}
+
+# 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(t:naf:)\
+(\
+set -euo pipefail                                                   \
+  %{shrink:                                                         \
+    %{__cargo} install                                              \
+      %{__cargo_common_opts}                                        \
+      --profile rpm                                                 \
+      --no-track                                                    \
+      --path .                                                      \
+      %{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}}              \
+      %*                                                            \
+  }                                                                 \
+)
+
+# 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:)\
+(\
+set -euo pipefail\
+%{shrink:                                                           \
+    %{__cargo} tree                                                 \
+    --workspace                                                     \
+    --offline                                                       \
+    --edges no-build,no-dev,no-proc-macro                           \
+    --no-dedupe                                                     \
+    %{__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:)\
+(\
+set -euo pipefail\
+%{shrink:                                                           \
+    %{__cargo} tree                                                 \
+    --workspace                                                     \
+    --offline                                                       \
+    --edges no-build,no-dev,no-proc-macro                           \
+    --no-dedupe                                                     \
+    %{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}}                \
+    --prefix none                                                   \
+    --format "# {l}"                                                \
+    | sed -e "s: / :/:g" -e "s:/: OR :g"                            \
+    | sort -u                                                       \
+}\
+)
+
+# cargo_vendor_manifest: write list of vendored crates and their versions
+#
+# The arguments for the internal "cargo tree" call emulate the logic
+# that determines which crates are included when running "cargo vendor".
+# The results are written to "cargo-vendor.txt".
+#
+# TODO: --all-features may be overly broad; this should be modified to
+# use %%__cargo_parse_opts to handle feature flags.
+%cargo_vendor_manifest()\
+(\
+set -euo pipefail\
+%{shrink:                                                           \
+    %{__cargo} tree                                                 \
+    --workspace                                                     \
+    --offline                                                       \
+    --edges normal,build                                            \
+    --no-dedupe                                                     \
+    --all-features                                                  \
+    --prefix none                                                   \
+    --format "{p}"                                                  \
+    | grep -v "$(pwd)"                                              \
+    | sed -e "s: (proc-macro)::"                                    \
+    | sort -u                                                       \
+    > cargo-vendor.txt                                              \
+}\
+)
+
diff --git a/plans/ci.fmf b/plans/ci.fmf
new file mode 100644
index 0000000..9160802
--- /dev/null
+++ b/plans/ci.fmf
@@ -0,0 +1,6 @@
+summary: CI Gating Plan
+discover:
+    how: fmf
+    url: https://src.fedoraproject.org/tests/rust.git
+execute:
+    how: tmt
diff --git a/rpminspect.yaml b/rpminspect.yaml
new file mode 100644
index 0000000..a12c8a4
--- /dev/null
+++ b/rpminspect.yaml
@@ -0,0 +1,27 @@
+---
+debuginfo:
+    ignore:
+        # i686 has limited debuginfo. From rust.spec
+        # full debuginfo is exhausting memory; just do libstd for now
+        # https://github.com/rust-lang/rust/issues/45854
+        - /usr/lib/debug/usr/bin/rustc-*.i386.debug
+
+unicode:
+    ignore:
+        # These files are known to contain forbidden unicode chars as
+        # they are tests for those.
+        - rustc-*-src/tests/ui/lint/issue-90614-accept-allow-text-direction-codepoint-in-comment-lint.rs
+        - rustc-*-src/tests/ui/parser/unicode-control-codepoints.rs
+        - rustc-*-src/tests/ui/parser/macro/unicode-control-codepoints-macros.rs
+        - rustc-*-src/tests/ui/parser/macro/auxiliary/unicode-control.rs
+        - rustc-*-src/compiler/rustc_lint/src/hidden_unicode_codepoints.rs
+        - rustc-*-src/compiler/rustc_lint_defs/src/builtin.rs
+        - rustc-*-src/vendor/idna/tests/IdnaTestV2.txt
+        - rustc-*-src/vendor/idna-*/tests/IdnaTestV2.txt
+        - rustc-*-src/vendor/mdbook*/tests/testsuite/search/reasonable_search_index/expected_index.js
+        - rustc-*-src/vendor/mdbook*/tests/testsuite/search/reasonable_search_index/src/first/unicode.md
+        - rustc-*-src/vendor/wast-*/tests/parse-fail/confusing-string?.wat
+        - rustc-*-src/vendor/wast-*/tests/parse-fail/confusing-block-comment?.wat
+        - rustc-*-src/vendor/wast-*/tests/parse-fail/confusing-line-comment?.wat
+        - rustc-*-src/src/llvm-project/clang-tools-extra/docs/clang-tidy/checks/misc/misleading-bidirectional.rst
+        - rustc-*-src/src/gcc/gcc/testsuite/c-c++-common/*Wbidi*.c
diff --git a/rust-pr57840-llvm7-debuginfo-variants.patch b/rust-pr57840-llvm7-debuginfo-variants.patch
deleted file mode 100644
index 71996bc..0000000
--- a/rust-pr57840-llvm7-debuginfo-variants.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit ab998a2eeb2bcdc69ce70c814af97f0d1302a404 (from d17f62d857c70508efbf60be41135880bcd2e062)
-Merge: d17f62d857c7 9452a8dfa3ba
-Author: Mazdak Farrokhzad 
-Date:   Thu Jan 24 00:20:00 2019 +0100
-
-    Rollup merge of #57840 - tromey:fix-issue-57762, r=nikic
-    
-    Fix issue 57762
-    
-    against a stock LLVM 7.  LLVM 7 was released without a necessary fix
-    for a bug in the DWARF discriminant code.
-    
-    This patch changes rustc to use the fallback mode on (non-Rust) LLVM 7.
-    
-    Closes #57762
-
-diff --git a/src/librustc_codegen_llvm/debuginfo/metadata.rs b/src/librustc_codegen_llvm/debuginfo/metadata.rs
-index 6deedd0b5ea3..9f63038c3623 100644
---- a/src/librustc_codegen_llvm/debuginfo/metadata.rs
-+++ b/src/librustc_codegen_llvm/debuginfo/metadata.rs
-@@ -1164,7 +1164,10 @@ fn use_enum_fallback(cx: &CodegenCx) -> bool {
-     // On MSVC we have to use the fallback mode, because LLVM doesn't
-     // lower variant parts to PDB.
-     return cx.sess().target.target.options.is_like_msvc
--        || llvm_util::get_major_version() < 7;
-+        // LLVM version 7 did not release with an important bug fix;
-+        // but the required patch is in the LLVM 8.  Rust LLVM reports
-+        // 8 as well.
-+        || llvm_util::get_major_version() < 8;
- }
- 
- // Describes the members of an enum value: An enum is described as a union of
diff --git a/rust-pr65474-split-rustc-dev.patch b/rust-pr65474-split-rustc-dev.patch
deleted file mode 100644
index 7e1c57a..0000000
--- a/rust-pr65474-split-rustc-dev.patch
+++ /dev/null
@@ -1,479 +0,0 @@
-From 8e0007f829661e57d008d2e908c95f6e84b04b25 Mon Sep 17 00:00:00 2001
-From: bors 
-Date: Thu, 24 Oct 2019 07:27:00 +0000
-Subject: [PATCH] Auto merge of #65474 - Mark-Simulacrum:rustc-dev-split,
- r=pietroalbini
-
-Split the rustc target libraries into separate rustc-dev component
-
-This is re-applies a squashed version of #64823 as well as including #65337 to fix bugs noted after merging the first PR.
-
-The second PR is confirmed as fixing windows-gnu, and presumably also fixes other platforms, such as musl (i.e. #65335 should be fixed); `RUSTUP_DIST_SERVER=https://dev-static.rust-lang.org rustup toolchain install nightly-2019-10-16` can be installed to confirm that this is indeed the case.
-
-diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
-index b8071b98f707..2748903f2d47 100644
---- a/src/bootstrap/builder.rs
-+++ b/src/bootstrap/builder.rs
-@@ -443,6 +443,7 @@ impl<'a> Builder<'a> {
-                 dist::Rustc,
-                 dist::DebuggerScripts,
-                 dist::Std,
-+                dist::RustcDev,
-                 dist::Analysis,
-                 dist::Src,
-                 dist::PlainSourceTarball,
-diff --git a/src/bootstrap/check.rs b/src/bootstrap/check.rs
-index cadb9a7e441f..df1c72575846 100644
---- a/src/bootstrap/check.rs
-+++ b/src/bootstrap/check.rs
-@@ -55,6 +55,7 @@ impl Step for Std {
-                   cargo,
-                   args(builder.kind),
-                   &libstd_stamp(builder, compiler, target),
-+                  vec![],
-                   true);
- 
-         let libdir = builder.sysroot_libdir(compiler, target);
-@@ -103,6 +104,7 @@ impl Step for Rustc {
-                   cargo,
-                   args(builder.kind),
-                   &librustc_stamp(builder, compiler, target),
-+                  vec![],
-                   true);
- 
-         let libdir = builder.sysroot_libdir(compiler, target);
-@@ -155,6 +157,7 @@ impl Step for CodegenBackend {
-                   cargo,
-                   args(builder.kind),
-                   &codegen_backend_stamp(builder, compiler, target, backend),
-+                  vec![],
-                   true);
-     }
- }
-@@ -199,6 +202,7 @@ impl Step for Rustdoc {
-                   cargo,
-                   args(builder.kind),
-                   &rustdoc_stamp(builder, compiler, target),
-+                  vec![],
-                   true);
- 
-         let libdir = builder.sysroot_libdir(compiler, target);
-diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs
-index 5074b035789a..da8d43ed49b7 100644
---- a/src/bootstrap/compile.rs
-+++ b/src/bootstrap/compile.rs
-@@ -69,7 +69,7 @@ impl Step for Std {
-             return;
-         }
- 
--        builder.ensure(StartupObjects { compiler, target });
-+        let mut target_deps = builder.ensure(StartupObjects { compiler, target });
- 
-         let compiler_to_use = builder.compiler_for(compiler.stage, compiler.host, target);
-         if compiler_to_use != compiler {
-@@ -91,7 +91,7 @@ impl Step for Std {
-             return;
-         }
- 
--        copy_third_party_objects(builder, &compiler, target);
-+        target_deps.extend(copy_third_party_objects(builder, &compiler, target).into_iter());
- 
-         let mut cargo = builder.cargo(compiler, Mode::Std, target, "build");
-         std_cargo(builder, &compiler, target, &mut cargo);
-@@ -102,6 +102,7 @@ impl Step for Std {
-                   cargo,
-                   vec![],
-                   &libstd_stamp(builder, compiler, target),
-+                  target_deps,
-                   false);
- 
-         builder.ensure(StdLink {
-@@ -113,9 +114,22 @@ impl Step for Std {
- }
- 
- /// Copies third pary objects needed by various targets.
--fn copy_third_party_objects(builder: &Builder<'_>, compiler: &Compiler, target: Interned) {
-+fn copy_third_party_objects(builder: &Builder<'_>, compiler: &Compiler, target: Interned)
-+    -> Vec
-+{
-     let libdir = builder.sysroot_libdir(*compiler, target);
- 
-+    let mut target_deps = vec![];
-+
-+    let mut copy_and_stamp = |sourcedir: &Path, name: &str| {
-+        let target = libdir.join(name);
-+        builder.copy(
-+            &sourcedir.join(name),
-+            &target,
-+        );
-+        target_deps.push(target);
-+    };
-+
-     // Copies the crt(1,i,n).o startup objects
-     //
-     // Since musl supports fully static linking, we can cross link for it even
-@@ -123,19 +137,13 @@ fn copy_third_party_objects(builder: &Builder<'_>, compiler: &Compiler, target:
-     // files. As those shipped with glibc won't work, copy the ones provided by
-     // musl so we have them on linux-gnu hosts.
-     if target.contains("musl") {
-+        let srcdir = builder.musl_root(target).unwrap().join("lib");
-         for &obj in &["crt1.o", "crti.o", "crtn.o"] {
--            builder.copy(
--                &builder.musl_root(target).unwrap().join("lib").join(obj),
--                &libdir.join(obj),
--            );
-+            copy_and_stamp(&srcdir, obj);
-         }
-     } else if target.ends_with("-wasi") {
--        for &obj in &["crt1.o"] {
--            builder.copy(
--                &builder.wasi_root(target).unwrap().join("lib/wasm32-wasi").join(obj),
--                &libdir.join(obj),
--            );
--        }
-+        let srcdir = builder.wasi_root(target).unwrap().join("lib/wasm32-wasi");
-+        copy_and_stamp(&srcdir, "crt1.o");
-     }
- 
-     // Copies libunwind.a compiled to be linked wit x86_64-fortanix-unknown-sgx.
-@@ -145,11 +153,11 @@ fn copy_third_party_objects(builder: &Builder<'_>, compiler: &Compiler, target:
-     // which is provided by std for this target.
-     if target == "x86_64-fortanix-unknown-sgx" {
-         let src_path_env = "X86_FORTANIX_SGX_LIBS";
--        let obj = "libunwind.a";
-         let src = env::var(src_path_env).expect(&format!("{} not found in env", src_path_env));
--        let src = Path::new(&src).join(obj);
--        builder.copy(&src, &libdir.join(obj));
-+        copy_and_stamp(Path::new(&src), "libunwind.a");
-     }
-+
-+    target_deps
- }
- 
- /// Configure cargo to compile the standard library, adding appropriate env vars
-@@ -306,7 +314,7 @@ pub struct StartupObjects {
- }
- 
- impl Step for StartupObjects {
--    type Output = ();
-+    type Output = Vec;
- 
-     fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
-         run.path("src/rtstartup")
-@@ -325,13 +333,15 @@ impl Step for StartupObjects {
-     /// They don't require any library support as they're just plain old object
-     /// files, so we just use the nightly snapshot compiler to always build them (as
-     /// no other compilers are guaranteed to be available).
--    fn run(self, builder: &Builder<'_>) {
-+    fn run(self, builder: &Builder<'_>) -> Vec {
-         let for_compiler = self.compiler;
-         let target = self.target;
-         if !target.contains("windows-gnu") {
--            return
-+            return vec![]
-         }
- 
-+        let mut target_deps = vec![];
-+
-         let src_dir = &builder.src.join("src/rtstartup");
-         let dst_dir = &builder.native_dir(target).join("rtstartup");
-         let sysroot_dir = &builder.sysroot_libdir(for_compiler, target);
-@@ -350,7 +360,9 @@ impl Step for StartupObjects {
-                             .arg(src_file));
-             }
- 
--            builder.copy(dst_file, &sysroot_dir.join(file.to_string() + ".o"));
-+            let target = sysroot_dir.join(file.to_string() + ".o");
-+            builder.copy(dst_file, &target);
-+            target_deps.push(target);
-         }
- 
-         for obj in ["crt2.o", "dllcrt2.o"].iter() {
-@@ -358,8 +370,12 @@ impl Step for StartupObjects {
-                                     builder.cc(target),
-                                     target,
-                                     obj);
--            builder.copy(&src, &sysroot_dir.join(obj));
-+            let target = sysroot_dir.join(obj);
-+            builder.copy(&src, &target);
-+            target_deps.push(target);
-         }
-+
-+        target_deps
-     }
- }
- 
-@@ -437,6 +453,7 @@ impl Step for Rustc {
-                   cargo,
-                   vec![],
-                   &librustc_stamp(builder, compiler, target),
-+                  vec![],
-                   false);
- 
-         builder.ensure(RustcLink {
-@@ -585,7 +602,7 @@ impl Step for CodegenBackend {
- 
-         let tmp_stamp = out_dir.join(".tmp.stamp");
- 
--        let files = run_cargo(builder, cargo, vec![], &tmp_stamp, false);
-+        let files = run_cargo(builder, cargo, vec![], &tmp_stamp, vec![], false);
-         if builder.config.dry_run {
-             return;
-         }
-@@ -941,6 +958,7 @@ pub fn run_cargo(builder: &Builder<'_>,
-                  cargo: Cargo,
-                  tail_args: Vec,
-                  stamp: &Path,
-+                 additional_target_deps: Vec,
-                  is_check: bool)
-     -> Vec
- {
-@@ -1057,6 +1075,7 @@ pub fn run_cargo(builder: &Builder<'_>,
-         deps.push((path_to_add.into(), false));
-     }
- 
-+    deps.extend(additional_target_deps.into_iter().map(|d| (d, false)));
-     deps.sort();
-     let mut new_contents = Vec::new();
-     for (dep, proc_macro) in deps.iter() {
-diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
-index 514ad1144491..93143570b0fe 100644
---- a/src/bootstrap/dist.rs
-+++ b/src/bootstrap/dist.rs
-@@ -637,6 +637,28 @@ impl Step for DebuggerScripts {
-     }
- }
- 
-+fn skip_host_target_lib(builder: &Builder<'_>, compiler: Compiler) -> bool {
-+    // The only true set of target libraries came from the build triple, so
-+    // let's reduce redundant work by only producing archives from that host.
-+    if compiler.host != builder.config.build {
-+        builder.info("\tskipping, not a build host");
-+        true
-+    } else {
-+        false
-+    }
-+}
-+
-+/// Copy stamped files into an image's `target/lib` directory.
-+fn copy_target_libs(builder: &Builder<'_>, target: &str, image: &Path, stamp: &Path) {
-+    let dst = image.join("lib/rustlib").join(target).join("lib");
-+    t!(fs::create_dir_all(&dst));
-+    for (path, host) in builder.read_stamp_file(stamp) {
-+        if !host || builder.config.build == target {
-+            builder.copy(&path, &dst.join(path.file_name().unwrap()));
-+        }
-+    }
-+}
-+
- #[derive(Debug, PartialOrd, Ord, Copy, Clone, Hash, PartialEq, Eq)]
- pub struct Std {
-     pub compiler: Compiler,
-@@ -667,44 +689,19 @@ impl Step for Std {
-         let target = self.target;
- 
-         let name = pkgname(builder, "rust-std");
--
--        // The only true set of target libraries came from the build triple, so
--        // let's reduce redundant work by only producing archives from that host.
--        if compiler.host != builder.config.build {
--            builder.info("\tskipping, not a build host");
--            return distdir(builder).join(format!("{}-{}.tar.gz", name, target));
-+        let archive = distdir(builder).join(format!("{}-{}.tar.gz", name, target));
-+        if skip_host_target_lib(builder, compiler) {
-+            return archive;
-         }
- 
--        // We want to package up as many target libraries as possible
--        // for the `rust-std` package, so if this is a host target we
--        // depend on librustc and otherwise we just depend on libtest.
--        if builder.hosts.iter().any(|t| t == target) {
--            builder.ensure(compile::Rustc { compiler, target });
--        } else {
--            builder.ensure(compile::Std { compiler, target });
--        }
-+        builder.ensure(compile::Std { compiler, target });
- 
-         let image = tmpdir(builder).join(format!("{}-{}-image", name, target));
-         let _ = fs::remove_dir_all(&image);
- 
--        let dst = image.join("lib/rustlib").join(target);
--        t!(fs::create_dir_all(&dst));
--        let mut src = builder.sysroot_libdir(compiler, target).to_path_buf();
--        src.pop(); // Remove the trailing /lib folder from the sysroot_libdir
--        builder.cp_filtered(&src, &dst, &|path| {
--            if let Some(name) = path.file_name().and_then(|s| s.to_str()) {
--                if name == builder.config.rust_codegen_backends_dir.as_str() {
--                    return false
--                }
--                if name == "bin" {
--                    return false
--                }
--                if name.contains("LLVM") {
--                    return false
--                }
--            }
--            true
--        });
-+        let compiler_to_use = builder.compiler_for(compiler.stage, compiler.host, target);
-+        let stamp = compile::libstd_stamp(builder, compiler_to_use, target);
-+        copy_target_libs(builder, &target, &image, &stamp);
- 
-         let mut cmd = rust_installer(builder);
-         cmd.arg("generate")
-@@ -723,7 +720,73 @@ impl Step for Std {
-         let _time = timeit(builder);
-         builder.run(&mut cmd);
-         builder.remove_dir(&image);
--        distdir(builder).join(format!("{}-{}.tar.gz", name, target))
-+        archive
-+    }
-+}
-+
-+#[derive(Debug, PartialOrd, Ord, Copy, Clone, Hash, PartialEq, Eq)]
-+pub struct RustcDev {
-+    pub compiler: Compiler,
-+    pub target: Interned,
-+}
-+
-+impl Step for RustcDev {
-+    type Output = PathBuf;
-+    const DEFAULT: bool = true;
-+    const ONLY_HOSTS: bool = true;
-+
-+    fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
-+        run.path("rustc-dev")
-+    }
-+
-+    fn make_run(run: RunConfig<'_>) {
-+        run.builder.ensure(RustcDev {
-+            compiler: run.builder.compiler_for(
-+                run.builder.top_stage,
-+                run.builder.config.build,
-+                run.target,
-+            ),
-+            target: run.target,
-+        });
-+    }
-+
-+    fn run(self, builder: &Builder<'_>) -> PathBuf {
-+        let compiler = self.compiler;
-+        let target = self.target;
-+
-+        let name = pkgname(builder, "rustc-dev");
-+        let archive = distdir(builder).join(format!("{}-{}.tar.gz", name, target));
-+        if skip_host_target_lib(builder, compiler) {
-+            return archive;
-+        }
-+
-+        builder.ensure(compile::Rustc { compiler, target });
-+
-+        let image = tmpdir(builder).join(format!("{}-{}-image", name, target));
-+        let _ = fs::remove_dir_all(&image);
-+
-+        let compiler_to_use = builder.compiler_for(compiler.stage, compiler.host, target);
-+        let stamp = compile::librustc_stamp(builder, compiler_to_use, target);
-+        copy_target_libs(builder, &target, &image, &stamp);
-+
-+        let mut cmd = rust_installer(builder);
-+        cmd.arg("generate")
-+           .arg("--product-name=Rust")
-+           .arg("--rel-manifest-dir=rustlib")
-+           .arg("--success-message=Rust-is-ready-to-develop.")
-+           .arg("--image-dir").arg(&image)
-+           .arg("--work-dir").arg(&tmpdir(builder))
-+           .arg("--output-dir").arg(&distdir(builder))
-+           .arg(format!("--package-name={}-{}", name, target))
-+           .arg(format!("--component-name=rustc-dev-{}", target))
-+           .arg("--legacy-manifest-dirs=rustlib,cargo");
-+
-+        builder.info(&format!("Dist rustc-dev stage{} ({} -> {})",
-+            compiler.stage, &compiler.host, target));
-+        let _time = timeit(builder);
-+        builder.run(&mut cmd);
-+        builder.remove_dir(&image);
-+        archive
-     }
- }
- 
-diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
-index a182405f3b2d..d1cf1cbca784 100644
---- a/src/bootstrap/lib.rs
-+++ b/src/bootstrap/lib.rs
-@@ -1137,6 +1137,7 @@ impl Build {
-     pub fn copy(&self, src: &Path, dst: &Path) {
-         if self.config.dry_run { return; }
-         self.verbose_than(1, &format!("Copy {:?} to {:?}", src, dst));
-+        if src == dst { return; }
-         let _ = fs::remove_file(&dst);
-         let metadata = t!(src.symlink_metadata());
-         if metadata.file_type().is_symlink() {
-diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs
-index f41e7dd17ede..c0d2deab2f8b 100644
---- a/src/tools/build-manifest/src/main.rs
-+++ b/src/tools/build-manifest/src/main.rs
-@@ -399,6 +399,7 @@ impl Builder {
-     fn add_packages_to(&mut self, manifest: &mut Manifest) {
-         let mut package = |name, targets| self.package(name, &mut manifest.pkg, targets);
-         package("rustc", HOSTS);
-+        package("rustc-dev", HOSTS);
-         package("cargo", HOSTS);
-         package("rust-mingw", MINGW);
-         package("rust-std", TARGETS);
-@@ -426,6 +427,13 @@ impl Builder {
-             "rls-preview", "rust-src", "llvm-tools-preview",
-             "lldb-preview", "rust-analysis", "miri-preview"
-         ]);
-+
-+        // The compiler libraries are not stable for end users, but `rustc-dev` was only recently
-+        // split out of `rust-std`. We'll include it by default as a transition for nightly users.
-+        if self.rust_release == "nightly" {
-+            self.extend_profile("default", &mut manifest.profiles, &["rustc-dev"]);
-+            self.extend_profile("complete", &mut manifest.profiles, &["rustc-dev"]);
-+        }
-     }
- 
-     fn add_renames_to(&self, manifest: &mut Manifest) {
-@@ -481,6 +489,15 @@ impl Builder {
-             components.push(host_component("rust-mingw"));
-         }
- 
-+        // The compiler libraries are not stable for end users, but `rustc-dev` was only recently
-+        // split out of `rust-std`. We'll include it by default as a transition for nightly users,
-+        // but ship it as an optional component on the beta and stable channels.
-+        if self.rust_release == "nightly" {
-+            components.push(host_component("rustc-dev"));
-+        } else {
-+            extensions.push(host_component("rustc-dev"));
-+        }
-+
-         // Tools are always present in the manifest,
-         // but might be marked as unavailable if they weren't built.
-         extensions.extend(vec![
-@@ -498,6 +515,11 @@ impl Builder {
-                 .filter(|&&target| target != host)
-                 .map(|target| Component::from_str("rust-std", target))
-         );
-+        extensions.extend(
-+            HOSTS.iter()
-+                .filter(|&&target| target != host)
-+                .map(|target| Component::from_str("rustc-dev", target))
-+        );
-         extensions.push(Component::from_str("rust-src", "*"));
- 
-         // If the components/extensions don't actually exist for this
-@@ -534,6 +556,14 @@ impl Builder {
-         dst.insert(profile_name.to_owned(), pkgs.iter().map(|s| (*s).to_owned()).collect());
-     }
- 
-+    fn extend_profile(&mut self,
-+               profile_name: &str,
-+               dst: &mut BTreeMap>,
-+               pkgs: &[&str]) {
-+        dst.get_mut(profile_name).expect("existing profile")
-+            .extend(pkgs.iter().map(|s| (*s).to_owned()));
-+    }
-+
-     fn package(&mut self,
-                pkgname: &str,
-                dst: &mut BTreeMap,
diff --git a/rust.spec b/rust.spec
index 6de3a28..b789949 100644
--- a/rust.spec
+++ b/rust.spec
@@ -1,125 +1,244 @@
-# Only x86_64 and i686 are Tier 1 platforms at this time.
-# https://forge.rust-lang.org/platform-support.html
-%global rust_arches x86_64 i686 armv7hl aarch64 ppc64 ppc64le s390x
+Name:           rust
+Version:        1.92.0
+Release:        %autorelease
+Summary:        The Rust Programming Language
+License:        (Apache-2.0 OR MIT) AND (Artistic-2.0 AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 AND Unicode-3.0)
+# ^ written as: (rust itself) and (bundled libraries)
+URL:            https://www.rust-lang.org
 
-# The channel can be stable, beta, or nightly
-%{!?channel: %global channel stable}
+# 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 armv7hl aarch64 ppc64le s390x riscv64
+ExclusiveArch:  %{rust_arches}
 
-# To bootstrap from scratch, set the channel and date from src/stage0.txt
-# e.g. 1.10.0 wants rustc: 1.9.0-2016-05-24
+# To bootstrap from scratch, set the channel and date from src/stage0
+# e.g. 1.89.0 wants rustc: 1.88.0-2025-06-26
 # or nightly wants some beta-YYYY-MM-DD
-# Note that cargo matches the program version here, not its crate version.
-%global bootstrap_rust 1.38.0
-%global bootstrap_cargo 1.38.0
-%global bootstrap_channel 1.38.0
-%global bootstrap_date 2019-09-26
+%global bootstrap_version 1.91.0
+%global bootstrap_channel 1.91.0
+%global bootstrap_date 2025-10-30
 
 # Only the specified arches will use bootstrap binaries.
+# NOTE: Those binaries used to be uploaded with every new release, but that was
+# a waste of lookaside cache space when they're most often unused.
+# Run "spectool -g rust.spec" after changing this and then "fedpkg upload" to
+# add them to sources. Remember to remove them again after the bootstrap build!
 #global bootstrap_arches %%{rust_arches}
 
+# We need CRT files for *-wasi targets, at least as new as the commit in
+# src/ci/docker/host-x86_64/dist-various-2/build-wasi-toolchain.sh
+%global wasi_libc_url https://github.com/WebAssembly/wasi-libc
+%global wasi_libc_ref wasi-sdk-27
+%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}
+%if 0%{?fedora}
+%bcond_with bundled_wasi_libc
+%else
+%bcond_without bundled_wasi_libc
+%endif
+
 # Using llvm-static may be helpful as an opt-in, e.g. to aid LLVM rebases.
 %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 6.0+.
-%if 0%{?rhel} && !0%{?epel}
-%bcond_without bundled_llvm
-%else
+# is insufficient. Rust currently requires LLVM 19.0+.
+# See src/bootstrap/src/core/build_steps/llvm.rs, fn check_llvm_version
+%global min_llvm_version 20.0.0
+%global bundled_llvm_version 21.1.3
+#global llvm_compat_version 19
+%global llvm llvm%{?llvm_compat_version}
 %bcond_with bundled_llvm
+
+# Requires stable libgit2 1.9, and not the next minor soname change.
+# This needs to be consistent with the bindings in vendor/libgit2-sys.
+%global min_libgit2_version 1.9.0
+%global next_libgit2_version 1.10.0~
+%global bundled_libgit2_version 1.9.1
+%if 0%{?fedora} >= 41
+%bcond_with bundled_libgit2
+%else
+%bcond_without bundled_libgit2
 %endif
 
-# libgit2-sys expects to use its bundled library, which is sometimes just a
-# snapshot of libgit2's master branch.  This can mean the FFI declarations
-# won't match our released libgit2.so, e.g. having changed struct fields.
-# So, tread carefully if you toggle this...
-%bcond_without bundled_libgit2
+# Try to use system oniguruma (only used at build time for rust-docs)
+# src/tools/rustbook -> ... -> onig_sys v69.9.1 needs at least 6.9.3
+%global min_oniguruma_version 6.9.3
+%if 0%{?rhel} && 0%{?rhel} < 9
+%bcond_without bundled_oniguruma
+%else
+%bcond_with bundled_oniguruma
+%endif
+
+# Cargo uses UPSERTs with omitted conflict targets
+%global min_sqlite3_version 3.35
+%global bundled_sqlite3_version 3.50.2
+%if 0%{?rhel} && 0%{?rhel} < 10
+%bcond_without bundled_sqlite3
+%else
+%bcond_with bundled_sqlite3
+%endif
 
 %if 0%{?rhel}
-%bcond_without bundled_libssh2
+# Disable cargo->libgit2->libssh2 on RHEL, as it's not approved for FIPS (rhbz1732949)
+%bcond_without disabled_libssh2
 %else
-%bcond_with bundled_libssh2
+%bcond_with disabled_libssh2
 %endif
 
-# LLDB isn't available everywhere...
-%if !0%{?rhel}
-%bcond_without lldb
-%else
-%bcond_with lldb
+# Reduce rustc's own debuginfo and optimizations to conserve 32-bit memory.
+# e.g. https://github.com/rust-lang/rust/issues/45854
+%global reduced_debuginfo 0
+%if 0%{?__isa_bits} == 32
+%global reduced_debuginfo 1
+%endif
+# Also on current riscv64 hardware, although future hardware will be
+# able to handle it.
+# e.g. http://fedora.riscv.rocks/koji/buildinfo?buildID=249870
+%ifarch riscv64
+%global reduced_debuginfo 1
 %endif
 
-Name:           rust
-Version:        1.39.0
-Release:        1%{?dist}
-Summary:        The Rust Programming Language
-License:        (ASL 2.0 or MIT) and (BSD and MIT)
-# ^ written as: (rust itself) and (bundled libraries)
-URL:            https://www.rust-lang.org
-ExclusiveArch:  %{rust_arches}
-
-%if "%{channel}" == "stable"
-%global rustc_package rustc-%{version}-src
+%if 0%{?reduced_debuginfo}
+%global enable_debuginfo --debuginfo-level=0 --debuginfo-level-std=2
+%global enable_rust_opts --set rust.codegen-units-std=1
+%bcond_with rustc_pgo
 %else
-%global rustc_package rustc-%{channel}-src
+# Build rustc with full debuginfo, CGU=1, ThinLTO, and PGO.
+%global enable_debuginfo --debuginfo-level=2
+%global enable_rust_opts --set rust.codegen-units=1 --set rust.lto=thin
+%bcond_without rustc_pgo
 %endif
+
+# Detect non-stable channels from the version, like 1.74.0~beta.1
+%{lua: do
+  local version = rpm.expand("%{version}")
+  local version_channel, subs = version:gsub("^.*~(%w+).*$", "%1", 1)
+  rpm.define("channel " .. (subs ~= 0 and version_channel or "stable"))
+  rpm.define("rustc_package rustc-" .. version_channel .. "-src")
+end}
 Source0:        https://static.rust-lang.org/dist/%{rustc_package}.tar.xz
+Source1:        %{wasi_libc_source}
+# Sources for bootstrap_arches are inserted by lua below
 
-# Revert https://github.com/rust-lang/rust/pull/57840
-# We do have the necessary fix in our LLVM 7.
-Patch1:         rust-pr57840-llvm7-debuginfo-variants.patch
+# By default, rust tries to use "rust-lld" as a linker for some targets.
+Patch1:         0001-Use-lld-provided-by-system.patch
 
-# Reduce the size of rust-std
-# https://github.com/rust-lang/rust/pull/65474
-Patch2:         rust-pr65474-split-rustc-dev.patch
+# Set a substitute-path in rust-gdb for standard library sources.
+Patch2:         rustc-1.70.0-rust-gdb-substitute-path.patch
 
-# Get the Rust triple for any arch.
-%{lua: function rust_triple(arch)
-  local abi = "gnu"
+# Override default target CPUs to match distro settings
+# TODO: upstream this ability into the actual build configuration
+Patch3:         0001-Let-environment-variables-override-some-default-CPUs.patch
+
+# Override the default self-contained system libraries
+# TODO: the first can probably be upstreamed, but the second is hard-coded,
+# and we're only applying that if not with bundled_wasi_libc.
+Patch4:         0001-bootstrap-allow-disabling-target-self-contained.patch
+Patch5:         0002-set-an-external-library-path-for-wasm32-wasi.patch
+
+# We don't want to use the bundled library in libsqlite3-sys
+Patch6:         rustc-1.92.0-unbundle-sqlite.patch
+
+# stage0 tries to copy all of /usr/lib, sometimes unsuccessfully, see #143735
+Patch7:         0001-only-copy-rustlib-into-stage0-sysroot.patch
+
+### RHEL-specific patches below ###
+
+# Simple rpm macros for rust-toolset (as opposed to full rust-packaging)
+Source100:      macros.rust-toolset
+Source101:      macros.rust-srpm
+Source102:      cargo_vendor.attr
+Source103:      cargo_vendor.prov
+
+# Disable cargo->libgit2->libssh2 on RHEL, as it's not approved for FIPS (rhbz1732949)
+Patch100:       rustc-1.92.0-disable-libssh2.patch
+
+# Get the Rust triple for any architecture and ABI.
+%{lua: function rust_triple(arch, abi)
+  abi = abi or "gnu"
   if arch == "armv7hl" then
     arch = "armv7"
-    abi = "gnueabihf"
-  elseif arch == "ppc64" then
-    arch = "powerpc64"
+    abi = abi.."eabihf"
   elseif arch == "ppc64le" then
     arch = "powerpc64le"
+  elseif arch == "riscv64" then
+    arch = "riscv64gc"
   end
   return arch.."-unknown-linux-"..abi
 end}
 
-%global rust_triple %{lua: print(rust_triple(rpm.expand("%{_target_cpu}")))}
+%define rust_triple() %{lua: print(rust_triple(
+  rpm.expand("%{?1}%{!?1:%{_target_cpu}}"),
+  rpm.expand("%{?2}%{!?2:gnu}")
+))}
+
+# Get the environment variable form of the Rust triple.
+%define rust_triple_env() %{lua:
+  print(rpm.expand("%{rust_triple %*}"):gsub("-", "_"):upper())
+}
+
+# Define a space-separated list of targets to ship rust-std-static-$triple for
+# cross-compilation. The packages are noarch, but they're not fully
+# reproducible between hosts, so only x86_64 actually builds it.
+%ifarch x86_64
+%if 0%{?fedora}
+%global mingw_targets i686-pc-windows-gnu x86_64-pc-windows-gnu
+%endif
+%global wasm_targets wasm32-unknown-unknown wasm32-wasip1
+%if 0%{?fedora}
+%global extra_targets x86_64-unknown-none x86_64-unknown-uefi
+%endif
+%if 0%{?rhel} >= 10
+%global extra_targets x86_64-unknown-none
+%endif
+%endif
+%ifarch aarch64
+%if 0%{?fedora}
+%global extra_targets aarch64-unknown-none-softfloat aarch64-unknown-uefi
+%endif
+%if 0%{?rhel} >= 10
+%global extra_targets aarch64-unknown-none-softfloat
+%endif
+%endif
+%global all_targets %{?mingw_targets} %{?wasm_targets} %{?extra_targets}
+%define target_enabled() %{lua:
+  print(rpm.expand(" %{all_targets} "):find(rpm.expand(" %1 "), 1, true) or 0)
+}
 
 %if %defined bootstrap_arches
 # For each bootstrap arch, add an additional binary Source.
 # Also define bootstrap_source just for the current target.
 %{lua: do
   local bootstrap_arches = {}
-  for arch in string.gmatch(rpm.expand("%{bootstrap_arches}"), "%S+") do
+  for arch in rpm.expand("%{bootstrap_arches}"):gmatch("%S+") do
     table.insert(bootstrap_arches, arch)
   end
-  local base = rpm.expand("https://static.rust-lang.org/dist/%{bootstrap_date}"
-                          .."/rust-%{bootstrap_channel}")
+  local base = rpm.expand("https://static.rust-lang.org/dist/%{bootstrap_date}")
+  local channel = rpm.expand("%{bootstrap_channel}")
   local target_arch = rpm.expand("%{_target_cpu}")
   for i, arch in ipairs(bootstrap_arches) do
-    print(string.format("Source%d: %s-%s.tar.xz\n",
-                        i, base, rust_triple(arch)))
+    i = 1000 + i * 3
+    local suffix = channel.."-"..rust_triple(arch)
+    print(string.format("Source%d: %s/cargo-%s.tar.xz\n", i, base, suffix))
+    print(string.format("Source%d: %s/rustc-%s.tar.xz\n", i+1, base, suffix))
+    print(string.format("Source%d: %s/rust-std-%s.tar.xz\n", i+2, base, suffix))
     if arch == target_arch then
-      rpm.define("bootstrap_source "..i)
+      rpm.define("bootstrap_source_cargo "..i)
+      rpm.define("bootstrap_source_rustc "..i+1)
+      rpm.define("bootstrap_source_std "..i+2)
+      rpm.define("bootstrap_suffix "..suffix)
     end
   end
 end}
 %endif
 
 %ifarch %{bootstrap_arches}
-%global bootstrap_root rust-%{bootstrap_channel}-%{rust_triple}
-%global local_rust_root %{_builddir}/%{bootstrap_root}/usr
-Provides:       bundled(%{name}-bootstrap) = %{bootstrap_rust}
+%global local_rust_root %{_builddir}/rust-%{bootstrap_suffix}
+Provides:       bundled(%{name}-bootstrap) = %{bootstrap_version}
 %else
-BuildRequires:  cargo >= %{bootstrap_cargo}
-%if 0%{?fedora} >= 27
-BuildRequires:  (%{name} >= %{bootstrap_rust} with %{name} <= %{version})
-%else
-BuildRequires:  %{name} >= %{bootstrap_rust}
-BuildConflicts: %{name} > %{version}
-%endif
+BuildRequires:  (cargo >= %{bootstrap_version} with cargo <= %{version})
+BuildRequires:  (%{name} >= %{bootstrap_version} with %{name} <= %{version})
 %global local_rust_root %{_prefix}
 %endif
 
@@ -127,58 +246,68 @@ BuildRequires:  make
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  ncurses-devel
-BuildRequires:  curl
+# explicit curl-devel to avoid httpd24-curl (rhbz1540167)
+BuildRequires:  curl-devel
 BuildRequires:  pkgconfig(libcurl)
 BuildRequires:  pkgconfig(liblzma)
 BuildRequires:  pkgconfig(openssl)
 BuildRequires:  pkgconfig(zlib)
 
-%if %without bundled_libgit2
-BuildRequires:  pkgconfig(libgit2) >= 0.27
+%if %{without bundled_libgit2}
+BuildRequires:  (pkgconfig(libgit2) >= %{min_libgit2_version} with pkgconfig(libgit2) < %{next_libgit2_version})
 %endif
 
-%if %without bundled_libssh2
-# needs libssh2_userauth_publickey_frommemory
-BuildRequires:  pkgconfig(libssh2) >= 1.6.0
+%if %{without bundled_oniguruma}
+BuildRequires:  pkgconfig(oniguruma) >= %{min_oniguruma_version}
 %endif
 
-%if 0%{?rhel} && 0%{?rhel} <= 7
-%global python python2
+%if %{without bundled_sqlite3}
+BuildRequires:  pkgconfig(sqlite3) >= %{min_sqlite3_version}
+%endif
+
+%if %{without disabled_libssh2}
+BuildRequires:  pkgconfig(libssh2)
+%endif
+
+%if 0%{?rhel} == 8
+BuildRequires:  platform-python
 %else
-%global python python3
+BuildRequires:  python3
 %endif
-BuildRequires:  %{python}
+BuildRequires:  python3-rpm-macros
 
 %if %with bundled_llvm
-BuildRequires:  cmake3 >= 3.4.3
-Provides:       bundled(llvm) = 8.0.0
+BuildRequires:  cmake >= 3.20.0
+BuildRequires:  ninja-build
+Provides:       bundled(llvm) = %{bundled_llvm_version}
 %else
-BuildRequires:  cmake >= 2.8.11
-%if 0%{?epel}
-%global llvm llvm7.0
-%endif
-%if %defined llvm
+BuildRequires:  cmake >= 3.5.1
+%if %defined llvm_compat_version
 %global llvm_root %{_libdir}/%{llvm}
+%global llvm_path %{llvm_root}/bin
 %else
-%global llvm llvm
 %global llvm_root %{_prefix}
 %endif
-BuildRequires:  %{llvm}-devel >= 6.0
+BuildRequires:  %{llvm}-devel >= %{min_llvm_version}
 %if %with llvm_static
 BuildRequires:  %{llvm}-static
 BuildRequires:  libffi-devel
+BuildRequires:  libxml2-devel
 %endif
 %endif
 
-# make check needs "ps" for src/test/run-pass/wait-forked-but-failed-child.rs
+# make check needs "ps" for src/test/ui/wait-forked-but-failed-child.rs
 BuildRequires:  procps-ng
 
 # debuginfo-gdb tests need gdb
 BuildRequires:  gdb
+# Work around https://bugzilla.redhat.com/show_bug.cgi?id=2275274:
+# gdb currently prints a "Unable to load 'rpm' module. Please install the python3-rpm package."
+# message that breaks version detection.
+BuildRequires:  python3-rpm
 
-# TODO: work on unbundling these!
-Provides:       bundled(libbacktrace) = 8.1.0
-Provides:       bundled(miniz) = 2.0.7
+# For src/test/run-make/static-pie
+BuildRequires:  glibc-static
 
 # Virtual provides for folks who attempt "dnf install rustc"
 Provides:       rustc = %{version}-%{release}
@@ -187,11 +316,13 @@ Provides:       rustc%{?_isa} = %{version}-%{release}
 # Always require our exact standard library
 Requires:       %{name}-std-static%{?_isa} = %{version}-%{release}
 
-# The C compiler is needed at runtime just for linking.  Someday rustc might
+# The C compiler is needed at runtime just for linking. Someday rustc might
 # invoke the linker directly, and then we'll only need binutils.
 # https://github.com/rust-lang/rust/issues/11937
 Requires:       /usr/bin/cc
 
+%global __ranlib %{_bindir}/ranlib
+
 # ALL Rust libraries are private, because they don't keep an ABI.
 %global _privatelibs lib(.*-[[:xdigit:]]{16}*|rustc.*)[.]so.*
 %global __provides_exclude ^(%{_privatelibs})$
@@ -201,23 +332,73 @@ Requires:       /usr/bin/cc
 
 # While we don't want to encourage dynamic linking to Rust shared libraries, as
 # there's no stable ABI, we still need the unallocated metadata (.rustc) to
-# support custom-derive plugins like #[proc_macro_derive(Foo)].  But eu-strip is
-# very eager by default, so we have to limit it to -g, only debugging symbols.
-%if 0%{?fedora} >= 27
-# Newer find-debuginfo.sh supports --keep-section, which is preferable. rhbz1465997
+# support custom-derive plugins like #[proc_macro_derive(Foo)].
 %global _find_debuginfo_opts --keep-section .rustc
+
+# The standard library rlibs are essentially static archives, but we don't want
+# to strip them because that impairs the debuginfo of all Rust programs.
+# It also had a tendency to break the cross-compiled libraries:
+# - wasm targets lost the archive index, which we were repairing with llvm-ranlib
+# - uefi targets couldn't link builtins like memcpy, possibly due to lost COMDAT flags
+%global __brp_strip_static_archive %{nil}
+%global __brp_strip_lto %{nil}
+
+# We're going to override --libdir when configuring to get rustlib into a
+# common path, but we'll fix the shared libraries during install.
+%global common_libdir %{_prefix}/lib
+%global rustlibdir %{common_libdir}/rustlib
+
+%if %defined mingw_targets
+BuildRequires:  mingw32-filesystem >= 95
+BuildRequires:  mingw64-filesystem >= 95
+BuildRequires:  mingw32-crt
+BuildRequires:  mingw64-crt
+BuildRequires:  mingw32-gcc
+BuildRequires:  mingw64-gcc
+BuildRequires:  mingw32-winpthreads-static
+BuildRequires:  mingw64-winpthreads-static
+%endif
+
+%if %defined wasm_targets
+%if %with bundled_wasi_libc
+BuildRequires:  clang%{?llvm_compat_version}
 %else
-%global _find_debuginfo_opts -g
-%undefine _include_minidebuginfo
+BuildRequires:  wasi-libc-static
+%endif
+BuildRequires:  lld%{?llvm_compat_version}
 %endif
 
-# Use hardening ldflags.
-%global rustflags -Clink-arg=-Wl,-z,relro,-z,now
+# For profiler_builtins
+BuildRequires:  compiler-rt%{?llvm_compat_version}
 
-%if %{without bundled_llvm}
-%if "%{llvm_root}" == "%{_prefix}" || 0%{?scl:1}
-%global llvm_has_filecheck 1
-%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~
+
+# Experimenting with a fine-grained version of %%cargo_vendor_manifest,
+# so we can have different bundled provides for each tool subpackage.
+%define cargo_tree_manifest(n:m:f:t:) (       \
+  %{!-n:%{error:must specify a tool name}}    \
+  set -euo pipefail                           \
+  mkdir -p build/manifests/%{-n*}             \
+  %{shrink:                                   \
+    env RUSTC_BOOTSTRAP=1                     \
+      RUSTC=%{local_rust_root}/bin/rustc      \
+      %{local_rust_root}/bin/cargo tree       \
+      --offline --edges normal,build          \
+      --prefix none --format "{p}"            \
+      %{-m:--manifest-path %{-m*}/Cargo.toml} \
+      %{-f:--features %{-f*}}                 \
+      %{-t:--target %{-t*}}                   \
+      %*                                      \
+    | sed '/([*/]/d; s/ (proc-macro)$//'      \
+    | sort -u                                 \
+    >build/manifests/%{-n*}/cargo-vendor.txt  \
+  }                                           \
+)
+%ifnarch %{bootstrap_arches}
+%{?fedora:BuildRequires: cargo-rpm-macros}
+%{?rhel:BuildRequires: rust-toolset}
 %endif
 
 %description
@@ -229,11 +410,91 @@ 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.17
 
 %description std-static
 This package includes the standard libraries for building applications
 written in Rust.
 
+%global target_package()                        \
+%package std-static-%1                          \
+Summary:        Standard library for Rust %1    \
+Requires:       %{name} = %{version}-%{release}
+
+%global target_description()                                            \
+%description std-static-%1                                              \
+This package includes the standard libraries for building applications  \
+written in Rust for the %2 target %1.
+
+%if %target_enabled i686-pc-windows-gnu
+%target_package i686-pc-windows-gnu
+Requires:       mingw32-crt
+Requires:       mingw32-gcc
+Requires:       mingw32-winpthreads-static
+Provides:       mingw32-rust = %{version}-%{release}
+Provides:       mingw32-rustc = %{version}-%{release}
+BuildArch:      noarch
+%target_description i686-pc-windows-gnu MinGW
+%endif
+
+%if %target_enabled x86_64-pc-windows-gnu
+%target_package x86_64-pc-windows-gnu
+Requires:       mingw64-crt
+Requires:       mingw64-gcc
+Requires:       mingw64-winpthreads-static
+Provides:       mingw64-rust = %{version}-%{release}
+Provides:       mingw64-rustc = %{version}-%{release}
+BuildArch:      noarch
+%target_description x86_64-pc-windows-gnu MinGW
+%endif
+
+%if %target_enabled wasm32-unknown-unknown
+%target_package wasm32-unknown-unknown
+Requires:       lld >= 8.0
+BuildArch:      noarch
+%target_description wasm32-unknown-unknown WebAssembly
+%endif
+
+%if %target_enabled wasm32-wasip1
+%target_package wasm32-wasip1
+Requires:       lld >= 8.0
+%if %with bundled_wasi_libc
+Provides:       bundled(wasi-libc)
+%else
+Requires:       wasi-libc-static
+%endif
+BuildArch:      noarch
+# https://blog.rust-lang.org/2024/04/09/updates-to-rusts-wasi-targets.html
+Obsoletes:      %{name}-std-static-wasm32-wasi < 1.84.0~
+%target_description wasm32-wasip1 WebAssembly
+%endif
+
+%if %target_enabled x86_64-unknown-none
+%target_package x86_64-unknown-none
+Requires:       lld
+%target_description x86_64-unknown-none embedded
+%endif
+
+%if %target_enabled aarch64-unknown-uefi
+%target_package aarch64-unknown-uefi
+Requires:       lld
+%target_description aarch64-unknown-uefi embedded
+%endif
+
+%if %target_enabled x86_64-unknown-uefi
+%target_package x86_64-unknown-uefi
+Requires:       lld
+%target_description x86_64-unknown-uefi embedded
+%endif
+
+%if %target_enabled aarch64-unknown-none-softfloat
+%target_package aarch64-unknown-none-softfloat
+Requires:       lld
+%target_description aarch64-unknown-none-softfloat embedded
+%endif
+
 
 %package debugger-common
 Summary:        Common debugger pretty printers for Rust
@@ -248,31 +509,27 @@ Summary:        GDB pretty printers for Rust
 BuildArch:      noarch
 Requires:       gdb
 Requires:       %{name}-debugger-common = %{version}-%{release}
+# rust-gdb uses rustc to find the sysroot
+Requires:       %{name} = %{version}-%{release}
 
 %description gdb
 This package includes the rust-gdb script, which allows easier debugging of Rust
 programs.
 
 
-%if %with lldb
-
 %package lldb
 Summary:        LLDB pretty printers for Rust
 BuildArch:      noarch
 Requires:       lldb
-%if 0%{?fedora} >= 31
 Requires:       python3-lldb
-%else
-Requires:       python2-lldb
-%endif
 Requires:       %{name}-debugger-common = %{version}-%{release}
+# rust-lldb uses rustc to find the sysroot
+Requires:       %{name} = %{version}-%{release}
 
 %description lldb
 This package includes the rust-lldb script, which allows easier debugging of Rust
 programs.
 
-%endif
-
 
 %package doc
 Summary:        Documentation for Rust
@@ -281,6 +538,12 @@ Summary:        Documentation for Rust
 # Koji will fail the build in rpmdiff if two architectures build a noarch
 # subpackage differently, so instead we have to keep its arch.
 
+# Cargo no longer builds its own documentation
+# https://github.com/rust-lang/cargo/pull/4904
+# We used to keep a shim cargo-doc package, but now that's merged too.
+Obsoletes:      cargo-doc < 1.65.0~
+Provides:       cargo-doc = %{version}-%{release}
+
 %description doc
 This package includes HTML documentation for the Rust programming language and
 its standard library.
@@ -289,17 +552,18 @@ its standard library.
 %package -n cargo
 Summary:        Rust's package manager and build tool
 %if %with bundled_libgit2
-Provides:       bundled(libgit2) = 0.28.2
+Provides:       bundled(libgit2) = %{bundled_libgit2_version}
 %endif
-%if %with bundled_libssh2
-Provides:       bundled(libssh2) = 1.8.1~dev
+%if %with bundled_sqlite3
+Provides:       bundled(sqlite) = %{bundled_sqlite3_version}
 %endif
 # For tests:
-BuildRequires:  git
-# Cargo is not much use without Rust
-Requires:       rust
+BuildRequires:  git-core
+# Cargo is not much use without Rust, and it's worth keeping the versions
+# in sync since some feature development depends on them together.
+Requires:       %{name} = %{version}-%{release}
 
-# "cargo vendor" is a builtin command starting with 1.37.  The Obsoletes and
+# "cargo vendor" is a builtin command starting with 1.37. The Obsoletes and
 # Provides are mostly relevant to RHEL, but harmless to have on Fedora/etc. too
 Obsoletes:      cargo-vendor <= 0.1.23
 Provides:       cargo-vendor = %{version}-%{release}
@@ -309,21 +573,13 @@ Cargo is a tool that allows Rust projects to declare their various dependencies
 and ensure that you'll always get a repeatable build.
 
 
-%package -n cargo-doc
-Summary:        Documentation for Cargo
-BuildArch:      noarch
-# Cargo no longer builds its own documentation
-# https://github.com/rust-lang/cargo/pull/4904
-Requires:       rust-doc = %{version}-%{release}
-
-%description -n cargo-doc
-This package includes HTML documentation for Cargo.
-
-
 %package -n rustfmt
 Summary:        Tool to find and fix Rust formatting issues
 Requires:       cargo
 
+# /usr/bin/rustfmt is dynamically linked against internal rustc libs
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+
 # The component/package was rustfmt-preview until Rust 1.31.
 Obsoletes:      rustfmt-preview < 1.0.0
 Provides:       rustfmt-preview = %{version}-%{release}
@@ -332,27 +588,25 @@ Provides:       rustfmt-preview = %{version}-%{release}
 A tool for formatting Rust code according to style guidelines.
 
 
-%package -n rls
-Summary:        Rust Language Server for IDE integration
-%if %with bundled_libgit2
-Provides:       bundled(libgit2) = 0.28.2
-%endif
-%if %with bundled_libssh2
-Provides:       bundled(libssh2) = 1.8.1~dev
-%endif
-Requires:       rust-analysis
-# /usr/bin/rls is dynamically linked against internal rustc libs
+%package analyzer
+Summary:        Rust implementation of the Language Server Protocol
+
+# /usr/bin/rust-analyzer is dynamically linked against internal rustc libs
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 
+# The standard library sources are needed for most functionality.
+Recommends:     %{name}-src
+
+# RLS is no longer available as of Rust 1.65, but we're including the stub
+# binary that implements LSP just enough to recommend rust-analyzer.
+Obsoletes:      rls < 1.65.0~
 # The component/package was rls-preview until Rust 1.31.
 Obsoletes:      rls-preview < 1.31.6
-Provides:       rls-preview = %{version}-%{release}
 
-%description -n rls
-The Rust Language Server provides a server that runs in the background,
-providing IDEs, editors, and other tools with information about Rust programs.
-It supports functionality such as 'goto definition', symbol search,
-reformatting, and code completion, and enables renaming and refactorings.
+%description analyzer
+rust-analyzer is an implementation of Language Server Protocol for the Rust
+programming language. It provides features like completion and goto definition
+for many code editors, including VS Code, Emacs and Vim.
 
 
 %package -n clippy
@@ -372,84 +626,136 @@ A collection of lints to catch common mistakes and improve your Rust code.
 %package src
 Summary:        Sources for the Rust standard library
 BuildArch:      noarch
+Recommends:     %{name}-std-static = %{version}-%{release}
 
 %description src
-This package includes source files for the Rust standard library.  It may be
+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
-Summary:        Compiler analysis data for the Rust standard library
-Requires:       rust-std-static%{?_isa} = %{version}-%{release}
+%if 0%{?rhel}
 
-%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.
+%package toolset-srpm-macros
+Summary:        RPM macros for building Rust source packages
+BuildArch:      noarch
+
+# This used to be from its own source package, versioned like rust2rpm.
+Obsoletes:      rust-srpm-macros < 18~
+Provides:       rust-srpm-macros = 25.2
+
+%description toolset-srpm-macros
+RPM macros for building source packages for Rust projects.
+
+
+%package toolset
+Summary:        Rust Toolset
+BuildArch:      noarch
+Requires:       rust = %{version}-%{release}
+Requires:       cargo = %{version}-%{release}
+Requires:       rust-toolset-srpm-macros = %{version}-%{release}
+Conflicts:      cargo-rpm-macros
+
+%description toolset
+This is the metapackage for Rust Toolset, bringing in the Rust compiler,
+the Cargo package manager, and a few convenience macros for rpm builds.
+
+%endif
 
 
 %prep
 
 %ifarch %{bootstrap_arches}
-%setup -q -n %{bootstrap_root} -T -b %{bootstrap_source}
-./install.sh --components=cargo,rustc,rust-std-%{rust_triple} \
-  --prefix=%{local_rust_root} --disable-ldconfig
+rm -rf %{local_rust_root}
+%setup -q -n cargo-%{bootstrap_suffix} -T -b %{bootstrap_source_cargo}
+./install.sh --prefix=%{local_rust_root} --disable-ldconfig
+%setup -q -n rustc-%{bootstrap_suffix} -T -b %{bootstrap_source_rustc}
+./install.sh --prefix=%{local_rust_root} --disable-ldconfig
+%setup -q -n rust-std-%{bootstrap_suffix} -T -b %{bootstrap_source_std}
+./install.sh --prefix=%{local_rust_root} --disable-ldconfig
 test -f '%{local_rust_root}/bin/cargo'
 test -f '%{local_rust_root}/bin/rustc'
 %endif
 
+%if %{defined wasm_targets} && %{with bundled_wasi_libc}
+%setup -q -n %{wasi_libc_name} -T -b 1
+rm -rf %{wasi_libc_dir}/dlmalloc/
+%endif
+
 %setup -q -n %{rustc_package}
 
-%patch1 -p1 -R
-%patch2 -p1
-
-%if "%{python}" == "python3"
-sed -i.try-py3 -e '/try python2.7/i try python3 "$@"' ./configure
+%patch -P1 -p1
+%patch -P2 -p1
+%patch -P3 -p1
+%patch -P4 -p1
+%if %without bundled_wasi_libc
+%patch -P5 -p1
 %endif
+%if %without bundled_sqlite3
+%patch -P6 -p1
+%endif
+%patch -P7 -p1
+
+%if %with disabled_libssh2
+%patch -P100 -p1
+%endif
+
+# Use our explicit python3 first
+sed -i.try-python -e '/^try python3 /i try "%{__python3}" "$@"' ./configure
+
+# Set a substitute-path in rust-gdb for standard library sources.
+sed -i.rust-src -e "s#@BUILDDIR@#$PWD#" ./src/etc/rust-gdb
 
 %if %without bundled_llvm
 rm -rf src/llvm-project/
+mkdir -p src/llvm-project/libunwind/
 %endif
 
-# We never enable emscripten.
-rm -rf src/llvm-emscripten/
+# Remove submodules we don't need.
+rm -rf src/gcc
+rm -rf src/tools/enzyme
+rm -rf src/tools/rustc-perf/collector/*-benchmarks/
 
-# Remove other unused vendored libraries
-rm -rf vendor/curl-sys/curl/
-rm -rf vendor/jemalloc-sys/jemalloc/
-rm -rf vendor/libz-sys/src/zlib/
-rm -rf vendor/lzma-sys/xz-*/
-rm -rf vendor/openssl-src/openssl/
+# Remove other unused vendored libraries. This leaves the directory in place,
+# because some build scripts watch them, e.g. "cargo:rerun-if-changed=curl".
+%define clear_dir() find ./%1 -mindepth 1 -delete
+%clear_dir vendor/curl-sys*/curl/
+%clear_dir vendor/*jemalloc-sys*/jemalloc/
+%clear_dir vendor/libffi-sys*/libffi/
+%clear_dir vendor/libmimalloc-sys*/c_src/mimalloc/
+%clear_dir vendor/libsqlite3-sys*/sqlcipher/
+%clear_dir vendor/libssh2-sys*/libssh2/
+%clear_dir vendor/libz-sys*/src/zlib{,-ng}/
+%clear_dir vendor/lzma-sys*/xz-*/
+%clear_dir vendor/openssl-src*/openssl/
 
 %if %without bundled_libgit2
-rm -rf vendor/libgit2-sys/libgit2/
+%clear_dir vendor/libgit2-sys*/libgit2/
 %endif
 
-%if %without bundled_libssh2
-rm -rf vendor/libssh2-sys/libssh2/
+%if %without bundled_oniguruma
+%clear_dir vendor/onig_sys*/oniguruma/
+%endif
+
+%if %without bundled_sqlite3
+%clear_dir vendor/libsqlite3-sys*/sqlite3/
+%endif
+
+%if %with disabled_libssh2
+rm -rf vendor/libssh2-sys*/
 %endif
 
 # This only affects the transient rust-installer, but let it use our dynamic xz-libs
-sed -i.lzma -e '/LZMA_API_STATIC/d' src/bootstrap/tool.rs
-
-# rename bundled license for packaging
-cp -a vendor/backtrace-sys/src/libbacktrace/LICENSE{,-libbacktrace}
-
-%if %{with bundled_llvm} && 0%{?epel}
-mkdir -p cmake-bin
-ln -s /usr/bin/cmake3 cmake-bin/cmake
-%global cmake_path $PWD/cmake-bin
-%endif
+sed -i.lzma -e '/LZMA_API_STATIC/d' src/bootstrap/src/core/build_steps/tool.rs
 
 %if %{without bundled_llvm} && %{with llvm_static}
 # Static linking to distro LLVM needs to add -lffi
 # https://github.com/rust-lang/rust/issues/34486
-sed -i.ffi -e '$a #[link(name = "ffi")] extern {}' \
-  src/librustc_llvm/lib.rs
+sed -i.ffi -e '$a #[link(name = "ffi")] extern "C" {}' \
+  compiler/rustc_llvm/src/lib.rs
 %endif
 
 # The configure macro will modify some autoconf-related files, which upsets
-# cargo when it tries to verify checksums in those files.  If we just truncate
+# cargo when it tries to verify checksums in those files. If we just truncate
 # that file list, cargo won't have anything to complain about.
 find vendor -name .cargo-checksum.json \
   -exec sed -i.uncheck -e 's/"files":{[^}]*}/"files":{ }/' '{}' '+'
@@ -458,75 +764,209 @@ 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
+%global rustc_target_cpus %{lua: do
+  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")
+  print(env)
+end}
+
+# Set up shared environment variables for build/install/check.
+# *_USE_PKG_CONFIG=1 convinces *-sys crates to use the system library.
+%global rust_env %{shrink:
+  %{?rustflags:RUSTFLAGS="%{rustflags}"}
+  %{rustc_target_cpus}
+  %{!?with_bundled_oniguruma:RUSTONIG_SYSTEM_LIBONIG=1}
+  %{!?with_bundled_sqlite3:LIBSQLITE3_SYS_USE_PKG_CONFIG=1}
+  %{!?with_disabled_libssh2:LIBSSH2_SYS_USE_PKG_CONFIG=1}
+  %{?llvm_path:PATH="%{llvm_path}:$PATH"}
+}
+%global export_rust_env export %{rust_env}
 
 %build
+%{export_rust_env}
 
-%if %without bundled_libgit2
-# convince libgit2-sys to use the distro libgit2
-export LIBGIT2_SYS_USE_PKG_CONFIG=1
+# Some builders have relatively little memory for their CPU count.
+# At least 4GB per CPU is a good rule of thumb for building rustc.
+%if %undefined constrain_build
+%define constrain_build(m:) %{lua:
+  for l in io.lines('/proc/meminfo') do
+    if l:sub(1, 9) == "MemTotal:" then
+      local opt_m = math.tointeger(rpm.expand("%{-m*}"))
+      local mem_total = math.tointeger(string.match(l, "MemTotal:%s+(%d+)"))
+      local cpu_limit = math.max(1, mem_total // (opt_m * 1024))
+      if cpu_limit < math.tointeger(rpm.expand("%_smp_build_ncpus")) then
+        rpm.define("_smp_build_ncpus " .. cpu_limit)
+      end
+      break
+    end
+  end
+}
+%endif
+%constrain_build -m 4096
+
+%if %defined mingw_targets
+%define mingw_target_config %{shrink:
+  --set target.i686-pc-windows-gnu.linker=%{mingw32_cc}
+  --set target.i686-pc-windows-gnu.cc=%{mingw32_cc}
+  --set target.i686-pc-windows-gnu.ar=%{mingw32_ar}
+  --set target.i686-pc-windows-gnu.ranlib=%{mingw32_ranlib}
+  --set target.i686-pc-windows-gnu.self-contained=false
+  --set target.x86_64-pc-windows-gnu.linker=%{mingw64_cc}
+  --set target.x86_64-pc-windows-gnu.cc=%{mingw64_cc}
+  --set target.x86_64-pc-windows-gnu.ar=%{mingw64_ar}
+  --set target.x86_64-pc-windows-gnu.ranlib=%{mingw64_ranlib}
+  --set target.x86_64-pc-windows-gnu.self-contained=false
+}
 %endif
 
-%if %without bundled_libssh2
-# convince libssh2-sys to use the distro libssh2
-export LIBSSH2_SYS_USE_PKG_CONFIG=1
-%endif
-
-%{?cmake_path:export PATH=%{cmake_path}:$PATH}
-%{?rustflags:export RUSTFLAGS="%{rustflags}"}
-
-# We're going to override --libdir when configuring to get rustlib into a
-# common path, but we'll fix the shared libraries during install.
-%global common_libdir %{_prefix}/lib
-%global rustlibdir %{common_libdir}/rustlib
-
-%ifarch %{arm} %{ix86} s390x
-# full debuginfo is exhausting memory; just do libstd for now
-# https://github.com/rust-lang/rust/issues/45854
-%if (0%{?fedora} && 0%{?fedora} < 27) || (0%{?rhel} && 0%{?rhel} <= 7)
-# Older rpmbuild didn't work with partial debuginfo coverage.
-%global debug_package %{nil}
-%define enable_debuginfo --debuginfo-level=0
+%if %defined wasm_targets
+%if %with bundled_wasi_libc
+%define wasi_libc_flags MALLOC_IMPL=emmalloc CC=clang AR=llvm-ar NM=llvm-nm
+%make_build --quiet -C %{wasi_libc_dir} %{wasi_libc_flags} TARGET_TRIPLE=wasm32-wasip1
+%define wasm_target_config %{shrink:
+  --set target.wasm32-wasip1.wasi-root=%{wasi_libc_dir}/sysroot
+}
 %else
-%define enable_debuginfo --debuginfo-level=0 --debuginfo-level-std=2
+%define wasm_target_config %{shrink:
+  --set target.wasm32-wasip1.wasi-root=%{_prefix}/wasm32-wasi
+  --set target.wasm32-wasip1.self-contained=false
+}
 %endif
-%else
-%define enable_debuginfo --debuginfo-level=2
 %endif
 
-# We want the best optimization for std, but it caused problems for rpm-ostree
-# on ppc64le to have all of the compiler_builtins in a single object:
-# https://bugzilla.redhat.com/show_bug.cgi?id=1713090
-%ifnarch %{power64}
-%define codegen_units_std --set rust.codegen-units-std=1
+# Find the compiler-rt library for the Rust profiler_builtins and optimized-builtins crates.
+%define clang_lib %{expand:%%clang%{?llvm_compat_version}_resource_dir}/lib
+%define profiler %{clang_lib}/%{_arch}-redhat-linux-gnu/libclang_rt.profile.a
+test -r "%{profiler}"
+
+# llvm < 21 does not provide a builtins library for s390x.
+%if "%{_arch}" != "s390x" || 0%{?clang_major_version} >= 21
+%define optimized_builtins %{clang_lib}/%{_arch}-redhat-linux-gnu/libclang_rt.builtins.a
+test -r "%{optimized_builtins}"
+%else
+%define optimized_builtins false
 %endif
 
+
 %configure --disable-option-checking \
+  --docdir=%{_pkgdocdir} \
   --libdir=%{common_libdir} \
   --build=%{rust_triple} --host=%{rust_triple} --target=%{rust_triple} \
-  --python=%{python} \
+  --set target.%{rust_triple}.linker=%{__cc} \
+  --set target.%{rust_triple}.cc=%{__cc} \
+  --set target.%{rust_triple}.cxx=%{__cxx} \
+  --set target.%{rust_triple}.ar=%{__ar} \
+  --set target.%{rust_triple}.ranlib=%{__ranlib} \
+  --set target.%{rust_triple}.profiler="%{profiler}" \
+  --set target.%{rust_triple}.optimized-compiler-builtins="%{optimized_builtins}" \
+  %{?mingw_target_config} \
+  %{?wasm_target_config} \
+  --python=%{__python3} \
   --local-rust-root=%{local_rust_root} \
+  --set build.rustfmt=/bin/true \
   %{!?with_bundled_llvm: --llvm-root=%{llvm_root} \
-    %{!?llvm_has_filecheck: --disable-codegen-tests} \
     %{!?with_llvm_static: --enable-llvm-link-shared } } \
+  --disable-llvm-static-stdcpp \
+  --disable-llvm-bitcode-linker \
+  --disable-lld \
   --disable-rpath \
   %{enable_debuginfo} \
+  %{enable_rust_opts} \
+  --set build.jobs=%_smp_build_ncpus \
+  --set build.build-stage=2 \
+  --set build.doc-stage=2 \
+  --set build.install-stage=2 \
+  --set build.test-stage=2 \
+  --set build.optimized-compiler-builtins=false \
+  --set rust.llvm-tools=false \
+  --set rust.verify-llvm-ir=true \
   --enable-extended \
+  --tools=cargo,clippy,rust-analyzer,rustdoc,rustfmt,src \
   --enable-vendor \
   --enable-verbose-tests \
-  %{?codegen_units_std} \
-  --release-channel=%{channel}
+  --release-channel=%{channel} \
+  --release-description="%{?fedora:Fedora }%{?rhel:Red Hat }%{version}-%{release}"
 
-%{python} ./x.py build
-%{python} ./x.py doc
+%global __x %{__python3} ./x.py
 
+%if %{with rustc_pgo}
+# Build the compiler with profile instrumentation
+%define profraw $PWD/build/profiles
+%define profdata $PWD/build/rustc.profdata
+mkdir -p "%{profraw}"
+%{__x} build sysroot --rust-profile-generate="%{profraw}"
+# Build cargo as a workload to generate compiler profiles
+# We normally use `x.py`, but in this case we invoke the stage 2 compiler and libs
+# directly to ensure we use the instrumented compiler.
+env LLVM_PROFILE_FILE="%{profraw}/default_%%m_%%p.profraw" \
+  LD_LIBRARY_PATH=$PWD/build/host/stage2/lib \
+  RUSTC=$PWD/build/host/stage2/bin/rustc \
+  cargo build --manifest-path=src/tools/cargo/Cargo.toml
+# Finalize the profile data and clean up the raw files
+llvm-profdata merge -o "%{profdata}" "%{profraw}"
+rm -r "%{profraw}" build/%{rust_triple}/stage2*/
+# Redefine the macro to use that profile data from now on
+%global __x %{__x} --rust-profile-use="%{profdata}"
+%endif
+
+# Build the compiler normally (with or without PGO)
+%{__x} build sysroot
+
+# Build everything else normally
+%{__x} build
+%{__x} doc
+
+for triple in %{?all_targets} ; do
+  %{__x} build --target=$triple std
+done
+
+# Collect cargo-vendor.txt for each tool and std
+%{cargo_tree_manifest -n rustc -- -p rustc-main -p rustdoc}
+%{cargo_tree_manifest -n cargo -m src/tools/cargo}
+%{cargo_tree_manifest -n clippy -m src/tools/clippy}
+%{cargo_tree_manifest -n rust-analyzer -m src/tools/rust-analyzer}
+%{cargo_tree_manifest -n rustfmt -m src/tools/rustfmt}
+
+%{cargo_tree_manifest -n std -m library -f backtrace}
+for triple in %{?all_targets} ; do
+  case $triple in
+    *-none*) %{cargo_tree_manifest -n std-$triple -m library/alloc -t $triple} ;;
+    *) %{cargo_tree_manifest -n std-$triple -m library -f backtrace -t $triple} ;;
+  esac
+done
 
 %install
-%{?cmake_path:export PATH=%{cmake_path}:$PATH}
-%{?rustflags:export RUSTFLAGS="%{rustflags}"}
+%if 0%{?rhel} && 0%{?rhel} <= 9
+%{?set_build_flags}
+%endif
+%{export_rust_env}
 
-DESTDIR=%{buildroot} %{python} ./x.py install
+DESTDIR=%{buildroot} %{__x} install
 
-# Make sure the shared libraries are in the proper libdir
+for triple in %{?all_targets} ; do
+  DESTDIR=%{buildroot} %{__x} install --target=$triple std
+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 compiler's shared libraries are in the proper libdir
 %if "%{_libdir}" != "%{common_libdir}"
 mkdir -p %{buildroot}%{_libdir}
 find %{buildroot}%{common_libdir} -maxdepth 1 -type f -name '*.so' \
@@ -537,18 +977,12 @@ find %{buildroot}%{common_libdir} -maxdepth 1 -type f -name '*.so' \
 find %{buildroot}%{_libdir} -maxdepth 1 -type f -name '*.so' \
   -exec chmod -v +x '{}' '+'
 
-# The libdir libraries are identical to those under rustlib/.  It's easier on
-# library loading if we keep them in libdir, but we do need them in rustlib/
-# to support dynamic linking for compiler plugins, so we'll symlink.
-(cd "%{buildroot}%{rustlibdir}/%{rust_triple}/lib" &&
- find ../../../../%{_lib} -maxdepth 1 -name '*.so' |
- while read lib; do
-   if [ -f "${lib##*/}" ]; then
-     # make sure they're actually identical!
-     cmp "$lib" "${lib##*/}"
-     ln -v -f -s -t . "$lib"
-   fi
- done)
+# The shared standard library is excluded from Provides, because it has no
+# stable ABI. However, we still ship it alongside the static target libraries
+# to enable some niche local use-cases, like the `evcxr` REPL.
+# Make sure those libraries are also executable for debuginfo extraction.
+find %{buildroot}%{rustlibdir} -type f -name '*.so' \
+  -exec chmod -v +x '{}' '+'
 
 # Remove installer artifacts (manifests, uninstall scripts, etc.)
 find %{buildroot}%{rustlibdir} -maxdepth 1 -type f -exec rm -v '{}' '+'
@@ -560,21 +994,18 @@ find %{buildroot}%{rustlibdir} -type f -name '*.orig' -exec rm -v '{}' '+'
 # We don't actually need to ship any of those python scripts in rust-src anyway.
 find %{buildroot}%{rustlibdir}/src -type f -name '*.py' -exec rm -v '{}' '+'
 
-# FIXME: __os_install_post will strip the rlibs
-# -- should we find a way to preserve debuginfo?
-
 # Remove unwanted documentation files (we already package them)
-rm -f %{buildroot}%{_docdir}/%{name}/README.md
-rm -f %{buildroot}%{_docdir}/%{name}/COPYRIGHT
-rm -f %{buildroot}%{_docdir}/%{name}/LICENSE
-rm -f %{buildroot}%{_docdir}/%{name}/LICENSE-APACHE
-rm -f %{buildroot}%{_docdir}/%{name}/LICENSE-MIT
-rm -f %{buildroot}%{_docdir}/%{name}/LICENSE-THIRD-PARTY
-rm -f %{buildroot}%{_docdir}/%{name}/*.old
+rm -f %{buildroot}%{_pkgdocdir}/README.md
+rm -f %{buildroot}%{_pkgdocdir}/COPYRIGHT
+rm -f %{buildroot}%{_pkgdocdir}/LICENSE
+rm -f %{buildroot}%{_pkgdocdir}/LICENSE-APACHE
+rm -f %{buildroot}%{_pkgdocdir}/LICENSE-MIT
+rm -f %{buildroot}%{_pkgdocdir}/LICENSE-THIRD-PARTY
+rm -f %{buildroot}%{_pkgdocdir}/*.old
 
 # Sanitize the HTML documentation
-find %{buildroot}%{_docdir}/%{name}/html -empty -delete
-find %{buildroot}%{_docdir}/%{name}/html -type f -exec chmod -x '{}' '+'
+find %{buildroot}%{_pkgdocdir}/html -empty -delete
+find %{buildroot}%{_pkgdocdir}/html -type f -exec chmod -x '{}' '+'
 
 # Create the path for crate-devel packages
 mkdir -p %{buildroot}%{_datadir}/cargo/registry
@@ -584,42 +1015,104 @@ mkdir -p %{buildroot}%{_datadir}/cargo/registry
 mkdir -p %{buildroot}%{_docdir}/cargo
 ln -sT ../rust/html/cargo/ %{buildroot}%{_docdir}/cargo/html
 
-%if %without lldb
-rm -f %{buildroot}%{_bindir}/rust-lldb
-rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py*
+# 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}
+# This allows users to build packages using Rust Toolset.
+%{__install} -D -m 644 %{S:100} %{buildroot}%{rpmmacrodir}/macros.rust-toolset
+%{__install} -D -m 644 %{S:101} %{buildroot}%{rpmmacrodir}/macros.rust-srpm
+%{__install} -D -m 644 %{S:102} %{buildroot}%{_fileattrsdir}/cargo_vendor.attr
+%{__install} -D -m 755 %{S:103} %{buildroot}%{_rpmconfigdir}/cargo_vendor.prov
 %endif
 
 
 %check
-%{?cmake_path:export PATH=%{cmake_path}:$PATH}
-%{?rustflags:export RUSTFLAGS="%{rustflags}"}
+%if 0%{?rhel} && 0%{?rhel} <= 9
+%{?set_build_flags}
+%endif
+%{export_rust_env}
+
+# Sanity-check the installed binaries, debuginfo-stripped and all.
+TMP_HELLO=$(mktemp -d)
+(
+  cd "$TMP_HELLO"
+  export RUSTC=%{buildroot}%{_bindir}/rustc \
+    LD_LIBRARY_PATH="%{buildroot}%{_libdir}:$LD_LIBRARY_PATH"
+  %{buildroot}%{_bindir}/cargo init --name hello-world
+  %{buildroot}%{_bindir}/cargo run --verbose
+
+  # Sanity-check that code-coverage builds and runs
+  env RUSTFLAGS="-Cinstrument-coverage" %{buildroot}%{_bindir}/cargo run --verbose
+  test -r default_*.profraw
+
+  # Try a build sanity-check for other std-enabled targets
+  for triple in %{?mingw_targets} %{?wasm_targets}; do
+    %{buildroot}%{_bindir}/cargo build --verbose --target=$triple
+  done
+)
+rm -rf "$TMP_HELLO"
 
 # The results are not stable on koji, so mask errors and just log it.
-%{python} ./x.py test --no-fail-fast || :
-%{python} ./x.py test --no-fail-fast cargo || :
-%{python} ./x.py test --no-fail-fast clippy || :
-%{python} ./x.py test --no-fail-fast rls || :
-%{python} ./x.py test --no-fail-fast rustfmt || :
+# Some of the larger test artifacts are manually cleaned to save space.
 
+# - Bootstrap is excluded because it's not something we ship, and a lot of its
+#   tests are geared toward the upstream CI environment.
+# - Crashes are excluded because they are less reliable, especially stuff like
+#   SIGSEGV across different arches -- UB can do all kinds of weird things.
+#   They're only meant to notice "accidental" fixes anyway, not *should* crash.
+%{__x} test --no-fail-fast --skip={src/bootstrap,tests/crashes} || :
+rm -rf "./build/%{rust_triple}/test/"
+
+# Cargo tests skip list
+# Every test skipped here must have a documented reason to be skipped.
+# Duplicates are safe to add.
+
+# This test relies on the DNS to fail to resolve the host. DNS is not enabled
+# in mock in koji so the DNS resolution doesn't take place to begin with.
+# We test this after packaging
+%global cargo_test_skip_list net_err_suggests_fetch_with_cli
+
+%ifarch aarch64
+# https://github.com/rust-lang/rust/issues/123733
+%global cargo_test_skip_list %{cargo_test_skip_list} panic_abort_doc_tests
+%endif
+%if %with disabled_libssh2
+# These tests need ssh - guaranteed to fail when libssh2 is disabled.
+%global cargo_test_skip_list %{shrink:
+  %{cargo_test_skip_list}
+  net_err_suggests_fetch_with_cli
+  ssh_something_happens
+}
+%endif
+%if "%{cargo_test_skip_list}" != ""
+%define cargo_test_skip --test-args "%(printf -- '--skip %%s ' %{cargo_test_skip_list})"
+%endif
+%{__x} test --no-fail-fast cargo %{?cargo_test_skip} || :
+rm -rf "./build/%{rust_triple}/stage2-tools/%{rust_triple}/cit/"
+
+%{__x} test --no-fail-fast clippy || :
+
+%{__x} test --no-fail-fast rust-analyzer || :
+
+%{__x} test --no-fail-fast rustfmt || :
 
 %ldconfig_scriptlets
 
 
 %files
 %license COPYRIGHT LICENSE-APACHE LICENSE-MIT
-%license vendor/backtrace-sys/src/libbacktrace/LICENSE-libbacktrace
 %doc README.md
 %{_bindir}/rustc
 %{_bindir}/rustdoc
-%{_libdir}/*.so
+%{_libdir}/librustc_driver-*.so
+%{_libexecdir}/rust-analyzer-proc-macro-srv
 %{_mandir}/man1/rustc.1*
 %{_mandir}/man1/rustdoc.1*
-%dir %{rustlibdir}
-%dir %{rustlibdir}/%{rust_triple}
-%dir %{rustlibdir}/%{rust_triple}/lib
-%{rustlibdir}/%{rust_triple}/lib/*.so
-%{rustlibdir}/%{rust_triple}/codegen-backends/
-%exclude %{_bindir}/*miri
+%license build/manifests/rustc/cargo-vendor.txt
+%license %{_pkgdocdir}/COPYRIGHT.html
+%license %{_pkgdocdir}/licenses/
+%exclude %{_sysconfdir}/target-spec-json-schema.json
 
 
 %files std-static
@@ -627,45 +1120,91 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py*
 %dir %{rustlibdir}/%{rust_triple}
 %dir %{rustlibdir}/%{rust_triple}/lib
 %{rustlibdir}/%{rust_triple}/lib/*.rlib
+%{rustlibdir}/%{rust_triple}/lib/*.so
+%license build/manifests/std/cargo-vendor.txt
+%license %{_pkgdocdir}/COPYRIGHT-library.html
+
+%global target_files()      \
+%files std-static-%1        \
+%dir %{rustlibdir}          \
+%dir %{rustlibdir}/%1       \
+%dir %{rustlibdir}/%1/lib   \
+%{rustlibdir}/%1/lib/*.rlib \
+%license build/manifests/std-%1/cargo-vendor.txt
+
+%if %target_enabled i686-pc-windows-gnu
+%target_files i686-pc-windows-gnu
+%{rustlibdir}/i686-pc-windows-gnu/lib/rs*.o
+%exclude %{rustlibdir}/i686-pc-windows-gnu/lib/*.dll
+%exclude %{rustlibdir}/i686-pc-windows-gnu/lib/*.dll.a
+%endif
+
+%if %target_enabled x86_64-pc-windows-gnu
+%target_files x86_64-pc-windows-gnu
+%{rustlibdir}/x86_64-pc-windows-gnu/lib/rs*.o
+%exclude %{rustlibdir}/x86_64-pc-windows-gnu/lib/*.dll
+%exclude %{rustlibdir}/x86_64-pc-windows-gnu/lib/*.dll.a
+%endif
+
+%if %target_enabled wasm32-unknown-unknown
+%target_files wasm32-unknown-unknown
+%endif
+
+%if %target_enabled wasm32-wasip1
+%target_files wasm32-wasip1
+%if %with bundled_wasi_libc
+%dir %{rustlibdir}/wasm32-wasip1/lib/self-contained
+%{rustlibdir}/wasm32-wasip1/lib/self-contained/crt*.o
+%{rustlibdir}/wasm32-wasip1/lib/self-contained/libc.a
+%endif
+%endif
+
+%if %target_enabled x86_64-unknown-none
+%target_files x86_64-unknown-none
+%endif
+
+%if %target_enabled aarch64-unknown-uefi
+%target_files aarch64-unknown-uefi
+%endif
+
+%if %target_enabled x86_64-unknown-uefi
+%target_files x86_64-unknown-uefi
+%endif
+
+%if %target_enabled aarch64-unknown-none-softfloat
+%target_files aarch64-unknown-none-softfloat
+%endif
 
 
 %files debugger-common
 %dir %{rustlibdir}
 %dir %{rustlibdir}/etc
-%{rustlibdir}/etc/debugger_*.py*
+%{rustlibdir}/etc/rust_*.py*
 
 
 %files gdb
 %{_bindir}/rust-gdb
-%{rustlibdir}/etc/gdb_*.py*
+%{rustlibdir}/etc/gdb_*
 %exclude %{_bindir}/rust-gdbgui
 
 
-%if %with lldb
 %files lldb
 %{_bindir}/rust-lldb
-%{rustlibdir}/etc/lldb_*.py*
-%endif
+%{rustlibdir}/etc/lldb_*
 
 
 %files doc
-%docdir %{_docdir}/%{name}
-%dir %{_docdir}/%{name}
-%dir %{_docdir}/%{name}/html
-%{_docdir}/%{name}/html/*/
-%{_docdir}/%{name}/html/*.html
-%{_docdir}/%{name}/html/*.css
-%{_docdir}/%{name}/html/*.ico
-%{_docdir}/%{name}/html/*.js
-%{_docdir}/%{name}/html/*.png
-%{_docdir}/%{name}/html/*.svg
-%{_docdir}/%{name}/html/*.woff
-%license %{_docdir}/%{name}/html/*.txt
-%license %{_docdir}/%{name}/html/*.md
+%docdir %{_pkgdocdir}
+%dir %{_pkgdocdir}
+%{_pkgdocdir}/html
+# former cargo-doc
+%docdir %{_docdir}/cargo
+%dir %{_docdir}/cargo
+%{_docdir}/cargo/html
 
 
 %files -n cargo
-%license src/tools/cargo/LICENSE-APACHE src/tools/cargo/LICENSE-MIT src/tools/cargo/LICENSE-THIRD-PARTY
+%license src/tools/cargo/LICENSE-{APACHE,MIT,THIRD-PARTY}
 %doc src/tools/cargo/README.md
 %{_bindir}/cargo
 %{_mandir}/man1/cargo*.1*
@@ -673,12 +1212,7 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py*
 %{_datadir}/zsh/site-functions/_cargo
 %dir %{_datadir}/cargo
 %dir %{_datadir}/cargo/registry
-
-
-%files -n cargo-doc
-%docdir %{_docdir}/cargo
-%dir %{_docdir}/cargo
-%{_docdir}/cargo/html
+%license build/manifests/cargo/cargo-vendor.txt
 
 
 %files -n rustfmt
@@ -686,12 +1220,14 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py*
 %{_bindir}/cargo-fmt
 %doc src/tools/rustfmt/{README,CHANGELOG,Configurations}.md
 %license src/tools/rustfmt/LICENSE-{APACHE,MIT}
+%license build/manifests/rustfmt/cargo-vendor.txt
 
 
-%files -n rls
-%{_bindir}/rls
-%doc src/tools/rls/{README.md,COPYRIGHT,debugging.md}
-%license src/tools/rls/LICENSE-{APACHE,MIT}
+%files analyzer
+%{_bindir}/rust-analyzer
+%doc src/tools/rust-analyzer/README.md
+%license src/tools/rust-analyzer/LICENSE-{APACHE,MIT}
+%license build/manifests/rust-analyzer/cargo-vendor.txt
 
 
 %files -n clippy
@@ -699,6 +1235,7 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py*
 %{_bindir}/clippy-driver
 %doc src/tools/clippy/{README.md,CHANGELOG.md}
 %license src/tools/clippy/LICENSE-{APACHE,MIT}
+%license build/manifests/clippy/cargo-vendor.txt
 
 
 %files src
@@ -706,291 +1243,16 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py*
 %{rustlibdir}/src
 
 
-%files analysis
-%{rustlibdir}/%{rust_triple}/analysis/
+%if 0%{?rhel}
+%files toolset-srpm-macros
+%{rpmmacrodir}/macros.rust-srpm
+
+%files toolset
+%{rpmmacrodir}/macros.rust-toolset
+%{_fileattrsdir}/cargo_vendor.attr
+%{_rpmconfigdir}/cargo_vendor.prov
+%endif
 
 
 %changelog
-* Thu Nov 07 2019 Josh Stone  - 1.39.0-1
-- Update to 1.39.0.
-
-* Fri Sep 27 2019 Josh Stone  - 1.38.0-2
-- Filter the libraries included in rust-std (rhbz1756487)
-
-* Thu Sep 26 2019 Josh Stone  - 1.38.0-1
-- Update to 1.38.0.
-
-* Thu Aug 15 2019 Josh Stone  - 1.37.0-1
-- Update to 1.37.0.
-
-* Fri Jul 26 2019 Fedora Release Engineering  - 1.36.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jul 04 2019 Josh Stone  - 1.36.0-1
-- Update to 1.36.0.
-
-* Wed May 29 2019 Josh Stone  - 1.35.0-2
-- Fix compiletest for rebuild testing.
-
-* Thu May 23 2019 Josh Stone  - 1.35.0-1
-- Update to 1.35.0.
-
-* Tue May 14 2019 Josh Stone  - 1.34.2-1
-- Update to 1.34.2 -- fixes CVE-2019-12083.
-
-* Tue Apr 30 2019 Josh Stone  - 1.34.1-3
-- Set rust.codegen-units-std=1
-
-* Fri Apr 26 2019 Josh Stone  - 1.34.1-2
-- Remove the ThinLTO workaround.
-
-* Thu Apr 25 2019 Josh Stone  - 1.34.1-1
-- Update to 1.34.1.
-- Add a ThinLTO fix for rhbz1701339.
-
-* Thu Apr 11 2019 Josh Stone  - 1.34.0-1
-- Update to 1.34.0.
-
-* Fri Mar 01 2019 Josh Stone  - 1.33.0-2
-- Fix deprecations for self-rebuild
-
-* Thu Feb 28 2019 Josh Stone  - 1.33.0-1
-- Update to 1.33.0.
-
-* Sat Feb 02 2019 Fedora Release Engineering  - 1.32.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Jan 17 2019 Josh Stone  - 1.32.0-1
-- Update to 1.32.0.
-
-* Mon Jan 07 2019 Josh Stone  - 1.31.1-9
-- Update to 1.31.1 for RLS fixes.
-
-* Thu Dec 06 2018 Josh Stone  - 1.31.0-8
-- Update to 1.31.0 -- Rust 2018!
-- clippy/rls/rustfmt are no longer -preview
-
-* Thu Nov 08 2018 Josh Stone  - 1.30.1-7
-- Update to 1.30.1.
-
-* Thu Oct 25 2018 Josh Stone  - 1.30.0-6
-- Update to 1.30.0.
-
-* Mon Oct 22 2018 Josh Stone  - 1.29.2-5
-- Rebuild without bootstrap binaries.
-
-* Sat Oct 20 2018 Josh Stone  - 1.29.2-4
-- Re-bootstrap armv7hl due to rhbz#1639485
-
-* Fri Oct 12 2018 Josh Stone  - 1.29.2-3
-- Update to 1.29.2.
-
-* Tue Sep 25 2018 Josh Stone  - 1.29.1-2
-- Update to 1.29.1.
-- Security fix for str::repeat (pending CVE).
-
-* Thu Sep 13 2018 Josh Stone  - 1.29.0-1
-- Update to 1.29.0.
-- Add a clippy-preview subpackage
-
-* Mon Aug 13 2018 Josh Stone  - 1.28.0-3
-- Use llvm6.0 instead of llvm-7 for now
-
-* Tue Aug 07 2018 Josh Stone  - 1.28.0-2
-- Rebuild for LLVM ppc64/s390x fixes
-
-* Thu Aug 02 2018 Josh Stone  - 1.28.0-1
-- Update to 1.28.0.
-
-* Tue Jul 24 2018 Josh Stone  - 1.27.2-4
-- Update to 1.27.2.
-
-* Sat Jul 14 2018 Fedora Release Engineering  - 1.27.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Jul 10 2018 Josh Stone  - 1.27.1-2
-- Update to 1.27.1.
-- Security fix for CVE-2018-1000622
-
-* Thu Jun 21 2018 Josh Stone  - 1.27.0-1
-- Update to 1.27.0.
-
-* Tue Jun 05 2018 Josh Stone  - 1.26.2-4
-- Rebuild without bootstrap binaries.
-
-* Tue Jun 05 2018 Josh Stone  - 1.26.2-3
-- Update to 1.26.2.
-- Re-bootstrap to deal with LLVM symbol changes.
-
-* Tue May 29 2018 Josh Stone  - 1.26.1-2
-- Update to 1.26.1.
-
-* Thu May 10 2018 Josh Stone  - 1.26.0-1
-- Update to 1.26.0.
-
-* Mon Apr 16 2018 Dan Callaghan  - 1.25.0-3
-- Add cargo, rls, and analysis
-
-* Tue Apr 10 2018 Josh Stone  - 1.25.0-2
-- Filter codegen-backends from Provides too.
-
-* Thu Mar 29 2018 Josh Stone  - 1.25.0-1
-- Update to 1.25.0.
-
-* Thu Mar 01 2018 Josh Stone  - 1.24.1-1
-- Update to 1.24.1.
-
-* Wed Feb 21 2018 Josh Stone  - 1.24.0-3
-- Backport a rebuild fix for rust#48308.
-
-* Mon Feb 19 2018 Josh Stone  - 1.24.0-2
-- rhbz1546541: drop full-bootstrap; cmp libs before symlinking.
-- Backport pr46592 to fix local_rebuild bootstrapping.
-- Backport pr48362 to fix relative/absolute libdir.
-
-* Thu Feb 15 2018 Josh Stone  - 1.24.0-1
-- Update to 1.24.0.
-
-* Mon Feb 12 2018 Iryna Shcherbina  - 1.23.0-4
-- Update Python 2 dependency declarations to new packaging standards
-  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
-
-* Tue Feb 06 2018 Josh Stone  - 1.23.0-3
-- Use full-bootstrap to work around a rebuild issue.
-- Patch binaryen for GCC 8
-
-* Thu Feb 01 2018 Igor Gnatenko  - 1.23.0-2
-- Switch to %%ldconfig_scriptlets
-
-* Mon Jan 08 2018 Josh Stone  - 1.23.0-1
-- Update to 1.23.0.
-
-* Thu Nov 23 2017 Josh Stone  - 1.22.1-1
-- Update to 1.22.1.
-
-* Thu Oct 12 2017 Josh Stone  - 1.21.0-1
-- Update to 1.21.0.
-
-* Mon Sep 11 2017 Josh Stone  - 1.20.0-2
-- ABI fixes for ppc64 and s390x.
-
-* Thu Aug 31 2017 Josh Stone  - 1.20.0-1
-- Update to 1.20.0.
-- Add a rust-src subpackage.
-
-* Thu Aug 03 2017 Fedora Release Engineering  - 1.19.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering  - 1.19.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Mon Jul 24 2017 Josh Stone  - 1.19.0-2
-- Use find-debuginfo.sh --keep-section .rustc
-
-* Thu Jul 20 2017 Josh Stone  - 1.19.0-1
-- Update to 1.19.0.
-
-* Thu Jun 08 2017 Josh Stone  - 1.18.0-1
-- Update to 1.18.0.
-
-* Mon May 08 2017 Josh Stone  - 1.17.0-2
-- Move shared libraries back to libdir and symlink in rustlib
-
-* Thu Apr 27 2017 Josh Stone  - 1.17.0-1
-- Update to 1.17.0.
-
-* Mon Mar 20 2017 Josh Stone  - 1.16.0-3
-- Make rust-lldb arch-specific to deal with lldb deps
-
-* Fri Mar 17 2017 Josh Stone  - 1.16.0-2
-- Limit rust-lldb arches
-
-* Thu Mar 16 2017 Josh Stone  - 1.16.0-1
-- Update to 1.16.0.
-- Use rustbuild instead of the old makefiles.
-- Update bootstrapping to include rust-std and cargo.
-- Add a rust-lldb subpackage.
-
-* Thu Feb 09 2017 Josh Stone  - 1.15.1-1
-- Update to 1.15.1.
-- Require rust-rpm-macros for new crate packaging.
-- Keep shared libraries under rustlib/, only debug-stripped.
-- Merge and clean up conditionals for epel7.
-
-* Fri Dec 23 2016 Josh Stone  - 1.14.0-2
-- Rebuild without bootstrap binaries.
-
-* Thu Dec 22 2016 Josh Stone  - 1.14.0-1
-- Update to 1.14.0.
-- Rewrite bootstrap logic to target specific arches.
-- Bootstrap ppc64, ppc64le, s390x. (thanks to Sinny Kumari for testing!)
-
-* Thu Nov 10 2016 Josh Stone  - 1.13.0-1
-- Update to 1.13.0.
-- Use hardening flags for linking.
-- Split the standard library into its own package
-- Centralize rustlib/ under /usr/lib/ for multilib integration.
-
-* Thu Oct 20 2016 Josh Stone  - 1.12.1-1
-- Update to 1.12.1.
-
-* Fri Oct 14 2016 Josh Stone  - 1.12.0-7
-- Rebuild with LLVM 3.9.
-- Add ncurses-devel for llvm-config's -ltinfo.
-
-* Thu Oct 13 2016 Josh Stone  - 1.12.0-6
-- Rebuild with llvm-static, preparing for 3.9
-
-* Fri Oct 07 2016 Josh Stone  - 1.12.0-5
-- Rebuild with fixed eu-strip (rhbz1380961)
-
-* Fri Oct 07 2016 Josh Stone  - 1.12.0-4
-- Rebuild without bootstrap binaries.
-
-* Thu Oct 06 2016 Josh Stone  - 1.12.0-3
-- Bootstrap aarch64.
-- Use jemalloc's MALLOC_CONF to work around #36944.
-- Apply pr36933 to really disable armv7hl NEON.
-
-* Sat Oct 01 2016 Josh Stone  - 1.12.0-2
-- Protect .rustc from rpm stripping.
-
-* Fri Sep 30 2016 Josh Stone  - 1.12.0-1
-- Update to 1.12.0.
-- Always use --local-rust-root, even for bootstrap binaries.
-- Remove the rebuild conditional - the build system now figures it out.
-- Let minidebuginfo do its thing, since metadata is no longer a note.
-- Let rust build its own compiler-rt builtins again.
-
-* Sat Sep 03 2016 Josh Stone  - 1.11.0-3
-- Rebuild without bootstrap binaries.
-
-* Fri Sep 02 2016 Josh Stone  - 1.11.0-2
-- Bootstrap armv7hl, with backported no-neon patch.
-
-* Wed Aug 24 2016 Josh Stone  - 1.11.0-1
-- Update to 1.11.0.
-- Drop the backported patches.
-- Patch get-stage0.py to trust existing bootstrap binaries.
-- Use libclang_rt.builtins from compiler-rt, dodging llvm-static issues.
-- Use --local-rust-root to make sure the right bootstrap is used.
-
-* Sat Aug 13 2016 Josh Stone  1.10.0-4
-- Rebuild without bootstrap binaries.
-
-* Fri Aug 12 2016 Josh Stone  - 1.10.0-3
-- Initial import into Fedora (#1356907), bootstrapped
-- Format license text as suggested in review.
-- Note how the tests already run in parallel.
-- Undefine _include_minidebuginfo, because it duplicates ".note.rustc".
-- Don't let checks fail the whole build.
-- Note that -doc can't be noarch, as rpmdiff doesn't allow variations.
-
-* Tue Jul 26 2016 Josh Stone  - 1.10.0-2
-- Update -doc directory ownership, and mark its licenses.
-- Package and declare licenses for libbacktrace and hoedown.
-- Set bootstrap_base as a global.
-- Explicitly require python2.
-
-* Thu Jul 14 2016 Josh Stone  - 1.10.0-1
-- Initial package, bootstrapped
+%autochangelog
diff --git a/rustc-1.70.0-rust-gdb-substitute-path.patch b/rustc-1.70.0-rust-gdb-substitute-path.patch
new file mode 100644
index 0000000..e9e5e2e
--- /dev/null
+++ b/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" \
+   "$@"
+  
diff --git a/rustc-1.92.0-disable-libssh2.patch b/rustc-1.92.0-disable-libssh2.patch
new file mode 100644
index 0000000..a03668f
--- /dev/null
+++ b/rustc-1.92.0-disable-libssh2.patch
@@ -0,0 +1,44 @@
+diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools/cargo/Cargo.lock
+--- rustc-beta-src/src/tools/cargo/Cargo.lock.orig	2025-08-16 15:47:14.000000000 -0700
++++ rustc-beta-src/src/tools/cargo/Cargo.lock	2025-08-18 17:31:39.554771554 -0700
+@@ -2800,7 +2800,6 @@ checksum = "1c42fe03df2bd3c53a3a9c7317ad
+ dependencies = [
+  "cc",
+  "libc",
+- "libssh2-sys",
+  "libz-sys",
+  "openssl-sys",
+  "pkg-config",
+@@ -2847,20 +2846,6 @@ dependencies = [
+  "pkg-config",
+  "vcpkg",
+ ]
+-
+-[[package]]
+-name = "libssh2-sys"
+-version = "0.3.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "220e4f05ad4a218192533b300327f5150e809b54c4ec83b5a1d91833601811b9"
+-dependencies = [
+- "cc",
+- "libc",
+- "libz-sys",
+- "openssl-sys",
+- "pkg-config",
+- "vcpkg",
+-]
+ 
+ [[package]]
+ name = "libz-rs-sys"
+diff -up rustc-beta-src/src/tools/cargo/Cargo.toml.orig rustc-beta-src/src/tools/cargo/Cargo.toml
+--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2025-08-16 15:47:14.000000000 -0700
++++ rustc-beta-src/src/tools/cargo/Cargo.toml	2025-08-18 17:33:02.401743230 -0700
+@@ -46,7 +46,7 @@ curl = "0.4.48"
+ curl-sys = "0.4.83"
+ filetime = "0.2.26"
+ flate2 = { version = "1.1.2", default-features = false, features = ["zlib-rs"] }
+-git2 = "0.20.2"
++git2 = { version = "0.20.2", default-features = false, features = ["https"] }
+ git2-curl = "0.21.0"
+ # When updating this, also see if `gix-transport` further down needs updating or some auth-related tests will fail.
+ gix = { version = "0.73.0", default-features = false, features = ["progress-tree", "parallel", "dirwalk", "status"] }
diff --git a/rustc-1.92.0-unbundle-sqlite.patch b/rustc-1.92.0-unbundle-sqlite.patch
new file mode 100644
index 0000000..fb0b284
--- /dev/null
+++ b/rustc-1.92.0-unbundle-sqlite.patch
@@ -0,0 +1,23 @@
+diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools/cargo/Cargo.lock
+--- rustc-beta-src/src/tools/cargo/Cargo.lock.orig	2025-11-07 13:31:19.003737886 +0100
++++ rustc-beta-src/src/tools/cargo/Cargo.lock	2025-11-07 13:14:41.637982893 +0100
+@@ -2835,7 +2835,6 @@ version = "0.35.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "133c182a6a2c87864fe97778797e46c7e999672690dc9fa3ee8e241aa4a9c13f"
+ dependencies = [
+- "cc",
+  "pkg-config",
+  "vcpkg",
+ ]
+diff -up rustc-beta-src/src/tools/cargo/Cargo.toml.orig rustc-beta-src/src/tools/cargo/Cargo.toml
+--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2025-11-07 13:31:28.338643618 +0100
++++ rustc-beta-src/src/tools/cargo/Cargo.toml	2025-11-07 13:15:00.266505214 +0100
+@@ -81,7 +81,7 @@ proptest = "1.8.0"
+ pulldown-cmark = { version = "0.13.0", default-features = false, features = ["html"] }
+ rand = "0.9.2"
+ regex = "1.11.3"
+-rusqlite = { version = "0.37.0", features = ["bundled"] }
++rusqlite = { version = "0.37.0", features = [] }
+ rustc-hash = "2.1.1"
+ rustc-stable-hash = "0.1.2"
+ rustfix = { version = "0.9.2", path = "crates/rustfix" }
diff --git a/sources b/sources
index 3be13be..682e418 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-SHA512 (rustc-1.39.0-src.tar.xz) = 8610b2ec77722087c572bd84ac562a5b7c5f1a644aea58c5d5daa07a9aed242703b7816e73e2eaa049f773d5907859e259744a0de700622df005584fd798dab0
+SHA512 (rustc-1.92.0-src.tar.xz) = a2c0b127933595b9bc2063d7b7c88d9af512c4664b18f29d44c9a6e2c68d194b87a3071717e8f1b7c858ae940baca888e10be95cd31e0201916d0bfc312a3b15
+SHA512 (wasi-libc-wasi-sdk-27.tar.gz) = dfc2c36fabf32f465fc833ed0b10efffc9a35c68162ecc3e8d656d1d684d170b734d55e790614d12d925d17f49d60f0d2d01c46cecac941cf62d68eda84df13e
diff --git a/sources-bootstrap b/sources-bootstrap
deleted file mode 100644
index 820432c..0000000
--- a/sources-bootstrap
+++ /dev/null
@@ -1,8 +0,0 @@
-SHA512 (rustc-1.39.0-src.tar.xz) = 8610b2ec77722087c572bd84ac562a5b7c5f1a644aea58c5d5daa07a9aed242703b7816e73e2eaa049f773d5907859e259744a0de700622df005584fd798dab0
-SHA512 (rust-1.38.0-aarch64-unknown-linux-gnu.tar.xz) = c9dea8907d05af938c1936139c1fb8673d0db90503552f53645d71637bb7248263fd20b1c16db140694b2d467a12c474015a2077d9b26c782b44e965a01544c6
-SHA512 (rust-1.38.0-armv7-unknown-linux-gnueabihf.tar.xz) = ddbb2c8d2e7112c5871155890c8308080ac800795c685c4b4d06b9dd8c5abd28ee13961686c9be465d1bbd33d476c6478b90af8de0ca5a451f8b07eaff42f97d
-SHA512 (rust-1.38.0-i686-unknown-linux-gnu.tar.xz) = ffdea264378510c6df687a173211427f4cb5930553c9d14e33c5776b0e15d435d1be719bba8a1db50f50a3171a38802e090451dc92a6ea764cc8fdca24651f24
-SHA512 (rust-1.38.0-powerpc64le-unknown-linux-gnu.tar.xz) = 5f3e1dd233ef17d8a296dcb55738fa119e40c32b154a7575f149bf1475b64e34f7e805f206b9862dc6499be470f179290d8abb7ad8d2b5cb355cef03d95ae374
-SHA512 (rust-1.38.0-powerpc64-unknown-linux-gnu.tar.xz) = 26240976834e510fa5a47c35b747b42db4651ea8decdb5498704432c9a21563e603046994fcc2b070d06361bf2c36fe02a15c7f02d88161b299a410f1995983a
-SHA512 (rust-1.38.0-s390x-unknown-linux-gnu.tar.xz) = 7af64849236e0173d2aea723f3462682fde7d2e1e04d61c28d215163415e1b15cfb8cac57010ce55bdd928ea74076506ef50376d7550999e0fb00f9d20c4f5ff
-SHA512 (rust-1.38.0-x86_64-unknown-linux-gnu.tar.xz) = 0b25c3049a7a213e9151c898979ec9b5b45e46a9072f9853d8f048cf401ef7ac343526d6919e68607a490e3e7bd0375b12ed9fb253caed26bb60f46473d3699b