X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86_64%2Flink.ld;h=49fe7ae3f1f8705e17552ad748d078a413d32304;hb=a59083b859599aeee6ab3e4fd6a0113faa5fddf5;hp=eb84fcd72eb9b644f43c8752b52a5c73046fa5f5;hpb=586a47ab9343a85c944a2cf7b27a74cf459a8423;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86_64/link.ld b/Kernel/arch/x86_64/link.ld
index eb84fcd7..49fe7ae3 100644
--- a/Kernel/arch/x86_64/link.ld
+++ b/Kernel/arch/x86_64/link.ld
@@ -7,9 +7,12 @@
 /* -2 GiB */
 _kernel_base = 0xFFFFFFFF80000000;
 
+/*
 OUTPUT_FORMAT(elf32-i386)
 OUTPUT_ARCH(i386:x86-64)
-ENTRY (start)
+*/
+OUTPUT_FORMAT(elf64-x86-64)
+ENTRY(start)
 
 SECTIONS {
 	. = 0x100000;
@@ -29,13 +32,12 @@ SECTIONS {
 	.usertext ALIGN(0x1000): AT(ADDR(.usertext) - _kernel_base) {
 		_UsertextBase = .;
 		*(.usertext)
+		_UsertextEnd = .;
 	}
-	_UsertextEnd = .;
 	
 	.rodata ALIGN(0x1000): AT(ADDR(.rodata) - _kernel_base) {
 		*(.initpd)
-		*(.rodata)
-		*(.rodata.*)
+		*(.rodata .rodata.*)
 		*(.rdata)
 		
 		. = ALIGN(0x10);
@@ -48,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;
 }