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 3ec1bd7241865..18f3ef887ddfc 100644
--- a/compiler/rustc_target/src/spec/targets/xtensa_esp32_espidf.rs
+++ b/compiler/rustc_target/src/spec/targets/xtensa_esp32_espidf.rs
@@ -5,7 +5,7 @@ pub fn target() -> Target {
     Target {
         llvm_target: "xtensa-none-elf".into(),
         pointer_width: 32,
-        data_layout: "e-m:e-p:32:32-i64:64-i128:128-n32".into(),
+        data_layout: "e-m:e-p:32:32-i64:32-i128:32-n32".into(),
         arch: "xtensa".into(),
 
         options: TargetOptions {
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 77299eadec354..2eeb00f7bfdb1 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 fn target() -> Target {
     Target {
         llvm_target: "xtensa-none-elf".into(),
         pointer_width: 32,
-        data_layout: "e-m:e-p:32:32-i64:64-i128:128-n32".into(),
+        data_layout: "e-m:e-p:32:32-i64:32-i128:32-n32".into(),
         arch: "xtensa".into(),
         
         options: TargetOptions {
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 586874660bed8..68cad38abd7bd 100644
--- a/compiler/rustc_target/src/spec/targets/xtensa_esp32s2_espidf.rs
+++ b/compiler/rustc_target/src/spec/targets/xtensa_esp32s2_espidf.rs
@@ -5,7 +5,7 @@ pub fn target() -> Target {
     Target {
         llvm_target: "xtensa-none-elf".into(),
         pointer_width: 32,
-        data_layout: "e-m:e-p:32:32-i64:64-i128:128-n32".into(),
+        data_layout: "e-m:e-p:32:32-i64:32-i128:32-n32".into(),
         arch: "xtensa".into(),
 
         options: TargetOptions {
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 c8ab223b5cb97..ed7f53b1c3025 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
@@ -4,7 +4,7 @@ pub fn target() -> Target {
     Target {
         llvm_target: "xtensa-none-elf".into(),
         pointer_width: 32,
-        data_layout: "e-m:e-p:32:32-i64:64-i128:128-n32".into(),
+        data_layout: "e-m:e-p:32:32-i64:32-i128:32-n32".into(),
         arch: "xtensa".into(),
         
         options: TargetOptions {
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 32c363b5c9730..49a844ad91cd9 100644
--- a/compiler/rustc_target/src/spec/targets/xtensa_esp32s3_espidf.rs
+++ b/compiler/rustc_target/src/spec/targets/xtensa_esp32s3_espidf.rs
@@ -5,7 +5,7 @@ pub fn target() -> Target {
     Target {
         llvm_target: "xtensa-none-elf".into(),
         pointer_width: 32,
-        data_layout: "e-m:e-p:32:32-i64:64-i128:128-n32".into(),
+        data_layout: "e-m:e-p:32:32-i64:32-i128:32-n32".into(),
         arch: "xtensa".into(),
 
         options: TargetOptions {
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 c0319d6c5ddb1..7bfc3372b52b9 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
@@ -4,7 +4,7 @@ pub fn target() -> Target {
     Target {
         llvm_target: "xtensa-none-elf".into(),
         pointer_width: 32,
-        data_layout: "e-m:e-p:32:32-i64:64-i128:128-n32".into(),
+        data_layout: "e-m:e-p:32:32-i64:32-i128:32-n32".into(),
         arch: "xtensa".into(),
         
         options: TargetOptions {
diff --git a/compiler/rustc_target/src/spec/targets/xtensa_esp8266_none_elf.rs b/compiler/rustc_target/src/spec/targets/xtensa_esp8266_none_elf.rs
index cb7b0ed12a740..cffb95d104516 100644
--- a/compiler/rustc_target/src/spec/targets/xtensa_esp8266_none_elf.rs
+++ b/compiler/rustc_target/src/spec/targets/xtensa_esp8266_none_elf.rs
@@ -4,7 +4,7 @@ pub fn target() -> Target {
     Target {
         llvm_target: "xtensa-none-elf".into(),
         pointer_width: 32,
-        data_layout: "e-m:e-p:32:32-i64:64-i128:128-n32".into(),
+        data_layout: "e-m:e-p:32:32-i64:32-i128:32-n32".into(),
         arch: "xtensa".into(),
         
         options: TargetOptions {