Merge pull request #6 from Steveice10/master

Ensure .text.start comes first in code binaries.
jasondellaluce · Feb 18, 2016 · 2841057 · 2841057
2 parents d951ed3 + 088ef48
commit 2841057
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/common/payload_stage1.ld b/common/payload_stage1.ld
@@ -17,6 +17,12 @@ SECTIONS
 		} >ram = 0xff
 	.plt : { *(.plt) } >ram = 0xff
 
+	.text.start :   /* ALIGN (4): */
+	{
+		*(.text.start)
+		. = ALIGN(4);  /* REQUIRED. LD is flaky without it. */
+	} >ram = 0xff
+
 	.text :   /* ALIGN (4): */
 	{
 		*(.text .stub .text.* .gnu.linkonce.t.*)

diff --git a/common/payload_stage2.ld b/common/payload_stage2.ld
@@ -17,6 +17,12 @@ SECTIONS
 		} >ram = 0xff
 	.plt : { *(.plt) } >ram = 0xff
 
+	.text.start :   /* ALIGN (4): */
+	{
+		*(.text.start)
+		. = ALIGN(4);  /* REQUIRED. LD is flaky without it. */
+	} >ram = 0xff
+
 	.text :   /* ALIGN (4): */
 	{
 		*(.text .stub .text.* .gnu.linkonce.t.*)

diff --git a/payload_installer/installer/bootstrap.ld b/payload_installer/installer/bootstrap.ld
@@ -17,6 +17,12 @@ SECTIONS
 		} >ram = 0xff
 	.plt : { *(.plt) } >ram = 0xff
 
+	.text.start :   /* ALIGN (4): */
+	{
+		*(.text.start)
+		. = ALIGN(4);  /* REQUIRED. LD is flaky without it. */
+	} >ram = 0xff
+
 	.text :   /* ALIGN (4): */
 	{
 		*(.text .stub .text.* .gnu.linkonce.t.*)