Module Name:    src
Committed By:   mrg
Date:           Tue Oct 11 07:23:53 UTC 2016

Modified Files:
        src/distrib/sets/lists/comp: ad.arm
        src/external/gpl3/binutils/usr.bin/ld: Makefile

Log Message:
build and install the arm ldscripts.  now i can build oabi again.


To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/distrib/sets/lists/comp/ad.arm
cvs rdiff -u -r1.23 -r1.24 src/external/gpl3/binutils/usr.bin/ld/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/comp/ad.arm
diff -u src/distrib/sets/lists/comp/ad.arm:1.72 src/distrib/sets/lists/comp/ad.arm:1.73
--- src/distrib/sets/lists/comp/ad.arm:1.72	Fri Mar 18 03:08:25 2016
+++ src/distrib/sets/lists/comp/ad.arm	Tue Oct 11 07:23:53 2016
@@ -1,4 +1,4 @@
-# $NetBSD: ad.arm,v 1.72 2016/03/18 03:08:25 mrg Exp $
+# $NetBSD: ad.arm,v 1.73 2016/10/11 07:23:53 mrg Exp $
 ./usr/include/acorn26				comp-c-include
 ./usr/include/acorn26/ansi.h			comp-obsolete		obsolete
 ./usr/include/acorn26/aout_machdep.h		comp-obsolete		obsolete
@@ -673,3 +673,96 @@
 ./usr/libdata/lint/llib-larm.ln			comp-c-lintlib		lint
 ./usr/libdata/lint/llib-larm32.ln		comp-obsolete		obsolete
 ./usr/libdata/lint/llib-lpmc.ln			comp-c-lintlib		lint
+./usr/libdata/ldscripts/armelf.x		-unknown-		binutils
+./usr/libdata/ldscripts/armelf.xbn		-unknown-		binutils
+./usr/libdata/ldscripts/armelf.xc		-unknown-		binutils
+./usr/libdata/ldscripts/armelf.xn		-unknown-		binutils
+./usr/libdata/ldscripts/armelf.xr		-unknown-		binutils
+./usr/libdata/ldscripts/armelf.xs		-unknown-		binutils
+./usr/libdata/ldscripts/armelf.xsc		-unknown-		binutils
+./usr/libdata/ldscripts/armelf.xsw		-unknown-		binutils
+./usr/libdata/ldscripts/armelf.xu		-unknown-		binutils
+./usr/libdata/ldscripts/armelf.xw		-unknown-		binutils
+./usr/libdata/ldscripts/armelf_nbsd.x		-unknown-		binutils
+./usr/libdata/ldscripts/armelf_nbsd.xbn		-unknown-		binutils
+./usr/libdata/ldscripts/armelf_nbsd.xn		-unknown-		binutils
+./usr/libdata/ldscripts/armelf_nbsd.xr		-unknown-		binutils
+./usr/libdata/ldscripts/armelf_nbsd.xu		-unknown-		binutils
+./usr/libdata/ldscripts/armelf_nbsd_eabi.x	-unknown-		binutils
+./usr/libdata/ldscripts/armelf_nbsd_eabi.xbn	-unknown-		binutils
+./usr/libdata/ldscripts/armelf_nbsd_eabi.xn	-unknown-		binutils
+./usr/libdata/ldscripts/armelf_nbsd_eabi.xr	-unknown-		binutils
+./usr/libdata/ldscripts/armelf_nbsd_eabi.xu	-unknown-		binutils
+./usr/libdata/ldscripts/armelf_nbsd_eabihf.x	-unknown-		binutils
+./usr/libdata/ldscripts/armelf_nbsd_eabihf.xbn	-unknown-		binutils
+./usr/libdata/ldscripts/armelf_nbsd_eabihf.xn	-unknown-		binutils
+./usr/libdata/ldscripts/armelf_nbsd_eabihf.xr	-unknown-		binutils
+./usr/libdata/ldscripts/armelf_nbsd_eabihf.xu	-unknown-		binutils
+./usr/libdata/ldscripts/armelfb_nbsd.x		-unknown-		binutils
+./usr/libdata/ldscripts/armelfb_nbsd.xbn	-unknown-		binutils
+./usr/libdata/ldscripts/armelfb_nbsd.xn		-unknown-		binutils
+./usr/libdata/ldscripts/armelfb_nbsd.xr		-unknown-		binutils
+./usr/libdata/ldscripts/armelfb_nbsd.xu		-unknown-		binutils
+./usr/libdata/ldscripts/armelfb_nbsd_eabi.x	-unknown-		binutils
+./usr/libdata/ldscripts/armelfb_nbsd_eabi.xbn	-unknown-		binutils
+./usr/libdata/ldscripts/armelfb_nbsd_eabi.xn	-unknown-		binutils
+./usr/libdata/ldscripts/armelfb_nbsd_eabi.xr	-unknown-		binutils
+./usr/libdata/ldscripts/armelfb_nbsd_eabi.xu	-unknown-		binutils
+./usr/libdata/ldscripts/armelfb_nbsd_eabihf.x	-unknown-		binutils
+./usr/libdata/ldscripts/armelfb_nbsd_eabihf.xbn	-unknown-		binutils
+./usr/libdata/ldscripts/armelfb_nbsd_eabihf.xn	-unknown-		binutils
+./usr/libdata/ldscripts/armelfb_nbsd_eabihf.xr	-unknown-		binutils
+./usr/libdata/ldscripts/armelfb_nbsd_eabihf.xu	-unknown-		binutils
+./usr/libdata/ldscripts/armnbsd.x		-unknown-		binutils
+./usr/libdata/ldscripts/armnbsd.xbn		-unknown-		binutils
+./usr/libdata/ldscripts/armnbsd.xn		-unknown-		binutils
+./usr/libdata/ldscripts/armnbsd.xr		-unknown-		binutils
+./usr/libdata/ldscripts/armnbsd.xu		-unknown-		binutils
+./usr/libdata/ldscripts/armelf_nbsd.xc		-unknown-		binutils
+./usr/libdata/ldscripts/armelf_nbsd.xd		-unknown-		binutils
+./usr/libdata/ldscripts/armelf_nbsd.xdc		-unknown-		binutils
+./usr/libdata/ldscripts/armelf_nbsd.xdw		-unknown-		binutils
+./usr/libdata/ldscripts/armelf_nbsd.xs		-unknown-		binutils
+./usr/libdata/ldscripts/armelf_nbsd.xsc		-unknown-		binutils
+./usr/libdata/ldscripts/armelf_nbsd.xsw		-unknown-		binutils
+./usr/libdata/ldscripts/armelf_nbsd.xw		-unknown-		binutils
+./usr/libdata/ldscripts/armelf_nbsd_eabi.xc	-unknown-		binutils
+./usr/libdata/ldscripts/armelf_nbsd_eabi.xd	-unknown-		binutils
+./usr/libdata/ldscripts/armelf_nbsd_eabi.xdc	-unknown-		binutils
+./usr/libdata/ldscripts/armelf_nbsd_eabi.xdw	-unknown-		binutils
+./usr/libdata/ldscripts/armelf_nbsd_eabi.xs	-unknown-		binutils
+./usr/libdata/ldscripts/armelf_nbsd_eabi.xsc	-unknown-		binutils
+./usr/libdata/ldscripts/armelf_nbsd_eabi.xsw	-unknown-		binutils
+./usr/libdata/ldscripts/armelf_nbsd_eabi.xw	-unknown-		binutils
+./usr/libdata/ldscripts/armelf_nbsd_eabihf.xc	-unknown-		binutils
+./usr/libdata/ldscripts/armelf_nbsd_eabihf.xd	-unknown-		binutils
+./usr/libdata/ldscripts/armelf_nbsd_eabihf.xdc	-unknown-		binutils
+./usr/libdata/ldscripts/armelf_nbsd_eabihf.xdw	-unknown-		binutils
+./usr/libdata/ldscripts/armelf_nbsd_eabihf.xs	-unknown-		binutils
+./usr/libdata/ldscripts/armelf_nbsd_eabihf.xsc	-unknown-		binutils
+./usr/libdata/ldscripts/armelf_nbsd_eabihf.xsw	-unknown-		binutils
+./usr/libdata/ldscripts/armelf_nbsd_eabihf.xw	-unknown-		binutils
+./usr/libdata/ldscripts/armelfb_nbsd.xc		-unknown-		binutils
+./usr/libdata/ldscripts/armelfb_nbsd.xd		-unknown-		binutils
+./usr/libdata/ldscripts/armelfb_nbsd.xdc	-unknown-		binutils
+./usr/libdata/ldscripts/armelfb_nbsd.xdw	-unknown-		binutils
+./usr/libdata/ldscripts/armelfb_nbsd.xs		-unknown-		binutils
+./usr/libdata/ldscripts/armelfb_nbsd.xsc	-unknown-		binutils
+./usr/libdata/ldscripts/armelfb_nbsd.xsw	-unknown-		binutils
+./usr/libdata/ldscripts/armelfb_nbsd.xw		-unknown-		binutils
+./usr/libdata/ldscripts/armelfb_nbsd_eabi.xc	-unknown-		binutils
+./usr/libdata/ldscripts/armelfb_nbsd_eabi.xd	-unknown-		binutils
+./usr/libdata/ldscripts/armelfb_nbsd_eabi.xdc	-unknown-		binutils
+./usr/libdata/ldscripts/armelfb_nbsd_eabi.xdw	-unknown-		binutils
+./usr/libdata/ldscripts/armelfb_nbsd_eabi.xs	-unknown-		binutils
+./usr/libdata/ldscripts/armelfb_nbsd_eabi.xsc	-unknown-		binutils
+./usr/libdata/ldscripts/armelfb_nbsd_eabi.xsw	-unknown-		binutils
+./usr/libdata/ldscripts/armelfb_nbsd_eabi.xw	-unknown-		binutils
+./usr/libdata/ldscripts/armelfb_nbsd_eabihf.xc	-unknown-		binutils
+./usr/libdata/ldscripts/armelfb_nbsd_eabihf.xd	-unknown-		binutils
+./usr/libdata/ldscripts/armelfb_nbsd_eabihf.xdc	-unknown-		binutils
+./usr/libdata/ldscripts/armelfb_nbsd_eabihf.xdw	-unknown-		binutils
+./usr/libdata/ldscripts/armelfb_nbsd_eabihf.xs	-unknown-		binutils
+./usr/libdata/ldscripts/armelfb_nbsd_eabihf.xsc	-unknown-		binutils
+./usr/libdata/ldscripts/armelfb_nbsd_eabihf.xsw	-unknown-		binutils
+./usr/libdata/ldscripts/armelfb_nbsd_eabihf.xw	-unknown-		binutils

Index: src/external/gpl3/binutils/usr.bin/ld/Makefile
diff -u src/external/gpl3/binutils/usr.bin/ld/Makefile:1.23 src/external/gpl3/binutils/usr.bin/ld/Makefile:1.24
--- src/external/gpl3/binutils/usr.bin/ld/Makefile:1.23	Fri Jan 29 14:42:49 2016
+++ src/external/gpl3/binutils/usr.bin/ld/Makefile	Tue Oct 11 07:23:52 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.23 2016/01/29 14:42:49 christos Exp $
+#	$NetBSD: Makefile,v 1.24 2016/10/11 07:23:52 mrg Exp $
 
 CPPFLAGS+=	-I${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH} \
 		-I${DIST}/ld \
@@ -92,15 +92,23 @@ e${f}.c: ${DIST}/ld/genscripts.sh ${.CUR
 		${G_target_alias} ${G_target_alias} ${G_target_alias} \
 		${G_EMUL} ${LIBDIR} yes ${G_enable_initfini_array}  ${f} "${G_target_alias}"
 
-.if ${BINUTILS_MACHINE_ARCH} == "x86_64" \
-    || ${BINUTILS_MACHINE_ARCH} == "sparc64" \
-    || !empty(BINUTILS_MACHINE_ARCH:Mmips64*)
+.if ${BINUTILS_MACHINE_ARCH} == "x86_64" || \
+    ${BINUTILS_MACHINE_ARCH} == "sparc64" || \
+    ${BINUTILS_MACHINE_ARCH} == "earm" || \
+    ${BINUTILS_MACHINE_ARCH} == "arm" || \
+    ${BINUTILS_MACHINE_ARCH} == "aarch64" || \
+    !empty(BINUTILS_MACHINE_ARCH:Mmips64*)
 FILES+=		${f}.x ${f}.xbn ${f}.xn ${f}.xr ${f}.xu
 
 # XXX hack to find out if .xs/.xc exists - slow!
 HAS_XS!=	grep '^GENERATE_SHLIB_SCRIPT' ${DIST}/ld/emulparams/${f}.sh || echo
 # XXX
 #HAS_XC!=	grep '^GENERATE_COMBRELOC_SCRIPT' ${DIST}/ld/emulparams/${f}.sh || echo
+.if ${BINUTILS_MACHINE_ARCH} == "earm" || \
+    ${BINUTILS_MACHINE_ARCH} == "arm" || \
+    ${BINUTILS_MACHINE_ARCH} == "aarch64"
+HAS_XS=		yes
+.endif
 .if !empty(HAS_XS)
 FILES+= ${f}.xc ${f}.xd ${f}.xdc ${f}.xdw ${f}.xs ${f}.xsc ${f}.xsw ${f}.xw
 # only do this if we don't have GENERATE_SHLIB_SCRIPT

Reply via email to