backported malloc fixes from 256boss, plus the addition of calloc and

[bootcensus] / pcboot.ld

diff --git a/pcboot.ld b/pcboot.ld
index f629124..e2c0308 100644 (file)
--- a/pcboot.ld
+++ b/pcboot.ld
@@ -1,10 +1,25 @@
 OUTPUT_ARCH(i386)
 
 SECTIONS {
-       /* BIOS will load us at 0x7c000h */
-       . = 0x7c000;
+       /* BIOS loads the boot code at 0000:7c00 */
+       . = 0x7c00;
 
        .boot : { * (.boot); }
+
+       /* second stage boot loader */
+       .boot2 : {
+               * (.boot2);
+               /* pad the boot loader to the next sector boundary */
+               . = ALIGN(512);
+       }
+       _boot2_size = SIZEOF(.boot2);
+
+       /* main program will be loaded at 1MB by the second stage
+        * boot loader
+        */
+       . = 1M;
+       _main_start = .;
+
        .startup : { * (.startup); }
        .text : { * (.text); }
        .rodata : { * (.rodata); }
@@ -18,5 +33,6 @@ SECTIONS {
        }
        _bss_size = SIZEOF(.bss);
 
+       _main_size = . - _main_start;
        _mem_start = .;
 }