1 files changed, 3 insertions, 15 deletions
diff --git a/c/src/lib/libbsp/i386/pc386/startup/linkcmds b/c/src/lib/libbsp/i386/pc386/startup/linkcmds
index 599a9b2c0b..04d5fea6b2 100644
--- a/c/src/lib/libbsp/i386/pc386/startup/linkcmds
+++ b/c/src/lib/libbsp/i386/pc386/startup/linkcmds
@@ -73,7 +73,7 @@ SECTIONS
 
   } =0x90909090
 
-  .robsdsets : {
+  .rtemsroset : {
     /* for pre rtems-libbsd FreeBSD code */
     __start_set_sysctl_set = .;
     *(set_sysctl_*);
@@ -81,20 +81,7 @@ 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.*)))
   } =0x90909090
 
   .init           :
@@ -184,6 +171,7 @@ SECTIONS
     SORT(CONSTRUCTORS)
   }
   .data1          : { *(.data1) }
+  .rtemsrwset     : { KEEP (*(SORT(.rtemsrwset.*))) }
   _edata = .; PROVIDE (edata = .);
   __bss_start = .;
   .bss            :