From 0d5048ee5095b72f389555e21151e8dfd528b8eb Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Sun, 28 Jan 2024 11:29:37 +0100 Subject: [PATCH 1/2] Fix data layout for `x86_64-bootloader` target --- x86_64-bootloader.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x86_64-bootloader.json b/x86_64-bootloader.json index ceb196e9..f40a2b6f 100644 --- 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-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-f80:128-n8:16:32:64-S128", "linker-flavor": "ld.lld", "linker": "rust-lld", "pre-link-args": { From cb31d5a63f143e53a5eed2be502044bf59720ffc Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Sun, 28 Jan 2024 11:31:57 +0100 Subject: [PATCH 2/2] Fix data layout for example kernels too --- example-kernel/x86_64-example-kernel.json | 2 +- test-kernel/x86_64-test-kernel.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/example-kernel/x86_64-example-kernel.json b/example-kernel/x86_64-example-kernel.json index 9afe809f..bcb4c8bf 100644 --- 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-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-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 index 9afe809f..bcb4c8bf 100644 --- 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-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-f80:128-n8:16:32:64-S128", "arch": "x86_64", "target-endian": "little", "target-pointer-width": "64",