Skip to content

Commit a0ffcb9

Browse files
maurermaurer
committed
LLVM 18 x86 data layout update
With https://reviews.llvm.org/D86310 LLVM now has i128 aligned to 16-bytes on x86 based platforms. This will be in LLVM-18. This patch updates all our spec targets to be 16-byte aligned, and removes the alignment when speaking to older LLVM. This results in Rust overaligning things relative to LLVM on older LLVMs. See #54341
1 parent 3c23df4 commit a0ffcb9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+86
-77
lines changed

‎compiler/rustc_codegen_llvm/src/context.rs

+9
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,15 @@ pub unsafe fn create_module<'ll>(
157157
.replace("-Fi64", "");
158158
}
159159
}
160+
if llvm_version < (18, 0, 0) {
161+
if sess.target.arch == "i386" || sess.target.arch == "i686" || sess.target.arch == "x86_64"
162+
{
163+
// LLVM 18 adjusts i128 to be 128-bit aligned on x86 variants.
164+
// Earlier LLVMs leave this as default alignment, so remove it.
165+
// See https://reviews.llvm.org/D86310
166+
target_data_layout = target_data_layout.replace("-i128:128", "");
167+
}
168+
}
160169

161170
// Ensure the data-layout values hardcoded remain the defaults.
162171
if sess.target.is_builtin {

‎compiler/rustc_target/src/spec/i386_apple_ios.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pub fn target() -> Target {
1111
llvm_target: ios_sim_llvm_target(arch).into(),
1212
pointer_width: 32,
1313
data_layout: "e-m:o-p:32:32-p270:32:32-p271:32:32-p272:64:64-\
14-
f64:32:64-f80:128-n8:16:32-S128"
14+
i128:128-f64:32:64-f80:128-n8:16:32-S128"
1515
.into(),
1616
arch: arch.target_arch(),
1717
options: TargetOptions {

‎compiler/rustc_target/src/spec/i686_apple_darwin.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ pub fn target() -> Target {
1919
llvm_target: macos_llvm_target(Arch::I686).into(),
2020
pointer_width: 32,
2121
data_layout: "e-m:o-p:32:32-p270:32:32-p271:32:32-p272:64:64-\
22-
f64:32:64-f80:128-n8:16:32-S128"
22+
i128:128-f64:32:64-f80:128-n8:16:32-S128"
2323
.into(),
2424
arch: arch.target_arch(),
2525
options: TargetOptions { mcount: "\u{1}mcount".into(), ..base },

‎compiler/rustc_target/src/spec/i686_linux_android.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub fn target() -> Target {
1717
llvm_target: "i686-linux-android".into(),
1818
pointer_width: 32,
1919
data_layout: "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-\
20-
f64:32:64-f80:32-n8:16:32-S128"
20+
i128:128-f64:32:64-f80:32-n8:16:32-S128"
2121
.into(),
2222
arch: "x86".into(),
2323
options: TargetOptions { supported_sanitizers: SanitizerSet::ADDRESS, ..base },

‎compiler/rustc_target/src/spec/i686_unknown_freebsd.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pub fn target() -> Target {
1111
llvm_target: "i686-unknown-freebsd".into(),
1212
pointer_width: 32,
1313
data_layout: "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-\
14-
f64:32:64-f80:32-n8:16:32-S128"
14+
i128:128-f64:32:64-f80:32-n8:16:32-S128"
1515
.into(),
1616
arch: "x86".into(),
1717
options: base,

‎compiler/rustc_target/src/spec/i686_unknown_haiku.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pub fn target() -> Target {
1111
llvm_target: "i686-unknown-haiku".into(),
1212
pointer_width: 32,
1313
data_layout: "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-\
14-
f64:32:64-f80:32-n8:16:32-S128"
14+
i128:128-f64:32:64-f80:32-n8:16:32-S128"
1515
.into(),
1616
arch: "x86".into(),
1717
options: base,

‎compiler/rustc_target/src/spec/i686_unknown_hurd_gnu.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pub fn target() -> Target {
1111
llvm_target: "i686-unknown-hurd-gnu".into(),
1212
pointer_width: 32,
1313
data_layout: "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-\
14-
f64:32:64-f80:32-n8:16:32-S128"
14+
i128:128-f64:32:64-f80:32-n8:16:32-S128"
1515
.into(),
1616
arch: "x86".into(),
1717
options: base,

‎compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pub fn target() -> Target {
1212
llvm_target: "i686-unknown-linux-gnu".into(),
1313
pointer_width: 32,
1414
data_layout: "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-\
15-
f64:32:64-f80:32-n8:16:32-S128"
15+
i128:128-f64:32:64-f80:32-n8:16:32-S128"
1616
.into(),
1717
arch: "x86".into(),
1818
options: base,

‎compiler/rustc_target/src/spec/i686_unknown_linux_musl.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ pub fn target() -> Target {
2525
llvm_target: "i686-unknown-linux-musl".into(),
2626
pointer_width: 32,
2727
data_layout: "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-\
28-
f64:32:64-f80:32-n8:16:32-S128"
28+
i128:128-f64:32:64-f80:32-n8:16:32-S128"
2929
.into(),
3030
arch: "x86".into(),
3131
options: base,

‎compiler/rustc_target/src/spec/i686_unknown_netbsd.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pub fn target() -> Target {
1111
llvm_target: "i686-unknown-netbsdelf".into(),
1212
pointer_width: 32,
1313
data_layout: "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-\
14-
f64:32:64-f80:32-n8:16:32-S128"
14+
i128:128-f64:32:64-f80:32-n8:16:32-S128"
1515
.into(),
1616
arch: "x86".into(),
1717
options: TargetOptions { mcount: "__mcount".into(), ..base },

‎compiler/rustc_target/src/spec/i686_unknown_openbsd.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pub fn target() -> Target {
1111
llvm_target: "i686-unknown-openbsd".into(),
1212
pointer_width: 32,
1313
data_layout: "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-\
14-
f64:32:64-f80:32-n8:16:32-S128"
14+
i128:128-f64:32:64-f80:32-n8:16:32-S128"
1515
.into(),
1616
arch: "x86".into(),
1717
options: base,

‎compiler/rustc_target/src/spec/i686_wrs_vxworks.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pub fn target() -> Target {
1111
llvm_target: "i686-unknown-linux-gnu".into(),
1212
pointer_width: 32,
1313
data_layout: "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-\
14-
f64:32:64-f80:32-n8:16:32-S128"
14+
i128:128-f64:32:64-f80:32-n8:16:32-S128"
1515
.into(),
1616
arch: "x86".into(),
1717
options: base,

‎compiler/rustc_target/src/spec/x86_64_apple_darwin.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ pub fn target() -> Target {
1818
// correctly, we do too.
1919
llvm_target: macos_llvm_target(arch).into(),
2020
pointer_width: 64,
21-
data_layout: "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
22-
.into(),
21+
data_layout:
22+
"e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128".into(),
2323
arch: arch.target_arch(),
2424
options: TargetOptions { mcount: "\u{1}mcount".into(), ..base },
2525
}

‎compiler/rustc_target/src/spec/x86_64_apple_ios.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ pub fn target() -> Target {
99
Target {
1010
llvm_target: ios_sim_llvm_target(arch).into(),
1111
pointer_width: 64,
12-
data_layout: "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
13-
.into(),
12+
data_layout:
13+
"e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128".into(),
1414
arch: arch.target_arch(),
1515
options: TargetOptions {
1616
max_atomic_width: Some(128),

‎compiler/rustc_target/src/spec/x86_64_apple_ios_macabi.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ pub fn target() -> Target {
1212
Target {
1313
llvm_target: llvm_target.into(),
1414
pointer_width: 64,
15-
data_layout: "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
16-
.into(),
15+
data_layout:
16+
"e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128".into(),
1717
arch: arch.target_arch(),
1818
options: TargetOptions {
1919
max_atomic_width: Some(128),

‎compiler/rustc_target/src/spec/x86_64_apple_tvos.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ pub fn target() -> Target {
66
Target {
77
llvm_target: tvos_sim_llvm_target(arch).into(),
88
pointer_width: 64,
9-
data_layout: "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
10-
.into(),
9+
data_layout:
10+
"e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128".into(),
1111
arch: arch.target_arch(),
1212
options: TargetOptions {
1313
max_atomic_width: Some(128),

‎compiler/rustc_target/src/spec/x86_64_apple_watchos_sim.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ pub fn target() -> Target {
66
Target {
77
llvm_target: watchos_sim_llvm_target(arch).into(),
88
pointer_width: 64,
9-
data_layout: "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
10-
.into(),
9+
data_layout:
10+
"e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128".into(),
1111
arch: arch.target_arch(),
1212
options: TargetOptions {
1313
max_atomic_width: Some(128),

‎compiler/rustc_target/src/spec/x86_64_fortanix_unknown_sgx.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ pub fn target() -> Target {
7575
Target {
7676
llvm_target: "x86_64-elf".into(),
7777
pointer_width: 64,
78-
data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
79-
.into(),
78+
data_layout:
79+
"e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128".into(),
8080
arch: "x86_64".into(),
8181
options: opts,
8282
}

‎compiler/rustc_target/src/spec/x86_64_linux_android.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ pub fn target() -> Target {
1414
Target {
1515
llvm_target: "x86_64-linux-android".into(),
1616
pointer_width: 64,
17-
data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
18-
.into(),
17+
data_layout:
18+
"e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128".into(),
1919
arch: "x86_64".into(),
2020
options: TargetOptions { supported_sanitizers: SanitizerSet::ADDRESS, ..base },
2121
}

‎compiler/rustc_target/src/spec/x86_64_pc_nto_qnx710.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ pub fn target() -> Target {
55
Target {
66
llvm_target: "x86_64-pc-unknown".into(),
77
pointer_width: 64,
8-
data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
9-
.into(),
8+
data_layout:
9+
"e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128".into(),
1010
arch: "x86_64".into(),
1111
options: TargetOptions {
1212
cpu: "x86-64".into(),

‎compiler/rustc_target/src/spec/x86_64_pc_solaris.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ pub fn target() -> Target {
1313
Target {
1414
llvm_target: "x86_64-pc-solaris".into(),
1515
pointer_width: 64,
16-
data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
17-
.into(),
16+
data_layout:
17+
"e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128".into(),
1818
arch: "x86_64".into(),
1919
options: base,
2020
}

‎compiler/rustc_target/src/spec/x86_64_pc_windows_gnu.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ pub fn target() -> Target {
1616
Target {
1717
llvm_target: "x86_64-pc-windows-gnu".into(),
1818
pointer_width: 64,
19-
data_layout: "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
20-
.into(),
19+
data_layout:
20+
"e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128".into(),
2121
arch: "x86_64".into(),
2222
options: base,
2323
}

‎compiler/rustc_target/src/spec/x86_64_pc_windows_gnullvm.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ pub fn target() -> Target {
1111
Target {
1212
llvm_target: "x86_64-pc-windows-gnu".into(),
1313
pointer_width: 64,
14-
data_layout: "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
15-
.into(),
14+
data_layout:
15+
"e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128".into(),
1616
arch: "x86_64".into(),
1717
options: base,
1818
}

‎compiler/rustc_target/src/spec/x86_64_pc_windows_msvc.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ pub fn target() -> Target {
99
Target {
1010
llvm_target: "x86_64-pc-windows-msvc".into(),
1111
pointer_width: 64,
12-
data_layout: "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
13-
.into(),
12+
data_layout:
13+
"e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128".into(),
1414
arch: "x86_64".into(),
1515
options: base,
1616
}

‎compiler/rustc_target/src/spec/x86_64_sun_solaris.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ pub fn target() -> Target {
1212
Target {
1313
llvm_target: "x86_64-pc-solaris".into(),
1414
pointer_width: 64,
15-
data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
16-
.into(),
15+
data_layout:
16+
"e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128".into(),
1717
arch: "x86_64".into(),
1818
options: base,
1919
}

‎compiler/rustc_target/src/spec/x86_64_unikraft_linux_musl.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ pub fn target() -> Target {
55
llvm_target: "x86_64-unknown-linux-musl".into(),
66
pointer_width: 64,
77
arch: "x86_64".into(),
8-
data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
9-
.into(),
8+
data_layout:
9+
"e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128".into(),
1010
options: TargetOptions {
1111
cpu: "x86-64".into(),
1212
plt_by_default: false,

‎compiler/rustc_target/src/spec/x86_64_unknown_dragonfly.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ pub fn target() -> Target {
1111
Target {
1212
llvm_target: "x86_64-unknown-dragonfly".into(),
1313
pointer_width: 64,
14-
data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
15-
.into(),
14+
data_layout:
15+
"e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128".into(),
1616
arch: "x86_64".into(),
1717
options: base,
1818
}

‎compiler/rustc_target/src/spec/x86_64_unknown_freebsd.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ pub fn target() -> Target {
1414
Target {
1515
llvm_target: "x86_64-unknown-freebsd".into(),
1616
pointer_width: 64,
17-
data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
18-
.into(),
17+
data_layout:
18+
"e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128".into(),
1919
arch: "x86_64".into(),
2020
options: base,
2121
}

‎compiler/rustc_target/src/spec/x86_64_unknown_fuchsia.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ pub fn target() -> Target {
1111
Target {
1212
llvm_target: "x86_64-unknown-fuchsia".into(),
1313
pointer_width: 64,
14-
data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
15-
.into(),
14+
data_layout:
15+
"e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128".into(),
1616
arch: "x86_64".into(),
1717
options: base,
1818
}

‎compiler/rustc_target/src/spec/x86_64_unknown_haiku.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ pub fn target() -> Target {
1313
Target {
1414
llvm_target: "x86_64-unknown-haiku".into(),
1515
pointer_width: 64,
16-
data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
17-
.into(),
16+
data_layout:
17+
"e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128".into(),
1818
arch: "x86_64".into(),
1919
options: base,
2020
}

‎compiler/rustc_target/src/spec/x86_64_unknown_hermit.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ pub fn target() -> Target {
55
llvm_target: "x86_64-unknown-hermit".into(),
66
pointer_width: 64,
77
arch: "x86_64".into(),
8-
data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
9-
.into(),
8+
data_layout:
9+
"e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128".into(),
1010
options: TargetOptions {
1111
cpu: "x86-64".into(),
1212
features: "+rdrnd,+rdseed".into(),

‎compiler/rustc_target/src/spec/x86_64_unknown_illumos.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ pub fn target() -> Target {
1313
// so we still pass Solaris to it
1414
llvm_target: "x86_64-pc-solaris".into(),
1515
pointer_width: 64,
16-
data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
17-
.into(),
16+
data_layout:
17+
"e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128".into(),
1818
arch: "x86_64".into(),
1919
options: base,
2020
}

‎compiler/rustc_target/src/spec/x86_64_unknown_l4re_uclibc.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ pub fn target() -> Target {
1010
Target {
1111
llvm_target: "x86_64-unknown-l4re-uclibc".into(),
1212
pointer_width: 64,
13-
data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
14-
.into(),
13+
data_layout:
14+
"e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128".into(),
1515
arch: "x86_64".into(),
1616
options: base,
1717
}

‎compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ pub fn target() -> Target {
1919
Target {
2020
llvm_target: "x86_64-unknown-linux-gnu".into(),
2121
pointer_width: 64,
22-
data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
23-
.into(),
22+
data_layout:
23+
"e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128".into(),
2424
arch: "x86_64".into(),
2525
options: base,
2626
}

‎compiler/rustc_target/src/spec/x86_64_unknown_linux_musl.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ pub fn target() -> Target {
1818
Target {
1919
llvm_target: "x86_64-unknown-linux-musl".into(),
2020
pointer_width: 64,
21-
data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
22-
.into(),
21+
data_layout:
22+
"e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128".into(),
2323
arch: "x86_64".into(),
2424
options: base,
2525
}

‎compiler/rustc_target/src/spec/x86_64_unknown_linux_ohos.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ pub fn target() -> Target {
1818
// LLVM 15 doesn't support OpenHarmony yet, use a linux target instead.
1919
llvm_target: "x86_64-unknown-linux-musl".into(),
2020
pointer_width: 64,
21-
data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
22-
.into(),
21+
data_layout:
22+
"e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128".into(),
2323
arch: "x86_64".into(),
2424
options: base,
2525
}

‎compiler/rustc_target/src/spec/x86_64_unknown_netbsd.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ pub fn target() -> Target {
1717
Target {
1818
llvm_target: "x86_64-unknown-netbsd".into(),
1919
pointer_width: 64,
20-
data_layout: "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
21-
.into(),
20+
data_layout:
21+
"e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128".into(),
2222
arch: "x86_64".into(),
2323
options: TargetOptions { mcount: "__mcount".into(), ..base },
2424
}

0 commit comments

Comments
 (0)