Skip to content

Commit 3f4c31c

Browse files
Rollup merge of rust-lang#138064 - SergioGasquez:feat/xtensa-names, r=jieyouxu
Remove - from xtensa targets cpu names This PR removes the `-` from the Xtensa CPU names as it was updated in LLVM, see esp-rs#252
2 parents 5804b52 + 376955e commit 3f4c31c

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ pub(crate) fn target() -> Target {
2020
vendor: "espressif".into(),
2121

2222
executables: true,
23-
cpu: "esp32-s2".into(),
23+
cpu: "esp32s2".into(),
2424
linker: Some("xtensa-esp32s2-elf-gcc".into()),
2525

2626
// See https://github.com/espressif/rust-esp32-example/issues/3#issuecomment-861054477

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pub(crate) fn target() -> Target {
1616

1717
options: TargetOptions {
1818
vendor: "espressif".into(),
19-
cpu: "esp32-s2".into(),
19+
cpu: "esp32s2".into(),
2020
linker: Some("xtensa-esp32s2-elf-gcc".into()),
2121
max_atomic_width: Some(32),
2222
features: "+forced-atomics".into(),

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ pub(crate) fn target() -> Target {
2020
vendor: "espressif".into(),
2121

2222
executables: true,
23-
cpu: "esp32-s3".into(),
23+
cpu: "esp32s3".into(),
2424
linker: Some("xtensa-esp32s3-elf-gcc".into()),
2525

2626
// The esp32s3 only supports native 32bit atomics.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pub(crate) fn target() -> Target {
1616

1717
options: TargetOptions {
1818
vendor: "espressif".into(),
19-
cpu: "esp32-s3".into(),
19+
cpu: "esp32s3".into(),
2020
linker: Some("xtensa-esp32s3-elf-gcc".into()),
2121
max_atomic_width: Some(32),
2222
atomic_cas: true,

0 commit comments

Comments
 (0)