JSON target specs: remove 'x86-softfloat' compatibility alias#157151
JSON target specs: remove 'x86-softfloat' compatibility alias#157151RalfJung wants to merge 2 commits into
Conversation
|
These commits modify compiler targets. The Miri subtree was changed cc @rust-lang/miri |
|
r? @adwinwhite rustbot has assigned @adwinwhite. Use Why was this reviewer chosen?The reviewer was selected based on:
|
|
The relevant part of the RfL target is here. if cfg.rustc_version_atleast(1, 86, 0) {
ts.push("rustc-abi", "x86-softfloat");
}It sounds like this should be updated to: if cfg.rustc_version_atleast(1, 95, 0) {
ts.push("rustc-abi", "softfloat");
} else if cfg.rustc_version_atleast(1, 86, 0) {
ts.push("rustc-abi", "x86-softfloat");
} |
|
Yes, that looks right. And I guess we need a patch somewhere in the rustc tree to satisfy the RfL CI job. I'd appreciate help with preparing that patch. :) |
|
Sounds good, I will prepare it. |
Starting with Rust 1.98.0 (expected 2026-08-20), the target spec will not support `x86-softfloat` anymore [1]. Instead, `softfloat` should be used. Thus conditionally use one or the other depending on the version. The alias has been there since Rust 1.95.0 (released 2026-04-16). Cc: Ralf Jung <post@ralfj.de> Cc: Alice Ryhl <aliceryhl@google.com> Link: rust-lang/rust#157151 [1] Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
|
Please cherry-pick: ojeda@90f7e1c (not tested yet, though). I used >= 1.98.0 since I would prefer to avoid changing how we build in existing compilers unless there is a reason not to (since we will need to backport it). @rustbot label A-rust-for-linux |
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 <post@ralfj.de> Cc: Alice Ryhl <aliceryhl@google.com> Link: rust-lang#157151 [1] Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
The compiler is removing `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 <post@ralfj.de> Cc: Alice Ryhl <aliceryhl@google.com> Link: rust-lang#157151 [1] Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
Ether way seems entirely fine for me. This is mapped to the same constant in the compiler already while parsing the JSON so there's absolutely no difference between the two values for compilers that accept both. |
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 <post@ralfj.de> Cc: Alice Ryhl <aliceryhl@google.com> Link: rust-lang#157151 [1] Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
|
try-job: x86_64-rust-for-linux |
This comment has been minimized.
This comment has been minimized.
JSON target specs: remove 'x86-softfloat' compatibility alias
|
That won't work. You need to put the |
This comment has been minimized.
This comment has been minimized.
JSON target specs: remove 'x86-softfloat' compatibility alias try-job: x86_64-rust-for-linux
|
Ah, I always try from a PR of my own, so I didn't know the try-job wouldn't be read from a comment by the bot, thanks! Ok, I tested it locally, it works, so the CI here should also pass :) |
This got introduced in #151154 as a compatibility alias. It's been a few months, so seems fine to remove the compatibility alias now. JSON targets are anyway unstable.
Cc @Darksonn @ojeda as this may affect Linux