nortti
/
sortix-mirror
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix multiboot header not coming first in the executable. 

The default linker script places .text.unlikely prior to .text.
This commit is contained in:
Jonas 'Sortie' Termansen 2018-10-14 22:09:07 +02:00
parent d3a64e1163
commit 1f659c49c6
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/x64/boot.S
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2011, 2014, 2015, 2016 Jonas 'Sortie' Termansen. * Copyright (c) 2011, 2014, 2015, 2016, 2018 Jonas 'Sortie' Termansen.
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@ -18,8 +18,7 @@
* kernel main function. It also jumps into long mode! * kernel main function. It also jumps into long mode!
*/ */
.section .text .section .text.unlikely
.text 0x100000
# Multiboot header. # Multiboot header.
.align 4 .align 4

5
kernel/x86/boot.S
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2011, 2014, 2015, 2016 Jonas 'Sortie' Termansen. * Copyright (c) 2011, 2014, 2015, 2016, 2018 Jonas 'Sortie' Termansen.
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@ -18,8 +18,7 @@
* kernel main function. * kernel main function.
*/ */
.section .text .section .text.unlikely
.text 0x100000
# Multiboot header. # Multiboot header.
.align 4 .align 4