[rtems commit] bsps: Fix some linker set descriptions

[Sebastian Huber]

Module:    rtems
Branch:    master
Commit:    44d18b9e64b24bdf367a153dde1f50436e399b15
Changeset: http://git.rtems.org/rtems/commit/?id=44d18b9e64b24bdf367a153dde1f50436e399b15

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Wed Dec  9 14:03:09 2015 +0100

bsps: Fix some linker set descriptions

Fix broken RTEMS linker set descriptions introduced by
b618d8cfc54f84d4ed03dc7b7fa510c872e6128a.

---

 c/src/lib/libbsp/m32c/m32cbsp/startup/linkcmds    | 3 ++-
 c/src/lib/libbsp/m32r/m32rsim/startup/linkcmds    | 2 +-
 c/src/lib/libbsp/nios2/nios2_iss/startup/linkcmds | 3 ++-
 c/src/lib/libbsp/powerpc/qemuppc/startup/linkcmds | 3 ++-
 c/src/lib/libbsp/powerpc/virtex4/startup/linkcmds | 2 +-
 c/src/lib/libbsp/powerpc/virtex5/startup/linkcmds | 2 +-
 c/src/lib/libbsp/v850/gdbv850sim/startup/linkcmds | 2 +-
 7 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/c/src/lib/libbsp/m32c/m32cbsp/startup/linkcmds b/c/src/lib/libbsp/m32c/m32cbsp/startup/linkcmds
index 5f838bc..35e601d 100644
--- a/c/src/lib/libbsp/m32c/m32cbsp/startup/linkcmds
+++ b/c/src/lib/libbsp/m32c/m32cbsp/startup/linkcmds
@@ -52,7 +52,8 @@ SECTIONS
     *(.plt)
     KEEP (*(.init))
     KEEP (*(.fini))
-    *(.rodata .rodata.* KEEP (*(SORT(.rtemsroset.*))) .gnu.linkonce.r.*)
+    *(.rodata .rodata.* .gnu.linkonce.r.*)
+    KEEP (*(SORT(.rtemsroset.*)))
     *(.rodata1)
     *(.eh_frame_hdr)
     KEEP (*(.eh_frame))
diff --git a/c/src/lib/libbsp/m32r/m32rsim/startup/linkcmds b/c/src/lib/libbsp/m32r/m32rsim/startup/linkcmds
index 018d405..e36a6a9 100644
--- a/c/src/lib/libbsp/m32r/m32rsim/startup/linkcmds
+++ b/c/src/lib/libbsp/m32r/m32rsim/startup/linkcmds
@@ -78,7 +78,7 @@ SECTIONS
   PROVIDE (__etext = .);
   PROVIDE (_etext = .);
   PROVIDE (etext = .);
-  .rodata         : { *(.rodata .rodata.* KEEP (*(SORT(.rtemsroset.*))) .gnu.linkonce.r.*) }
+  .rodata         : { *(.rodata .rodata.* .gnu.linkonce.r.*) KEEP (*(SORT(.rtemsroset.*))) }
   .rodata1        : { *(.rodata1) }
   .tdata : {
     _TLS_Data_begin = .;
diff --git a/c/src/lib/libbsp/nios2/nios2_iss/startup/linkcmds b/c/src/lib/libbsp/nios2/nios2_iss/startup/linkcmds
index 662d097..f3a1dd3 100644
--- a/c/src/lib/libbsp/nios2/nios2_iss/startup/linkcmds
+++ b/c/src/lib/libbsp/nios2/nios2_iss/startup/linkcmds
@@ -193,8 +193,9 @@ SECTIONS
     {
         PROVIDE (__ram_rodata_start = ABSOLUTE(.));
         . = ALIGN(32 / 8);
-        *(.rodata .rodata.* KEEP (*(SORT(.rtemsroset.*))) .gnu.linkonce.r.*)
+        *(.rodata .rodata.* .gnu.linkonce.r.*)
         *(.rodata1)
+        KEEP (*(SORT(.rtemsroset.*)))
     } > onchip_memory_0
 
     .tdata : {
diff --git a/c/src/lib/libbsp/powerpc/qemuppc/startup/linkcmds b/c/src/lib/libbsp/powerpc/qemuppc/startup/linkcmds
index 6e1e877..206fc77 100644
--- a/c/src/lib/libbsp/powerpc/qemuppc/startup/linkcmds
+++ b/c/src/lib/libbsp/powerpc/qemuppc/startup/linkcmds
@@ -95,8 +95,9 @@ SECTIONS
 
   .rodata :
   {
-    *(.rodata .rodata.* KEEP (*(SORT(.rtemsroset.*))) .gnu.linkonce.r.*)
+    *(.rodata .rodata.* .gnu.linkonce.r.*)
     *(.rodata1)
+    KEEP (*(SORT(.rtemsroset.*)))
     . = ALIGN (bsp_section_align);
     __rodata_end = .;
   } >ROM =0
diff --git a/c/src/lib/libbsp/powerpc/virtex4/startup/linkcmds b/c/src/lib/libbsp/powerpc/virtex4/startup/linkcmds
index a22ee3f..66dd828 100644
--- a/c/src/lib/libbsp/powerpc/virtex4/startup/linkcmds
+++ b/c/src/lib/libbsp/powerpc/virtex4/startup/linkcmds
@@ -91,7 +91,7 @@ SECTIONS
                     } > RAM
 
   /* Miscellaneous read-only data */
-  .rodata         : { *(.rodata.* KEEP (*(SORT(.rtemsroset.*))) .gnu.linkonce.r*) } > RAM
+  .rodata         : { *(.rodata.* .gnu.linkonce.r*) KEEP (*(SORT(.rtemsroset.*))) } > RAM
   .rodata1        : { *(.rodata1)                                      } > RAM
 
   .tdata : {
diff --git a/c/src/lib/libbsp/powerpc/virtex5/startup/linkcmds b/c/src/lib/libbsp/powerpc/virtex5/startup/linkcmds
index ce88a43..8f8a27e 100644
--- a/c/src/lib/libbsp/powerpc/virtex5/startup/linkcmds
+++ b/c/src/lib/libbsp/powerpc/virtex5/startup/linkcmds
@@ -91,7 +91,7 @@ SECTIONS
                     } > RAM
 
   /* Miscellaneous read-only data */
-  .rodata         : { *(.rodata.* KEEP (*(SORT(.rtemsroset.*))) .gnu.linkonce.r*) } > RAM
+  .rodata         : { *(.rodata.* .gnu.linkonce.r*) KEEP (*(SORT(.rtemsroset.*))) } > RAM
   .rodata1        : { *(.rodata1)                                      } > RAM
 
   .tdata : {
diff --git a/c/src/lib/libbsp/v850/gdbv850sim/startup/linkcmds b/c/src/lib/libbsp/v850/gdbv850sim/startup/linkcmds
index ff7bb85..fcffb95 100644
--- a/c/src/lib/libbsp/v850/gdbv850sim/startup/linkcmds
+++ b/c/src/lib/libbsp/v850/gdbv850sim/startup/linkcmds
@@ -89,7 +89,7 @@ SECTIONS
     *(.call_table_text)
   }
   .fini		: { KEEP (*(.fini)) } =0
-  .rodata	: { *(.rodata .rodata.* KEEP (*(SORT(.rtemsroset.*))) .gnu.linkonce.r.*) }
+  .rodata	: { *(.rodata .rodata.* .gnu.linkonce.r.*) KEEP (*(SORT(.rtemsroset.*))) }
   .rodata1	: { *(.rodata1) }
   .tdata : {
     __TLS_Data_begin = .;