Moved build-id sections to the main .text/.data sections to prevent l…

…d link warning.
werchou · Oct 20, 2015 · e4ab510 · e4ab510
1 parent 11d2584
commit e4ab510
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 68 deletions.
diff --git a/config/arm/raspberry/kernel.ld b/config/arm/raspberry/kernel.ld
@@ -21,11 +21,6 @@ OUTPUT_FORMAT("elf32-littlearm")
 
 SECTIONS
 {
-    /DISCARD/ :
-    {
-        *(.note.gnu.build-id)
-    }
-
     /* Starts at LOADER_ADDR. */
     . = 0x8000;
     __start = .;
@@ -50,6 +45,7 @@ SECTIONS
     .data :
     {
         *(.data)
+        *(.note.gnu.build-id)
 
         CTOR_LIST = .;
         KEEP (*(SORT(.ctors.*)))

diff --git a/config/arm/raspberry/user.ld b/config/arm/raspberry/user.ld
@@ -23,11 +23,6 @@ SECTIONS
 {
     . = 0x80000000;
 
-    /DISCARD/ :
-    {
-        *(.note.gnu.build-id)
-    }
-
     .text :
     {
 	*(.entry)
@@ -38,6 +33,7 @@ SECTIONS
 	*(.rodata)
 	*(.rodata.*)
 	*(.eh_frame)
+        *(.note.gnu.build-id)
 
 	. = ALIGN(4);
         CTOR_LIST = .;

diff --git a/config/intel/pc/kernel.ld b/config/intel/pc/kernel.ld
@@ -27,65 +27,61 @@ SECTIONS
     . = 0x00100000;
     kernelStart = .;
 
-    /DISCARD/ :
-    {
-        *(.note.gnu.build-id)
-    }
-
     .text virt : AT(phys)
     {
-	code = .;
-	*(.boot)
-	*(.text)
-	*(*.text)
-	*(.gnu.linkonce.*)
-	*(.rodata)
-	*(.rodata.*)
-	*(.eh_frame)
-	. = ALIGN(4096);
+        code = .;
+        *(.boot)
+        *(.text)
+        *(*.text)
+        *(.gnu.linkonce.*)
+        *(.rodata)
+        *(.rodata.*)
+        *(.eh_frame)
+        . = ALIGN(4096);
     }
 
     .data : AT (phys + (data - code))
     {
-	data = .;
-	*(.data)
+        data = .;
+        *(.data)
+        *(.note.gnu.build-id)
 
         CTOR_LIST = .;
-	KEEP (*(SORT(.ctors.*)))
-	KEEP (*(.ctors))
+        KEEP (*(SORT(.ctors.*)))
+        KEEP (*(.ctors))
         KEEP (*(.preinit_array))
         KEEP (*(.init_array.*))
         KEEP (*(.init_array))
-	LONG(0)
+        LONG(0)
         CTOR_END = .;
 
         DTOR_LIST = .;
-	KEEP (*(SORT(.dtors.*)))
-	KEEP (*(.dtors))
+        KEEP (*(SORT(.dtors.*)))
+        KEEP (*(.dtors))
         KEEP (*(.fini_array.*))
         KEEP (*(.fini_array))
         LONG(0)
         DTOR_END = .;
-	. += 4;
+        . += 4;
 
-	initStart = .;
-	KEEP (*(SORT(.init*)))
-	initEnd   = .;
+        initStart = .;
+        KEEP (*(SORT(.init*)))
+        initEnd   = .;
         isKernel = .;
         LONG(1);
-	. = ALIGN(4096);
+        . = ALIGN(4096);
     }
 
     .bss : AT(phys + (bss - code))
     {
-	bss = .;
-	*(.bss)
-	*(.bss.*)
-	*(COMMON)
+        bss = .;
+        *(.bss)
+        *(.bss.*)
+        *(COMMON)
 
         . += 4;
-	kernelEnd = .;
+        kernelEnd = .;
 
-	. = 0x00400000;
+        . = 0x00400000;
     }
 }
diff --git a/config/intel/pc/user.ld b/config/intel/pc/user.ld
@@ -23,46 +23,42 @@ SECTIONS
 {
     . = 0x80000000;
 
-    /DISCARD/ :
-    {
-        *(.note.gnu.build-id)
-    }
-
     .text :
     {
-	*(.entry)
-	*(.text)
-	*(*.text)
-	*(.gnu.linkonce.*)
-	*(.data)
-	*(.rodata)
-	*(.rodata.*)
-	*(.eh_frame)
+        *(.entry)
+        *(.text)
+        *(*.text)
+        *(.gnu.linkonce.*)
+        *(.data)
+        *(.rodata)
+        *(.rodata.*)
+        *(.eh_frame)
+        *(.note.gnu.build-id)
 
-	. = ALIGN(4);
+        . = ALIGN(4);
         CTOR_LIST = .;
-	KEEP (*(SORT(.ctors.*)))
-	KEEP (*(.ctors))
+        KEEP (*(SORT(.ctors.*)))
+        KEEP (*(.ctors))
         KEEP (*(.preinit_array))
         KEEP (*(.init_array.*))
         KEEP (*(.init_array))
-	LONG(0)
+        LONG(0)
         CTOR_END = .;
-	
+
         DTOR_LIST = .;
-	KEEP (*(SORT(.dtors.*)))
-	KEEP (*(.dtors))
+        KEEP (*(SORT(.dtors.*)))
+        KEEP (*(.dtors))
         KEEP (*(.dtors))
         KEEP (*(.fini_array.*))
         KEEP (*(.fini_array))
         LONG(0)
         DTOR_END = .;
-	. += 4;
-	
-	initStart = .;
-	KEEP (*(SORT(.init*)))
-	KEEP (*(.init*))
-	initEnd   = .;
+        . += 4;
+        
+        initStart = .;
+        KEEP (*(SORT(.init*)))
+        KEEP (*(.init*))
+        initEnd   = .;
         isKernel = .;
         LONG(0);