Module Name: src
Committed By: christos
Date: Mon Dec 24 18:21:50 UTC 2018
Modified Files:
src/sys/arch/i386/stand/efiboot/bootia32: ldscript
src/sys/arch/i386/stand/efiboot/bootx64: ldscript
Log Message:
Avoid error with new binutils:
error: PHDR segment not covered by LOAD segment
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/i386/stand/efiboot/bootia32/ldscript
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/i386/stand/efiboot/bootx64/ldscript
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/stand/efiboot/bootia32/ldscript
diff -u src/sys/arch/i386/stand/efiboot/bootia32/ldscript:1.1 src/sys/arch/i386/stand/efiboot/bootia32/ldscript:1.2
--- src/sys/arch/i386/stand/efiboot/bootia32/ldscript:1.1 Tue Jan 24 06:09:14 2017
+++ src/sys/arch/i386/stand/efiboot/bootia32/ldscript Mon Dec 24 13:21:50 2018
@@ -1,7 +1,14 @@
-/* $NetBSD: ldscript,v 1.1 2017/01/24 11:09:14 nonaka Exp $ */
+/* $NetBSD: ldscript,v 1.2 2018/12/24 18:21:50 christos Exp $ */
OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
OUTPUT_ARCH(i386)
ENTRY(_start)
+
+PHDRS
+{
+ text PT_LOAD;
+ headers PT_PHDR FILEHDR PHDRS;
+}
+
SECTIONS
{
. = 0;
@@ -13,7 +20,7 @@ SECTIONS
*(.text)
*(.text.*)
*(.gnu.linkonce.t.*)
- }
+ } :text
. = ALIGN(4096);
.sdata :
{
Index: src/sys/arch/i386/stand/efiboot/bootx64/ldscript
diff -u src/sys/arch/i386/stand/efiboot/bootx64/ldscript:1.1 src/sys/arch/i386/stand/efiboot/bootx64/ldscript:1.2
--- src/sys/arch/i386/stand/efiboot/bootx64/ldscript:1.1 Tue Jan 24 06:09:14 2017
+++ src/sys/arch/i386/stand/efiboot/bootx64/ldscript Mon Dec 24 13:21:50 2018
@@ -1,8 +1,15 @@
-/* $NetBSD: ldscript,v 1.1 2017/01/24 11:09:14 nonaka Exp $ */
+/* $NetBSD: ldscript,v 1.2 2018/12/24 18:21:50 christos Exp $ */
/* Same as elf_x86_64_fbsd_efi.lds, except for OUTPUT_FORMAT below - KEEP IN SYNC */
OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64")
OUTPUT_ARCH(i386:x86-64)
ENTRY(_start)
+
+PHDRS
+{
+ text PT_LOAD;
+ headers PT_PHDR FILEHDR PHDRS;
+}
+
SECTIONS
{
. = 0;
@@ -19,7 +26,7 @@ SECTIONS
*(.text)
*(.text.*)
*(.gnu.linkonce.t.*)
- }
+ } :text
. = ALIGN(4096);
.reloc :
{
