mirrors/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2025-01-24 02:12:09 -05:00
Code Issues Projects Releases Packages Wiki Activity

Kernel: Simplify the linker script for the prekernel

Browse source
This commit is contained in:
Gunnar Beutner 2021-07-19 09:34:47 +02:00 • committed by Andreas Kling
parent a364f5c7b7
commit b6ddb4b70f
2 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Kernel/Prekernel/boot.S
View file

@ -38,7 +38,7 @@ boot_pd_kernel_pts:
boot_pd_kernel_pt1023: boot_pd_kernel_pt1023:
.skip 4096 .skip 4096
.section .boot_text, "ax" .section .text
.global start .global start
.type start, @function .type start, @function

13
Kernel/Prekernel/linker.ld
View file

@ -3,7 +3,6 @@ ENTRY(start)
PHDRS PHDRS
{ {
boot_text PT_LOAD ; boot_text PT_LOAD ;
boot_bss PT_LOAD ;
text PT_LOAD ; text PT_LOAD ;
data PT_LOAD ; data PT_LOAD ;
bss PT_LOAD ; bss PT_LOAD ;
@ -17,20 +16,12 @@ SECTIONS
.boot_text ALIGN(4K) : AT (ADDR(.boot_text)) .boot_text ALIGN(4K) : AT (ADDR(.boot_text))
{ {
KEEP(*(.boot_text))
KEEP(*(.multiboot)) KEEP(*(.multiboot))
} :boot_text } :boot_text
.boot_bss ALIGN(4K) (NOLOAD) : AT (ADDR(.boot_bss))
{
KEEP(*(.page_tables))
KEEP(*(.stack))
*(.super_pages)
} :boot_bss
.text ALIGN(4K) : AT (ADDR(.text)) .text ALIGN(4K) : AT (ADDR(.text))
{ {
start_of_kernel_text = .; start_of_prekernel_text = .;
*(.text*) *(.text*)
} :text } :text
@ -48,6 +39,8 @@ SECTIONS
{ {
*(COMMON) *(COMMON)
*(.bss) *(.bss)
*(.stack)
*(.page_tables)
} :bss } :bss
end_of_prekernel_image = .; end_of_prekernel_image = .;