summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2022-08-27 20:28:26 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2022-08-27 20:30:02 +0200
commitc442d1a656e16d12cefe2d3e9b57f764ca4bc755 (patch)
tree2ea41eb7fbc8588654c6d6347203c4bc350d3645
parentf90ba97d5091ad85f089817231f53e34a0f6f259 (diff)
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.
-rw-r--r--x86_64/boothdr.S12
1 files changed, 5 insertions, 7 deletions
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