From f47bee5f51a73593d3594940663f56f2427f480b Mon Sep 17 00:00:00 2001
From: Felix Morgner <felix.morgner@ost.ch>
Date: Wed, 11 Oct 2023 10:24:38 +0200
Subject: x86_64: multiboot: fix header and tag alignment

---
 source/boot/arch/x86_64/src/multiboot.s | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/source/boot/arch/x86_64/src/multiboot.s b/source/boot/arch/x86_64/src/multiboot.s
index 207a639..7ccca56 100644
--- a/source/boot/arch/x86_64/src/multiboot.s
+++ b/source/boot/arch/x86_64/src/multiboot.s
@@ -1,5 +1,5 @@
 .section .boot_mbh, "a"
-.align 64
+.align 8
 
 multiboot_header_start:
 .Lmagic:
@@ -10,8 +10,17 @@ multiboot_header_start:
     .long multiboot_header_end - multiboot_header_start
 .Lchecksum:
     .long 0x100000000 - (0xe85250d6 + 0 + (multiboot_header_end - multiboot_header_start))
-.Lend:
-    .int 0
-    .int 0
-    .long 8
+.align 8
+.Lflags_start:
+    .word 4
+    .word 1
+    .long .Lflags_end - .Lflags_start
+    .long 3
+.Lflags_end:
+.align 8
+.Lend_start:
+    .word 0
+    .word 0
+    .long .Lend_end - .Lend_start
+.Lend_end:
 multiboot_header_end:
-- 
cgit v1.2.3