Skip to content

Commit 35ff9e2

Browse files
authored
Rollup merge of rust-lang#131173 - madsmtm:target-info-solid_asp3-abi, r=lcnr
Fix `target_abi` in SOLID targets The `armv7a-kmc-solid_asp3-eabi` and `armv7a-kmc-solid_asp3-eabihf` targets clearly have the ABI in their name, so it should also be exposed in Rust's `target_abi` cfg variable. CC target maintainer `@kawadakk.`
2 parents aedf14b + 0ae7964 commit 35ff9e2

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

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

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ pub(crate) fn target() -> Target {
1414
data_layout: "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64".into(),
1515
arch: "arm".into(),
1616
options: TargetOptions {
17+
abi: "eabi".into(),
1718
linker: Some("arm-kmc-eabi-gcc".into()),
1819
features: "+v7,+soft-float,+thumb2,-neon".into(),
1920
relocation_model: RelocModel::Static,

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

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ pub(crate) fn target() -> Target {
1414
data_layout: "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64".into(),
1515
arch: "arm".into(),
1616
options: TargetOptions {
17+
abi: "eabihf".into(),
1718
linker: Some("arm-kmc-eabi-gcc".into()),
1819
features: "+v7,+vfp3,-d32,+thumb2,-neon".into(),
1920
relocation_model: RelocModel::Static,

0 commit comments

Comments
 (0)