From d061e0b19f872477c52729139c1ef36b23a8a3d7 Mon Sep 17 00:00:00 2001 From: Scott Mabin Date: Thu, 28 May 2026 11:53:38 +0100 Subject: [PATCH] Update Xtensa target data layouts to match upstream LLVM changes --- compiler/rustc_target/src/spec/targets/xtensa_esp32_espidf.rs | 2 +- compiler/rustc_target/src/spec/targets/xtensa_esp32_none_elf.rs | 2 +- compiler/rustc_target/src/spec/targets/xtensa_esp32s2_espidf.rs | 2 +- .../rustc_target/src/spec/targets/xtensa_esp32s2_none_elf.rs | 2 +- compiler/rustc_target/src/spec/targets/xtensa_esp32s3_espidf.rs | 2 +- .../rustc_target/src/spec/targets/xtensa_esp32s3_none_elf.rs | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/compiler/rustc_target/src/spec/targets/xtensa_esp32_espidf.rs b/compiler/rustc_target/src/spec/targets/xtensa_esp32_espidf.rs index 0fb4d186087bc..25b2cb22cb851 100644 --- a/compiler/rustc_target/src/spec/targets/xtensa_esp32_espidf.rs +++ b/compiler/rustc_target/src/spec/targets/xtensa_esp32_espidf.rs @@ -7,7 +7,7 @@ pub(crate) fn target() -> Target { Target { llvm_target: "xtensa-none-elf".into(), pointer_width: 32, - data_layout: "e-m:e-p:32:32-v1:8:8-i64:64-i128:128-n32".into(), + data_layout: "e-m:e-p:32:32-i8:8:32-i16:16:32-i64:64-n32".into(), arch: Arch::Xtensa, metadata: TargetMetadata { description: None, tier: Some(3), host_tools: None, std: None }, 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 index 82c6e0cfa3f62..d9f8ccabaf516 100644 --- a/compiler/rustc_target/src/spec/targets/xtensa_esp32_none_elf.rs +++ b/compiler/rustc_target/src/spec/targets/xtensa_esp32_none_elf.rs @@ -5,7 +5,7 @@ pub(crate) fn target() -> Target { Target { llvm_target: "xtensa-none-elf".into(), pointer_width: 32, - data_layout: "e-m:e-p:32:32-v1:8:8-i64:64-i128:128-n32".into(), + data_layout: "e-m:e-p:32:32-i8:8:32-i16:16:32-i64:64-n32".into(), arch: Arch::Xtensa, metadata: TargetMetadata { description: Some("Xtensa ESP32".into()), diff --git a/compiler/rustc_target/src/spec/targets/xtensa_esp32s2_espidf.rs b/compiler/rustc_target/src/spec/targets/xtensa_esp32s2_espidf.rs index 81eab657db712..5a93362eb4aaa 100644 --- a/compiler/rustc_target/src/spec/targets/xtensa_esp32s2_espidf.rs +++ b/compiler/rustc_target/src/spec/targets/xtensa_esp32s2_espidf.rs @@ -7,7 +7,7 @@ pub(crate) fn target() -> Target { Target { llvm_target: "xtensa-none-elf".into(), pointer_width: 32, - data_layout: "e-m:e-p:32:32-v1:8:8-i64:64-i128:128-n32".into(), + data_layout: "e-m:e-p:32:32-i8:8:32-i16:16:32-i64:64-n32".into(), arch: Arch::Xtensa, metadata: TargetMetadata { description: None, tier: Some(3), host_tools: None, std: None }, 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 index 755f4db3b2ddf..688ae1b184135 100644 --- a/compiler/rustc_target/src/spec/targets/xtensa_esp32s2_none_elf.rs +++ b/compiler/rustc_target/src/spec/targets/xtensa_esp32s2_none_elf.rs @@ -5,7 +5,7 @@ pub(crate) fn target() -> Target { Target { llvm_target: "xtensa-none-elf".into(), pointer_width: 32, - data_layout: "e-m:e-p:32:32-v1:8:8-i64:64-i128:128-n32".into(), + data_layout: "e-m:e-p:32:32-i8:8:32-i16:16:32-i64:64-n32".into(), arch: Arch::Xtensa, metadata: TargetMetadata { description: Some("Xtensa ESP32-S2".into()), diff --git a/compiler/rustc_target/src/spec/targets/xtensa_esp32s3_espidf.rs b/compiler/rustc_target/src/spec/targets/xtensa_esp32s3_espidf.rs index fb1f4f4719794..c03fabe33c209 100644 --- a/compiler/rustc_target/src/spec/targets/xtensa_esp32s3_espidf.rs +++ b/compiler/rustc_target/src/spec/targets/xtensa_esp32s3_espidf.rs @@ -7,7 +7,7 @@ pub(crate) fn target() -> Target { Target { llvm_target: "xtensa-none-elf".into(), pointer_width: 32, - data_layout: "e-m:e-p:32:32-v1:8:8-i64:64-i128:128-n32".into(), + data_layout: "e-m:e-p:32:32-i8:8:32-i16:16:32-i64:64-n32".into(), arch: Arch::Xtensa, metadata: TargetMetadata { description: None, tier: Some(3), host_tools: None, std: None }, 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 index 07530d874c09a..1f65af439481a 100644 --- a/compiler/rustc_target/src/spec/targets/xtensa_esp32s3_none_elf.rs +++ b/compiler/rustc_target/src/spec/targets/xtensa_esp32s3_none_elf.rs @@ -5,7 +5,7 @@ pub(crate) fn target() -> Target { Target { llvm_target: "xtensa-none-elf".into(), pointer_width: 32, - data_layout: "e-m:e-p:32:32-v1:8:8-i64:64-i128:128-n32".into(), + data_layout: "e-m:e-p:32:32-i8:8:32-i16:16:32-i64:64-n32".into(), arch: Arch::Xtensa, metadata: TargetMetadata { description: Some("Xtensa ESP32-S3".into()),