mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #131173 - madsmtm:target-info-solid_asp3-abi, r=lcnr

Browse Source 
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.`
This commit is contained in:
Matthias Krüger 2024-10-03 13:48:00 +02:00 committed by GitHub
commit 35ff9e2bc6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
compiler/rustc_target/src/spec/targets/armv7a_kmc_solid_asp3_eabi.rs
View File

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

1
compiler/rustc_target/src/spec/targets/armv7a_kmc_solid_asp3_eabihf.rs
View File

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