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?
Zalathar · Oct 8, 2024 · e416a9c · e416a9c
2 parents 4d63896 + 51537c6
commit e416a9c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/compiler/rustc_target/src/spec/targets/xtensa_esp32_none_elf.rs b/compiler/rustc_target/src/spec/targets/xtensa_esp32_none_elf.rs
@@ -15,6 +15,7 @@ pub(crate) fn target() -> Target {
  },
 
  options: TargetOptions {
+ vendor: "espressif".into(),
  cpu: "esp32".into(),
  linker: Some("xtensa-esp32-elf-gcc".into()),
  max_atomic_width: Some(32),

diff --git a/compiler/rustc_target/src/spec/targets/xtensa_esp32s2_none_elf.rs b/compiler/rustc_target/src/spec/targets/xtensa_esp32s2_none_elf.rs
@@ -15,6 +15,7 @@ pub(crate) fn target() -> Target {
  },
 
  options: TargetOptions {
+ vendor: "espressif".into(),
  cpu: "esp32-s2".into(),
  linker: Some("xtensa-esp32s2-elf-gcc".into()),
  max_atomic_width: Some(32),

diff --git a/compiler/rustc_target/src/spec/targets/xtensa_esp32s3_none_elf.rs b/compiler/rustc_target/src/spec/targets/xtensa_esp32s3_none_elf.rs
@@ -15,6 +15,7 @@ pub(crate) fn target() -> Target {
  },
 
  options: TargetOptions {
+ vendor: "espressif".into(),
  cpu: "esp32-s3".into(),
  linker: Some("xtensa-esp32s3-elf-gcc".into()),
  max_atomic_width: Some(32),