Now kernel.lds.in is preprocessed to get kernel.lds.

diff --git a/src/threads/kernel.lds b/src/threads/kernel.lds
deleted file mode 100644 (file)
index d60fe0a..0000000
--- a/src/threads/kernel.lds
+++ /dev/null
@@ -1,34 +0,0 @@
-/* ld script to make i386 Linux kernel
- * Written by Martin Mares <mj@atrey.karlin.mff.cuni.cz>;
- */
-OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
-OUTPUT_ARCH(i386)
-ENTRY(start)
-SECTIONS
-{
-  . = 0xC0100000;
-  _text = .;                   /* Text and read-only data */
-  .text : {
-       *(.text)
-       *(.fixup)
-       *(.gnu.warning)
-       } = 0x9090
-
-  _etext = .;                  /* End of text section */
-
-  .rodata : { *(.rodata) *(.rodata.*) }
-  .kstrtab : { *(.kstrtab) }
-
-  .data : {                    /* Data */
-       *(.data)
-       CONSTRUCTORS
-       }
-
-  _edata = .;                  /* End of data section */
-
-  __bss_start = .;             /* BSS */
-  .bss : {
-       *(.bss)
-       }
-  _end = . ;
-}

diff --git a/src/threads/kernel.lds.in b/src/threads/kernel.lds.in
new file mode 100644 (file)
index 0000000..fb76cac
--- /dev/null
+++ b/src/threads/kernel.lds.in
@@ -0,0 +1,23 @@
+#include "loader.h"
+
+OUTPUT_FORMAT("elf32-i386")
+OUTPUT_ARCH("i386")
+ENTRY(start)
+SECTIONS
+{
+  . = LOADER_PHYS_BASE + LOADER_KERN_BASE;
+
+  _start = .;
+
+  .text : { *(.text) } = 0x9090
+
+  .rodata : { *(.rodata) *(.rodata.*) }
+
+  .data : { *(.data) }
+
+  _start_bss = .;
+  .bss : { *(.bss) }
+  _end_bss = .;
+
+  _end = .;
+}