[src/trunk]: src/sys/arch/i386/stand/efiboot Avoid error with new binutils:

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c9a7dc13ad90
branches:  trunk
changeset: 837859:c9a7dc13ad90
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Dec 24 18:21:50 2018 +0000

description:
Avoid error with new binutils:
error: PHDR segment not covered by LOAD segment

diffstat:

 sys/arch/i386/stand/efiboot/bootia32/ldscript |  11 +++++++++--
 sys/arch/i386/stand/efiboot/bootx64/ldscript  |  11 +++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diffs (57 lines):

diff -r 62cd30b98c4a -r c9a7dc13ad90 sys/arch/i386/stand/efiboot/bootia32/ldscript
--- a/sys/arch/i386/stand/efiboot/bootia32/ldscript     Mon Dec 24 17:44:40 2018 +0000
+++ b/sys/arch/i386/stand/efiboot/bootia32/ldscript     Mon Dec 24 18:21:50 2018 +0000
@@ -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 @@
    *(.text)
    *(.text.*)
    *(.gnu.linkonce.t.*)
-  }
+  } :text
   . = ALIGN(4096);
   .sdata :
   {
diff -r 62cd30b98c4a -r c9a7dc13ad90 sys/arch/i386/stand/efiboot/bootx64/ldscript
--- a/sys/arch/i386/stand/efiboot/bootx64/ldscript      Mon Dec 24 17:44:40 2018 +0000
+++ b/sys/arch/i386/stand/efiboot/bootx64/ldscript      Mon Dec 24 18:21:50 2018 +0000
@@ -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 @@
    *(.text)
    *(.text.*)
    *(.gnu.linkonce.t.*)
-  }
+  } :text
   . = ALIGN(4096);
   .reloc :
   {