From f07e34c84917ab61f80cf8ce05077ca4d51695e7 Mon Sep 17 00:00:00 2001
From: josh <josh@5b3e749e-e535-0410-8002-a9bb6afbdfca>
Date: Thu, 2 Jul 2009 03:43:44 +0000
Subject: [PATCH] updated link script to pack things better

git-svn-id: svn://anubis/hos/trunk@37 5b3e749e-e535-0410-8002-a9bb6afbdfca
---
 kernel/include/hos_defines.h |  2 --
 kernel/link.ld               | 41 ++++++++++++++++++------------------
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/kernel/include/hos_defines.h b/kernel/include/hos_defines.h
index 7f5460f..c6d281a 100644
--- a/kernel/include/hos_defines.h
+++ b/kernel/include/hos_defines.h
@@ -16,12 +16,10 @@ extern "C" {
 #define CONSOLE_MEMORY          (KERNEL_OFFSET + 0xB8000)
 
 extern  u8_t    _code;
-extern  u8_t    _data;
 extern  u8_t    _bss;
 extern  u8_t    _end;
 
 #define KERNEL_CODE (&_code)
-#define KERNEL_DATA (&_data)
 #define KERNEL_BSS  (&_bss)
 #define KERNEL_END  (&_end)
 
diff --git a/kernel/link.ld b/kernel/link.ld
index 52f7ddc..60a6108 100644
--- a/kernel/link.ld
+++ b/kernel/link.ld
@@ -2,24 +2,25 @@ OUTPUT_FORMAT(binary)
 ENTRY(start)
 SECTIONS
 {
-  .text  0xE0100000 : {
-    code = .; _code = .; __code = .;
-    *(.text)
-  }
-  .gnulinkonce : {
-    *(.gnu.linkonce*)
-    . = ALIGN(4096);
-  }
-  .data  : {
-    data = .; _data = .; __data = .;
-    *(.data)
-    *(.rodata)
-    . = ALIGN(4096);
-  }
-  .bss  : {
-    bss = .; _bss = .; __bss = .;
-    *(.bss)
-    . = ALIGN(4096);
-  }
-  end = .; _end = .; __end = .;
+    .text 0xE0100000 : {
+        code = .; _code = .; __code = .;
+        *(.text*)
+        *(.gnu.linkonce*)
+        . = ALIGN(4096);
+    }
+    .rodata : {
+        *(.rodata*)
+        . = ALIGN(4096);
+    }
+    .data : {
+        data = .; _data = .; __data = .;
+        *(.data*)
+        . = ALIGN(4096);
+    }
+    .bss : {
+        bss = .; _bss = .; __bss = .;
+        *(.bss*)
+        . = ALIGN(4096);
+    }
+    end = .; _end = .; __end = .;
 }