From eb9335a34beee00dbf78ce37c4dd3295b5a04a8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Sun, 14 Mar 2004 17:01:51 +0000 Subject: [PATCH] Applied NewOS change 1972: "Fix the build with gcc 3.3.3. The bootloader was broken because of some new behavior that puts initialized varaibles in .bss anyway (if you initialize with zero). The bootloader was relying on not having a .bss. Fixed in the linker script.". git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6968 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kernel/ldscripts/x86/stage2.ld | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/kernel/ldscripts/x86/stage2.ld b/src/kernel/ldscripts/x86/stage2.ld index 6b8963f2a8..77d76b1f43 100644 --- a/src/kernel/ldscripts/x86/stage2.ld +++ b/src/kernel/ldscripts/x86/stage2.ld @@ -13,20 +13,16 @@ SECTIONS .ctors : { *(.ctors) } __ctor_end = .; - .rodata : { *(.rodata) } + .rodata : { *(.rodata .rodata.*) } /* writable data */ . = ALIGN(0x1000); __data_start = .; - .data : { *(.data .gnu.linkonce.d.*) } - - /* unintialized data (in same segment as writable data) */ - __bss_start = .; - .bss : { *(.bss) } + .data : { *(.data .gnu.linkonce.d.* .bss) } . = ALIGN(0x1000); _end = . ; /* Strip unnecessary stuff */ - /DISCARD/ : { *(.comment .note .eh_frame .dtors) } + /DISCARD/ : { *(.comment .note .eh_frame .dtors .stab .stabstr .debug*) } }