Skip to content

Commit c3c70e1

Browse files
maurerkxxt
maurer
authored and
kxxt
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 ignores the alignment change when checking what the LLVM's default spec is on the relevant targets for older LLVMs. * This is a potentially breaking change, as u128 and i128 will have their alignment increase on some platforms. * This results in Rust overaligning things relative to LLVM on older LLVMs. See rust-lang#54341
1 parent 2e4e2a8 commit c3c70e1

Some content is hidden

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

47 files changed

+108
-84
lines changed

‎compiler/rustc_ast/src/ast.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3124,9 +3124,13 @@ mod size_asserts {
31243124
static_assert_size!(Impl, 136);
31253125
static_assert_size!(Item, 136);
31263126
static_assert_size!(ItemKind, 64);
3127-
static_assert_size!(LitKind, 24);
3127+
// This can be removed after i128:128 is in the bootstrap compiler's target.
3128+
#[cfg(not(bootstrap))]
3129+
static_assert_size!(LitKind, 32);
31283130
static_assert_size!(Local, 72);
3129-
static_assert_size!(MetaItemLit, 40);
3131+
// This can be removed after i128:128 is in the bootstrap compiler's target.
3132+
#[cfg(not(bootstrap))]
3133+
static_assert_size!(MetaItemLit, 48);
31303134
static_assert_size!(Param, 40);
31313135
static_assert_size!(Pat, 72);
31323136
static_assert_size!(Path, 24);

‎compiler/rustc_codegen_llvm/src/context.rs

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,12 +186,26 @@ pub unsafe fn create_module<'ll>(
186186
let cfg_llvm_root = option_env!("CFG_LLVM_ROOT").unwrap_or("");
187187
let custom_llvm_used = !cfg_llvm_root.trim().is_empty();
188188

189-
if !custom_llvm_used && target_data_layout != llvm_data_layout {
189+
let mut checked_target_data_layout = target_data_layout.clone();
190+
if llvm_version < (18, 0, 0) {
191+
if sess.target.arch == "x86" || sess.target.arch == "x86_64" {
192+
// LLVM 18 adjusts i128 to be 128-bit aligned on x86 variants.
193+
// Earlier LLVMs leave this as default alignment, so remove it.
194+
// We only modify the checked data layout because LLVM will generate incorrect code without it.
195+
// This matches the behavior of Clang on earlier LLVMs, which reduces the likelihood of problems arising from it.
196+
// This removal acts as our acknowledgement of this deviation between the default LLVM target spec and the one we are using.
197+
//
198+
// See https://reviews.llvm.org/D86310
199+
checked_target_data_layout = checked_target_data_layout.replace("-i128:128", "");
200+
}
201+
}
202+
203+
if !custom_llvm_used && checked_target_data_layout != llvm_data_layout {
190204
bug!(
191205
"data-layout for target `{rustc_target}`, `{rustc_layout}`, \
192206
differs from LLVM target's `{llvm_target}` default layout, `{llvm_layout}`",
193207
rustc_target = sess.opts.target_triple,
194-
rustc_layout = target_data_layout,
208+
rustc_layout = checked_target_data_layout,
195209
llvm_target = sess.target.llvm_target,
196210
llvm_layout = llvm_data_layout
197211
);

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1595,13 +1595,19 @@ mod size_asserts {
15951595
use super::*;
15961596
use rustc_data_structures::static_assert_size;
15971597
// tidy-alphabetical-start
1598-
static_assert_size!(BasicBlockData<'_>, 136);
1598+
// This can be removed after i128:128 is in the bootstrap compiler's target.
1599+
#[cfg(not(bootstrap))]
1600+
static_assert_size!(BasicBlockData<'_>, 144);
15991601
static_assert_size!(LocalDecl<'_>, 40);
16001602
static_assert_size!(SourceScopeData<'_>, 72);
16011603
static_assert_size!(Statement<'_>, 32);
16021604
static_assert_size!(StatementKind<'_>, 16);
1603-
static_assert_size!(Terminator<'_>, 104);
1604-
static_assert_size!(TerminatorKind<'_>, 88);
1605+
// This can be removed after i128:128 is in the bootstrap compiler's target.
1606+
#[cfg(not(bootstrap))]
1607+
static_assert_size!(Terminator<'_>, 112);
1608+
// This can be removed after i128:128 is in the bootstrap compiler's target.
1609+
#[cfg(not(bootstrap))]
1610+
static_assert_size!(TerminatorKind<'_>, 96);
16051611
static_assert_size!(VarDebugInfo<'_>, 88);
16061612
// tidy-alphabetical-end
16071613
}

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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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
}

0 commit comments

Comments
 (0)