Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit ebf5363

Browse files
no1wudino1wudi
committed
Mark all NuttX targets as tier 3 target and support the standard library
Signed-off-by: Huang Qi <[email protected]>
1 parent f85c6de commit ebf5363

18 files changed

+51
-54
lines changed

‎compiler/rustc_target/src/spec/targets/aarch64_unknown_nuttx.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ pub(crate) fn target() -> Target {
3636
description: Some("AArch64 NuttX".into()),
3737
tier: Some(3),
3838
host_tools: Some(false),
39-
std: Some(false),
39+
std: Some(true),
4040
},
4141
pointer_width: 64,
4242
data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32".into(),

‎compiler/rustc_target/src/spec/targets/armv7a_nuttx_eabi.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ pub(crate) fn target() -> Target {
3131
description: Some("ARMv7-A Cortex-A with NuttX".into()),
3232
tier: Some(3),
3333
host_tools: Some(false),
34-
std: Some(false),
34+
std: Some(true),
3535
},
3636
pointer_width: 32,
3737
data_layout: "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64".into(),

‎compiler/rustc_target/src/spec/targets/armv7a_nuttx_eabihf.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ pub(crate) fn target() -> Target {
3131
description: Some("ARMv7-A Cortex-A with NuttX (hard float)".into()),
3232
tier: Some(3),
3333
host_tools: Some(false),
34-
std: Some(false),
34+
std: Some(true),
3535
},
3636
pointer_width: 32,
3737
data_layout: "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64".into(),

‎compiler/rustc_target/src/spec/targets/riscv32imac_unknown_nuttx_elf.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ pub(crate) fn target() -> Target {
66
llvm_target: "riscv32".into(),
77
metadata: crate::spec::TargetMetadata {
88
description: None,
9-
tier: None,
9+
tier: Some(3),
1010
host_tools: None,
11-
std: None,
11+
std: Some(true),
1212
},
1313
pointer_width: 32,
1414
arch: "riscv32".into(),

‎compiler/rustc_target/src/spec/targets/riscv32imafc_unknown_nuttx_elf.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ pub(crate) fn target() -> Target {
66
llvm_target: "riscv32".into(),
77
metadata: crate::spec::TargetMetadata {
88
description: None,
9-
tier: None,
9+
tier: Some(3),
1010
host_tools: None,
11-
std: None,
11+
std: Some(true),
1212
},
1313
pointer_width: 32,
1414
arch: "riscv32".into(),

‎compiler/rustc_target/src/spec/targets/riscv32imc_unknown_nuttx_elf.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ pub(crate) fn target() -> Target {
66
llvm_target: "riscv32".into(),
77
metadata: crate::spec::TargetMetadata {
88
description: None,
9-
tier: None,
9+
tier: Some(3),
1010
host_tools: None,
11-
std: None,
11+
std: Some(true),
1212
},
1313
pointer_width: 32,
1414
arch: "riscv32".into(),

‎compiler/rustc_target/src/spec/targets/riscv64gc_unknown_nuttx_elf.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ pub(crate) fn target() -> Target {
88
data_layout: "e-m:e-p:64:64-i64:64-i128:128-n32:64-S128".into(),
99
metadata: crate::spec::TargetMetadata {
1010
description: None,
11-
tier: None,
11+
tier: Some(3),
1212
host_tools: None,
13-
std: None,
13+
std: Some(true),
1414
},
1515
llvm_target: "riscv64".into(),
1616
pointer_width: 64,

‎compiler/rustc_target/src/spec/targets/riscv64imac_unknown_nuttx_elf.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ pub(crate) fn target() -> Target {
88
data_layout: "e-m:e-p:64:64-i64:64-i128:128-n32:64-S128".into(),
99
metadata: crate::spec::TargetMetadata {
1010
description: None,
11-
tier: None,
11+
tier: Some(3),
1212
host_tools: None,
13-
std: None,
13+
std: Some(true),
1414
},
1515
llvm_target: "riscv64".into(),
1616
pointer_width: 64,

‎compiler/rustc_target/src/spec/targets/thumbv6m_nuttx_eabi.rs‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ pub(crate) fn target() -> Target {
77
llvm_target: "thumbv6m-none-eabi".into(),
88
metadata: crate::spec::TargetMetadata {
99
description: None,
10-
tier: None,
10+
tier: Some(3),
1111
host_tools: None,
12-
std: None,
12+
std: Some(true),
1313
},
1414
pointer_width: 32,
1515
data_layout: "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64".into(),
@@ -22,12 +22,9 @@ pub(crate) fn target() -> Target {
2222
llvm_floatabi: Some(FloatAbi::Soft),
2323
// The ARMv6-M architecture doesn't support unaligned loads/stores so we disable them
2424
// with +strict-align.
25-
// Also force-enable 32-bit atomics, which allows the use of atomic load/store only.
26-
// The resulting atomics are ABI incompatible with atomics backed by libatomic.
27-
features: "+strict-align,+atomics-32".into(),
28-
// There are no atomic CAS instructions available in the instruction set of the ARMv6-M
29-
// architecture
30-
atomic_cas: false,
25+
// The ARMv6-M doesn't support hardware atomic operations, use atomic builtins instead.
26+
features: "+strict-align".into(),
27+
max_atomic_width: Some(32),
3128
..base::thumb::opts()
3229
},
3330
}

‎compiler/rustc_target/src/spec/targets/thumbv7a_nuttx_eabi.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ pub(crate) fn target() -> Target {
1111
llvm_target: "thumbv7a-none-eabi".into(),
1212
metadata: crate::spec::TargetMetadata {
1313
description: None,
14-
tier: None,
14+
tier: Some(3),
1515
host_tools: None,
16-
std: None,
16+
std: Some(true),
1717
},
1818
pointer_width: 32,
1919
data_layout: "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64".into(),

0 commit comments

Comments
 (0)