Re-arrange flash layout to make linker happy

Splitting data landing in flash resulted in the linker getting upset
in a couple of ways.

First, the constructor/destructor arrays were no longer getting
aligned via the ALIGN statement above them, resulting in the symbols
being mis-aligned from the actual arrays.

Second, the constructors and destructors were somehow getting marked
'writable' which made the linker unhappy as that meant the contents of
flash were marked both executable and writable.

Fix this up by stuffing the constructor/destructor arrays into the
.text segment along with the ALIGN statement.

Signed-off-by: Keith Packard <[email protected]>

Author: keith-packard

picolibc.ld.in

@@ -75,23 +75,6 @@ SECTIONS
 		PROVIDE (@PREFIX@__etext = @PREFIX@__text_end);
 		PROVIDE (@PREFIX@_etext = @PREFIX@__text_end);
 		PROVIDE (@PREFIX@etext = @PREFIX@__text_end);
-	} >flash AT>flash :text
-
-	.rodata : {
-		/* read-only data */
-		*(.rdata)
-		*(.rodata .rodata.*)
-		*(.gnu.linkonce.r.*)
-
-		*(.srodata.cst16)
-		*(.srodata.cst8)
-		*(.srodata.cst4)
-		*(.srodata.cst2)
-		*(.srodata .srodata.*)
-	} >flash AT>flash :text
-
-	.data.rel.ro : {
-		*(.data.rel.ro .data.rel.ro.*)
 
 		/* Need to pre-align so that the symbols come after padding */
 		. = ALIGN(@DEFAULT_ALIGNMENT@);
@@ -113,6 +96,28 @@ SECTIONS
 
 	} >flash AT>flash :text
 
+	.rodata : {
+
+		/* read-only data */
+		*(.rdata)
+		*(.rodata .rodata.*)
+		*(.gnu.linkonce.r.*)
+
+		*(.srodata.cst16)
+		*(.srodata.cst8)
+		*(.srodata.cst4)
+		*(.srodata.cst2)
+		*(.srodata .srodata.*)
+
+	} >flash AT>flash :text
+
+	.data.rel.ro : {
+
+		/* data that needs relocating */
+		*(.data.rel.ro .data.rel.ro.*)
+
+	} >flash AT>flash :text
+
 	/*
 	 * Needs to be in its own segment with the PLT entries first
 	 * so that the linker will compute the offsets to those