diff --git a/stand/efi/loader/arch/amd64/amd64.ldscript b/stand/efi/loader/arch/amd64/amd64.ldscript
index 57014aefc025..0e620654ea81 100644
--- a/stand/efi/loader/arch/amd64/amd64.ldscript
+++ b/stand/efi/loader/arch/amd64/amd64.ldscript
@@ -1,71 +1,60 @@
 OUTPUT_FORMAT("elf64-x86-64-freebsd", "elf64-x86-64-freebsd", "elf64-x86-64-freebsd")
 OUTPUT_ARCH(i386:x86-64)
 ENTRY(_start)
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
   . = 0;
   ImageBase = .;
   .hash : { *(.hash) }  /* this MUST come first! */
   . = ALIGN(4096);
   .eh_frame :
   {
     *(.eh_frame)
   }
   . = ALIGN(4096);
   .text		: {
     *(.text .stub .text.* .gnu.linkonce.t.*)
     /* .gnu.warning sections are handled specially by elf32.em. */
     *(.gnu.warning)
     *(.plt)
   } =0xCCCCCCCC
   . = ALIGN(4096);
   .data		: {
     *(.rodata .rodata.* .gnu.linkonce.r.*)
     *(.rodata1)
     *(.sdata2 .sdata2.* .gnu.linkonce.s2.*)
     *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*)
     *(.opd)
     *(.data .data.* .gnu.linkonce.d.*)
     *(.data1)
     *(.plabel)
     *(.dynbss)
     *(.bss .bss.* .gnu.linkonce.b.*)
     *(COMMON)
   }
   . = ALIGN(4096);
-  set_Xcommand_set	: {
-    __start_set_Xcommand_set = .;
-    *(set_Xcommand_set)
-    __stop_set_Xcommand_set = .;
-  }
-  set_Xficl_compile_set	: {
-    __start_set_Xficl_compile_set = .;
-    *(set_Xficl_compile_set)
-    __stop_set_Xficl_compile_set = .;
-  }
-  . = ALIGN(4096);
   __gp = .;
   .sdata	: {
     *(.got.plt .got)
     *(.sdata .sdata.* .gnu.linkonce.s.*)
     *(dynsbss)
     *(.sbss .sbss.* .gnu.linkonce.sb.*)
     *(.scommon)
   }
   . = ALIGN(4096);
   .dynamic	: { *(.dynamic) }
   . = ALIGN(4096);
   .rela.dyn	: {
     *(.rela.data*)
     *(.rela.got)
     *(.rela.stab)
     *(.relaset_*)
   }
   . = ALIGN(4096);
   .reloc	: { *(.reloc) }
   . = ALIGN(4096);
   .dynsym	: { *(.dynsym) }
   . = ALIGN(4096);
   .dynstr	: { *(.dynstr) }
 }
diff --git a/stand/efi/loader/arch/arm/arm.ldscript b/stand/efi/loader/arch/arm/arm.ldscript
index 13affe12bbba..7b5c2af399c9 100644
--- a/stand/efi/loader/arch/arm/arm.ldscript
+++ b/stand/efi/loader/arch/arm/arm.ldscript
@@ -1,66 +1,56 @@
 OUTPUT_ARCH(arm)
 ENTRY(_start)
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
   . = 0;
   ImageBase = .;
   .text		: {
     *(.peheader)
     *(.text .stub .text.* .gnu.linkonce.t.*)
     /* .gnu.warning sections are handled specially by elf32.em. */
     *(.gnu.warning)
     *(.gnu.linkonce.t*)
   } =0
   _etext = .;
   PROVIDE (etext = .);
   . = ALIGN(16);
   .data    :
   {
     *(.data .data.*)
     *(.gnu.linkonce.d*)
     *(.rodata)
     *(.rodata.*)
     CONSTRUCTORS
 
     . = ALIGN(4);
     PROVIDE (__bss_start = .);
     *(.sbss)
     *(.scommon)
     *(.dynsbss)
     *(.dynbss)
     *(.bss)
     *(COMMON)
     . = ALIGN(4);
     PROVIDE (__bss_end = .);
   }
   .dynamic	: { *(.dynamic) }
   /* We want the small data sections together, so single-instruction offsets
      can access them all, and initialized data all before uninitialized, so
      we can shorten the on-disk segment size.  */
   .sdata     : {
     *(.got.plt .got)
     *(.sdata*.sdata.* .gnu.linkonce.s.*)
   }
-  set_Xcommand_set	: {
-    __start_set_Xcommand_set = .;
-    *(set_Xcommand_set)
-    __stop_set_Xcommand_set = .;
-  }
-  set_Xficl_compile_set	: {
-    __start_set_Xficl_compile_set = .;
-    *(set_Xficl_compile_set)
-    __stop_set_Xficl_compile_set = .;
-  }
   __gp = .;
   .plt   : { *(.plt) }
   .reloc	: { *(.reloc) }
   .dynsym	: { *(.dynsym) }
   .dynstr	: { *(.dynstr) }
   .rel.dyn	: {
     *(.rel.*)
     *(.relset_*)
   }
   _edata = .;
   .hash		: { *(.hash) }
 }
diff --git a/stand/efi/loader/arch/arm64/arm64.ldscript b/stand/efi/loader/arch/arm64/arm64.ldscript
index bacb81b5032f..18aead05cb49 100644
--- a/stand/efi/loader/arch/arm64/arm64.ldscript
+++ b/stand/efi/loader/arch/arm64/arm64.ldscript
@@ -1,88 +1,77 @@
 /*
 OUTPUT_FORMAT("elf64-aarch64-freebsd", "elf64-aarch64-freebsd", "elf64-aarch64-freebsd")
 */
 OUTPUT_ARCH(aarch64)
 ENTRY(_start)
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
   . = 0;
   ImageBase = .;
   .text		: {
     *(.peheader)
     *(.text .stub .text.* .gnu.linkonce.t.*)
     /* .gnu.warning sections are handled specially by elf32.em. */
     *(.gnu.warning)
     *(.plt)
   } =0xD4200000
   . = ALIGN(4096);
   _etext = .;
   __data_start = .;
   .data		: {
     *(.rodata .rodata.* .gnu.linkonce.r.*)
     *(.rodata1)
     *(.sdata2 .sdata2.* .gnu.linkonce.s2.*)
     *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*)
     *(.opd)
     *(.data .data.* .gnu.linkonce.d.*)
     *(.data1)
     *(.plabel)
 
     . = ALIGN(16);
     __bss_start = .;
     *(.sbss .sbss.* .gnu.linkonce.sb.*)
     *(.scommon)
     *(.dynbss)
     *(.bss *.bss.*)
     *(COMMON)
     . = ALIGN(16);
     __bss_end = .;
   }
   . = ALIGN(16);
-  set_Xcommand_set	: {
-    __start_set_Xcommand_set = .;
-    *(set_Xcommand_set)
-    __stop_set_Xcommand_set = .;
-  }
-  set_Xficl_compile_set	: {
-    __start_set_Xficl_compile_set = .;
-    *(set_Xficl_compile_set)
-    __stop_set_Xficl_compile_set = .;
-  }
-  . = ALIGN(16);
   __gp = .;
   .sdata	: {
     *(.got.plt .got)
     *(.sdata .sdata.* .gnu.linkonce.s.*)
     *(dynsbss)
     *(.scommon)
   }
   . = ALIGN(16);
   .dynamic	: { *(.dynamic) }
   . = ALIGN(16);
   .rela.dyn	: {
     *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*)
     *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*)
     *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*)
     *(.rela.got)
     *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*)
     *(.rela.sbss .rela.sbss.* .rela.gnu.linkonce.sb.*)
     *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*)
     *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*)
     *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*)
     *(.rela.plt)
     *(.relset_*)
     *(.rela.dyn .rela.dyn.*)
   }
   . = ALIGN(16);
   .reloc	: { *(.reloc) }
   . = ALIGN(16);
   .dynsym	: { *(.dynsym) }
   _edata = .;
   __data_size = . - __data_start;
 
   /* Unused sections */
   .interp	: { *(.interp) }
   .dynstr	: { *(.dynstr) }
   .hash		: { *(.hash) }
 }
diff --git a/stand/efi/loader/arch/riscv/riscv.ldscript b/stand/efi/loader/arch/riscv/riscv.ldscript
index 342ec62cf03e..63b71c3bd702 100644
--- a/stand/efi/loader/arch/riscv/riscv.ldscript
+++ b/stand/efi/loader/arch/riscv/riscv.ldscript
@@ -1,87 +1,76 @@
 OUTPUT_FORMAT("elf64-littleriscv", "elf64-littleriscv", "elf64-littleriscv")
 OUTPUT_ARCH(riscv64)
 ENTRY(_start)
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
   . = 0;
   ImageBase = .;
   .text		: {
     *(.peheader)
     *(.text .stub .text.* .gnu.linkonce.t.*)
     /* .gnu.warning sections are handled specially by elf32.em. */
     *(.gnu.warning)
     *(.plt)
   } =0x9090
   . = ALIGN(16);
   .data		: {
     *(.rodata .rodata.* .gnu.linkonce.r.*)
     *(.rodata1)
     *(.sdata2 .sdata2.* .gnu.linkonce.s2.*)
     *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*)
     *(.opd)
     *(.data .data.* .gnu.linkonce.d.*)
     *(.data1)
     *(.plabel)
 
     . = ALIGN(16);
     __bss_start = .;
     *(.sbss .sbss.* .gnu.linkonce.sb.*)
     *(.scommon)
     *(.dynbss)
     *(.bss *.bss.*)
     *(COMMON)
     . = ALIGN(16);
     __bss_end = .;
   }
   . = ALIGN(16);
-  set_Xcommand_set	: {
-    __start_set_Xcommand_set = .;
-    *(set_Xcommand_set)
-    __stop_set_Xcommand_set = .;
-  }
-  set_Xficl_compile_set	: {
-    __start_set_Xficl_compile_set = .;
-    *(set_Xficl_compile_set)
-    __stop_set_Xficl_compile_set = .;
-  }
-  . = ALIGN(16);
   .sdata	: {
     /*
      * u-boot expects the gp register to be untouched by the EFI payload, so we
      * can't enable this yet.
      */
     /* __global_pointer$ = . + 0x800; */
     *(.got.plt .got)
     *(.sdata .sdata.* .gnu.linkonce.s.*)
     *(dynsbss)
     *(.scommon)
   }
   . = ALIGN(16);
   .dynamic	: { *(.dynamic) }
   . = ALIGN(16);
   .rela.dyn	: {
     *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*)
     *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*)
     *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*)
     *(.rela.got)
     *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*)
     *(.rela.sbss .rela.sbss.* .rela.gnu.linkonce.sb.*)
     *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*)
     *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*)
     *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*)
     *(.rela.plt)
     *(.relset_*)
     *(.rela.dyn .rela.dyn.*)
   }
   . = ALIGN(16);
   .reloc	: { *(.reloc) }
   . = ALIGN(16);
   .dynsym	: { *(.dynsym) }
   _edata = .;
 
   /* Unused sections */
   .interp	: { *(.interp) }
   .dynstr	: { *(.dynstr) }
   .hash		: { *(.hash) }
 }