From f6d98a43cf64f12ea502322b37c63213aa9e3068 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sat, 30 May 2026 12:40:30 +0200 Subject: [PATCH 1/2] JSON target specs: remove 'x86-softfloat' compatibility alias --- compiler/rustc_target/src/spec/mod.rs | 2 +- src/tools/miri/tests/x86_64-unknown-kernel.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs index ea6abe5491262..64f347ae15955 100644 --- a/compiler/rustc_target/src/spec/mod.rs +++ b/compiler/rustc_target/src/spec/mod.rs @@ -993,7 +993,7 @@ crate::target_spec_enum! { /// On x86-32 only: make use of SSE and SSE2 for ABI purposes. X86Sse2 = "x86-sse2", /// On x86-32/64, aarch64, and S390x: do not use any FPU or SIMD registers for the ABI. - Softfloat = "softfloat", "x86-softfloat", + Softfloat = "softfloat", } parse_error_type = "rustc abi"; diff --git a/src/tools/miri/tests/x86_64-unknown-kernel.json b/src/tools/miri/tests/x86_64-unknown-kernel.json index 0f8032c39d568..c5e519429d71a 100644 --- a/src/tools/miri/tests/x86_64-unknown-kernel.json +++ b/src/tools/miri/tests/x86_64-unknown-kernel.json @@ -10,7 +10,7 @@ "vendor": "unknown", "linker": "rust-lld", "linker-flavor": "gnu-lld", - "rustc-abi": "x86-softfloat", + "rustc-abi": "softfloat", "features": "-mmx,-sse,-sse2,-sse3,-ssse3,-sse4.1,-sse4.2,-avx,-avx2,+soft-float", "dynamic-linking": false, "executables": true, From f0ac18af5adf36355174889701c5835c0bdadcf0 Mon Sep 17 00:00:00 2001 From: Miguel Ojeda Date: Sat, 30 May 2026 13:09:44 +0200 Subject: [PATCH 2/2] CI: rfl: add temporary commit for removal of `x86-softfloat` The compiler is removing the `x86-softfloat` [1], thus temporarily add a patch. As usual, the patch will eventually make it to the Linux kernel so that both sides are good. Cc: Ralf Jung Cc: Alice Ryhl Link: https://github.com/rust-lang/rust/pull/157151 [1] Signed-off-by: Miguel Ojeda --- src/ci/docker/scripts/rfl-build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ci/docker/scripts/rfl-build.sh b/src/ci/docker/scripts/rfl-build.sh index 54ede153f6153..eae2aec917b1c 100755 --- a/src/ci/docker/scripts/rfl-build.sh +++ b/src/ci/docker/scripts/rfl-build.sh @@ -2,7 +2,8 @@ set -euo pipefail -LINUX_VERSION=v7.1-rc1 +# https://github.com/rust-lang/rust/pull/157151 +LINUX_VERSION=40bc55834bc15896f4438b0936c679ef32e20df1 # Build rustc, rustdoc, cargo, clippy-driver and rustfmt ../x.py build --stage 2 library rustdoc clippy rustfmt