From 533a5dd4b11ec58df8785b33fb003236873a16e2 Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@cs.stanford.edu>
Date: Tue, 31 Aug 2004 01:00:56 +0000
Subject: [PATCH] Now kernel.lds.in is preprocessed to get kernel.lds.

---
 src/threads/kernel.lds    | 34 ----------------------------------
 src/threads/kernel.lds.in | 23 +++++++++++++++++++++++
 2 files changed, 23 insertions(+), 34 deletions(-)
 delete mode 100644 src/threads/kernel.lds
 create mode 100644 src/threads/kernel.lds.in

diff --git a/src/threads/kernel.lds b/src/threads/kernel.lds
deleted file mode 100644
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
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 = .;
+}
-- 
2.30.2