Skip to content

Commit 0547c41

Browse files
borsbors
committed
Auto merge of rust-lang#116672 - maurer:128-align, r=nikic
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. This implements MCP rust-lang/compiler-team#683. See rust-lang#54341
2 parents 88189a7 + ec55a05 commit 0547c41

Some content is hidden

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

58 files changed

+213
-92
lines changed

‎compiler/rustc_ast/src/ast.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -3304,9 +3304,13 @@ mod size_asserts {
33043304
static_assert_size!(Impl, 136);
33053305
static_assert_size!(Item, 136);
33063306
static_assert_size!(ItemKind, 64);
3307-
static_assert_size!(LitKind, 24);
3307+
// This can be removed after i128:128 is in the bootstrap compiler's target.
3308+
#[cfg(not(bootstrap))]
3309+
static_assert_size!(LitKind, 32);
33083310
static_assert_size!(Local, 72);
3309-
static_assert_size!(MetaItemLit, 40);
3311+
// This can be removed after i128:128 is in the bootstrap compiler's target.
3312+
#[cfg(not(bootstrap))]
3313+
static_assert_size!(MetaItemLit, 48);
33103314
static_assert_size!(Param, 40);
33113315
static_assert_size!(Pat, 72);
33123316
static_assert_size!(Path, 24);

‎compiler/rustc_codegen_llvm/src/context.rs

+8
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,14 @@ pub unsafe fn create_module<'ll>(
145145
.replace("-Fi64", "");
146146
}
147147
}
148+
if llvm_version < (18, 0, 0) {
149+
if sess.target.arch == "x86" || sess.target.arch == "x86_64" {
150+
// LLVM 18 adjusts i128 to be 128-bit aligned on x86 variants.
151+
// Earlier LLVMs leave this as default alignment, so remove it.
152+
// See https://reviews.llvm.org/D86310
153+
target_data_layout = target_data_layout.replace("-i128:128", "");
154+
}
155+
}
148156

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

‎compiler/rustc_middle/src/mir/mod.rs

+9-3
Original file line numberDiff line numberDiff line change
@@ -1672,13 +1672,19 @@ mod size_asserts {
16721672
use super::*;
16731673
use rustc_data_structures::static_assert_size;
16741674
// tidy-alphabetical-start
1675-
static_assert_size!(BasicBlockData<'_>, 136);
1675+
// This can be removed after i128:128 is in the bootstrap compiler's target.
1676+
#[cfg(not(bootstrap))]
1677+
static_assert_size!(BasicBlockData<'_>, 144);
16761678
static_assert_size!(LocalDecl<'_>, 40);
16771679
static_assert_size!(SourceScopeData<'_>, 72);
16781680
static_assert_size!(Statement<'_>, 32);
16791681
static_assert_size!(StatementKind<'_>, 16);
1680-
static_assert_size!(Terminator<'_>, 104);
1681-
static_assert_size!(TerminatorKind<'_>, 88);
1682+
// This can be removed after i128:128 is in the bootstrap compiler's target.
1683+
#[cfg(not(bootstrap))]
1684+
static_assert_size!(Terminator<'_>, 112);
1685+
// This can be removed after i128:128 is in the bootstrap compiler's target.
1686+
#[cfg(not(bootstrap))]
1687+
static_assert_size!(TerminatorKind<'_>, 96);
16821688
static_assert_size!(VarDebugInfo<'_>, 88);
16831689
// tidy-alphabetical-end
16841690
}

‎compiler/rustc_target/src/spec/targets/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 { max_atomic_width: Some(64), ..opts("ios", arch) },

‎compiler/rustc_target/src/spec/targets/i586_pc_nto_qnx700.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ pub fn target() -> Target {
55
llvm_target: "i586-pc-unknown".into(),
66
pointer_width: 32,
77
data_layout: "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-\
8-
f64:32:64-f80:32-n8:16:32-S128"
8+
i128:128-f64:32:64-f80:32-n8:16:32-S128"
99
.into(),
1010
arch: "x86".into(),
1111
options: TargetOptions {

‎compiler/rustc_target/src/spec/targets/i586_unknown_netbsd.rs

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

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

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

‎compiler/rustc_target/src/spec/targets/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/targets/i686_pc_windows_gnu.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ pub fn target() -> Target {
1919
llvm_target: "i686-pc-windows-gnu".into(),
2020
pointer_width: 32,
2121
data_layout: "e-m:x-p:32:32-p270:32:32-p271:32:32-p272:64:64-\
22-
i64:64-f80:32-n8:16:32-a:0:32-S32"
22+
i64:64-i128:128-f80:32-n8:16:32-a:0:32-S32"
2323
.into(),
2424
arch: "x86".into(),
2525
options: base,

‎compiler/rustc_target/src/spec/targets/i686_pc_windows_gnullvm.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pub fn target() -> Target {
1818
llvm_target: "i686-pc-windows-gnu".into(),
1919
pointer_width: 32,
2020
data_layout: "e-m:x-p:32:32-p270:32:32-p271:32:32-p272:64:64-\
21-
i64:64-f80:32-n8:16:32-a:0:32-S32"
21+
i64:64-i128:128-f80:32-n8:16:32-a:0:32-S32"
2222
.into(),
2323
arch: "x86".into(),
2424
options: base,

‎compiler/rustc_target/src/spec/targets/i686_pc_windows_msvc.rs

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

‎compiler/rustc_target/src/spec/targets/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/targets/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/targets/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/targets/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/targets/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/targets/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/targets/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/targets/i686_unknown_uefi.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ pub fn target() -> Target {
8080
llvm_target: "i686-unknown-windows-gnu".into(),
8181
pointer_width: 32,
8282
data_layout: "e-m:x-p:32:32-p270:32:32-p271:32:32-p272:64:64-\
83-
i64:64-f80:32-n8:16:32-a:0:32-S32"
83+
i64:64-i128:128-f80:32-n8:16:32-a:0:32-S32"
8484
.into(),
8585
arch: "x86".into(),
8686

‎compiler/rustc_target/src/spec/targets/i686_uwp_windows_gnu.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pub fn target() -> Target {
1818
llvm_target: "i686-pc-windows-gnu".into(),
1919
pointer_width: 32,
2020
data_layout: "e-m:x-p:32:32-p270:32:32-p271:32:32-p272:64:64-\
21-
i64:64-f80:32-n8:16:32-a:0:32-S32"
21+
i64:64-i128:128-f80:32-n8:16:32-a:0:32-S32"
2222
.into(),
2323
arch: "x86".into(),
2424
options: base,

‎compiler/rustc_target/src/spec/targets/i686_uwp_windows_msvc.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ pub fn target() -> Target {
99
llvm_target: "i686-pc-windows-msvc".into(),
1010
pointer_width: 32,
1111
data_layout: "e-m:x-p:32:32-p270:32:32-p271:32:32-p272:64:64-\
12-
i64:64-f80:128-n8:16:32-a:0:32-S32"
12+
i64:64-i128:128-f80:128-n8:16:32-a:0:32-S32"
1313
.into(),
1414
arch: "x86".into(),
1515
options: base,

‎compiler/rustc_target/src/spec/targets/i686_win7_windows_msvc.rs

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

‎compiler/rustc_target/src/spec/targets/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/targets/x86_64_apple_darwin.rs

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

‎compiler/rustc_target/src/spec/targets/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 { max_atomic_width: Some(128), ..base },
1616
}

‎compiler/rustc_target/src/spec/targets/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 { max_atomic_width: Some(128), ..base },
1919
}

‎compiler/rustc_target/src/spec/targets/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 { max_atomic_width: Some(128), ..opts("tvos", arch) },
1313
}

‎compiler/rustc_target/src/spec/targets/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 { max_atomic_width: Some(128), ..opts("watchos", arch) },
1313
}

‎compiler/rustc_target/src/spec/targets/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/targets/x86_64_linux_android.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-linux-android".into(),
1818
pointer_width: 64,
19-
data_layout: "e-m:e-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:e-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: TargetOptions { supported_sanitizers: SanitizerSet::ADDRESS, ..base },
2323
}

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

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

‎compiler/rustc_target/src/spec/targets/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/targets/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/targets/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/targets/x86_64_pc_windows_msvc.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-pc-windows-msvc".into(),
1212
pointer_width: 64,
13-
data_layout: "e-m:w-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:w-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/targets/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/targets/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/targets/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
}

0 commit comments

Comments
 (0)