Module Name: src
Committed By: matt
Date: Mon Aug 5 00:08:58 UTC 2013
Modified Files:
src/external/gpl3/binutils/lib/libbfd: Makefile
src/external/gpl3/binutils/lib/libiberty: Makefile
src/external/gpl3/binutils/lib/libopcodes: Makefile
src/external/gpl3/binutils/usr.bin: Makefile Makefile.inc
src/external/gpl3/binutils/usr.bin/common: Makefile Makefile.inc
Makefile.prog
src/external/gpl3/binutils/usr.bin/gas: Makefile
src/external/gpl3/binutils/usr.bin/gprof: Makefile
src/external/gpl3/binutils/usr.bin/ld: Makefile
Log Message:
Use BINUTILS_MACHINE_ARCH instead of MACHINE_ARCH
BINUTILS_MACHINE_ARCH is MACHINE_ARCH,
except armv[467] is replaced with arm instead.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/binutils/lib/libbfd/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/binutils/lib/libiberty/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/binutils/lib/libopcodes/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/binutils/usr.bin/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/binutils/usr.bin/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/binutils/usr.bin/common/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/binutils/usr.bin/common/Makefile.inc
cvs rdiff -u -r1.7 -r1.8 \
src/external/gpl3/binutils/usr.bin/common/Makefile.prog
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/binutils/usr.bin/gas/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/binutils/usr.bin/gprof/Makefile
cvs rdiff -u -r1.16 -r1.17 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/lib/libbfd/Makefile
diff -u src/external/gpl3/binutils/lib/libbfd/Makefile:1.7 src/external/gpl3/binutils/lib/libbfd/Makefile:1.8
--- src/external/gpl3/binutils/lib/libbfd/Makefile:1.7 Fri Jun 22 20:32:35 2012
+++ src/external/gpl3/binutils/lib/libbfd/Makefile Mon Aug 5 00:08:58 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/06/22 20:32:35 abs Exp $
+# $NetBSD: Makefile,v 1.8 2013/08/05 00:08:58 matt Exp $
NOLINKLIB= # defined
NOLINT= # defined
@@ -18,10 +18,12 @@ libinstall: # do nothing
LIB= bfd
-BFD_MACHINE_ARCH?= ${MACHINE_ARCH}
+BFD_MACHINE_ARCH?= ${MACHINE_ARCH:C/armv[467]/arm/}
-.if exists(${.CURDIR}/arch/${BFD_MACHINE_ARCH}/defs.mk)
-.include "${.CURDIR}/arch/${BFD_MACHINE_ARCH}/defs.mk"
+DEFS_MK=${.CURDIR}/arch/${BFD_MACHINE_ARCH}/defs.mk
+
+.if exists(${DEFS_MK})
+.include "${DEFS_MK}"
DIST= ${NETBSDSRCDIR}/external/gpl3/binutils/dist
@@ -35,7 +37,7 @@ CPPFLAGS+= -I${.CURDIR}/arch/${BFD_MACHI
-I${DIST}/bfd ${GCPPFLAGS:M-D*} ${GCPPFLAGS:M-I*:N-I.*} \
-DDEBUGDIR=\"${DEBUGDIR}\"
-.if (${MACHINE_ARCH} == "vax")
+.if (${BFD_MACHINE_ARCH} == "vax")
CPPFLAGS.elf.c += -O0
.endif
Index: src/external/gpl3/binutils/lib/libiberty/Makefile
diff -u src/external/gpl3/binutils/lib/libiberty/Makefile:1.2 src/external/gpl3/binutils/lib/libiberty/Makefile:1.3
--- src/external/gpl3/binutils/lib/libiberty/Makefile:1.2 Mon May 30 14:41:26 2011
+++ src/external/gpl3/binutils/lib/libiberty/Makefile Mon Aug 5 00:08:58 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/05/30 14:41:26 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2013/08/05 00:08:58 matt Exp $
NOLINT= # defined
NOPROFILE= # defined
@@ -10,7 +10,9 @@ NOCLANGERROR= # defined
LIB= iberty
-.include "${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk"
+BINUTILS_MACHINE_ARCH=${MACHINE_ARCH:C/armv[467]/arm/}
+
+.include "${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH}/defs.mk"
COPTS.argv.c = -Wno-stack-protector
COPTS.cp-demangle.c = -Wno-stack-protector
@@ -22,7 +24,7 @@ DIST= ${NETBSDSRCDIR}/external/gpl3/bin
SRCS= ${G_REQUIRED_OFILES:.o=.c} ${G_EXTRA_OFILES:.o=.c} \
${G_LIBOBJS:.o=.c} ${G_ALLOCA:.o=.c}
-CPPFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR}/arch/${MACHINE_ARCH} \
+CPPFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH} \
-I${DIST}/include
.PATH: ${DIST}/libiberty
Index: src/external/gpl3/binutils/lib/libopcodes/Makefile
diff -u src/external/gpl3/binutils/lib/libopcodes/Makefile:1.4 src/external/gpl3/binutils/lib/libopcodes/Makefile:1.5
--- src/external/gpl3/binutils/lib/libopcodes/Makefile:1.4 Sun Sep 25 04:32:46 2011
+++ src/external/gpl3/binutils/lib/libopcodes/Makefile Mon Aug 5 00:08:58 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/09/25 04:32:46 christos Exp $
+# $NetBSD: Makefile,v 1.5 2013/08/05 00:08:58 matt Exp $
NOLINKLIB= # defined
NOLINT= # defined
@@ -10,7 +10,7 @@ NOCLANGERROR= # defined
LIB= opcodes
-BFD_MACHINE_ARCH?= ${MACHINE_ARCH}
+BFD_MACHINE_ARCH?= ${MACHINE_ARCH:C/armv[467]/arm/}
.if exists(${.CURDIR}/arch/${BFD_MACHINE_ARCH}/defs.mk)
.include "${.CURDIR}/arch/${BFD_MACHINE_ARCH}/defs.mk"
Index: src/external/gpl3/binutils/usr.bin/Makefile
diff -u src/external/gpl3/binutils/usr.bin/Makefile:1.3 src/external/gpl3/binutils/usr.bin/Makefile:1.4
--- src/external/gpl3/binutils/usr.bin/Makefile:1.3 Wed Sep 23 19:41:24 2009
+++ src/external/gpl3/binutils/usr.bin/Makefile Mon Aug 5 00:08:58 2013
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2009/09/23 19:41:24 skrll Exp $
+# $NetBSD: Makefile,v 1.4 2013/08/05 00:08:58 matt Exp $
.include <bsd.own.mk>
-.if ${MKBINUTILS} != "no" && exists(${.CURDIR}/common/arch/${MACHINE_ARCH}/defs.mk)
-.include "${.CURDIR}/common/arch/${MACHINE_ARCH}/defs.mk"
+BINUTILS_MACHINE_ARCH=${MACHINE_ARCH:C/armv[457]/arm/}
+
+.if ${MKBINUTILS} != "no" && exists(${.CURDIR}/common/arch/${BINUTILS_MACHINE_ARCH}/defs.mk)
+.include "${.CURDIR}/common/arch/${BINUTILS_MACHINE_ARCH}/defs.mk"
SSUBDIR+= gas gprof ld ${G_PROGRAMS:C/-new$//:C/sysdump//:C/srconv//:cxxfilt=c++filt}
SUBDIR+= common .WAIT ${SSUBDIR:O} # alphabetize
Index: src/external/gpl3/binutils/usr.bin/Makefile.inc
diff -u src/external/gpl3/binutils/usr.bin/Makefile.inc:1.4 src/external/gpl3/binutils/usr.bin/Makefile.inc:1.5
--- src/external/gpl3/binutils/usr.bin/Makefile.inc:1.4 Thu Feb 14 21:29:35 2013
+++ src/external/gpl3/binutils/usr.bin/Makefile.inc Mon Aug 5 00:08:58 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.4 2013/02/14 21:29:35 christos Exp $
+# $NetBSD: Makefile.inc,v 1.5 2013/08/05 00:08:58 matt Exp $
BINDIR?= /usr/bin
@@ -7,10 +7,12 @@ __MAKEFILE_INC_INCLUDED__=1
.include <bsd.own.mk>
+BINUTILS_MACHINE_ARCH= ${MACHINE_ARCH:C/armv[467]/arm/}
+
GNUHOSTDIST= ${DIST}
GNUCPPFLAGS= ${G_DEFS} ${G_INCLUDES}
CPPFLAGS+= ${GNUCPPFLAGS:M-D*:N-DLOCALEDIR*} ${GNUCPPFLAGS:M-I*:N-I.*} \
- -I${TOP}/${BFDSUBDIR}/libbfd/arch/${MACHINE_ARCH} \
+ -I${TOP}/${BFDSUBDIR}/libbfd/arch/${BINUTILS_MACHINE_ARCH} \
-I${DIST}/include -I${DIST}/bfd -I${DIST}/binutils \
-DLOCALEDIR=\"${LOCALEDIR}\"
NOGCCERROR= # defined
Index: src/external/gpl3/binutils/usr.bin/common/Makefile
diff -u src/external/gpl3/binutils/usr.bin/common/Makefile:1.5 src/external/gpl3/binutils/usr.bin/common/Makefile:1.6
--- src/external/gpl3/binutils/usr.bin/common/Makefile:1.5 Tue Nov 10 10:24:50 2009
+++ src/external/gpl3/binutils/usr.bin/common/Makefile Mon Aug 5 00:08:58 2013
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2009/11/10 10:24:50 skrll Exp $
+# $NetBSD: Makefile,v 1.6 2013/08/05 00:08:58 matt Exp $
.include <bsd.own.mk>
TOP= ${NETBSDSRCDIR}/external/gpl3/binutils
-.include "${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk"
.include "${.CURDIR}/../common/Makefile.inc"
+.include "${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH}/defs.mk"
TEXINFO= ${G_TEXINFOS}
INFOFLAGS= -I${DIST}/binutils/doc -I${DIST}/libiberty -I{.CURDIR}
@@ -14,7 +14,7 @@ INFOFLAGS= -I${DIST}/binutils/doc -I${DI
${TEXINFO}: bfdver.texi
-bfdver.texi: ${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk
+bfdver.texi: ${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH}/defs.mk
${_MKTARGET_CREATE}
rm -f ${.TARGET}
(echo "@set VERSION ${G_VERSION}"; \
Index: src/external/gpl3/binutils/usr.bin/common/Makefile.inc
diff -u src/external/gpl3/binutils/usr.bin/common/Makefile.inc:1.1 src/external/gpl3/binutils/usr.bin/common/Makefile.inc:1.2
--- src/external/gpl3/binutils/usr.bin/common/Makefile.inc:1.1 Tue Aug 18 20:22:08 2009
+++ src/external/gpl3/binutils/usr.bin/common/Makefile.inc Mon Aug 5 00:08:58 2013
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.1 2009/08/18 20:22:08 skrll Exp $
+# $NetBSD: Makefile.inc,v 1.2 2013/08/05 00:08:58 matt Exp $
.if !defined(__COMMON_MAKEFILE_INC_INCLUDED__)
__COMMON_MAKEFILE_INC_INCLUDED__=1
+BINUTILS_MACHINE_ARCH=${MACHINE_ARCH:C/armv[467]/arm/}
DIST= ${NETBSDSRCDIR}/external/gpl3/binutils/dist
BFDSUBDIR= lib
Index: src/external/gpl3/binutils/usr.bin/common/Makefile.prog
diff -u src/external/gpl3/binutils/usr.bin/common/Makefile.prog:1.7 src/external/gpl3/binutils/usr.bin/common/Makefile.prog:1.8
--- src/external/gpl3/binutils/usr.bin/common/Makefile.prog:1.7 Thu Apr 25 14:53:35 2013
+++ src/external/gpl3/binutils/usr.bin/common/Makefile.prog Mon Aug 5 00:08:58 2013
@@ -1,14 +1,16 @@
-# $NetBSD: Makefile.prog,v 1.7 2013/04/25 14:53:35 matt Exp $
+# $NetBSD: Makefile.prog,v 1.8 2013/08/05 00:08:58 matt Exp $
#
# Common Makefile fragment for a binutils program.
#
.include <bsd.own.mk>
+BINUTILS_MACHINE_ARCH=${MACHINE_ARCH:C/armv[467]/arm/}
+
TOP= ${NETBSDSRCDIR}/external/gpl3/binutils
.include "${.CURDIR}/../common/Makefile.inc"
-.include "${.CURDIR}/../common/arch/${MACHINE_ARCH}/defs.mk"
+.include "${.CURDIR}/../common/arch/${BINUTILS_MACHINE_ARCH}/defs.mk"
# Might end in "-new" in GNU makefile
XPROG= ${PROG:c++filt=cxxfilt}
@@ -18,7 +20,7 @@ SRCS= ${G_${BUPROG}_OBJECTS:.o=.c} \
${G_${BUPROG}_DEPENDENCIES:M*.o:.o=.c}
MAN= ${G_man_MANS:M${PROG}.1}
-CPPFLAGS+= -I${.CURDIR}/../common/arch/${MACHINE_ARCH}
+CPPFLAGS+= -I${.CURDIR}/../common/arch/${BINUTILS_MACHINE_ARCH}
.if !empty(G_${BUPROG}_DEPENDENCIES:M*/libopcodes*)
PROGDPLIBS+= opcodes ${TOP}/${BFDSUBDIR}/libopcodes
Index: src/external/gpl3/binutils/usr.bin/gas/Makefile
diff -u src/external/gpl3/binutils/usr.bin/gas/Makefile:1.10 src/external/gpl3/binutils/usr.bin/gas/Makefile:1.11
--- src/external/gpl3/binutils/usr.bin/gas/Makefile:1.10 Thu Apr 25 14:53:36 2013
+++ src/external/gpl3/binutils/usr.bin/gas/Makefile Mon Aug 5 00:08:58 2013
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.10 2013/04/25 14:53:36 matt Exp $
+# $NetBSD: Makefile,v 1.11 2013/08/05 00:08:58 matt Exp $
.include <bsd.own.mk>
TOP= ${NETBSDSRCDIR}/external/gpl3/binutils
.include "${.CURDIR}/../common/Makefile.inc"
-.include "${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk"
+.include "${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH}/defs.mk"
PROG= as
SRCS= ${G_OBJS:Nitbl-[pl]*:Nm68k-parse.o:.o=.c} \
@@ -20,7 +20,7 @@ COPTS.symbols.c = -Wno-stack-protector
COPTS.stabs.c = -Wno-stack-protector
COPTS.macro.c = -Wno-stack-protector
-CPPFLAGS+= -I${.CURDIR}/arch/${MACHINE_ARCH}
+CPPFLAGS+= -I${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH}
CPPFLAGS+= -I${DIST}/gas -I${DIST}/gas/config
CPPFLAGS+= -I${DIST}
Index: src/external/gpl3/binutils/usr.bin/gprof/Makefile
diff -u src/external/gpl3/binutils/usr.bin/gprof/Makefile:1.7 src/external/gpl3/binutils/usr.bin/gprof/Makefile:1.8
--- src/external/gpl3/binutils/usr.bin/gprof/Makefile:1.7 Thu Feb 14 21:29:35 2013
+++ src/external/gpl3/binutils/usr.bin/gprof/Makefile Mon Aug 5 00:08:58 2013
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.7 2013/02/14 21:29:35 christos Exp $
+# $NetBSD: Makefile,v 1.8 2013/08/05 00:08:58 matt Exp $
.include <bsd.own.mk>
TOP= ${NETBSDSRCDIR}/external/gpl3/binutils
.include "${.CURDIR}/../common/Makefile.inc"
-.include "${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk"
+.include "${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH}/defs.mk"
PROG= gprof
SRCS= ${G_gprof_OBJECTS:.o=.c}
-CPPFLAGS+= -I${.CURDIR}/arch/${MACHINE_ARCH}
+CPPFLAGS+= -I${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH}
PROGDPLIBS+= bfd ${TOP}/${BFDSUBDIR}/libbfd
PROGDPLIBS+= iberty ${TOP}/${BFDSUBDIR}/libiberty
Index: src/external/gpl3/binutils/usr.bin/ld/Makefile
diff -u src/external/gpl3/binutils/usr.bin/ld/Makefile:1.16 src/external/gpl3/binutils/usr.bin/ld/Makefile:1.17
--- src/external/gpl3/binutils/usr.bin/ld/Makefile:1.16 Thu Feb 14 21:29:35 2013
+++ src/external/gpl3/binutils/usr.bin/ld/Makefile Mon Aug 5 00:08:58 2013
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.16 2013/02/14 21:29:35 christos Exp $
+# $NetBSD: Makefile,v 1.17 2013/08/05 00:08:58 matt Exp $
.include <bsd.own.mk>
TOP= ${NETBSDSRCDIR}/external/gpl3/binutils
.include "${.CURDIR}/../common/Makefile.inc"
-.include "${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk"
+.include "${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH}/defs.mk"
SCRIPTSDIR= /usr/libdata
PROG= ld
SRCS= ${G_OFILES:.o=.c}
-CPPFLAGS+= -I${.CURDIR}/arch/${MACHINE_ARCH} \
+CPPFLAGS+= -I${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH} \
-I${DIST}/ld \
-DDEFAULT_EMULATION=\"${G_EMUL}\" \
-DSCRIPTDIR=\"${SCRIPTSDIR}\" \
@@ -64,13 +64,13 @@ DPSRCS+= .depend.${f} e${f}.c
CLEANFILES+= .depend.${f} e${f}.c
# XXX super hack
-. if (${MACHINE_ARCH} == "x86_64" && \
+. if (${BINUTILS_MACHINE_ARCH} == "x86_64" && \
("${f}" == "elf_i386" || "${f}" == "i386nbsd"))
EMUL_LIB_PATH.${f}=/usr/lib/i386
-. elif (${MACHINE_ARCH} == "sparc64" && \
+. elif (${BINUTILS_MACHINE_ARCH} == "sparc64" && \
("${f}" == "elf32_sparc" || "${f}" == "sparcnbsd"))
EMUL_LIB_PATH.${f}=/usr/lib/sparc
-. elif ${MACHINE_ARCH} == "mips64el"
+. elif ${BINUTILS_MACHINE_ARCH} == "mips64el"
. if "${f}" == "elf32ltsmip" || "${f}" == "elf32btsmip"
EMUL_LIB_PATH.${f}:=/usr/lib/o32
. elif "${f}" == "elf64ltsmip" || "${f}" == "elf64btsmip"
@@ -92,8 +92,9 @@ e${f}.c: ${DIST}/ld/genscripts.sh ${.CUR
${G_target_alias} ${G_target_alias} ${G_target_alias} \
${G_EMUL} ${LIBDIR} yes ${f} "${G_target_alias}"
-.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "sparc64" || \
- ${MACHINE_ARCH} == "mips64el" || ${MACHINE_ARCH} == "mips64eb"
+.if ${BINUTILS_MACHINE_ARCH} == "x86_64" \
+ || ${BINUTILS_MACHINE_ARCH} == "sparc64" \
+ || !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!
@@ -103,7 +104,7 @@ HAS_XS!= grep '^GENERATE_SHLIB_SCRIPT' $
.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
-.elif ${MACHINE_ARCH} == "mips64el" || ${MACHINE_ARCH} == "mips64eb"
+.elif !empty(BINUTILS_MACHINE_ARCH:Mmips64*)
FILES+= ${f}.xc ${f}.xs ${f}.xsc ${f}.xsw ${f}.xw
.endif
.endif # x64_64 || sparc64 || mips64
