1 files changed, 5 insertions, 15 deletions
diff --git a/c/src/lib/libbsp/sh/shsim/startup/linkcmds b/c/src/lib/libbsp/sh/shsim/startup/linkcmds
index d85a3d63a3..a12af48b9c 100644
--- a/c/src/lib/libbsp/sh/shsim/startup/linkcmds
+++ b/c/src/lib/libbsp/sh/shsim/startup/linkcmds
@@ -157,7 +157,7 @@ SECTIONS
     *(.dtors)
     ___dtors_end = .;
   }
-  .robsdsets : {
+  .rtemsroset : {
     /* for pre rtems-libbsd FreeBSD code */
     __start_set_sysctl_set = .;
     *(set_sysctl_*);
@@ -165,20 +165,10 @@ SECTIONS
     *(set_domain_*);
     *(set_pseudo_*);
 
-    /* for rtems-libbsd FreeBSD code */
-    __bsd__start_set_modmetadata_set = .;
-    *(_bsd_set_modmetadata_set);
-    __bsd__stop_set_modmetadata_set = .;
-
-    __bsd__start_set_sysctl_set = .;
-    *(_bsd_set_sysctl_set);
-    __bsd__stop_set_sysctl_set = .;
-
-    __bsd__start_set_sysinit_set = .;
-    *(_bsd_set_sysinit_*);
-    __bsd__stop_set_sysinit_set = .;
-
-    _bsp_section_rodata_end = .;
+    KEEP (*(SORT(.rtemsroset.*)))
+  } >ram
+  .rtemsrwset : {
+    KEEP (*(SORT(.rtemsrwset.*)))
   } >ram
 
   .got     .      : { *(.got.plt) *(.got) }