Massive clean-up of linker scripts from Freddie Chopin

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5307 42af7a65-404d-4744-a932-0658087f49c3

3 files changed, 40 insertions, 28 deletions

diff --git a/nuttx/configs/ea3131/locked/ld-locked.script b/nuttx/configs/ea3131/locked/ld-locked.script
index 955505364..334c328c0 100644
--- a/nuttx/configs/ea3131/locked/ld-locked.script
+++ b/nuttx/configs/ea3131/locked/ld-locked.script
@@ -38,6 +38,6 @@ OUTPUT_ARCH(arm)
 SECTIONS
 {
 	.text.locked : { *(.text .text.*) }
-	.data : { *(.data) } 
-	.bss :  { *(.bss)  *(COMMON) } 
+	.data : { *(.data) }
+	.bss :  { *(.bss)  *(COMMON) }
 }
diff --git a/nuttx/configs/ea3131/scripts/ld.script b/nuttx/configs/ea3131/scripts/ld.script
index 333117c19..72a3d9f97 100644
--- a/nuttx/configs/ea3131/scripts/ld.script
+++ b/nuttx/configs/ea3131/scripts/ld.script
@@ -51,10 +51,10 @@ SECTIONS
 	.text : {
 		_stext = ABSOLUTE(.);
 		*(.vectors)
-		*(.text .text.*)        
+		*(.text .text.*)
 		*(.fixup)
 		*(.gnu.warning)
-		*(.rodata .rodata.*)        
+		*(.rodata .rodata.*)
 		*(.gnu.linkonce.t.*)
 		*(.glue_7)
 		*(.glue_7t)
@@ -64,19 +64,15 @@ SECTIONS
 		_etext = ABSOLUTE(.);
 	} > isram
 
-	_eronly = ABSOLUTE(.);
-
-	.data : {
-		_sdata = ABSOLUTE(.);
-		*(.data .data.*)
-		*(.gnu.linkonce.d.*)
-		CONSTRUCTORS
-		_edata = ABSOLUTE(.);
+	.init_section : {
+		_sinit = ABSOLUTE(.);
+		*(.init_array .init_array.*)
+		_einit = ABSOLUTE(.);
 	} > isram
 
 	.ARM.extab : {
 		*(.ARM.extab*)
-	} >isram
+	} > isram
 
 	__exidx_start = ABSOLUTE(.);
 	.ARM.exidx : {
@@ -84,6 +80,16 @@ SECTIONS
 	} > isram
 	__exidx_end = ABSOLUTE(.);
 
+	_eronly = ABSOLUTE(.);
+
+	.data : {
+		_sdata = ABSOLUTE(.);
+		*(.data .data.*)
+		*(.gnu.linkonce.d.*)
+		CONSTRUCTORS
+		_edata = ABSOLUTE(.);
+	} > isram
+
 	.bss : {
 		_sbss = ABSOLUTE(.);
 		*(.bss .bss.*)
diff --git a/nuttx/configs/ea3131/scripts/pg-ld.script b/nuttx/configs/ea3131/scripts/pg-ld.script
index 90a713c7d..d7c1f1d4d 100644
--- a/nuttx/configs/ea3131/scripts/pg-ld.script
+++ b/nuttx/configs/ea3131/scripts/pg-ld.script
@@ -32,7 +32,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  ****************************************************************************/
- 
+
 /* The LPC3131 has 192Kb of ISRAM beginning at virtual address 0x1102:8000.
  * LPC31xx boot ROM expects the boot image be compiled with entry point at
  * 0x1102:9000.  A 128b header will appear at this address (applied by
@@ -80,10 +80,10 @@ SECTIONS
 	.locked : {
 		_slocked = ABSOLUTE(.);
 		*(.vectors)
-		up_head.o locked.r (.text .text.*)        
+		up_head.o locked.r (.text .text.*)
 		up_head.o locked.r (.fixup)
 		up_head.o locked.r (.gnu.warning)
-		up_head.o locked.r (.rodata .rodata.*)        
+		up_head.o locked.r (.rodata .rodata.*)
 		up_head.o locked.r (.gnu.linkonce.t.*)
 		up_head.o locked.r (.glue_7)
 		up_head.o locked.r (.glue_7t)
@@ -93,14 +93,30 @@ SECTIONS
 		_elocked = ABSOLUTE(.);
 	} >locked
 
+	.init_section : {
+		_sinit = ABSOLUTE(.);
+		*(.init_array .init_array.*)
+		_einit = ABSOLUTE(.);
+	} > locked
+
+	.ARM.extab : {
+		*(.ARM.extab*)
+	} > locked
+
+	__exidx_start = ABSOLUTE(.);
+	.ARM.exidx : {
+		*(.ARM.exidx*)
+	} > locked
+	__exidx_end = ABSOLUTE(.);
+
 	_eronly = ABSOLUTE(.);
 
 	.paged : {
 		_spaged = ABSOLUTE(.);
-		*(.text .text.*)        
+		*(.text .text.*)
 		*(.fixup)
 		*(.gnu.warning)
-		*(.rodata .rodata.*)        
+		*(.rodata .rodata.*)
 		*(.gnu.linkonce.t.*)
 		*(.glue_7)
 		*(.glue_7t)
@@ -118,16 +134,6 @@ SECTIONS
 		_edata = ABSOLUTE(.);
 	} > data AT > locked
 
-	.ARM.extab : {
-		*(.ARM.extab*)
-	} >data
-
-	.ARM.exidx : {
-		__exidx_start = ABSOLUTE(.);
-		*(.ARM.exidx*)
-		__exidx_end = ABSOLUTE(.);
-	} > data
-
 	.bss : {
 		_sbss = ABSOLUTE(.);
 		*(.bss .bss.*)