[src/trunk]: src/external/gpl3/binutils/usr.sbin Use BINUTILS_MACHINE_ARCH in...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ca04e557f9f1
branches:  trunk
changeset: 789036:ca04e557f9f1
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Aug 05 00:17:52 2013 +0000

description:
Use BINUTILS_MACHINE_ARCH instead of MACHINE_ARCH
BINUTILS_MACHINE_ARCH is MACHINE_ARCH,
except armv[467] is replaced with arm instead.

diffstat:

 external/gpl3/binutils/usr.sbin/Makefile.inc        |  3 ++-
 external/gpl3/binutils/usr.sbin/dbsym/Makefile      |  6 +++---
 external/gpl3/binutils/usr.sbin/mdsetimage/Makefile |  6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diffs (56 lines):

diff -r a8256665449a -r ca04e557f9f1 external/gpl3/binutils/usr.sbin/Makefile.inc
--- a/external/gpl3/binutils/usr.sbin/Makefile.inc      Mon Aug 05 00:11:51 2013 +0000
+++ b/external/gpl3/binutils/usr.sbin/Makefile.inc      Mon Aug 05 00:17:52 2013 +0000
@@ -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
diff -r a8256665449a -r ca04e557f9f1 external/gpl3/binutils/usr.sbin/dbsym/Makefile
--- a/external/gpl3/binutils/usr.sbin/dbsym/Makefile    Mon Aug 05 00:11:51 2013 +0000
+++ b/external/gpl3/binutils/usr.sbin/dbsym/Makefile    Mon Aug 05 00:17:52 2013 +0000
@@ -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 @@
 .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
diff -r a8256665449a -r ca04e557f9f1 external/gpl3/binutils/usr.sbin/mdsetimage/Makefile
--- a/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile       Mon Aug 05 00:11:51 2013 +0000
+++ b/external/gpl3/binutils/usr.sbin/mdsetimage/Makefile       Mon Aug 05 00:17:52 2013 +0000
@@ -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 @@
 .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}