refactor: restructure the user space stuff.

[lunaix-os.git] / lunaix-os / link / linker.ld

diff --git a/lunaix-os/link/linker.ld b/lunaix-os/link/linker.ld
index ce236c0c6ebbb01fc17c565a5e4d04b99579f833..7ea0804fe2d604444b3824e0d6fa258aa66e2289 100644 (file)
--- a/lunaix-os/link/linker.ld
+++ b/lunaix-os/link/linker.ld
@@ -41,10 +41,11 @@ SECTIONS {
         build/obj/hal/*.o (.text)
     }
 
         build/obj/hal/*.o (.text)
     }
 

-    .bss BLOCK(4K) : AT ( ADDR(.bss) - 0xC0000000 ) {
-        build/obj/kernel/*.o (.bss)
-        build/obj/hal/*.o (.bss)
+    __usrtext_start = ALIGN(4K);
+    .usrtext BLOCK(4K) : AT ( ADDR(.usrtext) - 0xC0000000 ) {
+        build/obj/kernel/*.o (.usrtext)

     }
     }

+    __usrtext_end = ALIGN(4K);

 
     .data BLOCK(4k) : AT ( ADDR(.data) - 0xC0000000 ) {
         build/obj/kernel/*.o (.data)
 
     .data BLOCK(4k) : AT ( ADDR(.data) - 0xC0000000 ) {
         build/obj/kernel/*.o (.data)


@@ -60,10 +61,10 @@ SECTIONS {
         build/obj/arch/x86/*.o (.kpg)
     }
 
         build/obj/arch/x86/*.o (.kpg)
     }
 

+    .bss BLOCK(4K) : AT ( ADDR(.bss) - 0xC0000000 ) {
+        build/obj/kernel/*.o (.bss)
+        build/obj/hal/*.o (.bss)
+    }
+

     __kernel_end = ALIGN(4K);
     __kernel_end = ALIGN(4K);

-    __pg_mount_point = ALIGN(4K);
-    . += 16K;
-    __proc_table = ALIGN(4K);
-    . += 128M;
-    __kernel_heap_start = ALIGN(4K);    /* 内核结束的地方即堆开始的地方 */

 }
\ No newline at end of file
 }
\ No newline at end of file