[src/trunk]: src Unbreak creation of i386 PIEs on amd64.

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

details:   https://anonhg.NetBSD.org/src/rev/152cc3f90e9c
branches:  trunk
changeset: 374492:152cc3f90e9c
user:      hgutch <hgutch%NetBSD.org@localhost>
date:      Thu Apr 27 20:55:27 2023 +0000

description:
Unbreak creation of i386 PIEs on amd64.

Functional patch by RVP;  set lists updated accordingly.

This fixes PR toolchain/57380.

diffstat:

 distrib/sets/lists/comp/md.amd64           |  23 ++++++++++++++++++++++-
 external/gpl3/binutils/usr.bin/ld/Makefile |   4 ++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diffs (95 lines):

diff -r bf063cbf51ba -r 152cc3f90e9c distrib/sets/lists/comp/md.amd64
--- a/distrib/sets/lists/comp/md.amd64  Thu Apr 27 13:21:59 2023 +0000
+++ b/distrib/sets/lists/comp/md.amd64  Thu Apr 27 20:55:27 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.295 2023/01/09 14:37:50 christos Exp $
+# $NetBSD: md.amd64,v 1.296 2023/04/27 20:55:27 hgutch Exp $
 ./usr/include/amd64                            comp-c-include
 ./usr/include/amd64/ansi.h                     comp-c-include
 ./usr/include/amd64/aout_machdep.h             comp-c-include
@@ -1440,30 +1440,44 @@
 ./usr/libdata/ldscripts/elf_i386.xce           comp-util-bin           binutils
 ./usr/libdata/ldscripts/elf_i386.xd            comp-util-bin           binutils
 ./usr/libdata/ldscripts/elf_i386.xdc           comp-util-bin           binutils
+./usr/libdata/ldscripts/elf_i386.xdce          comp-util-bin           binutils
+./usr/libdata/ldscripts/elf_i386.xde           comp-util-bin           binutils
 ./usr/libdata/ldscripts/elf_i386.xdw           comp-util-bin           binutils
+./usr/libdata/ldscripts/elf_i386.xdwe          comp-util-bin           binutils
+./usr/libdata/ldscripts/elf_i386.xe            comp-util-bin           binutils
 ./usr/libdata/ldscripts/elf_i386.xn            comp-util-bin           binutils
 ./usr/libdata/ldscripts/elf_i386.xr            comp-util-bin           binutils
 ./usr/libdata/ldscripts/elf_i386.xs            comp-util-bin           binutils
 ./usr/libdata/ldscripts/elf_i386.xsc           comp-util-bin           binutils
 ./usr/libdata/ldscripts/elf_i386.xsce          comp-util-bin           binutils
+./usr/libdata/ldscripts/elf_i386.xse           comp-util-bin           binutils
 ./usr/libdata/ldscripts/elf_i386.xsw           comp-util-bin           binutils
+./usr/libdata/ldscripts/elf_i386.xswe          comp-util-bin           binutils
 ./usr/libdata/ldscripts/elf_i386.xu            comp-util-bin           binutils
 ./usr/libdata/ldscripts/elf_i386.xw            comp-util-bin           binutils
+./usr/libdata/ldscripts/elf_i386.xwe           comp-util-bin           binutils
 ./usr/libdata/ldscripts/elf_iamcu.x            comp-util-bin           binutils
 ./usr/libdata/ldscripts/elf_iamcu.xbn          comp-util-bin           binutils
 ./usr/libdata/ldscripts/elf_iamcu.xc           comp-util-bin           binutils
 ./usr/libdata/ldscripts/elf_iamcu.xce          comp-util-bin           binutils
 ./usr/libdata/ldscripts/elf_iamcu.xd           comp-util-bin           binutils
 ./usr/libdata/ldscripts/elf_iamcu.xdc          comp-util-bin           binutils
+./usr/libdata/ldscripts/elf_iamcu.xdce         comp-util-bin           binutils
+./usr/libdata/ldscripts/elf_iamcu.xde          comp-util-bin           binutils
 ./usr/libdata/ldscripts/elf_iamcu.xdw          comp-util-bin           binutils
+./usr/libdata/ldscripts/elf_iamcu.xdwe         comp-util-bin           binutils
+./usr/libdata/ldscripts/elf_iamcu.xe           comp-util-bin           binutils
 ./usr/libdata/ldscripts/elf_iamcu.xn           comp-util-bin           binutils
 ./usr/libdata/ldscripts/elf_iamcu.xr           comp-util-bin           binutils
 ./usr/libdata/ldscripts/elf_iamcu.xs           comp-util-bin           binutils
 ./usr/libdata/ldscripts/elf_iamcu.xsc          comp-util-bin           binutils
 ./usr/libdata/ldscripts/elf_iamcu.xsce         comp-util-bin           binutils
+./usr/libdata/ldscripts/elf_iamcu.xse          comp-util-bin           binutils
 ./usr/libdata/ldscripts/elf_iamcu.xsw          comp-util-bin           binutils
+./usr/libdata/ldscripts/elf_iamcu.xswe         comp-util-bin           binutils
 ./usr/libdata/ldscripts/elf_iamcu.xu           comp-util-bin           binutils
 ./usr/libdata/ldscripts/elf_iamcu.xw           comp-util-bin           binutils
+./usr/libdata/ldscripts/elf_iamcu.xwe          comp-util-bin           binutils
 ./usr/libdata/ldscripts/elf_k1om.x             comp-obsolete   obsolete,binutils=239
 ./usr/libdata/ldscripts/elf_k1om.x             comp-util-bin           binutils=234
 ./usr/libdata/ldscripts/elf_k1om.xbn           comp-obsolete   obsolete,binutils=239
@@ -1523,15 +1537,22 @@
 ./usr/libdata/ldscripts/elf_x86_64.xce         comp-util-bin           binutils
 ./usr/libdata/ldscripts/elf_x86_64.xd          comp-util-bin           binutils
 ./usr/libdata/ldscripts/elf_x86_64.xdc         comp-util-bin           binutils
+./usr/libdata/ldscripts/elf_x86_64.xdce                comp-util-bin           binutils
+./usr/libdata/ldscripts/elf_x86_64.xde         comp-util-bin           binutils
 ./usr/libdata/ldscripts/elf_x86_64.xdw         comp-util-bin           binutils
+./usr/libdata/ldscripts/elf_x86_64.xdwe                comp-util-bin           binutils
+./usr/libdata/ldscripts/elf_x86_64.xe          comp-util-bin           binutils
 ./usr/libdata/ldscripts/elf_x86_64.xn          comp-util-bin           binutils
 ./usr/libdata/ldscripts/elf_x86_64.xr          comp-util-bin           binutils
 ./usr/libdata/ldscripts/elf_x86_64.xs          comp-util-bin           binutils
 ./usr/libdata/ldscripts/elf_x86_64.xsc         comp-util-bin           binutils
 ./usr/libdata/ldscripts/elf_x86_64.xsce                comp-util-bin           binutils
+./usr/libdata/ldscripts/elf_x86_64.xse         comp-util-bin           binutils
 ./usr/libdata/ldscripts/elf_x86_64.xsw         comp-util-bin           binutils
+./usr/libdata/ldscripts/elf_x86_64.xswe                comp-util-bin           binutils
 ./usr/libdata/ldscripts/elf_x86_64.xu          comp-util-bin           binutils
 ./usr/libdata/ldscripts/elf_x86_64.xw          comp-util-bin           binutils
+./usr/libdata/ldscripts/elf_x86_64.xwe         comp-util-bin           binutils
 ./usr/libdata/ldscripts/i386nbsd.x             comp-obsolete           obsolete
 ./usr/libdata/ldscripts/i386nbsd.xbn           comp-obsolete           obsolete
 ./usr/libdata/ldscripts/i386nbsd.xn            comp-obsolete           obsolete
diff -r bf063cbf51ba -r 152cc3f90e9c external/gpl3/binutils/usr.bin/ld/Makefile
--- a/external/gpl3/binutils/usr.bin/ld/Makefile        Thu Apr 27 13:21:59 2023 +0000
+++ b/external/gpl3/binutils/usr.bin/ld/Makefile        Thu Apr 27 20:55:27 2023 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.38 2023/01/09 14:38:14 christos Exp $
+#      $NetBSD: Makefile,v 1.39 2023/04/27 20:55:27 hgutch Exp $
 
 CPPFLAGS+=     -I${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH} \
                -I${DIST}/ld \
@@ -88,7 +88,7 @@ FILES+= ${f}.${e}
 .  endfor
 . endif
 . if ${BINUTILS_MACHINE_ARCH} == "x86_64"
-.  for e in xce xsce
+.  for e in xce xdce xde xdwe xe xsce xse xswe xwe
 .   if exists(ldscripts/${f}.${e})
 FILES+= ${f}.${e}
 .   endif