From c442d1a656e16d12cefe2d3e9b57f764ca4bc755 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sat, 27 Aug 2022 20:28:26 +0200 Subject: x86_64 boothdr: Fix _start symbol for multiboot address overrides We shouldn't be needing that since we won't use a.out for 64bit, but using address override in the multiboot header could be useful at least for testing. --- x86_64/boothdr.S | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'x86_64') diff --git a/x86_64/boothdr.S b/x86_64/boothdr.S index 12fc7ca2..5ea7834d 100644 --- a/x86_64/boothdr.S +++ b/x86_64/boothdr.S @@ -25,11 +25,13 @@ * This section will be put first into .boot. See also x86_64/ldscript. */ .section .boot.text,"ax" - .globl boot_start - /* We should never be entered this way. */ - .code32 + .globl _start +_start: + .globl boot_start boot_start: + + .code32 jmp boot_entry /* MultiBoot header - see multiboot.h. */ @@ -165,10 +167,6 @@ switch64: .code64 - /* why do we need this? it seems overwritten by linker */ - .globl _start -_start: - boot_entry64: /* Switch to our own interrupt stack. */ movq $(_intstack+INTSTACK_SIZE),%rax -- cgit v1.2.3