Skip to content

Commit f12c1c2

Browse files
authored
Rollup merge of rust-lang#120529 - nikic:llvm-18-datalayout-fixes, r=cuviper
Update data layouts in custom target tests for LLVM 18 Apply the data layout changes from rust-lang#116672 to custom target specs as well, as we started validating them since rust-lang#120062. Fixes rust-lang#120492. r? `@cuviper`
2 parents ab0b57c + 8eb48b4 commit f12c1c2

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

tests/run-make/rust-lld-custom-target/custom-target.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"arch": "x86_64",
33
"cpu": "x86-64",
44
"crt-static-respected": true,
5-
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
5+
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
66
"dynamic-linking": true,
77
"env": "gnu",
88
"has-rpath": true,

tests/run-make/rustdoc-target-spec-json-path/target.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"arch": "x86_64",
33
"cpu": "x86-64",
44
"crt-static-respected": true,
5-
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
5+
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
66
"dynamic-linking": true,
77
"env": "gnu",
88
"executables": true,

tests/run-make/target-specs/my-awesome-platform.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"data-layout": "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-f64:32:64-f80:32-n8:16:32-S128",
2+
"data-layout": "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-i128:128-f64:32:64-f80:32-n8:16:32-S128",
33
"linker-flavor": "gcc",
44
"llvm-target": "i686-unknown-linux-gnu",
55
"target-endian": "little",

tests/run-make/target-specs/my-x86_64-unknown-linux-gnu-platform.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"pre-link-args": {"gcc": ["-m64"]},
3-
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
3+
"data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128",
44
"linker-flavor": "gcc",
55
"llvm-target": "x86_64-unknown-linux-gnu",
66
"target-endian": "little",

0 commit comments

Comments
 (0)