From 0877ac2cc6682b71f8af9776181bb2a4bbf6bf1d Mon Sep 17 00:00:00 2001 From: Jack Halford Date: Thu, 22 Feb 2018 19:17:52 +0100 Subject: [PATCH] linker script again --- kernel-rs/src/arch/x86/linker.ld | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel-rs/src/arch/x86/linker.ld b/kernel-rs/src/arch/x86/linker.ld index 21070800..2c96fb77 100644 --- a/kernel-rs/src/arch/x86/linker.ld +++ b/kernel-rs/src/arch/x86/linker.ld @@ -12,14 +12,14 @@ SECTIONS { . = 1M; kernel_start = . ; + /* ensure that the multiboot header is at the beginning */ .multiboot_header : { KEEP(*(.multiboot_header)) } .text : { *(.text .text.*) } .rodata : { *(.rodata .rodata.*) } - .data.rel.ro : { *(.data.rel.ro.local*) *(.data.rel.ro .data.rel.ro.*) } + .data : { *(.data.rel.ro.local*) *(.data.rel.ro .data.rel.ro.*) *(.data.*) } .debug : { *(.debug_*) } + .bss : {*(.bss .bss.*)} -/* load stack */ -.bss : {*(.bss .bss.*)} -/* kernel_end = . ; */ + /* kernel_end = . ; */ }