From a64614c632001927ea626d7088815a53055f5d0f Mon Sep 17 00:00:00 2001 From: Toshaan Bharvani Date: Wed, 12 Feb 2025 22:54:17 +0100 Subject: [PATCH] update to new version Signed-off-by: Toshaan Bharvani --- ...ble-jump-threading-of-float-equality.patch | 212 +++++ ...variables-override-some-default-CPUs.patch | 42 +- ...ssue-122805.rs-big-endian-compatible.patch | 49 ++ ...x86-64-cpu-in-tests-that-are-sensiti.patch | 264 ++++++ SOURCES/0001-Use-lld-provided-by-system.patch | 65 ++ ...llow-disabling-target-self-contained.patch | 102 +++ ...xternal-library-path-for-wasm32-wasi.patch | 97 +++ SOURCES/cargo_vendor.attr | 2 + SOURCES/cargo_vendor.prov | 127 +++ SOURCES/macros.rust-toolset | 261 +++++- SOURCES/rustc-1.79.0-disable-libssh2.patch | 44 + SOURCES/rustc-1.79.0-unbundle-sqlite.patch | 23 + SPECS/rust.spec | 793 ++++++++++-------- 13 files changed, 1689 insertions(+), 392 deletions(-) create mode 100644 SOURCES/0001-Disable-jump-threading-of-float-equality.patch create mode 100644 SOURCES/0001-Make-issue-122805.rs-big-endian-compatible.patch create mode 100644 SOURCES/0001-Use-an-explicit-x86-64-cpu-in-tests-that-are-sensiti.patch create mode 100644 SOURCES/0001-Use-lld-provided-by-system.patch create mode 100644 SOURCES/0001-bootstrap-allow-disabling-target-self-contained.patch create mode 100644 SOURCES/0002-set-an-external-library-path-for-wasm32-wasi.patch create mode 100644 SOURCES/cargo_vendor.attr create mode 100755 SOURCES/cargo_vendor.prov create mode 100644 SOURCES/rustc-1.79.0-disable-libssh2.patch create mode 100644 SOURCES/rustc-1.79.0-unbundle-sqlite.patch diff --git a/SOURCES/0001-Disable-jump-threading-of-float-equality.patch b/SOURCES/0001-Disable-jump-threading-of-float-equality.patch new file mode 100644 index 0000000..29093bd --- /dev/null +++ b/SOURCES/0001-Disable-jump-threading-of-float-equality.patch @@ -0,0 +1,212 @@ +From 49166c7dd925244f631277b4aa9ae4233f300884 Mon Sep 17 00:00:00 2001 +From: Nilstrieb <48135649+Nilstrieb@users.noreply.github.com> +Date: Sat, 27 Jul 2024 15:08:11 +0200 +Subject: [PATCH] Disable jump threading of float equality + +Jump threading stores values as `u128` (`ScalarInt`) and does its +comparisons for equality as integer comparisons. +This works great for integers. Sadly, not everything is an integer. + +Floats famously have wonky equality semantcs, with `NaN!=NaN` and +`0.0 == -0.0`. This does not match our beautiful integer bitpattern +equality and therefore causes things to go horribly wrong. + +While jump threading could be extended to support floats by remembering +that they're floats in the value state and handling them properly, +it's signficantly easier to just disable it for now. + +(cherry picked from commit eca0a7e72346ba123ace318a0f9c28c57d990aeb) +--- + .../rustc_mir_transform/src/jump_threading.rs | 7 +++ + ...ding.floats.JumpThreading.panic-abort.diff | 59 +++++++++++++++++++ + ...ing.floats.JumpThreading.panic-unwind.diff | 59 +++++++++++++++++++ + tests/mir-opt/jump_threading.rs | 12 ++++ + 4 files changed, 137 insertions(+) + create mode 100644 tests/mir-opt/jump_threading.floats.JumpThreading.panic-abort.diff + create mode 100644 tests/mir-opt/jump_threading.floats.JumpThreading.panic-unwind.diff + +diff --git a/compiler/rustc_mir_transform/src/jump_threading.rs b/compiler/rustc_mir_transform/src/jump_threading.rs +index a458297210db..e2d2864ad2a0 100644 +--- a/compiler/rustc_mir_transform/src/jump_threading.rs ++++ b/compiler/rustc_mir_transform/src/jump_threading.rs +@@ -493,6 +493,13 @@ fn process_assign( + BinOp::Ne => ScalarInt::FALSE, + _ => return None, + }; ++ if value.const_.ty().is_floating_point() { ++ // Floating point equality does not follow bit-patterns. ++ // -0.0 and NaN both have special rules for equality, ++ // and therefore we cannot use integer comparisons for them. ++ // Avoid handling them, though this could be extended in the future. ++ return None; ++ } + let value = value.const_.normalize(self.tcx, self.param_env).try_to_scalar_int()?; + let conds = conditions.map(self.arena, |c| Condition { + value, +diff --git a/tests/mir-opt/jump_threading.floats.JumpThreading.panic-abort.diff b/tests/mir-opt/jump_threading.floats.JumpThreading.panic-abort.diff +new file mode 100644 +index 000000000000..6ca37e96d297 +--- /dev/null ++++ b/tests/mir-opt/jump_threading.floats.JumpThreading.panic-abort.diff +@@ -0,0 +1,59 @@ ++- // MIR for `floats` before JumpThreading +++ // MIR for `floats` after JumpThreading ++ ++ fn floats() -> u32 { ++ let mut _0: u32; ++ let _1: f64; ++ let mut _2: bool; ++ let mut _3: bool; ++ let mut _4: f64; ++ scope 1 { ++ debug x => _1; ++ } ++ ++ bb0: { ++ StorageLive(_1); ++ StorageLive(_2); ++ _2 = const true; ++- switchInt(move _2) -> [0: bb2, otherwise: bb1]; +++ goto -> bb1; ++ } ++ ++ bb1: { ++ _1 = const -0f64; ++ goto -> bb3; ++ } ++ ++ bb2: { ++ _1 = const 1f64; ++ goto -> bb3; ++ } ++ ++ bb3: { ++ StorageDead(_2); ++ StorageLive(_3); ++ StorageLive(_4); ++ _4 = _1; ++ _3 = Eq(move _4, const 0f64); ++ switchInt(move _3) -> [0: bb5, otherwise: bb4]; ++ } ++ ++ bb4: { ++ StorageDead(_4); ++ _0 = const 0_u32; ++ goto -> bb6; ++ } ++ ++ bb5: { ++ StorageDead(_4); ++ _0 = const 1_u32; ++ goto -> bb6; ++ } ++ ++ bb6: { ++ StorageDead(_3); ++ StorageDead(_1); ++ return; ++ } ++ } ++ +diff --git a/tests/mir-opt/jump_threading.floats.JumpThreading.panic-unwind.diff b/tests/mir-opt/jump_threading.floats.JumpThreading.panic-unwind.diff +new file mode 100644 +index 000000000000..6ca37e96d297 +--- /dev/null ++++ b/tests/mir-opt/jump_threading.floats.JumpThreading.panic-unwind.diff +@@ -0,0 +1,59 @@ ++- // MIR for `floats` before JumpThreading +++ // MIR for `floats` after JumpThreading ++ ++ fn floats() -> u32 { ++ let mut _0: u32; ++ let _1: f64; ++ let mut _2: bool; ++ let mut _3: bool; ++ let mut _4: f64; ++ scope 1 { ++ debug x => _1; ++ } ++ ++ bb0: { ++ StorageLive(_1); ++ StorageLive(_2); ++ _2 = const true; ++- switchInt(move _2) -> [0: bb2, otherwise: bb1]; +++ goto -> bb1; ++ } ++ ++ bb1: { ++ _1 = const -0f64; ++ goto -> bb3; ++ } ++ ++ bb2: { ++ _1 = const 1f64; ++ goto -> bb3; ++ } ++ ++ bb3: { ++ StorageDead(_2); ++ StorageLive(_3); ++ StorageLive(_4); ++ _4 = _1; ++ _3 = Eq(move _4, const 0f64); ++ switchInt(move _3) -> [0: bb5, otherwise: bb4]; ++ } ++ ++ bb4: { ++ StorageDead(_4); ++ _0 = const 0_u32; ++ goto -> bb6; ++ } ++ ++ bb5: { ++ StorageDead(_4); ++ _0 = const 1_u32; ++ goto -> bb6; ++ } ++ ++ bb6: { ++ StorageDead(_3); ++ StorageDead(_1); ++ return; ++ } ++ } ++ +diff --git a/tests/mir-opt/jump_threading.rs b/tests/mir-opt/jump_threading.rs +index 57f4e4a2654f..3e7e8995f1a3 100644 +--- a/tests/mir-opt/jump_threading.rs ++++ b/tests/mir-opt/jump_threading.rs +@@ -514,6 +514,16 @@ fn assume(a: u8, b: bool) -> u8 { + ) + } + ++fn floats() -> u32 { ++ // CHECK-LABEL: fn floats( ++ // CHECK: switchInt( ++ ++ // Test for issue #128243, where float equality was assumed to be bitwise. ++ // When adding float support, it must be ensured that this continues working properly. ++ let x = if true { -0.0 } else { 1.0 }; ++ if x == 0.0 { 0 } else { 1 } ++} ++ + fn main() { + // CHECK-LABEL: fn main( + too_complex(Ok(0)); +@@ -528,6 +538,7 @@ fn main() { + disappearing_bb(7); + aggregate(7); + assume(7, false); ++ floats(); + } + + // EMIT_MIR jump_threading.too_complex.JumpThreading.diff +@@ -542,3 +553,4 @@ fn main() { + // EMIT_MIR jump_threading.disappearing_bb.JumpThreading.diff + // EMIT_MIR jump_threading.aggregate.JumpThreading.diff + // EMIT_MIR jump_threading.assume.JumpThreading.diff ++// EMIT_MIR jump_threading.floats.JumpThreading.diff +-- +2.46.0 + diff --git a/SOURCES/0001-Let-environment-variables-override-some-default-CPUs.patch b/SOURCES/0001-Let-environment-variables-override-some-default-CPUs.patch index c394f78..dc8be55 100644 --- a/SOURCES/0001-Let-environment-variables-override-some-default-CPUs.patch +++ b/SOURCES/0001-Let-environment-variables-override-some-default-CPUs.patch @@ -1,33 +1,33 @@ -From 6e2adb05860b72610291d3b0e8bd525c44cb0cc9 Mon Sep 17 00:00:00 2001 +From 184d61d2c12aa2db01de9a14ccb2be0cfae5039b 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 --- - compiler/rustc_target/src/spec/powerpc64le_unknown_linux_gnu.rs | 2 +- - compiler/rustc_target/src/spec/s390x_unknown_linux_gnu.rs | 2 +- - compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs | 2 +- + .../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/powerpc64le_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/powerpc64le_unknown_linux_gnu.rs -index fd896e086b54..08d0c43d20b4 100644 ---- a/compiler/rustc_target/src/spec/powerpc64le_unknown_linux_gnu.rs -+++ b/compiler/rustc_target/src/spec/powerpc64le_unknown_linux_gnu.rs +diff --git a/compiler/rustc_target/src/spec/targets/powerpc64le_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/powerpc64le_unknown_linux_gnu.rs +index 194c3170e683..9806ca78297c 100644 +--- a/compiler/rustc_target/src/spec/targets/powerpc64le_unknown_linux_gnu.rs ++++ b/compiler/rustc_target/src/spec/targets/powerpc64le_unknown_linux_gnu.rs @@ -2,7 +2,7 @@ pub fn target() -> Target { - let mut base = super::linux_gnu_base::opts(); + 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/s390x_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/s390x_unknown_linux_gnu.rs -index f2c722b9a89d..17a14d10b27e 100644 ---- a/compiler/rustc_target/src/spec/s390x_unknown_linux_gnu.rs -+++ b/compiler/rustc_target/src/spec/s390x_unknown_linux_gnu.rs +diff --git a/compiler/rustc_target/src/spec/targets/s390x_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/s390x_unknown_linux_gnu.rs +index 6fc410eb2235..c8f84edb9715 100644 +--- a/compiler/rustc_target/src/spec/targets/s390x_unknown_linux_gnu.rs ++++ b/compiler/rustc_target/src/spec/targets/s390x_unknown_linux_gnu.rs @@ -5,7 +5,7 @@ pub fn target() -> Target { - let mut base = super::linux_gnu_base::opts(); + let mut base = base::linux_gnu::opts(); base.endian = Endian::Big; // z10 is the oldest CPU supported by LLVM - base.cpu = "z10".into(); @@ -35,19 +35,19 @@ index f2c722b9a89d..17a14d10b27e 100644 // FIXME: The ABI implementation in cabi_s390x.rs is for now hard-coded to assume the no-vector // ABI. Pass the -vector feature string to LLVM to respect this assumption. On LLVM < 16, we // also strip v128 from the data_layout below to match the older LLVM's expectation. -diff --git a/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs -index 9af1049b8702..68f876dd18c3 100644 ---- a/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs -+++ b/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs +diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs +index 80e267c163fa..8436a00e66d5 100644 +--- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs ++++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_gnu.rs @@ -2,7 +2,7 @@ pub fn target() -> Target { - let mut base = super::linux_gnu_base::opts(); + 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"]); - base.stack_probes = StackProbeType::X86; -- -2.40.1 +2.41.0 diff --git a/SOURCES/0001-Make-issue-122805.rs-big-endian-compatible.patch b/SOURCES/0001-Make-issue-122805.rs-big-endian-compatible.patch new file mode 100644 index 0000000..23d9a86 --- /dev/null +++ b/SOURCES/0001-Make-issue-122805.rs-big-endian-compatible.patch @@ -0,0 +1,49 @@ +From 26fa5c2c300f3c3a3ee3109c009bd4a6803a2a4c Mon Sep 17 00:00:00 2001 +From: Nikita Popov +Date: Tue, 11 Jun 2024 10:13:07 +0200 +Subject: [PATCH] Make issue-122805.rs big endian compatible + +Instead of not generating the function at all on big endian (which +makes the CHECK lines fail), instead use to_le() on big endian, +so that we essentially perform a bswap for both endiannesses. +--- + tests/codegen/issues/issue-122805.rs | 21 ++++++++++++--------- + 1 file changed, 12 insertions(+), 9 deletions(-) + +diff --git a/tests/codegen/issues/issue-122805.rs b/tests/codegen/issues/issue-122805.rs +index 6d108ada6dd..8e03c6c8884 100644 +--- a/tests/codegen/issues/issue-122805.rs ++++ b/tests/codegen/issues/issue-122805.rs +@@ -39,17 +39,20 @@ + // OPT3WINX64-NEXT: store <8 x i16> + // CHECK-NEXT: ret void + #[no_mangle] +-#[cfg(target_endian = "little")] + pub fn convert(value: [u16; 8]) -> [u8; 16] { ++ #[cfg(target_endian = "little")] ++ let bswap = u16::to_be; ++ #[cfg(target_endian = "big")] ++ let bswap = u16::to_le; + let addr16 = [ +- value[0].to_be(), +- value[1].to_be(), +- value[2].to_be(), +- value[3].to_be(), +- value[4].to_be(), +- value[5].to_be(), +- value[6].to_be(), +- value[7].to_be(), ++ bswap(value[0]), ++ bswap(value[1]), ++ bswap(value[2]), ++ bswap(value[3]), ++ bswap(value[4]), ++ bswap(value[5]), ++ bswap(value[6]), ++ bswap(value[7]), + ]; + unsafe { core::mem::transmute::<_, [u8; 16]>(addr16) } + } +-- +2.45.1 + diff --git a/SOURCES/0001-Use-an-explicit-x86-64-cpu-in-tests-that-are-sensiti.patch b/SOURCES/0001-Use-an-explicit-x86-64-cpu-in-tests-that-are-sensiti.patch new file mode 100644 index 0000000..c427d51 --- /dev/null +++ b/SOURCES/0001-Use-an-explicit-x86-64-cpu-in-tests-that-are-sensiti.patch @@ -0,0 +1,264 @@ +From 706f06c39a9e08a4708a53722429d13ae4069c2f Mon Sep 17 00:00:00 2001 +From: Josh Stone +Date: Wed, 1 May 2024 15:25:26 -0700 +Subject: [PATCH] Use an explicit x86-64 cpu in tests that are sensitive to it + +There are a few tests that depend on some target features **not** being +enabled by default, and usually they are correct with the default x86-64 +target CPU. However, in downstream builds we have modified the default +to fit our distros -- `x86-64-v2` in RHEL 9 and `x86-64-v3` in RHEL 10 +-- and the latter especially trips tests that expect not to have AVX. + +These cases are few enough that we can just set them back explicitly. +--- + tests/assembly/simd-intrinsic-mask-reduce.rs | 1 + + tests/assembly/x86_64-floating-point-clamp.rs | 2 +- + .../codegen/target-feature-inline-closure.rs | 2 +- + tests/ui/asm/x86_64/target-feature-attr.rs | 1 + + .../ui/asm/x86_64/target-feature-attr.stderr | 8 +++--- + .../const-eval/const_fn_target_feature.rs | 2 +- + .../rfc-2396-target_feature-11/safe-calls.rs | 1 + + .../safe-calls.stderr | 28 +++++++++---------- + tests/ui/sse2.rs | 4 +-- + 9 files changed, 26 insertions(+), 23 deletions(-) + +diff --git a/tests/assembly/simd-intrinsic-mask-reduce.rs b/tests/assembly/simd-intrinsic-mask-reduce.rs +index 763401755fad..0d77fc410511 100644 +--- a/tests/assembly/simd-intrinsic-mask-reduce.rs ++++ b/tests/assembly/simd-intrinsic-mask-reduce.rs +@@ -1,6 +1,7 @@ + // verify that simd mask reductions do not introduce additional bit shift operations + //@ revisions: x86 aarch64 + //@ [x86] compile-flags: --target=x86_64-unknown-linux-gnu -C llvm-args=-x86-asm-syntax=intel ++//@ [x86] compile-flags: -C target-cpu=x86-64 + //@ [x86] needs-llvm-components: x86 + //@ [aarch64] compile-flags: --target=aarch64-unknown-linux-gnu + //@ [aarch64] needs-llvm-components: aarch64 +diff --git a/tests/assembly/x86_64-floating-point-clamp.rs b/tests/assembly/x86_64-floating-point-clamp.rs +index 4a72a7f44fa0..b963aee35590 100644 +--- a/tests/assembly/x86_64-floating-point-clamp.rs ++++ b/tests/assembly/x86_64-floating-point-clamp.rs +@@ -2,7 +2,7 @@ + // so check to make sure that's what it's actually emitting. + + //@ assembly-output: emit-asm +-//@ compile-flags: --crate-type=lib -O -C llvm-args=-x86-asm-syntax=intel ++//@ compile-flags: --crate-type=lib -O -C llvm-args=-x86-asm-syntax=intel -C target-cpu=x86-64 + //@ only-x86_64 + //@ ignore-sgx + +diff --git a/tests/codegen/target-feature-inline-closure.rs b/tests/codegen/target-feature-inline-closure.rs +index 88bd413a8707..20bb4e66ff21 100644 +--- a/tests/codegen/target-feature-inline-closure.rs ++++ b/tests/codegen/target-feature-inline-closure.rs +@@ -1,5 +1,5 @@ + //@ only-x86_64 +-//@ compile-flags: -Copt-level=3 ++//@ compile-flags: -Copt-level=3 -Ctarget-cpu=x86-64 + + #![crate_type = "lib"] + #![feature(target_feature_11)] +diff --git a/tests/ui/asm/x86_64/target-feature-attr.rs b/tests/ui/asm/x86_64/target-feature-attr.rs +index 820be132ef79..51829be15065 100644 +--- a/tests/ui/asm/x86_64/target-feature-attr.rs ++++ b/tests/ui/asm/x86_64/target-feature-attr.rs +@@ -1,4 +1,5 @@ + //@ only-x86_64 ++//@ compile-flags: -C target-cpu=x86-64 + + #![feature(avx512_target_feature)] + +diff --git a/tests/ui/asm/x86_64/target-feature-attr.stderr b/tests/ui/asm/x86_64/target-feature-attr.stderr +index c852726ee7ff..1a9962732cfb 100644 +--- a/tests/ui/asm/x86_64/target-feature-attr.stderr ++++ b/tests/ui/asm/x86_64/target-feature-attr.stderr +@@ -1,23 +1,23 @@ + error: register class `ymm_reg` requires the `avx` target feature +- --> $DIR/target-feature-attr.rs:18:40 ++ --> $DIR/target-feature-attr.rs:19:40 + | + LL | asm!("vaddps {2:y}, {0:y}, {1:y}", in(ymm_reg) x, in(ymm_reg) y, lateout(ymm_reg) x); + | ^^^^^^^^^^^^^ + + error: register class `ymm_reg` requires the `avx` target feature +- --> $DIR/target-feature-attr.rs:18:55 ++ --> $DIR/target-feature-attr.rs:19:55 + | + LL | asm!("vaddps {2:y}, {0:y}, {1:y}", in(ymm_reg) x, in(ymm_reg) y, lateout(ymm_reg) x); + | ^^^^^^^^^^^^^ + + error: register class `ymm_reg` requires the `avx` target feature +- --> $DIR/target-feature-attr.rs:18:70 ++ --> $DIR/target-feature-attr.rs:19:70 + | + LL | asm!("vaddps {2:y}, {0:y}, {1:y}", in(ymm_reg) x, in(ymm_reg) y, lateout(ymm_reg) x); + | ^^^^^^^^^^^^^^^^^^ + + error: register class `kreg` requires at least one of the following target features: avx512bw, avx512f +- --> $DIR/target-feature-attr.rs:33:23 ++ --> $DIR/target-feature-attr.rs:34:23 + | + LL | asm!("/* {0} */", in(kreg) x); + | ^^^^^^^^^^ +diff --git a/tests/ui/consts/const-eval/const_fn_target_feature.rs b/tests/ui/consts/const-eval/const_fn_target_feature.rs +index b56b68a57958..d0de9d8d7a34 100644 +--- a/tests/ui/consts/const-eval/const_fn_target_feature.rs ++++ b/tests/ui/consts/const-eval/const_fn_target_feature.rs +@@ -1,5 +1,5 @@ + //@ only-x86_64 +-//@ compile-flags:-C target-feature=+ssse3 ++//@ compile-flags: -C target-cpu=x86-64 -C target-feature=+ssse3 + + #![crate_type = "lib"] + +diff --git a/tests/ui/rfcs/rfc-2396-target_feature-11/safe-calls.rs b/tests/ui/rfcs/rfc-2396-target_feature-11/safe-calls.rs +index c73b8d7e4d29..6fb0688008e6 100644 +--- a/tests/ui/rfcs/rfc-2396-target_feature-11/safe-calls.rs ++++ b/tests/ui/rfcs/rfc-2396-target_feature-11/safe-calls.rs +@@ -1,4 +1,5 @@ + //@ only-x86_64 ++//@ compile-flags: -C target-cpu=x86-64 + + #![feature(target_feature_11)] + +diff --git a/tests/ui/rfcs/rfc-2396-target_feature-11/safe-calls.stderr b/tests/ui/rfcs/rfc-2396-target_feature-11/safe-calls.stderr +index d9d7e297f8e9..fed3da6594cb 100644 +--- a/tests/ui/rfcs/rfc-2396-target_feature-11/safe-calls.stderr ++++ b/tests/ui/rfcs/rfc-2396-target_feature-11/safe-calls.stderr +@@ -1,5 +1,5 @@ + error[E0133]: call to function `sse2` with `#[target_feature]` is unsafe and requires unsafe function or block +- --> $DIR/safe-calls.rs:25:5 ++ --> $DIR/safe-calls.rs:26:5 + | + LL | sse2(); + | ^^^^^^ call to function with `#[target_feature]` +@@ -8,7 +8,7 @@ LL | sse2(); + = note: the sse2 target feature being enabled in the build configuration does not remove the requirement to list it in `#[target_feature]` + + error[E0133]: call to function `avx_bmi2` with `#[target_feature]` is unsafe and requires unsafe function or block +- --> $DIR/safe-calls.rs:27:5 ++ --> $DIR/safe-calls.rs:28:5 + | + LL | avx_bmi2(); + | ^^^^^^^^^^ call to function with `#[target_feature]` +@@ -16,7 +16,7 @@ LL | avx_bmi2(); + = help: in order for the call to be safe, the context requires the following additional target features: avx and bmi2 + + error[E0133]: call to function `Quux::avx_bmi2` with `#[target_feature]` is unsafe and requires unsafe function or block +- --> $DIR/safe-calls.rs:29:5 ++ --> $DIR/safe-calls.rs:30:5 + | + LL | Quux.avx_bmi2(); + | ^^^^^^^^^^^^^^^ call to function with `#[target_feature]` +@@ -24,7 +24,7 @@ LL | Quux.avx_bmi2(); + = help: in order for the call to be safe, the context requires the following additional target features: avx and bmi2 + + error[E0133]: call to function `avx_bmi2` with `#[target_feature]` is unsafe and requires unsafe function or block +- --> $DIR/safe-calls.rs:35:5 ++ --> $DIR/safe-calls.rs:36:5 + | + LL | avx_bmi2(); + | ^^^^^^^^^^ call to function with `#[target_feature]` +@@ -32,7 +32,7 @@ LL | avx_bmi2(); + = help: in order for the call to be safe, the context requires the following additional target features: avx and bmi2 + + error[E0133]: call to function `Quux::avx_bmi2` with `#[target_feature]` is unsafe and requires unsafe function or block +- --> $DIR/safe-calls.rs:37:5 ++ --> $DIR/safe-calls.rs:38:5 + | + LL | Quux.avx_bmi2(); + | ^^^^^^^^^^^^^^^ call to function with `#[target_feature]` +@@ -40,7 +40,7 @@ LL | Quux.avx_bmi2(); + = help: in order for the call to be safe, the context requires the following additional target features: avx and bmi2 + + error[E0133]: call to function `sse2` with `#[target_feature]` is unsafe and requires unsafe function or block +- --> $DIR/safe-calls.rs:43:5 ++ --> $DIR/safe-calls.rs:44:5 + | + LL | sse2(); + | ^^^^^^ call to function with `#[target_feature]` +@@ -49,7 +49,7 @@ LL | sse2(); + = note: the sse2 target feature being enabled in the build configuration does not remove the requirement to list it in `#[target_feature]` + + error[E0133]: call to function `avx_bmi2` with `#[target_feature]` is unsafe and requires unsafe function or block +- --> $DIR/safe-calls.rs:45:5 ++ --> $DIR/safe-calls.rs:46:5 + | + LL | avx_bmi2(); + | ^^^^^^^^^^ call to function with `#[target_feature]` +@@ -57,7 +57,7 @@ LL | avx_bmi2(); + = help: in order for the call to be safe, the context requires the following additional target feature: bmi2 + + error[E0133]: call to function `Quux::avx_bmi2` with `#[target_feature]` is unsafe and requires unsafe function or block +- --> $DIR/safe-calls.rs:47:5 ++ --> $DIR/safe-calls.rs:48:5 + | + LL | Quux.avx_bmi2(); + | ^^^^^^^^^^^^^^^ call to function with `#[target_feature]` +@@ -65,7 +65,7 @@ LL | Quux.avx_bmi2(); + = help: in order for the call to be safe, the context requires the following additional target feature: bmi2 + + error[E0133]: call to function `sse2` with `#[target_feature]` is unsafe and requires unsafe function or block +- --> $DIR/safe-calls.rs:54:5 ++ --> $DIR/safe-calls.rs:55:5 + | + LL | sse2(); + | ^^^^^^ call to function with `#[target_feature]` +@@ -74,7 +74,7 @@ LL | sse2(); + = note: the sse2 target feature being enabled in the build configuration does not remove the requirement to list it in `#[target_feature]` + + error[E0133]: call to function `sse2` with `#[target_feature]` is unsafe and requires unsafe function or block +- --> $DIR/safe-calls.rs:58:15 ++ --> $DIR/safe-calls.rs:59:15 + | + LL | const _: () = sse2(); + | ^^^^^^ call to function with `#[target_feature]` +@@ -83,7 +83,7 @@ LL | const _: () = sse2(); + = note: the sse2 target feature being enabled in the build configuration does not remove the requirement to list it in `#[target_feature]` + + error[E0133]: call to function `sse2_and_fxsr` with `#[target_feature]` is unsafe and requires unsafe function or block +- --> $DIR/safe-calls.rs:61:15 ++ --> $DIR/safe-calls.rs:62:15 + | + LL | const _: () = sse2_and_fxsr(); + | ^^^^^^^^^^^^^^^ call to function with `#[target_feature]` +@@ -92,7 +92,7 @@ LL | const _: () = sse2_and_fxsr(); + = note: the fxsr and sse2 target features being enabled in the build configuration does not remove the requirement to list them in `#[target_feature]` + + error: call to function `sse2` with `#[target_feature]` is unsafe and requires unsafe block (error E0133) +- --> $DIR/safe-calls.rs:68:5 ++ --> $DIR/safe-calls.rs:69:5 + | + LL | sse2(); + | ^^^^^^ call to function with `#[target_feature]` +@@ -101,12 +101,12 @@ LL | sse2(); + = help: in order for the call to be safe, the context requires the following additional target feature: sse2 + = note: the sse2 target feature being enabled in the build configuration does not remove the requirement to list it in `#[target_feature]` + note: an unsafe function restricts its caller, but its body is safe by default +- --> $DIR/safe-calls.rs:67:1 ++ --> $DIR/safe-calls.rs:68:1 + | + LL | unsafe fn needs_unsafe_block() { + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + note: the lint level is defined here +- --> $DIR/safe-calls.rs:64:8 ++ --> $DIR/safe-calls.rs:65:8 + | + LL | #[deny(unsafe_op_in_unsafe_fn)] + | ^^^^^^^^^^^^^^^^^^^^^^ +diff --git a/tests/ui/sse2.rs b/tests/ui/sse2.rs +index fa6d79713b4b..c203ca2716ff 100644 +--- a/tests/ui/sse2.rs ++++ b/tests/ui/sse2.rs +@@ -20,6 +20,6 @@ fn main() { + "SSE2 was not detected as available on an x86 platform"); + } + // check a negative case too -- allowed on x86, but not enabled by default +- assert!(cfg!(not(target_feature = "avx2")), +- "AVX2 shouldn't be detected as available by default on any platform"); ++ assert!(cfg!(not(target_feature = "avx512f")), ++ "AVX512 shouldn't be detected as available by default on any platform"); + } +-- +2.44.0 + diff --git a/SOURCES/0001-Use-lld-provided-by-system.patch b/SOURCES/0001-Use-lld-provided-by-system.patch new file mode 100644 index 0000000..8fcf4dc --- /dev/null +++ b/SOURCES/0001-Use-lld-provided-by-system.patch @@ -0,0 +1,65 @@ +From 61b5cc96337da2121221dd1bcdb63fd36551d065 Mon Sep 17 00:00:00 2001 +From: Josh Stone +Date: Wed, 1 Nov 2023 15:21:15 -0700 +Subject: [PATCH] Use lld provided by system + +--- + compiler/rustc_target/src/spec/base/wasm.rs | 3 +-- + compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs | 2 +- + compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs | 1 + + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/compiler/rustc_target/src/spec/base/wasm.rs b/compiler/rustc_target/src/spec/base/wasm.rs +index 87ade9e58cf4..2ddff95febab 100644 +--- a/compiler/rustc_target/src/spec/base/wasm.rs ++++ b/compiler/rustc_target/src/spec/base/wasm.rs +@@ -91,8 +91,7 @@ macro_rules! args { + // arguments just yet + limit_rdylib_exports: false, + +- // we use the LLD shipped with the Rust toolchain by default +- linker: Some("rust-lld".into()), ++ linker: Some("lld".into()), + linker_flavor: LinkerFlavor::WasmLld(Cc::No), + + pre_link_args, +diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs +index 9aa95a35f8e5..a9172f9441b7 100644 +--- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs ++++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs +@@ -17,7 +17,7 @@ pub fn target() -> Target { + static_position_independent_executables: true, + relro_level: RelroLevel::Full, + linker_flavor: LinkerFlavor::Gnu(Cc::No, Lld::Yes), +- linker: Some("rust-lld".into()), ++ linker: Some("lld".into()), + features: + "-mmx,-sse,-sse2,-sse3,-ssse3,-sse4.1,-sse4.2,-3dnow,-3dnowa,-avx,-avx2,+soft-float" + .into(), +diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs +index 5abfb8162f70..13cb43bda1a4 100644 +--- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs ++++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs +@@ -16,6 +16,7 @@ pub fn target() -> Target { + base.plt_by_default = false; + base.max_atomic_width = Some(64); + base.entry_abi = Conv::X86_64Win64; ++ base.linker = Some("lld".into()); + + // We disable MMX and SSE for now, even though UEFI allows using them. Problem is, you have to + // enable these CPU features explicitly before their first use, otherwise their instructions +diff -Naur a/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs b/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs +--- a/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs 2024-03-17 12:03:00.000000000 -0700 ++++ b/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs 2024-03-22 10:02:17.742806274 -0700 +@@ -14,7 +14,7 @@ + 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, +-- +2.41.0 + diff --git a/SOURCES/0001-bootstrap-allow-disabling-target-self-contained.patch b/SOURCES/0001-bootstrap-allow-disabling-target-self-contained.patch new file mode 100644 index 0000000..a168218 --- /dev/null +++ b/SOURCES/0001-bootstrap-allow-disabling-target-self-contained.patch @@ -0,0 +1,102 @@ +From 2b99134e2884fa56bcab6d360885ec5421048e66 Mon Sep 17 00:00:00 2001 +From: Josh Stone +Date: Thu, 28 Sep 2023 18:14:28 -0700 +Subject: [PATCH 1/2] bootstrap: allow disabling target self-contained + +--- + config.example.toml | 5 +++++ + src/bootstrap/src/core/build_steps/compile.rs | 4 ++++ + src/bootstrap/src/core/config/config.rs | 8 ++++++++ + src/bootstrap/src/lib.rs | 5 +++++ + 4 files changed, 22 insertions(+) + +diff --git a/config.example.toml b/config.example.toml +index f94553dd63f7..5ec969c80a37 100644 +--- a/config.example.toml ++++ b/config.example.toml +@@ -869,6 +869,11 @@ + # argument as the test binary. + #runner = (string) + ++# 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) ++ + # ============================================================================= + # Distribution options + # +diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs +index e927b491c71e..69a80d01d6b9 100644 +--- a/src/bootstrap/src/core/build_steps/compile.rs ++++ b/src/bootstrap/src/core/build_steps/compile.rs +@@ -356,6 +356,10 @@ fn copy_self_contained_objects( + compiler: &Compiler, + target: TargetSelection, + ) -> Vec<(PathBuf, DependencyType)> { ++ if builder.self_contained(target) != Some(true) { ++ return vec![]; ++ } ++ + let libdir_self_contained = builder.sysroot_libdir(*compiler, target).join("self-contained"); + t!(fs::create_dir_all(&libdir_self_contained)); + let mut target_deps = vec![]; +diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs +index 3e1bc9a9acdd..5e24a9cc4f60 100644 +--- a/src/bootstrap/src/core/config/config.rs ++++ b/src/bootstrap/src/core/config/config.rs +@@ -586,6 +586,7 @@ pub struct Target { + pub runner: Option, + pub no_std: bool, + pub codegen_backends: Option>, ++ pub self_contained: bool, + } + + impl Target { +@@ -594,6 +595,9 @@ pub fn from_triple(triple: &str) -> Self { + if triple.contains("-none") || triple.contains("nvptx") || triple.contains("switch") { + target.no_std = true; + } ++ if triple.contains("-musl") || triple.contains("-wasi") || triple.contains("-windows-gnu") { ++ target.self_contained = true; ++ } + target + } + } +@@ -1150,6 +1154,7 @@ struct TomlTarget { + no_std: Option = "no-std", + codegen_backends: Option> = "codegen-backends", + runner: Option = "runner", ++ self_contained: Option = "self-contained", + } + } + +@@ -1870,6 +1875,9 @@ fn get_table(option: &str) -> Result { + if let Some(s) = cfg.no_std { + target.no_std = s; + } ++ if let Some(s) = cfg.self_contained { ++ target.self_contained = s; ++ } + target.cc = cfg.cc.map(PathBuf::from); + target.cxx = cfg.cxx.map(PathBuf::from); + target.ar = cfg.ar.map(PathBuf::from); +diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs +index 5ed6b357e20a..c23b21d65713 100644 +--- a/src/bootstrap/src/lib.rs ++++ b/src/bootstrap/src/lib.rs +@@ -1348,6 +1348,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.44.0 + diff --git a/SOURCES/0002-set-an-external-library-path-for-wasm32-wasi.patch b/SOURCES/0002-set-an-external-library-path-for-wasm32-wasi.patch new file mode 100644 index 0000000..34ab22a --- /dev/null +++ b/SOURCES/0002-set-an-external-library-path-for-wasm32-wasi.patch @@ -0,0 +1,97 @@ +From e3b7d2e3d3b4fcbc6591de606957c0fd59b5e547 Mon Sep 17 00:00:00 2001 +From: Josh Stone +Date: Thu, 28 Sep 2023 18:18:16 -0700 +Subject: [PATCH 2/2] set an external library path for wasm32-wasi + +--- + compiler/rustc_codegen_ssa/src/back/link.rs | 9 +++++++++ + compiler/rustc_target/src/spec/mod.rs | 4 ++++ + compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs | 7 ++++--- + 3 files changed, 17 insertions(+), 3 deletions(-) + +diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs +index f5e8d5fc92a9..f4ad3f725427 100644 +--- a/compiler/rustc_codegen_ssa/src/back/link.rs ++++ b/compiler/rustc_codegen_ssa/src/back/link.rs +@@ -1563,6 +1563,12 @@ fn get_object_file_path(sess: &Session, name: &str, self_contained: bool) -> Pat + return file_path; + } + } ++ if let Some(lib_path) = &sess.target.options.external_lib_path { ++ let file_path = Path::new(lib_path.as_ref()).join(name); ++ if file_path.exists() { ++ return file_path; ++ } ++ } + for search_path in fs.search_paths() { + let file_path = search_path.dir.join(name); + if file_path.exists() { +@@ -2049,6 +2055,9 @@ fn add_library_search_dirs(cmd: &mut dyn Linker, sess: &Session, self_contained: + let lib_path = sess.target_filesearch(PathKind::All).get_self_contained_lib_path(); + cmd.include_path(&fix_windows_verbatim_for_gcc(&lib_path)); + } ++ if let Some(lib_path) = &sess.target.options.external_lib_path { ++ cmd.include_path(Path::new(lib_path.as_ref())); ++ } + } + + /// Add options making relocation sections in the produced ELF files read-only +diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs +index 941d767b850d..cd0a2ce51989 100644 +--- a/compiler/rustc_target/src/spec/mod.rs ++++ b/compiler/rustc_target/src/spec/mod.rs +@@ -1881,6 +1881,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, +@@ -2368,6 +2369,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, +@@ -3064,6 +3066,7 @@ macro_rules! key { + key!(linker_is_gnu_json = "linker-is-gnu", bool); + key!(pre_link_objects = "pre-link-objects", link_objects); + key!(post_link_objects = "post-link-objects", link_objects); ++ key!(external_lib_path, optional); + key!(pre_link_objects_self_contained = "pre-link-objects-fallback", link_objects); + key!(post_link_objects_self_contained = "post-link-objects-fallback", link_objects); + // Deserializes the backwards-compatible variants of `-Clink-self-contained` +@@ -3327,6 +3330,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"); +diff --git a/compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs b/compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs +index 7cbe9f09e6ca..b524890c2ec5 100644 +--- a/compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs ++++ b/compiler/rustc_target/src/spec/targets/wasm32_wasip1.rs +@@ -20,11 +20,12 @@ pub fn target() -> Target { + options.os = "wasi".into(); + options.add_pre_link_args(LinkerFlavor::WasmLld(Cc::Yes), &["--target=wasm32-wasi"]); + +- 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.44.0 + diff --git a/SOURCES/cargo_vendor.attr b/SOURCES/cargo_vendor.attr new file mode 100644 index 0000000..be2d48f --- /dev/null +++ b/SOURCES/cargo_vendor.attr @@ -0,0 +1,2 @@ +%__cargo_vendor_path ^%{_defaultlicensedir}(/[^/]+)+/cargo-vendor.txt$ +%__cargo_vendor_provides %{_rpmconfigdir}/cargo_vendor.prov diff --git a/SOURCES/cargo_vendor.prov b/SOURCES/cargo_vendor.prov new file mode 100755 index 0000000..6efca18 --- /dev/null +++ b/SOURCES/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/SOURCES/macros.rust-toolset b/SOURCES/macros.rust-toolset
index 41bb129..6a2f7f5 100644
--- a/SOURCES/macros.rust-toolset
+++ b/SOURCES/macros.rust-toolset
@@ -1,29 +1,100 @@
-# Explicitly use bindir tools, in case others are in the PATH,
-# like the rustup shims in a user's ~/.cargo/bin/.
+# __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
 #
-# Since cargo 1.31, install only uses $CARGO_HOME/config, ignoring $PWD.
-#   https://github.com/rust-lang/cargo/issues/6397
-# But we can set CARGO_HOME locally, which is a good idea anyway to make sure
-# it never writes to ~/.cargo during rpmbuild.
-%__cargo %{_bindir}/env CARGO_HOME=.cargo %{_bindir}/cargo
-%__rustc %{_bindir}/rustc
-%__rustdoc %{_bindir}/rustdoc
+# It corresponds to the "-Copt-level" rustc command line option.
+%rustflags_opt_level 3
 
-# Enable optimization, debuginfo, and link hardening.
-%__global_rustflags -Copt-level=3 -Cdebuginfo=2 -Clink-arg=-Wl,-z,relro,-z,now
+# 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
 
-%__global_rustflags_toml [%{lua:
-    for arg in string.gmatch(rpm.expand("%{__global_rustflags}"), "%S+") do
-        print('"' .. arg .. '", ')
-    end}]
+# 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
 
-%cargo_prep(V:) (\
-%{__mkdir} -p .cargo \
-cat > .cargo/config << EOF \
+# 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}"\
-rustflags = %{__global_rustflags_toml}\
+\
+[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}"\
@@ -31,21 +102,151 @@ root = "%{buildroot}%{_prefix}"\
 [term]\
 verbose = true\
 EOF\
-%if 0%{-V:1}\
-%{__tar} -xoaf %{S:%{-V*}}\
-cat >> .cargo/config << 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"\
-\
-[source.vendored-sources]\
-directory = "./vendor"\
-EOF\
-%endif\
+EOF}\
+%{__rm} -f Cargo.toml.orig\
 )
 
-%cargo_build %__cargo build --release %{?_smp_mflags}
+# __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_test %__cargo test --release %{?_smp_mflags} --no-fail-fast
+# NB: cargo_build/test/install do not use the -n/-a/-f argument parsing like
+# Fedora's rust-packaging, because that change would break anyone that's
+# already passing arguments directly to cargo after the macro. Instead, one can
+# explicitly use --no-default-features, --all-features, or --features XYZ.
+
+# cargo_build: builds the crate with cargo
+%cargo_build\
+%{shrink:                                               \
+    %{__cargo} build                                    \
+    %{__cargo_common_opts}                              \
+    --profile rpm                                       \
+}
+
+# cargo_test: runs the test suite with cargo
+#
+# To pass command-line arguments to the cargo test runners directly (for
+# example, to skip certain tests during package builds), the
+# "cargo test" argument parsing need to be bypassed,
+# i.e. "%%cargo_test -- --skip foo" for skipping all tests with names that
+# match "foo".
+%cargo_test\
+%{shrink:                                               \
+    %{__cargo} test                                     \
+    %{__cargo_common_opts}                              \
+    --profile rpm                                       \
+    --no-fail-fast                                      \
+}
+
+# cargo_install: install files into the buildroot
+#
+# For "binary" crates, this macro installs all "bin" build targets to _bindir
+# inside the buildroot. The "--no-track" option prevents the creation of the
+# "$CARGO_HOME/.crates.toml" file, which is used to keep track of which version
+# of a specific binary has been installed, but which conflicts between builds
+# of different Rust applications and is not needed when building RPM packages.
+%cargo_install\
+%{shrink:                                                         \
+  %{__cargo} install                                              \
+    %{__cargo_common_opts}                                        \
+    --profile rpm                                                 \
+    --no-track                                                    \
+    --path .                                                      \
+}
+
+# cargo_license: print license information for all crate dependencies
+#
+# The "no-build,no-dev,no-proc-macro" argument results in only crates which are
+# linked into the final binary to be considered.
+#
+# Additionally, deprecated SPDX syntax ("/" instead of "OR") is normalized
+# before sorting the results to ensure reproducible output of this macro.
+#
+# This macro must be called with the same feature flags as other cargo macros,
+# in particular, "cargo_build", otherwise its output will be incomplete.
+#
+# The "cargo tree" command called by this macro will fail if there are missing
+# (optional) dependencies.
+%cargo_license(naf:)\
+(\
+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                                              \
+}\
+)
 
-%cargo_install %__cargo install --no-track --path .
diff --git a/SOURCES/rustc-1.79.0-disable-libssh2.patch b/SOURCES/rustc-1.79.0-disable-libssh2.patch
new file mode 100644
index 0000000..6b3c90c
--- /dev/null
+++ b/SOURCES/rustc-1.79.0-disable-libssh2.patch
@@ -0,0 +1,44 @@
+diff -up rustc-1.79.0-src/src/tools/cargo/Cargo.lock.orig rustc-1.79.0-src/src/tools/cargo/Cargo.lock
+--- rustc-1.79.0-src/src/tools/cargo/Cargo.lock.orig	2024-06-13 16:37:16.640599290 -0700
++++ rustc-1.79.0-src/src/tools/cargo/Cargo.lock	2024-06-13 16:37:16.646599231 -0700
+@@ -2150,7 +2150,6 @@ checksum = "ee4126d8b4ee5c9d9ea891dd875c
+ dependencies = [
+  "cc",
+  "libc",
+- "libssh2-sys",
+  "libz-sys",
+  "openssl-sys",
+  "pkg-config",
+@@ -2191,20 +2190,6 @@ dependencies = [
+  "pkg-config",
+  "vcpkg",
+ ]
+-
+-[[package]]
+-name = "libssh2-sys"
+-version = "0.3.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee"
+-dependencies = [
+- "cc",
+- "libc",
+- "libz-sys",
+- "openssl-sys",
+- "pkg-config",
+- "vcpkg",
+-]
+ 
+ [[package]]
+ name = "libz-sys"
+diff -up rustc-1.79.0-src/src/tools/cargo/Cargo.toml.orig rustc-1.79.0-src/src/tools/cargo/Cargo.toml
+--- rustc-1.79.0-src/src/tools/cargo/Cargo.toml.orig	2024-06-13 16:37:16.646599231 -0700
++++ rustc-1.79.0-src/src/tools/cargo/Cargo.toml	2024-06-13 16:39:06.040526596 -0700
+@@ -44,7 +44,7 @@ curl = "0.4.46"
+ curl-sys = "0.4.72"
+ filetime = "0.2.23"
+ flate2 = { version = "1.0.28", default-features = false, features = ["zlib"] }
+-git2 = "0.18.3"
++git2 = { version = "0.18.3", default-features = false, features = ["https"] }
+ git2-curl = "0.19.0"
+ gix = { version = "0.63.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision", "parallel", "dirwalk"] }
+ glob = "0.3.1"
diff --git a/SOURCES/rustc-1.79.0-unbundle-sqlite.patch b/SOURCES/rustc-1.79.0-unbundle-sqlite.patch
new file mode 100644
index 0000000..8101227
--- /dev/null
+++ b/SOURCES/rustc-1.79.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	2006-07-24 10:21:28.000000000 +0900
++++ rustc-beta-src/src/tools/cargo/Cargo.lock	2024-05-06 14:13:00.172595245 +0900
+@@ -2191,7 +2191,6 @@ version = "0.28.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f"
+ 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	2024-05-06 14:13:00.173595257 +0900
++++ rustc-beta-src/src/tools/cargo/Cargo.toml	2024-05-06 14:13:54.089275003 +0900
+@@ -77,7 +77,7 @@ proptest = "1.4.0"
+ pulldown-cmark = { version = "0.10.2", default-features = false, features = ["html"] }
+ rand = "0.8.5"
+ regex = "1.10.4"
+-rusqlite = { version = "0.31.0", features = ["bundled"] }
++rusqlite = { version = "0.31.0", features = [] }
+ rustfix = { version = "0.8.2", path = "crates/rustfix" }
+ same-file = "1.0.6"
+ security-framework = "2.10.0"
diff --git a/SPECS/rust.spec b/SPECS/rust.spec
index 05c4277..63bfefe 100644
--- a/SPECS/rust.spec
+++ b/SPECS/rust.spec
@@ -1,16 +1,22 @@
+Name:           rust
+Version:        1.79.0
+Release:        3%{?dist}
+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-DFS-2016)
+# ^ written as: (rust itself) and (bundled libraries)
+URL:            https://www.rust-lang.org
+
 # Only x86_64, i686, and aarch64 are Tier 1 platforms at this time.
 # https://doc.rust-lang.org/nightly/rustc/platform-support.html
 %global rust_arches x86_64 i686 aarch64 ppc64le s390x
-
-# The channel can be stable, beta, or nightly
-%{!?channel: %global channel stable}
+ExclusiveArch:  %{rust_arches}
 
 # To bootstrap from scratch, set the channel and date from src/stage0.json
 # e.g. 1.59.0 wants rustc: 1.58.0-2022-01-13
 # or nightly wants some beta-YYYY-MM-DD
-%global bootstrap_version 1.70.0
-%global bootstrap_channel 1.70.0
-%global bootstrap_date 2023-06-01
+%global bootstrap_version 1.78.0
+%global bootstrap_channel 1.78.0
+%global bootstrap_date 2024-05-02
 
 # Only the specified arches will use bootstrap binaries.
 # NOTE: Those binaries used to be uploaded with every new release, but that was
@@ -26,42 +32,67 @@
 %if 0%{?fedora}
 %global mingw_targets i686-pc-windows-gnu x86_64-pc-windows-gnu
 %endif
-%if 0%{?fedora} || 0%{?rhel} >= 8
-%global wasm_targets wasm32-unknown-unknown wasm32-wasi
+# NB: wasm32-wasi is being gradually replaced by wasm32-wasip1
+# https://blog.rust-lang.org/2024/04/09/updates-to-rusts-wasi-targets.html
+%global wasm_targets wasm32-unknown-unknown wasm32-wasi wasm32-wasip1
+%if 0%{?fedora} || 0%{?rhel} >= 10
+%global extra_targets x86_64-unknown-none x86_64-unknown-uefi
 %endif
 %endif
+%ifarch aarch64
+%if 0%{?fedora} || 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(string.find(rpm.expand(" %{all_targets} "), rpm.expand(" %1 "), 1, true) or 0)
+}
 
 # 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
-# (updated per https://github.com/rust-lang/rust/pull/96907)
 %global wasi_libc_url https://github.com/WebAssembly/wasi-libc
-%global wasi_libc_ref wasi-sdk-20
+%global wasi_libc_ref wasi-sdk-22
 %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 14.0+.
-%global min_llvm_version 14.0.0
-%global bundled_llvm_version 16.0.5
+# is insufficient.  Rust currently requires LLVM 17.0+.
+%global min_llvm_version 17.0.0
+%global bundled_llvm_version 18.1.7
+#global llvm_compat_version 17
+%global llvm llvm%{?llvm_compat_version}
 %bcond_with bundled_llvm
 
-# Requires stable libgit2 1.6, and not the next minor soname change.
+# Requires stable libgit2 1.7, and not the next minor soname change.
 # This needs to be consistent with the bindings in vendor/libgit2-sys.
-%global min_libgit2_version 1.6.4
-%global next_libgit2_version 1.7.0~
-%global bundled_libgit2_version 1.6.4
-%if 0%{?fedora} >= 38
+%global min_libgit2_version 1.7.2
+%global next_libgit2_version 1.8.0~
+%global bundled_libgit2_version 1.7.2
+%if 0%{?fedora} >= 39
 %bcond_with bundled_libgit2
 %else
 %bcond_without bundled_libgit2
 %endif
 
-# needs libssh2_userauth_publickey_frommemory
-%global min_libssh2_version 1.6.0
+# Cargo uses UPSERTs with omitted conflict targets
+%global min_sqlite3_version 3.35
+%global bundled_sqlite3_version 3.45.0
+%if 0%{?rhel} && 0%{?rhel} < 10
+%bcond_without bundled_sqlite3
+%else
+%bcond_with bundled_sqlite3
+%endif
+
 %if 0%{?rhel}
 # Disable cargo->libgit2->libssh2 on RHEL, as it's not approved for FIPS (rhbz1732949)
 %bcond_without disabled_libssh2
@@ -69,39 +100,43 @@
 %bcond_with disabled_libssh2
 %endif
 
-%if 0%{?rhel} && 0%{?rhel} < 8
-%bcond_with curl_http2
-%else
-%bcond_without curl_http2
+# 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
 
-# LLDB isn't available everywhere...
-%if 0%{?rhel} && 0%{?rhel} < 8
-%bcond_with lldb
+%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
-%bcond_without lldb
+# 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
 
-Name:           rust
-Version:        1.71.1
-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
-%else
-%global rustc_package rustc-%{channel}-src
-%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 = string.gsub(version, "^.*~(%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
 
-# By default, rust tries to use "rust-lld" as a linker for WebAssembly.
-Patch1:         0001-Use-lld-provided-by-system-for-wasm.patch
+# By default, rust tries to use "rust-lld" as a linker for some targets.
+Patch1:         0001-Use-lld-provided-by-system.patch
 
 # Set a substitute-path in rust-gdb for standard library sources.
 Patch2:         rustc-1.70.0-rust-gdb-substitute-path.patch
@@ -110,24 +145,33 @@ Patch2:         rustc-1.70.0-rust-gdb-substitute-path.patch
 # TODO: upstream this ability into the actual build configuration
 Patch3:         0001-Let-environment-variables-override-some-default-CPUs.patch
 
-# Enable the profiler runtime for native hosts
-# https://github.com/rust-lang/rust/pull/114069
-Patch4:         0001-Allow-using-external-builds-of-the-compiler-rt-profi.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
 
-# https://github.com/rust-lang/rust/pull/114440
-Patch5:         0001-bootstrap-config-fix-version-comparison-bug.patch
+# We don't want to use the bundled library in libsqlite3-sys
+Patch6:         rustc-1.79.0-unbundle-sqlite.patch
+
+# https://github.com/rust-lang/rust/pull/124597
+Patch7:         0001-Use-an-explicit-x86-64-cpu-in-tests-that-are-sensiti.patch
+
+# Fix codegen test failure on big endian: https://github.com/rust-lang/rust/pull/126263
+Patch8:         0001-Make-issue-122805.rs-big-endian-compatible.patch
+
+# https://github.com/rust-lang/rust/pull/128271
+Patch9:         0001-Disable-jump-threading-of-float-equality.patch
 
 ### RHEL-specific patches below ###
 
 # Simple rpm macros for rust-toolset (as opposed to full rust-packaging)
 Source100:      macros.rust-toolset
+Source101:      cargo_vendor.attr
+Source102:      cargo_vendor.prov
 
 # Disable cargo->libgit2->libssh2 on RHEL, as it's not approved for FIPS (rhbz1732949)
-Patch100:       rustc-1.71.0-disable-libssh2.patch
-
-# libcurl on RHEL7 doesn't have http2, but since cargo requests it, curl-sys
-# will try to build it statically -- instead we turn off the feature.
-Patch101:       rustc-1.71.0-disable-http2.patch
+Patch100:       rustc-1.79.0-disable-libssh2.patch
 
 # Get the Rust triple for any arch.
 %{lua: function rust_triple(arch)
@@ -145,14 +189,12 @@ Patch101:       rustc-1.71.0-disable-http2.patch
   return arch.."-unknown-linux-"..abi
 end}
 
-# Get the environment form of a Rust triple
-%{lua: function rust_triple_env(triple)
-  local sub = string.gsub(triple, "-", "_")
-  return string.upper(sub)
-end}
-
 %global rust_triple %{lua: print(rust_triple(rpm.expand("%{_target_cpu}")))}
-%global rust_triple_env %{lua: print(rust_triple_env(rpm.expand("%{rust_triple}")))}
+
+# Get the environment form of the Rust triple
+%global rust_triple_env %{lua:
+  print(string.upper(string.gsub(rpm.expand("%{rust_triple}"), "-", "_")))
+}
 
 %if %defined bootstrap_arches
 # For each bootstrap arch, add an additional binary Source.
@@ -186,12 +228,7 @@ end}
 Provides:       bundled(%{name}-bootstrap) = %{bootstrap_version}
 %else
 BuildRequires:  cargo >= %{bootstrap_version}
-%if 0%{?rhel} && 0%{?rhel} < 8
-BuildRequires:  %{name} >= %{bootstrap_version}
-BuildConflicts: %{name} > %{version}
-%else
 BuildRequires:  (%{name} >= %{bootstrap_version} with %{name} <= %{version})
-%endif
 %global local_rust_root %{_prefix}
 %endif
 
@@ -210,8 +247,12 @@ BuildRequires:  pkgconfig(zlib)
 BuildRequires:  (pkgconfig(libgit2) >= %{min_libgit2_version} with pkgconfig(libgit2) < %{next_libgit2_version})
 %endif
 
+%if %{without bundled_sqlite3}
+BuildRequires:  pkgconfig(sqlite3) >= %{min_sqlite3_version}
+%endif
+
 %if %{without disabled_libssh2}
-BuildRequires:  pkgconfig(libssh2) >= %{min_libssh2_version}
+BuildRequires:  pkgconfig(libssh2)
 %endif
 
 %if 0%{?rhel} == 8
@@ -222,18 +263,14 @@ BuildRequires:  python3
 BuildRequires:  python3-rpm-macros
 
 %if %with bundled_llvm
-BuildRequires:  cmake3 >= 3.13.4
+BuildRequires:  cmake >= 3.20.0
 BuildRequires:  ninja-build
 Provides:       bundled(llvm) = %{bundled_llvm_version}
 %else
-BuildRequires:  cmake >= 2.8.11
-%if 0%{?epel} == 7
-%global llvm llvm14
-%endif
-%if %defined llvm
+BuildRequires:  cmake >= 3.5.1
+%if %defined llvm_compat_version
 %global llvm_root %{_libdir}/%{llvm}
 %else
-%global llvm llvm
 %global llvm_root %{_prefix}
 %endif
 BuildRequires:  %{llvm}-devel >= %{min_llvm_version}
@@ -248,10 +285,17 @@ 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
 
 # For src/test/run-make/static-pie
 BuildRequires:  glibc-static
 
+# For tests/run-make/pgo-branch-weights
+BuildRequires:  binutils-gold
+
 # Virtual provides for folks who attempt "dnf install rustc"
 Provides:       rustc = %{version}-%{release}
 Provides:       rustc%{?_isa} = %{version}-%{release}
@@ -264,20 +308,7 @@ Requires:       %{name}-std-static%{?_isa} = %{version}-%{release}
 # https://github.com/rust-lang/rust/issues/11937
 Requires:       /usr/bin/cc
 
-%if 0%{?epel} == 7
-%global devtoolset_name devtoolset-11
-BuildRequires:  %{devtoolset_name}-binutils
-BuildRequires:  %{devtoolset_name}-gcc
-BuildRequires:  %{devtoolset_name}-gcc-c++
-%global devtoolset_bindir /opt/rh/%{devtoolset_name}/root/usr/bin
-%global __cc     %{devtoolset_bindir}/gcc
-%global __cxx    %{devtoolset_bindir}/g++
-%global __ar     %{devtoolset_bindir}/ar
-%global __ranlib %{devtoolset_bindir}/ranlib
-%global __strip  %{devtoolset_bindir}/strip
-%else
 %global __ranlib %{_bindir}/ranlib
-%endif
 
 # ALL Rust libraries are private, because they don't keep an ABI.
 %global _privatelibs lib(.*-[[:xdigit:]]{16}*|rustc.*)[.]so.*
@@ -289,14 +320,15 @@ BuildRequires:  %{devtoolset_name}-gcc-c++
 # 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)].
-%if 0%{?rhel} && 0%{?rhel} < 8
-# eu-strip is very eager by default, so we have to limit it to -g, only debugging symbols.
-%global _find_debuginfo_opts -g
-%undefine _include_minidebuginfo
-%else
-# Newer find-debuginfo.sh supports --keep-section, which is preferable. rhbz1465997
 %global _find_debuginfo_opts --keep-section .rustc
-%endif
+
+# 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}
 
 %if %{without bundled_llvm}
 %if "%{llvm_root}" == "%{_prefix}" || 0%{?scl:1}
@@ -321,19 +353,16 @@ BuildRequires:  mingw64-winpthreads-static
 %endif
 
 %if %defined wasm_targets
+%if %with bundled_wasi_libc
 BuildRequires:  clang
+%else
+BuildRequires:  wasi-libc-static
+%endif
 BuildRequires:  lld
-# brp-strip-static-archive breaks the archive index for wasm
-%global __os_install_post \
-%__os_install_post \
-find '%{buildroot}%{rustlibdir}'/wasm*/lib -type f -regex '.*\\.\\(a\\|rlib\\)' -print -exec '%{llvm_root}/bin/llvm-ranlib' '{}' ';' \
-%{nil}
 %endif
 
-%if 0%{?fedora} || 0%{?rhel} >= 8
 # For profiler_builtins
-BuildRequires:  compiler-rt
-%endif
+BuildRequires:  compiler-rt%{?llvm_compat_version}
 
 # This component was removed as of Rust 1.69.0.
 # https://github.com/rust-lang/rust/pull/101841
@@ -356,65 +385,85 @@ Requires:       glibc-devel%{?_isa} >= 2.17
 This package includes the standard libraries for building applications
 written in Rust.
 
-%if %defined mingw_targets
-%{lua: do
-  for triple in string.gmatch(rpm.expand("%{mingw_targets}"), "%S+") do
-    local subs = {
-      triple = triple,
-      name = rpm.expand("%{name}"),
-      verrel = rpm.expand("%{version}-%{release}"),
-      mingw = string.sub(triple, 1, 4) == "i686" and "mingw32" or "mingw64",
-    }
-    local s = string.gsub([[
+%global target_package()                        \
+%package std-static-%1                          \
+Summary:        Standard library for Rust %1    \
+Requires:       %{name} = %{version}-%{release}
 
-%package std-static-{{triple}}
-Summary:        Standard library for Rust {{triple}}
+%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
-Provides:       {{mingw}}-rust = {{verrel}}
-Provides:       {{mingw}}-rustc = {{verrel}}
-Requires:       {{mingw}}-crt
-Requires:       {{mingw}}-gcc
-Requires:       {{mingw}}-winpthreads-static
-Requires:       {{name}} = {{verrel}}
-
-%description std-static-{{triple}}
-This package includes the standard libraries for building applications
-written in Rust for the MinGW target {{triple}}.
-
-]], "{{(%w+)}}", subs)
-    print(s)
-  end
-end}
+%target_description i686-pc-windows-gnu MinGW
 %endif
 
-%if %defined wasm_targets
-%{lua: do
-  for triple in string.gmatch(rpm.expand("%{wasm_targets}"), "%S+") do
-    local subs = {
-      triple = triple,
-      name = rpm.expand("%{name}"),
-      verrel = rpm.expand("%{version}-%{release}"),
-      wasi = string.find(triple, "-wasi") and 1 or 0,
-    }
-    local s = string.gsub([[
-
-%package std-static-{{triple}}
-Summary:        Standard library for Rust {{triple}}
+%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
-Requires:       {{name}} = {{verrel}}
+%target_description x86_64-pc-windows-gnu MinGW
+%endif
+
+%if %target_enabled wasm32-unknown-unknown
+%target_package wasm32-unknown-unknown
 Requires:       lld >= 8.0
-%if {{wasi}}
-Provides:       bundled(wasi-libc)
+BuildArch:      noarch
+%target_description wasm32-unknown-unknown WebAssembly
 %endif
 
-%description std-static-{{triple}}
-This package includes the standard libraries for building applications
-written in Rust for the WebAssembly target {{triple}}.
+%if %target_enabled wasm32-wasi
+%target_package wasm32-wasi
+Requires:       lld >= 8.0
+%if %with bundled_wasi_libc
+Provides:       bundled(wasi-libc)
+%else
+Requires:       wasi-libc-static
+%endif
+BuildArch:      noarch
+%target_description wasm32-wasi WebAssembly
+%endif
 
-]], "{{(%w+)}}", subs)
-    print(s)
-  end
-end}
+%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
+%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 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
 
 
@@ -437,8 +486,6 @@ 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
@@ -450,8 +497,6 @@ Requires:       %{name}-debugger-common = %{version}-%{release}
 This package includes the rust-lldb script, which allows easier debugging of Rust
 programs.
 
-%endif
-
 
 %package doc
 Summary:        Documentation for Rust
@@ -476,6 +521,9 @@ Summary:        Rust's package manager and build tool
 %if %with bundled_libgit2
 Provides:       bundled(libgit2) = %{bundled_libgit2_version}
 %endif
+%if %with bundled_sqlite3
+Provides:       bundled(sqlite) = %{bundled_sqlite3_version}
+%endif
 # For tests:
 BuildRequires:  git-core
 # Cargo is not much use without Rust
@@ -495,6 +543,9 @@ and ensure that you'll always get a repeatable build.
 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}
@@ -507,11 +558,7 @@ A tool for formatting Rust code according to style guidelines.
 Summary:        Rust implementation of the Language Server Protocol
 
 # The standard library sources are needed for most functionality.
-%if 0%{?rhel} && 0%{?rhel} < 8
-Requires:       %{name}-src
-%else
 Recommends:     %{name}-src
-%endif
 
 # 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.
@@ -542,11 +589,7 @@ A collection of lints to catch common mistakes and improve your Rust code.
 %package src
 Summary:        Sources for the Rust standard library
 BuildArch:      noarch
-%if 0%{?rhel} && 0%{?rhel} < 8
-Requires:       %{name}-std-static = %{version}-%{release}
-%else
 Recommends:     %{name}-std-static = %{version}-%{release}
-%endif
 
 %description src
 This package includes source files for the Rust standard library.  It may be
@@ -582,8 +625,9 @@ test -f '%{local_rust_root}/bin/cargo'
 test -f '%{local_rust_root}/bin/rustc'
 %endif
 
-%if %defined wasm_targets
+%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}
@@ -592,17 +636,20 @@ test -f '%{local_rust_root}/bin/rustc'
 %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
+%patch -P8 -p1
+%patch -P9 -p1
 
 %if %with disabled_libssh2
 %patch -P100 -p1
 %endif
 
-%if %without curl_http2
-%patch -P101 -p1
-rm -rf vendor/libnghttp2-sys*/
-%endif
-
 # Use our explicit python3 first
 sed -i.try-python -e '/^try python3 /i try "%{__python3}" "$@"' ./configure
 
@@ -614,18 +661,26 @@ rm -rf src/llvm-project/
 mkdir -p src/llvm-project/libunwind/
 %endif
 
-# Remove other unused vendored libraries
-rm -rf vendor/curl-sys*/curl/
-rm -rf vendor/*jemalloc-sys*/jemalloc/
-rm -rf vendor/libffi-sys*/libffi/
-rm -rf vendor/libmimalloc-sys*/c_src/mimalloc/
-rm -rf vendor/libssh2-sys*/libssh2/
-rm -rf vendor/libz-sys*/src/zlib{,-ng}/
-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_sqlite3
+%clear_dir vendor/libsqlite3-sys*/sqlite3/
 %endif
 
 %if %with disabled_libssh2
@@ -633,13 +688,7 @@ 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
-
-%if %{with bundled_llvm} && 0%{?epel} == 7
-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
@@ -665,7 +714,7 @@ find -name '*.rs' -type f -perm /111 -exec chmod -v -x '{}' '+'
 %endif
 
 # These are similar to __cflags_arch_* in /usr/lib/rpm/redhat/macros
-%{lua: function rustc_target_cpus()
+%global rustc_target_cpus %{lua: do
   local fedora = tonumber(rpm.expand("0%{?fedora}"))
   local rhel = tonumber(rpm.expand("0%{?rhel}"))
   local env =
@@ -674,37 +723,22 @@ find -name '*.rs' -type f -perm /111 -exec chmod -v -x '{}' '+'
     .. " RUSTC_TARGET_CPU_S390X=" ..
         ((rhel >= 9) and "z14" or (rhel == 8 or fedora >= 38) and "z13" or
          (fedora >= 26) and "zEC12" or (rhel == 7) and "z196" or "z10")
-  return env
+  print(env)
 end}
 
-# Set up shared environment variables for build/install/check
-%global rust_env %{?rustflags:RUSTFLAGS="%{rustflags}"} %{lua: print(rustc_target_cpus())}
-%if %defined cmake_path
-%global rust_env %{?rust_env} PATH="%{cmake_path}:$PATH"
-%endif
-%if %without disabled_libssh2
-# convince libssh2-sys to use the distro libssh2
-%global rust_env %{?rust_env} LIBSSH2_SYS_USE_PKG_CONFIG=1
-%endif
-%global export_rust_env %{?rust_env:export %{rust_env}}
+# 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_sqlite3:LIBSQLITE3_SYS_USE_PKG_CONFIG=1}
+  %{!?with_disabled_libssh2:LIBSSH2_SYS_USE_PKG_CONFIG=1}
+}
+%global export_rust_env export %{rust_env}
 
 %build
 %{export_rust_env}
 
-%ifarch %{arm} %{ix86}
-# full debuginfo is exhausting memory; just do libstd for now
-# https://github.com/rust-lang/rust/issues/45854
-%if 0%{?rhel} && 0%{?rhel} < 8
-# Older rpmbuild didn't work with partial debuginfo coverage.
-%global debug_package %{nil}
-%define enable_debuginfo --debuginfo-level=0
-%else
-%define enable_debuginfo --debuginfo-level=0 --debuginfo-level-std=2
-%endif
-%else
-%define enable_debuginfo --debuginfo-level=2
-%endif
-
 # Some builders have relatively little memory for their CPU count.
 # At least 2GB per CPU is a good rule of thumb for building rustc.
 ncpus=$(/usr/bin/getconf _NPROCESSORS_ONLN)
@@ -714,47 +748,55 @@ if [ "$max_cpus" -ge 1 -a "$max_cpus" -lt "$ncpus" ]; then
 fi
 
 %if %defined mingw_targets
-%{lua: do
-  local cfg = ""
-  for triple in string.gmatch(rpm.expand("%{mingw_targets}"), "%S+") do
-    local subs = {
-      triple = triple,
-      mingw = string.sub(triple, 1, 4) == "i686" and "mingw32" or "mingw64",
-    }
-    local s = string.gsub([[
-      --set target.{{triple}}.linker=%{{{mingw}}_cc}
-      --set target.{{triple}}.cc=%{{{mingw}}_cc}
-      --set target.{{triple}}.ar=%{{{mingw}}_ar}
-      --set target.{{triple}}.ranlib=%{{{mingw}}_ranlib}
-    ]], "{{(%w+)}}", subs)
-    cfg = cfg .. " " .. s
-  end
-  cfg = string.gsub(cfg, "%s+", " ")
-  rpm.define("mingw_target_config " .. cfg)
-end}
+%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 %defined wasm_targets
-%make_build --quiet -C %{wasi_libc_dir} CC=clang AR=llvm-ar NM=llvm-nm
-%{lua: do
-  local wasi_root = rpm.expand("%{wasi_libc_dir}") .. "/sysroot"
-  local cfg = ""
-  for triple in string.gmatch(rpm.expand("%{wasm_targets}"), "%S+") do
-    if string.find(triple, "-wasi") then
-      cfg = cfg .. " --set target." .. triple .. ".wasi-root=" .. wasi_root
-    end
-  end
-  rpm.define("wasm_target_config "..cfg)
-end}
+%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-wasi
+%make_build --quiet -C %{wasi_libc_dir} %{wasi_libc_flags} TARGET_TRIPLE=wasm32-wasip1
+%define wasm_target_config %{shrink:
+  --set target.wasm32-wasi.wasi-root=%{wasi_libc_dir}/sysroot
+  --set target.wasm32-wasip1.wasi-root=%{wasi_libc_dir}/sysroot
+}
+%else
+%define wasm_target_config %{shrink:
+  --set target.wasm32-wasi.wasi-root=%{_prefix}/wasm32-wasi
+  --set target.wasm32-wasi.self-contained=false
+  --set target.wasm32-wasip1.wasi-root=%{_prefix}/wasm32-wasi
+  --set target.wasm32-wasip1.self-contained=false
+}
+%endif
 %endif
 
-%if 0%{?fedora} || 0%{?rhel} >= 8
-# The exact profiler path is version dependent, and uses LLVM-specific
-# arch names in the filename, but this find is good enough for now...
-PROFILER=$(find %{_libdir}/clang -type f -name 'libclang_rt.profile-*.a')
+# Find the compiler-rt library for the Rust profiler_builtins crate.
+%if %defined llvm_compat_version
+# clang_resource_dir is not defined for compat builds.
+%define profiler /usr/lib/clang/%{llvm_compat_version}/lib/%{_arch}-redhat-linux-gnu/libclang_rt.profile.a
+%else
+%if 0%{?clang_major_version} >= 17
+%define profiler %{clang_resource_dir}/lib/%{_arch}-redhat-linux-gnu/libclang_rt.profile.a
+%else
+# The exact profiler path is version dependent..
+%define profiler %(echo %{_libdir}/clang/??/lib/libclang_rt.profile-*.a)
 %endif
+%endif
+test -r "%{profiler}"
 
 %configure --disable-option-checking \
+  --docdir=%{_pkgdocdir} \
   --libdir=%{common_libdir} \
   --build=%{rust_triple} --host=%{rust_triple} --target=%{rust_triple} \
   --set target.%{rust_triple}.linker=%{__cc} \
@@ -762,7 +804,7 @@ PROFILER=$(find %{_libdir}/clang -type f -name 'libclang_rt.profile-*.a')
   --set target.%{rust_triple}.cxx=%{__cxx} \
   --set target.%{rust_triple}.ar=%{__ar} \
   --set target.%{rust_triple}.ranlib=%{__ranlib} \
-  ${PROFILER:+--set target.%{rust_triple}.profiler="$PROFILER"} \
+  --set target.%{rust_triple}.profiler="%{profiler}" \
   %{?mingw_target_config} \
   %{?wasm_target_config} \
   --python=%{__python3} \
@@ -774,24 +816,46 @@ PROFILER=$(find %{_libdir}/clang -type f -name 'libclang_rt.profile-*.a')
   --disable-llvm-static-stdcpp \
   --disable-rpath \
   %{enable_debuginfo} \
-  --set rust.codegen-units-std=1 \
+  %{enable_rust_opts} \
   --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 \
   --enable-extended \
   --tools=cargo,clippy,rls,rust-analyzer,rustfmt,src \
   --enable-vendor \
   --enable-verbose-tests \
-  --dist-compression-formats=gz \
   --release-channel=%{channel} \
   --release-description="%{?fedora:Fedora }%{?rhel:Red Hat }%{version}-%{release}"
 
-%{__python3} ./x.py build -j "$ncpus"
-%{__python3} ./x.py doc
+%global __x %{__python3} ./x.py
 
-for triple in %{?mingw_targets} %{?wasm_targets}; do
-  %{__python3} ./x.py build --target=$triple std
+%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 -j "$ncpus" sysroot --rust-profile-generate="%{profraw}"
+# Build cargo as a workload to generate compiler profiles
+env LLVM_PROFILE_FILE="%{profraw}/default_%%m_%%p.profraw" \
+  %{__x} --keep-stage=0 --keep-stage=1 build cargo
+# Finalize the profile data and clean up the raw files
+%{llvm_root}/bin/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 -j "$ncpus" sysroot
+
+# Build everything else normally
+%{__x} build
+%{__x} doc
+
+for triple in %{?all_targets} ; do
+  %{__x} build --target=$triple std
 done
 
 %install
@@ -800,10 +864,10 @@ done
 %endif
 %{export_rust_env}
 
-DESTDIR=%{buildroot} %{__python3} ./x.py install
+DESTDIR=%{buildroot} %{__x} install
 
-for triple in %{?mingw_targets} %{?wasm_targets}; do
-  DESTDIR=%{buildroot} %{__python3} ./x.py install --target=$triple std
+for triple in %{?all_targets} ; do
+  DESTDIR=%{buildroot} %{__x} install --target=$triple std
 done
 
 # The rls stub doesn't have an install target, but we can just copy it.
@@ -849,21 +913,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
@@ -873,17 +934,14 @@ 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_*
-%endif
-
 # 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}%{_fileattrsdir}/cargo_vendor.attr
+%{__install} -D -m 755 %{S:102} %{buildroot}%{_rpmconfigdir}/cargo_vendor.prov
 %endif
 
 
@@ -894,34 +952,45 @@ rm -f %{buildroot}%{rustlibdir}/%{rust_triple}/bin/rust-ll*
 %{export_rust_env}
 
 # Sanity-check the installed binaries, debuginfo-stripped and all.
-%{buildroot}%{_bindir}/cargo new build/hello-world
-env RUSTC=%{buildroot}%{_bindir}/rustc \
-    LD_LIBRARY_PATH="%{buildroot}%{_libdir}:$LD_LIBRARY_PATH" \
-    %{buildroot}%{_bindir}/cargo run --manifest-path build/hello-world/Cargo.toml
+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
 
-# Try a build sanity-check for other targets
-for triple in %{?mingw_targets} %{?wasm_targets}; do
-  env RUSTC=%{buildroot}%{_bindir}/rustc \
-      LD_LIBRARY_PATH="%{buildroot}%{_libdir}:$LD_LIBRARY_PATH" \
-      %{buildroot}%{_bindir}/cargo build --manifest-path build/hello-world/Cargo.toml --target=$triple
-done
+  # 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.
 # 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.
-%{__python3} ./x.py test --no-fail-fast --exclude src/bootstrap || :
+%{__x} test --no-fail-fast --skip src/bootstrap || :
 rm -rf "./build/%{rust_triple}/test/"
 
-%{__python3} ./x.py test --no-fail-fast cargo || :
+%ifarch aarch64
+# https://github.com/rust-lang/rust/issues/123733
+%define cargo_test_skip --test-args "--skip panic_abort_doc_tests"
+%endif
+%{__x} test --no-fail-fast cargo %{?cargo_test_skip} || :
 rm -rf "./build/%{rust_triple}/stage2-tools/%{rust_triple}/cit/"
 
-%{__python3} ./x.py test --no-fail-fast clippy || :
+%{__x} test --no-fail-fast clippy || :
 
-%{__python3} ./x.py test --no-fail-fast rust-analyzer || :
+%{__x} test --no-fail-fast rust-analyzer || :
 
-%{__python3} ./x.py test --no-fail-fast rustfmt || :
+%{__x} test --no-fail-fast rustfmt || :
 
 
 %ldconfig_scriptlets
@@ -948,58 +1017,59 @@ rm -rf "./build/%{rust_triple}/stage2-tools/%{rust_triple}/cit/"
 %dir %{rustlibdir}/%{rust_triple}/lib
 %{rustlibdir}/%{rust_triple}/lib/*.rlib
 
+%global target_files()      \
+%files std-static-%1        \
+%dir %{rustlibdir}          \
+%dir %{rustlibdir}/%1       \
+%dir %{rustlibdir}/%1/lib   \
+%{rustlibdir}/%1/lib/*.rlib
 
-%if %defined mingw_targets
-%{lua: do
-  for triple in string.gmatch(rpm.expand("%{mingw_targets}"), "%S+") do
-    local subs = {
-      triple = triple,
-      rustlibdir = rpm.expand("%{rustlibdir}"),
-    }
-    local s = string.gsub([[
-
-%files std-static-{{triple}}
-%dir {{rustlibdir}}
-%dir {{rustlibdir}}/{{triple}}
-%dir {{rustlibdir}}/{{triple}}/lib
-{{rustlibdir}}/{{triple}}/lib/*.rlib
-{{rustlibdir}}/{{triple}}/lib/rs*.o
-%exclude {{rustlibdir}}/{{triple}}/lib/*.dll
-%exclude {{rustlibdir}}/{{triple}}/lib/*.dll.a
-%exclude {{rustlibdir}}/{{triple}}/lib/self-contained
-
-]], "{{(%w+)}}", subs)
-    print(s)
-  end
-end}
+%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 %defined wasm_targets
-%{lua: do
-  for triple in string.gmatch(rpm.expand("%{wasm_targets}"), "%S+") do
-    local subs = {
-      triple = triple,
-      rustlibdir = rpm.expand("%{rustlibdir}"),
-      wasi = string.find(triple, "-wasi") and 1 or 0,
-    }
-    local s = string.gsub([[
-
-%files std-static-{{triple}}
-%dir {{rustlibdir}}
-%dir {{rustlibdir}}/{{triple}}
-%dir {{rustlibdir}}/{{triple}}/lib
-{{rustlibdir}}/{{triple}}/lib/*.rlib
-%if {{wasi}}
-%dir {{rustlibdir}}/{{triple}}/lib/self-contained
-{{rustlibdir}}/{{triple}}/lib/self-contained/crt*.o
-{{rustlibdir}}/{{triple}}/lib/self-contained/libc.a
+%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
 
-]], "{{(%w+)}}", subs)
-    print(s)
-  end
-end}
+%if %target_enabled wasm32-unknown-unknown
+%target_files wasm32-unknown-unknown
+%endif
+
+%if %target_enabled wasm32-wasi
+%target_files wasm32-wasi
+%if %with bundled_wasi_libc
+%dir %{rustlibdir}/wasm32-wasi/lib/self-contained
+%{rustlibdir}/wasm32-wasi/lib/self-contained/crt*.o
+%{rustlibdir}/wasm32-wasi/lib/self-contained/libc.a
+%endif
+%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 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
 
 
@@ -1015,17 +1085,15 @@ end}
 %exclude %{_bindir}/rust-gdbgui
 
 
-%if %with lldb
 %files lldb
 %{_bindir}/rust-lldb
 %{rustlibdir}/etc/lldb_*
-%endif
 
 
 %files doc
-%docdir %{_docdir}/%{name}
-%dir %{_docdir}/%{name}
-%{_docdir}/%{name}/html
+%docdir %{_pkgdocdir}
+%dir %{_pkgdocdir}
+%{_pkgdocdir}/html
 # former cargo-doc
 %docdir %{_docdir}/cargo
 %dir %{_docdir}/cargo
@@ -1036,7 +1104,6 @@ end}
 %license src/tools/cargo/LICENSE-{APACHE,MIT,THIRD-PARTY}
 %doc src/tools/cargo/README.md
 %{_bindir}/cargo
-%{_libexecdir}/cargo*
 %{_mandir}/man1/cargo*.1*
 %{_sysconfdir}/bash_completion.d/cargo
 %{_datadir}/zsh/site-functions/_cargo
@@ -1073,10 +1140,54 @@ end}
 %if 0%{?rhel}
 %files toolset
 %{rpmmacrodir}/macros.rust-toolset
+%{_fileattrsdir}/cargo_vendor.attr
+%{_rpmconfigdir}/cargo_vendor.prov
 %endif
 
 
 %changelog
+* Fri Dec 06 2024 Josh Stone  - 1.79.0-3
+- Remove the subshell in the cargo_install macro
+
+* Tue Aug 13 2024 Josh Stone  - 1.79.0-2
+- Disable jump threading of float equality
+
+* Wed Jul 03 2024 Nikita Popov  - 1.79.0-1
+- Update to 1.79.0
+
+* Tue Jun 18 2024 Nikita Popov  - 1.78.0-1
+- Update to 1.78.0
+
+* Thu May 02 2024 Josh Stone  - 1.77.2-3
+- Fix the coverage-dump tool for tests.
+
+* Tue Apr 30 2024 Josh Stone  - 1.77.2-2
+- Use bundled sqlite3 when the system version is too old.
+
+* Fri Apr 19 2024 Josh Stone  - 1.77.2-1
+- Update to 1.77.2.
+
+* Tue Apr 16 2024 Josh Stone  - 1.76.0-1
+- Update to 1.76.0.
+- Sync rust-toolset macros to rust-packaging v25.2
+
+* Fri Jan 05 2024 Josh Stone  - 1.75.0-1
+- Update to 1.75.0.
+
+* Fri Jan 05 2024 Josh Stone  - 1.74.1-2
+- Rebuild in a new side-tag.
+
+* Wed Jan 03 2024 Josh Stone  - 1.74.1-1
+- Update to 1.74.1.
+
+* Tue Oct 17 2023 Josh Stone  - 1.73.0-1
+- Update to 1.73.0.
+- Use emmalloc instead of CC0 dlmalloc when bundling wasi-libc
+
+* Thu Oct 12 2023 Josh Stone  - 1.72.1-1
+- Update to 1.72.1.
+- Migrated to SPDX license
+
 * Tue Aug 08 2023 Josh Stone  - 1.71.1-1
 - Update to 1.71.1.
 - Security fix for CVE-2023-38497