diff options
| author | emaste <emaste@FreeBSD.org> | 2016-12-30 16:23:13 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2016-12-30 16:23:13 +0000 |
| commit | acb9ef06edc5d793f10a06ff9b8d34dcdc168cd5 (patch) | |
| tree | f408956f1ff116fd68297b4586e86ea6efb9fa38 /sys/boot | |
| parent | bad38aef9d61a36f94819d23b7fe50aff56a68e3 (diff) | |
| download | FreeBSD-src-acb9ef06edc5d793f10a06ff9b8d34dcdc168cd5.zip FreeBSD-src-acb9ef06edc5d793f10a06ff9b8d34dcdc168cd5.tar.gz | |
MFC r306264: Use 32-bit value for .text padding, for linker portability
GNU ld interprets the padding value as a variable-length byte string,
while GNU gold and LLVM lld interpret it as a 32-bit value.
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/efi/loader/arch/amd64/ldscript.amd64 | 2 | ||||
| -rw-r--r-- | sys/boot/efi/loader/arch/i386/ldscript.i386 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/boot/efi/loader/arch/amd64/ldscript.amd64 b/sys/boot/efi/loader/arch/amd64/ldscript.amd64 index 609aedf..53d9d76 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) - } =0xCC + } =0xCCCCCCCC . = ALIGN(4096); .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 0201269..4b28c10 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) - } =0xCC + } =0xCCCCCCCC . = ALIGN(4096); .data : { *(.rodata .rodata.* .gnu.linkonce.r.*) |
