[arm] fix problem with gcc 4.4 to ensure the boot code is in the binary

seems that gcc 4.4 or the newer binutils likes to put linker generated shims first in link order. Tweak the boot code to use a special section that is ordered first by the linker script. Conflicts: arch/arm/crt0.S Change-Id: Ib38697ce3de375965f607fd17c56bfc16b7774e1
multirom-nexus6p · Jul 28, 2011 · c713ab8 · c713ab8
1 parent 12403e3
commit c713ab8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/arch/arm/crt0.S b/arch/arm/crt0.S
@@ -24,7 +24,7 @@
 #define DSB .byte 0x4f, 0xf0, 0x7f, 0xf5
 #define ISB .byte 0x6f, 0xf0, 0x7f, 0xf5
 
-.text
+.section ".text.boot"
 .globl _start
 _start:
 	b	reset

diff --git a/arch/arm/system-onesegment.ld b/arch/arm/system-onesegment.ld
@@ -6,6 +6,10 @@ SECTIONS
 {
 	. = %MEMBASE%;
 
+	/* text/read-only data */
+	.text.boot : { *(.text.boot) }
+	.text :	{ *(.text .text.* .glue_7* .gnu.linkonce.t.*) } =0x9090
+
 	.interp : { *(.interp) }
 	.hash : { *(.hash) }
 	.dynsym : { *(.dynsym) }
@@ -33,9 +37,6 @@ SECTIONS
 	.init : { *(.init) } =0x9090
 	.plt : { *(.plt) }
 
-	/* text/read-only data */
-	.text :	{ *(.text .text.* .glue_7* .gnu.linkonce.t.*) } =0x9090
-
 	.rodata : { 
 		*(.rodata .rodata.* .gnu.linkonce.r.*)
 		. = ALIGN(4);

diff --git a/arch/arm/system-twosegment.ld b/arch/arm/system-twosegment.ld
@@ -6,6 +6,10 @@ SECTIONS
 {
 	. = %ROMBASE%;
 
+	/* text/read-only data */
+	.text.boot : { *(.text.boot) }
+	.text :	{ *(.text .text.* .glue_7* .gnu.linkonce.t.*) } =0x9090
+
 	.interp : { *(.interp) }
 	.hash : { *(.hash) }
 	.dynsym : { *(.dynsym) }
@@ -33,9 +37,6 @@ SECTIONS
 	.init : { *(.init) } =0x9090
 	.plt : { *(.plt) }
 
-	/* text/read-only data */
-	.text :	{ *(.text .text.* .glue_7* .gnu.linkonce.t.*) } =0x9090
-
 	.rodata : { 
 		*(.rodata .rodata.* .gnu.linkonce.r.*) 
 		. = ALIGN(4);