Skip to content

Commit 6feba49

Browse files
authored
Unrolled build for rust-lang#131174
Rollup merge of rust-lang#131174 - madsmtm:target-info-sparc-abi, r=pnkfelix Fix `target_abi` in `sparc-unknown-none-elf` This was previously set to `target_abi = "elf"`, but `elf` is not used elsewhere as a target ABI (even though there's many targets that have it in their name), so I've removed it. CC target maintainer ``@jonathanpallant,`` what do you think about this? ``@rustbot`` label O-SPARC
2 parents 14f303b + f51d8e3 commit 6feba49

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

compiler/rustc_target/src/spec/targets/sparc_unknown_none_elf.rs

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ pub(crate) fn target() -> Target {
77
linker: Some("sparc-elf-gcc".into()),
88
endian: Endian::Big,
99
cpu: "v7".into(),
10-
abi: "elf".into(),
1110
max_atomic_width: Some(32),
1211
atomic_cas: true,
1312
panic_strategy: PanicStrategy::Abort,

tests/ui/check-cfg/well-known-values.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ warning: unexpected `cfg` condition value: `_UNEXPECTED_VALUE`
129129
LL | target_abi = "_UNEXPECTED_VALUE",
130130
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
131131
|
132-
= note: expected values for `target_abi` are: ``, `abi64`, `abiv2`, `abiv2hf`, `eabi`, `eabihf`, `elf`, `fortanix`, `ilp32`, `llvm`, `macabi`, `sim`, `softfloat`, `spe`, `uwp`, `vec-extabi`, and `x32`
132+
= note: expected values for `target_abi` are: ``, `abi64`, `abiv2`, `abiv2hf`, `eabi`, `eabihf`, `fortanix`, `ilp32`, `llvm`, `macabi`, `sim`, `softfloat`, `spe`, `uwp`, `vec-extabi`, and `x32`
133133
= note: see <https://doc.rust-lang.org/nightly/rustc/check-cfg.html> for more information about checking conditional configuration
134134

135135
warning: unexpected `cfg` condition value: `_UNEXPECTED_VALUE`

0 commit comments

Comments
 (0)