diff --git a/stand/efi/loader/arch/amd64/amd64.ldscript b/stand/efi/loader/arch/amd64/amd64.ldscript
--- a/stand/efi/loader/arch/amd64/amd64.ldscript
+++ b/stand/efi/loader/arch/amd64/amd64.ldscript
@@ -34,17 +34,6 @@
     *(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)
diff --git a/stand/efi/loader/arch/arm/arm.ldscript b/stand/efi/loader/arch/arm/arm.ldscript
--- a/stand/efi/loader/arch/arm/arm.ldscript
+++ b/stand/efi/loader/arch/arm/arm.ldscript
@@ -42,16 +42,6 @@
     *(.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) }
diff --git a/stand/efi/loader/arch/arm64/arm64.ldscript b/stand/efi/loader/arch/arm64/arm64.ldscript
--- a/stand/efi/loader/arch/arm64/arm64.ldscript
+++ b/stand/efi/loader/arch/arm64/arm64.ldscript
@@ -39,17 +39,6 @@
     __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)
diff --git a/stand/efi/loader/arch/riscv/riscv.ldscript b/stand/efi/loader/arch/riscv/riscv.ldscript
--- a/stand/efi/loader/arch/riscv/riscv.ldscript
+++ b/stand/efi/loader/arch/riscv/riscv.ldscript
@@ -35,17 +35,6 @@
     __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