summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoremaste <emaste@FreeBSD.org>2016-12-30 16:19:19 +0000
committeremaste <emaste@FreeBSD.org>2016-12-30 16:19:19 +0000
commite029b5b197d04590aab3a4fd22547af213eb16c0 (patch)
treece59becbec996466a0d171e2b4e1e367d1822074
parent9bca445a16f857c24be7c12ee3ab58bbbd63bb44 (diff)
downloadFreeBSD-src-e029b5b197d04590aab3a4fd22547af213eb16c0.zip
FreeBSD-src-e029b5b197d04590aab3a4fd22547af213eb16c0.tar.gz
MFC r305854: Use arch-specific .text padding fill value in EFI loaders
The fill pattern was previously an ia64 instruction sequence. Presumably ia64's linker script was copied as a starting point.
-rw-r--r--sys/boot/efi/loader/arch/amd64/ldscript.amd642
-rw-r--r--sys/boot/efi/loader/arch/arm64/ldscript.arm642
-rw-r--r--sys/boot/efi/loader/arch/i386/ldscript.i3862
3 files changed, 3 insertions, 3 deletions
diff --git a/sys/boot/efi/loader/arch/amd64/ldscript.amd64 b/sys/boot/efi/loader/arch/amd64/ldscript.amd64
index 14e1f06..609aedf 100644
--- a/sys/boot/efi/loader/arch/amd64/ldscript.amd64
+++ b/sys/boot/efi/loader/arch/amd64/ldscript.amd64
@@ -19,7 +19,7 @@ SECTIONS
/* .gnu.warning sections are handled specially by elf32.em. */
*(.gnu.warning)
*(.plt)
- } =0x00300000010070000002000001000400
+ } =0xCC
. = ALIGN(4096);
.data : {
*(.rodata .rodata.* .gnu.linkonce.r.*)
diff --git a/sys/boot/efi/loader/arch/arm64/ldscript.arm64 b/sys/boot/efi/loader/arch/arm64/ldscript.arm64
index 7b62eaa..29b807b 100644
--- a/sys/boot/efi/loader/arch/arm64/ldscript.arm64
+++ b/sys/boot/efi/loader/arch/arm64/ldscript.arm64
@@ -15,7 +15,7 @@ SECTIONS
/* .gnu.warning sections are handled specially by elf32.em. */
*(.gnu.warning)
*(.plt)
- } =0x00300000010070000002000001000400
+ } =0xD4200000
. = ALIGN(16);
.data : {
*(.rodata .rodata.* .gnu.linkonce.r.*)
diff --git a/sys/boot/efi/loader/arch/i386/ldscript.i386 b/sys/boot/efi/loader/arch/i386/ldscript.i386
index fdfda0a..0201269 100644
--- a/sys/boot/efi/loader/arch/i386/ldscript.i386
+++ b/sys/boot/efi/loader/arch/i386/ldscript.i386
@@ -14,7 +14,7 @@ SECTIONS
/* .gnu.warning sections are handled specially by elf32.em. */
*(.gnu.warning)
*(.plt)
- } =0x00300000010070000002000001000400
+ } =0xCC
. = ALIGN(4096);
.data : {
*(.rodata .rodata.* .gnu.linkonce.r.*)
OpenPOWER on IntegriCloud