Thu Oct 13 13:29:39 2016 UTC ()
Install the arm ldscripts for big endian variants too


(martin)
diff -r1.24 -r1.25 src/external/gpl3/binutils/usr.bin/ld/Makefile
cvs diff -r1.24 -r1.25 src/external/gpl3/binutils/usr.bin/ld/Makefile (expand / switch to unified diff)

--- src/external/gpl3/binutils/usr.bin/ld/Makefile 2016/10/11 07:23:52 1.24
+++ src/external/gpl3/binutils/usr.bin/ld/Makefile 2016/10/13 13:29:39 1.25
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.24 2016/10/11 07:23:52 mrg Exp $ 1# $NetBSD: Makefile,v 1.25 2016/10/13 13:29:39 martin Exp $
2 2
3CPPFLAGS+= -I${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH} \ 3CPPFLAGS+= -I${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH} \
4 -I${DIST}/ld \ 4 -I${DIST}/ld \
5 -DDEFAULT_EMULATION=\"${G_EMUL}\" \ 5 -DDEFAULT_EMULATION=\"${G_EMUL}\" \
6 -DSCRIPTDIR=\"${SCRIPTSDIR}\" \ 6 -DSCRIPTDIR=\"${SCRIPTSDIR}\" \
7 -DTARGET=\"${G_target_alias}\" \ 7 -DTARGET=\"${G_target_alias}\" \
8 -DBINDIR=\"/usr/bin\" \ 8 -DBINDIR=\"/usr/bin\" \
9 -DTOOLBINDIR=\"/usr/bin\" \ 9 -DTOOLBINDIR=\"/usr/bin\" \
10 -DENABLE_PLUGINS \ 10 -DENABLE_PLUGINS \
11 -DELF_LIST_OPTIONS=TRUE \ 11 -DELF_LIST_OPTIONS=TRUE \
12 -DELF_SHLIB_LIST_OPTIONS=TRUE \ 12 -DELF_SHLIB_LIST_OPTIONS=TRUE \
13 -DELF_PLT_UNWIND_LIST_OPTIONS=TRUE 13 -DELF_PLT_UNWIND_LIST_OPTIONS=TRUE
14 14
@@ -84,38 +84,38 @@ EMUL_LIB_PATH.${f}=/usr/lib @@ -84,38 +84,38 @@ EMUL_LIB_PATH.${f}=/usr/lib
84 84
85#GENSCRIPTS = LIB_PATH='${LIB_PATH}' $(SHELL) $(srcdir)/genscripts.sh "${srcdir}" "${libdir}" "${prefix}" "${exec_prefix}" @host@ @target@ @ta rget_alias@ "@EMULATION_LIBPATH@" "@NATIVE_LIB_DIRS@" @use_sysroot@ 85#GENSCRIPTS = LIB_PATH='${LIB_PATH}' $(SHELL) $(srcdir)/genscripts.sh "${srcdir}" "${libdir}" "${prefix}" "${exec_prefix}" @host@ @target@ @ta rget_alias@ "@EMULATION_LIBPATH@" "@NATIVE_LIB_DIRS@" @use_sysroot@
86 86
87e${f}.c: ${DIST}/ld/genscripts.sh ${.CURDIR}/Makefile stringify.sed 87e${f}.c: ${DIST}/ld/genscripts.sh ${.CURDIR}/Makefile stringify.sed
88 ${_MKTARGET_CREATE} 88 ${_MKTARGET_CREATE}
89 unset MACHINE || true; \ 89 unset MACHINE || true; \
90 LIB_PATH=${EMUL_LIB_PATH.${f}} NATIVE=yes \ 90 LIB_PATH=${EMUL_LIB_PATH.${f}} NATIVE=yes \
91 ${HOST_SH} ${DIST}/ld/genscripts.sh ${DIST}/ld ${LIBDIR} "/usr" "/usr/bin" \ 91 ${HOST_SH} ${DIST}/ld/genscripts.sh ${DIST}/ld ${LIBDIR} "/usr" "/usr/bin" \
92 ${G_target_alias} ${G_target_alias} ${G_target_alias} \ 92 ${G_target_alias} ${G_target_alias} ${G_target_alias} \
93 ${G_EMUL} ${LIBDIR} yes ${G_enable_initfini_array} ${f} "${G_target_alias}" 93 ${G_EMUL} ${LIBDIR} yes ${G_enable_initfini_array} ${f} "${G_target_alias}"
94 94
95.if ${BINUTILS_MACHINE_ARCH} == "x86_64" || \ 95.if ${BINUTILS_MACHINE_ARCH} == "x86_64" || \
96 ${BINUTILS_MACHINE_ARCH} == "sparc64" || \ 96 ${BINUTILS_MACHINE_ARCH} == "sparc64" || \
97 ${BINUTILS_MACHINE_ARCH} == "earm" || \ 97 !empty(BINUTILS_MACHINE_ARCH:Mearm*) || \
98 ${BINUTILS_MACHINE_ARCH} == "arm" || \ 98 !empty(BINUTILS_MACHINE_ARCH:Marm*) || \
99 ${BINUTILS_MACHINE_ARCH} == "aarch64" || \ 99 ${BINUTILS_MACHINE_ARCH} == "aarch64" || \
100 !empty(BINUTILS_MACHINE_ARCH:Mmips64*) 100 !empty(BINUTILS_MACHINE_ARCH:Mmips64*)
101FILES+= ${f}.x ${f}.xbn ${f}.xn ${f}.xr ${f}.xu 101FILES+= ${f}.x ${f}.xbn ${f}.xn ${f}.xr ${f}.xu
102 102
103# XXX hack to find out if .xs/.xc exists - slow! 103# XXX hack to find out if .xs/.xc exists - slow!
104HAS_XS!= grep '^GENERATE_SHLIB_SCRIPT' ${DIST}/ld/emulparams/${f}.sh || echo 104HAS_XS!= grep '^GENERATE_SHLIB_SCRIPT' ${DIST}/ld/emulparams/${f}.sh || echo
105# XXX 105# XXX
106#HAS_XC!= grep '^GENERATE_COMBRELOC_SCRIPT' ${DIST}/ld/emulparams/${f}.sh || echo 106#HAS_XC!= grep '^GENERATE_COMBRELOC_SCRIPT' ${DIST}/ld/emulparams/${f}.sh || echo
107.if ${BINUTILS_MACHINE_ARCH} == "earm" || \ 107.if !empty(BINUTILS_MACHINE_ARCH:Mearm*) || \
108 ${BINUTILS_MACHINE_ARCH} == "arm" || \ 108 !empty(BINUTILS_MACHINE_ARCH:Marm*) || \
109 ${BINUTILS_MACHINE_ARCH} == "aarch64" 109 ${BINUTILS_MACHINE_ARCH} == "aarch64"
110HAS_XS= yes 110HAS_XS= yes
111.endif 111.endif
112.if !empty(HAS_XS) 112.if !empty(HAS_XS)
113FILES+= ${f}.xc ${f}.xd ${f}.xdc ${f}.xdw ${f}.xs ${f}.xsc ${f}.xsw ${f}.xw 113FILES+= ${f}.xc ${f}.xd ${f}.xdc ${f}.xdw ${f}.xs ${f}.xsc ${f}.xsw ${f}.xw
114# only do this if we don't have GENERATE_SHLIB_SCRIPT 114# only do this if we don't have GENERATE_SHLIB_SCRIPT
115.elif !empty(BINUTILS_MACHINE_ARCH:Mmips64*) 115.elif !empty(BINUTILS_MACHINE_ARCH:Mmips64*)
116FILES+= ${f}.xc ${f}.xs ${f}.xsc ${f}.xsw ${f}.xw 116FILES+= ${f}.xc ${f}.xs ${f}.xsc ${f}.xsw ${f}.xw
117.endif 117.endif
118.endif # x64_64 || sparc64 || mips64 118.endif # x64_64 || sparc64 || mips64
119 119
120.endfor 120.endfor
121 121