Merge pull request #421 from rust-osdev/v0.9-fix-data-layout

phil-opp · web-flow · commit 62d604970760 · 2024-02-16T12:33:29.000+01:00
[v0.9] Fix data layout for custom targets for LLVM 18
diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,8 @@
 # Unreleased
 
+- [Fix data layout for custom targets for LLVM 18](https://github.com/rust-osdev/bootloader/pull/421)
+  - Fixes build on latest Rust nightly
+
 # 0.9.24 – 2024-01-28
 
 - Fix data layout for `x86_64-bootloader` target ([#415](https://github.com/rust-osdev/bootloader/pull/415))
diff --git a/example-kernel/x86_64-example-kernel.json b/example-kernel/x86_64-example-kernel.json
@@ -1,6 +1,6 @@
 {
     "llvm-target": "x86_64-unknown-none",
-    "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
+    "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",
     "arch": "x86_64",
     "target-endian": "little",
     "target-pointer-width": "64",
diff --git a/test-kernel/x86_64-test-kernel.json b/test-kernel/x86_64-test-kernel.json
@@ -1,6 +1,6 @@
 {
     "llvm-target": "x86_64-unknown-none",
-    "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
+    "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",
     "arch": "x86_64",
     "target-endian": "little",
     "target-pointer-width": "64",
diff --git a/x86_64-bootloader.json b/x86_64-bootloader.json
@@ -1,6 +1,6 @@
 {
     "llvm-target": "x86_64-unknown-none-gnu",
-    "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128",
+    "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",
     "linker-flavor": "ld.lld",
     "linker": "rust-lld",
     "pre-link-args": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"llvm-target": "x86_64-unknown-none",`
`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",`
`4`	`4`	`"arch": "x86_64",`
`5`	`5`	`"target-endian": "little",`
`6`	`6`	`"target-pointer-width": "64",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"llvm-target": "x86_64-unknown-none-gnu",`
`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",`
`4`	`4`	`"linker-flavor": "ld.lld",`
`5`	`5`	`"linker": "rust-lld",`
`6`	`6`	`"pre-link-args": {`