Skip to content

Commit 28a2efd

Browse files
authored
Unrolled build for rust-lang#131170
Rollup merge of rust-lang#131170 - madsmtm:target-info-esp32-vendor, r=workingjubilee Fix `target_vendor` in non-IDF Xtensa ESP32 targets `rustc`'s Xtensa ESP32 targets are the following: - `xtensa-esp32-none-elf` - `xtensa-esp32-espidf` - `xtensa-esp32s2-none-elf` - `xtensa-esp32s2-espidf` - `xtensa-esp32s3-none-elf` - `xtensa-esp32s3-espidf` The ESP-IDF targets already set `target_vendor="espressif"`, however, the ESP32 is, from my understanding, produced by Espressif regardless of whether using the IDF or not, so we should set the target vendor there as well?
2 parents b8495e5 + 51537c6 commit 28a2efd

File tree

3 files changed

+3
-0
lines changed

3 files changed

+3
-0
lines changed

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

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

1717
options: TargetOptions {
18+
vendor: "espressif".into(),
1819
cpu: "esp32".into(),
1920
linker: Some("xtensa-esp32-elf-gcc".into()),
2021
max_atomic_width: Some(32),

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

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

1717
options: TargetOptions {
18+
vendor: "espressif".into(),
1819
cpu: "esp32-s2".into(),
1920
linker: Some("xtensa-esp32s2-elf-gcc".into()),
2021
max_atomic_width: Some(32),

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

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

1717
options: TargetOptions {
18+
vendor: "espressif".into(),
1819
cpu: "esp32-s3".into(),
1920
linker: Some("xtensa-esp32s3-elf-gcc".into()),
2021
max_atomic_width: Some(32),

0 commit comments

Comments
 (0)