Module Name: src
Committed By: joerg
Date: Mon Feb 25 19:55:35 UTC 2019
Modified Files:
src/external/gpl3/binutils.old/usr.bin/ld: Makefile
src/external/gpl3/binutils/usr.bin/ld: Makefile
Log Message:
Properly extract the emulation path from the linker script template.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/binutils.old/usr.bin/ld/Makefile
cvs rdiff -u -r1.29 -r1.30 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/external/gpl3/binutils.old/usr.bin/ld/Makefile
diff -u src/external/gpl3/binutils.old/usr.bin/ld/Makefile:1.6 src/external/gpl3/binutils.old/usr.bin/ld/Makefile:1.7
--- src/external/gpl3/binutils.old/usr.bin/ld/Makefile:1.6 Sat Apr 14 17:53:18 2018
+++ src/external/gpl3/binutils.old/usr.bin/ld/Makefile Mon Feb 25 19:55:35 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2018/04/14 17:53:18 christos Exp $
+# $NetBSD: Makefile,v 1.7 2019/02/25 19:55:35 joerg Exp $
CPPFLAGS+= -I${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH} \
-I${DIST}/ld \
@@ -63,30 +63,10 @@ ${PROG}.info: configdoc.texi bfdver.texi
DPSRCS+= .depend.${f} e${f}.c
CLEANFILES+= .depend.${f} e${f}.c
-# XXX super hack
-. if (${BINUTILS_MACHINE_ARCH} == "x86_64" && \
- ("${f}" == "elf_i386" || "${f}" == "i386nbsd"))
-EMUL_LIB_PATH.${f}=/usr/lib/i386
-. elif (${BINUTILS_MACHINE_ARCH} == "sparc64" && \
- ("${f}" == "elf32_sparc" || "${f}" == "sparcnbsd"))
-EMUL_LIB_PATH.${f}=/usr/lib/sparc
-. elif !empty(BINUTILS_MACHINE_ARCH:Mmips64*)
-. if "${f}" == "elf32ltsmip" || "${f}" == "elf32btsmip"
-EMUL_LIB_PATH.${f}:=/usr/lib/o32
-. elif "${f}" == "elf64ltsmip" || "${f}" == "elf64btsmip"
-EMUL_LIB_PATH.${f}:=/usr/lib/64
-. else
-EMUL_LIB_PATH.${f}=/usr/lib
-. endif
-. else
-EMUL_LIB_PATH.${f}=/usr/lib
-. endif
-
e${f}.c: ${DIST}/ld/genscripts.sh ${.CURDIR}/Makefile stringify.sed
${_MKTARGET_CREATE}
unset MACHINE || true; \
- LIB_PATH=${EMUL_LIB_PATH.${f}} NATIVE=yes \
- ${HOST_SH} ${DIST}/ld/genscripts.sh ${DIST}/ld \
+ NATIVE=yes ${HOST_SH} ${DIST}/ld/genscripts.sh ${DIST}/ld \
${LIBDIR} "/usr" "/usr/bin" \
${G_target_alias} ${G_target_alias} ${G_target_alias} \
${G_EMUL} ${LIBDIR} yes ${G_enable_initfini_array} \
Index: src/external/gpl3/binutils/usr.bin/ld/Makefile
diff -u src/external/gpl3/binutils/usr.bin/ld/Makefile:1.29 src/external/gpl3/binutils/usr.bin/ld/Makefile:1.30
--- src/external/gpl3/binutils/usr.bin/ld/Makefile:1.29 Wed Oct 19 20:55:44 2016
+++ src/external/gpl3/binutils/usr.bin/ld/Makefile Mon Feb 25 19:55:35 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2016/10/19 20:55:44 mrg Exp $
+# $NetBSD: Makefile,v 1.30 2019/02/25 19:55:35 joerg Exp $
CPPFLAGS+= -I${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH} \
-I${DIST}/ld \
@@ -63,30 +63,10 @@ ${PROG}.info: configdoc.texi bfdver.texi
DPSRCS+= .depend.${f} e${f}.c
CLEANFILES+= .depend.${f} e${f}.c
-# XXX super hack
-. if (${BINUTILS_MACHINE_ARCH} == "x86_64" && \
- ("${f}" == "elf_i386" || "${f}" == "i386nbsd"))
-EMUL_LIB_PATH.${f}=/usr/lib/i386
-. elif (${BINUTILS_MACHINE_ARCH} == "sparc64" && \
- ("${f}" == "elf32_sparc" || "${f}" == "sparcnbsd"))
-EMUL_LIB_PATH.${f}=/usr/lib/sparc
-. elif !empty(BINUTILS_MACHINE_ARCH:Mmips64*)
-. if "${f}" == "elf32ltsmip" || "${f}" == "elf32btsmip"
-EMUL_LIB_PATH.${f}:=/usr/lib/o32
-. elif "${f}" == "elf64ltsmip" || "${f}" == "elf64btsmip"
-EMUL_LIB_PATH.${f}:=/usr/lib/64
-. else
-EMUL_LIB_PATH.${f}=/usr/lib
-. endif
-. else
-EMUL_LIB_PATH.${f}=/usr/lib
-. endif
-
e${f}.c: ${DIST}/ld/genscripts.sh ${.CURDIR}/Makefile stringify.sed
${_MKTARGET_CREATE}
unset MACHINE || true; \
- LIB_PATH=${EMUL_LIB_PATH.${f}} NATIVE=yes \
- ${HOST_SH} ${DIST}/ld/genscripts.sh ${DIST}/ld \
+ NATIVE=yes ${HOST_SH} ${DIST}/ld/genscripts.sh ${DIST}/ld \
${LIBDIR} "/usr" "/usr/bin" \
${G_target_alias} ${G_target_alias} ${G_target_alias} \
${G_EMUL} ${LIBDIR} yes ${G_enable_initfini_array} \
