diff --git a/sys/boot/efi/loader/arch/amd64/ldscript.amd64 b/sys/boot/efi/loader/arch/amd64/ldscript.amd64
index 14e1f065862a..609aedf2385d 100644
--- a/sys/boot/efi/loader/arch/amd64/ldscript.amd64
+++ b/sys/boot/efi/loader/arch/amd64/ldscript.amd64
@@ -1,67 +1,67 @@
 /* $FreeBSD$ */
 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)
-  } =0x00300000010070000002000001000400
+  } =0xCC
   . = 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 = .;
   }
   . = 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/sys/boot/efi/loader/arch/arm64/ldscript.arm64 b/sys/boot/efi/loader/arch/arm64/ldscript.arm64
index 7b62eaa4d6ed..29b807b25078 100644
--- a/sys/boot/efi/loader/arch/arm64/ldscript.arm64
+++ b/sys/boot/efi/loader/arch/arm64/ldscript.arm64
@@ -1,80 +1,80 @@
 /* $FreeBSD$ */
 /*
 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)
-  } =0x00300000010070000002000001000400
+  } =0xD4200000
   . = 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 = .;
   }
   . = 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 = .;
 
   /* Unused sections */
   .dynstr	: { *(.dynstr) }
   .hash		: { *(.hash) }
 }
diff --git a/sys/boot/efi/loader/arch/i386/ldscript.i386 b/sys/boot/efi/loader/arch/i386/ldscript.i386
index fdfda0a05ce4..0201269158a0 100644
--- a/sys/boot/efi/loader/arch/i386/ldscript.i386
+++ b/sys/boot/efi/loader/arch/i386/ldscript.i386
@@ -1,72 +1,72 @@
 /* $FreeBSD$ */
 OUTPUT_FORMAT("elf32-i386-freebsd", "elf32-i386-freebsd", "elf32-i386-freebsd")
 OUTPUT_ARCH(i386)
 ENTRY(_start)
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
   . = 0;
   ImageBase = .;
   . = SIZEOF_HEADERS;
   . = ALIGN(4096);
   .text		: {
     *(.text .stub .text.* .gnu.linkonce.t.*)
     /* .gnu.warning sections are handled specially by elf32.em. */
     *(.gnu.warning)
     *(.plt)
-  } =0x00300000010070000002000001000400
+  } =0xCC
   . = 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 = .;
   }
   . = 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);
   .rel.dyn	: {
     *(.rel.text .rel.text.* .rel.gnu.linkonce.t.*)
     *(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*)
     *(.rel.data .rel.data.* .rel.gnu.linkonce.d.*)
     *(.rel.got)
     *(.rel.sdata .rel.sdata.* .rel.gnu.linkonce.s.*)
     *(.rel.sbss .rel.sbss.* .rel.gnu.linkonce.sb.*)
     *(.rel.sdata2 .rel.sdata2.* .rel.gnu.linkonce.s2.*)
     *(.rel.sbss2 .rel.sbss2.* .rel.gnu.linkonce.sb2.*)
     *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*)
     *(.rel.plt)
     *(.relset_*)
     *(.rel.dyn .rel.dyn.*)
   }
   . = ALIGN(4096);
   .reloc	: { *(.reloc) }
   . = ALIGN(4096);
   .hash		: { *(.hash) }
   . = ALIGN(4096);
   .dynsym	: { *(.dynsym) }
   . = ALIGN(4096);
   .dynstr	: { *(.dynstr) }
 }