x86_64: remove stl_* sections for now

We currently don't really support user mode anymore, since it doesn't
integrate well within the architecture. We therefore need no special
handling of STL and kstd anymore.

1 files changed, 8 insertions, 12 deletions

diff --git a/arch/x86_64/scripts/kernel.ld b/arch/x86_64/scripts/kernel.ld
index 9a5dfd8..a429570 100644
--- a/arch/x86_64/scripts/kernel.ld
+++ b/arch/x86_64/scripts/kernel.ld
@@ -71,24 +71,24 @@ SECTIONS
 
   .kernel_rodata ALIGN(4K) : AT (ADDR (.kernel_rodata) - TEACHOS_VMA)
   {
-    *(EXCLUDE_FILE (*libstdc++.a:*) .rodata*)
+    *(.rodata*)
   } :kernel_rodata
 
   .kernel_data ALIGN(4K) : AT (ADDR (.kernel_data) - TEACHOS_VMA)
   {
-    *(EXCLUDE_FILE (*libstdc++.a:*) .data*)
+    *(.data*)
   } :kernel_data
 
   . += 4K;
 
   .kernel_bss ALIGN(4K) : AT (ADDR (.kernel_bss) - TEACHOS_VMA)
   {
-    *(EXCLUDE_FILE (*libstdc++.a:*) .stack .bss*)
+    *(.stack .bss*)
   } :kernel_data
 
   .kernel_text ALIGN(4K) : AT(ADDR (.kernel_text) - TEACHOS_VMA)
   {
-    *(EXCLUDE_FILE (*libstdc++.a:*) .text*)
+    *(.text*)
   } :kernel_text
 
   /***************************************************************************
@@ -97,28 +97,24 @@ SECTIONS
 
   .user_rodata ALIGN(4K) : AT (ADDR (.user_rodata) - TEACHOS_VMA)
   {
-    *(.stl_rodata* .user_rodata*)
-    KEEP(*libstdc++.a:*(.rodata*))
+    KEEP(*(.user_rodata*))
   } :user_rodata
 
   .user_data ALIGN(4K) : AT (ADDR (.user_data) - TEACHOS_VMA)
   {
-    *(.stl_data* .user_data*)
-    KEEP(*libstdc++.a:*(.data*))
+    KEEP(*(.user_data*))
   } :user_data
 
   . += 4K;
 
   .user_bss ALIGN(4K) : AT(ADDR (.user_bss) - TEACHOS_VMA)
   {
-    *(.stl_bss* .user_bss*)
-    KEEP(*libstdc++.a:*(.bss*))
+    KEEP(*(.user_bss*))
   } :user_data
 
   .user_text ALIGN(4K) : AT(ADDR (.user_text) - TEACHOS_VMA)
   {
-    KEEP(*(.stl_text* .user_text*))
-    KEEP(*libstdc++.a:*(.text*))
+    KEEP(*(.user_text*))
   } :user_text
 
   /***************************************************************************