Build - Restructured configuration

[tpg/acess2.git] / Kernel / arch / x86_64 / link.ld

diff --git a/Kernel/arch/x86_64/link.ld b/Kernel/arch/x86_64/link.ld
index ce537f9..49fe7ae 100644 (file)
--- a/Kernel/arch/x86_64/link.ld
+++ b/Kernel/arch/x86_64/link.ld
@@ -7,8 +7,11 @@
 /* -2 GiB */
 _kernel_base = 0xFFFFFFFF80000000;
 
+/*
 OUTPUT_FORMAT(elf32-i386)
 OUTPUT_ARCH(i386:x86-64)
+*/
+OUTPUT_FORMAT(elf64-x86-64)
 ENTRY(start)
 
 SECTIONS {
@@ -29,8 +32,8 @@ SECTIONS {
        .usertext ALIGN(0x1000): AT(ADDR(.usertext) - _kernel_base) {
                _UsertextBase = .;
                *(.usertext)
+               _UsertextEnd = .;
        }
-       _UsertextEnd = .;
        
        .rodata ALIGN(0x1000): AT(ADDR(.rodata) - _kernel_base) {
                *(.initpd)
@@ -47,20 +50,15 @@ SECTIONS {
                gKernelSymbolsEnd = .;
        }
        
-       .padata ALIGN (0x1000) : AT(ADDR(.padata) - _kernel_base) {
-               *(.padata)
-       }
-       
        .data ALIGN (0x1000) : AT(ADDR(.data) - _kernel_base) {
+               *(.padata)
                *(.data)
        }
 
        __bss_start = .;
        .bss : AT(ADDR(.bss) - _kernel_base) {
-               _sbss = .;
                *(COMMON)
                *(.bss)
-               _ebss = .;
        }
        gKernelEnd = (. + 0xFFF)&0xFFFFFFFFFFFFF000;
 }