Module Name: src
Committed By: matt
Date: Mon Aug 5 00:17:53 UTC 2013
Modified Files:
src/external/gpl3/binutils/usr.sbin: Makefile.inc
src/external/gpl3/binutils/usr.sbin/dbsym: Makefile
src/external/gpl3/binutils/usr.sbin/mdsetimage: 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.3 -r1.4 src/external/gpl3/binutils/usr.sbin/Makefile.inc
cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/binutils/usr.sbin/dbsym/Makefile
cvs rdiff -u -r1.9 -r1.10 \
src/external/gpl3/binutils/usr.sbin/mdsetimage/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/usr.sbin/Makefile.inc
diff -u src/external/gpl3/binutils/usr.sbin/Makefile.inc:1.3 src/external/gpl3/binutils/usr.sbin/Makefile.inc:1.4
--- src/external/gpl3/binutils/usr.sbin/Makefile.inc:1.3 Sun Nov 1 00:12:00 2009
+++ src/external/gpl3/binutils/usr.sbin/Makefile.inc Mon Aug 5 00:17:52 2013
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile.inc,v 1.3 2009/11/01 00:12:00 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.4 2013/08/05 00:17:52 matt Exp $
BINDIR?= /usr/sbin
WARNS?= 1
LDADD+=-lz
.ifndef HOSTPROG
+BINUTILS_MACHINE_ARCH=${MACHINE_ARCH:C/armv[457]/arm/}
DPADD+=${LIBZ}
.endif
Index: src/external/gpl3/binutils/usr.sbin/dbsym/Makefile
diff -u src/external/gpl3/binutils/usr.sbin/dbsym/Makefile:1.9 src/external/gpl3/binutils/usr.sbin/dbsym/Makefile:1.10
--- src/external/gpl3/binutils/usr.sbin/dbsym/Makefile:1.9 Mon Feb 18 15:29:36 2013
+++ src/external/gpl3/binutils/usr.sbin/dbsym/Makefile Mon Aug 5 00:17:53 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2013/02/18 15:29:36 gdt Exp $
+# $NetBSD: Makefile,v 1.10 2013/08/05 00:17:53 matt Exp $
.include <bsd.own.mk>
@@ -28,8 +28,8 @@ LDADD+= -L${IBERTYDIR} -liberty
.include <bsd.prog.mk>
.ifndef HOSTPROG
-.include "${TOP}/${BFDSUBDIR}/libbfd/arch/${MACHINE_ARCH}/defs.mk"
-CPPFLAGS+= -I${TOP}/${BFDSUBDIR}/libbfd/arch/${MACHINE_ARCH} ${G_INCLUDES}
+.include "${TOP}/${BFDSUBDIR}/libbfd/arch/${BINUTILS_MACHINE_ARCH}/defs.mk"
+CPPFLAGS+= -I${TOP}/${BFDSUBDIR}/libbfd/arch/${BINUTILS_MACHINE_ARCH} ${G_INCLUDES}
LDADD+= -lintl
DPADD+= ${LIBINTL}
.endif # HOSTPROG
Index: src/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile
diff -u src/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile:1.9 src/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile:1.10
--- src/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile:1.9 Mon Feb 18 15:32:02 2013
+++ src/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile Mon Aug 5 00:17:53 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2013/02/18 15:32:02 gdt Exp $
+# $NetBSD: Makefile,v 1.10 2013/08/05 00:17:53 matt Exp $
.include <bsd.own.mk>
@@ -28,9 +28,9 @@ CPPFLAGS+= -I${BFDDIR}
.include <bsd.prog.mk>
.ifndef HOSTPROG
-.include "${TOP}/${BFDSUBDIR}/libbfd/arch/${MACHINE_ARCH}/defs.mk"
+.include "${TOP}/${BFDSUBDIR}/libbfd/arch/${BINUTILS_MACHINE_ARCH}/defs.mk"
-CPPFLAGS+= -I${TOP}/${BFDSUBDIR}/libbfd/arch/${MACHINE_ARCH} ${G_INCLUDES}
+CPPFLAGS+= -I${TOP}/${BFDSUBDIR}/libbfd/arch/${BINUTILS_MACHINE_ARCH} ${G_INCLUDES}
LDADD+= -lintl
DPADD+= ${LIBINTL}
DPADD+= ${LIBZ}
