[src/trunk]: src/external/gpl3/binutils Use BINUTILS_MACHINE_ARCH instead of ...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/external/gpl3/binutils Use BINUTILS_MACHINE_ARCH instead of ...
From: matt <matt%NetBSD.org@localhost>
Date: Tue, 07 Apr 2020 01:06:58 +0000
details:   https://anonhg.NetBSD.org/src/rev/b216b730cb69
branches:  trunk
changeset: 789034:b216b730cb69
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Aug 05 00:08:58 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/lib/libbfd/Makefile          |  12 +++++++-----
 external/gpl3/binutils/lib/libiberty/Makefile       |   8 +++++---
 external/gpl3/binutils/lib/libopcodes/Makefile      |   4 ++--
 external/gpl3/binutils/usr.bin/Makefile             |   8 +++++---
 external/gpl3/binutils/usr.bin/Makefile.inc         |   6 ++++--
 external/gpl3/binutils/usr.bin/common/Makefile      |   6 +++---
 external/gpl3/binutils/usr.bin/common/Makefile.inc  |   3 ++-
 external/gpl3/binutils/usr.bin/common/Makefile.prog |   8 +++++---
 external/gpl3/binutils/usr.bin/gas/Makefile         |   6 +++---
 external/gpl3/binutils/usr.bin/gprof/Makefile       |   6 +++---
 external/gpl3/binutils/usr.bin/ld/Makefile          |  19 ++++++++++---------
 11 files changed, 49 insertions(+), 37 deletions(-)

diffs (truncated from 303 to 300 lines):

diff -r ff9b09008d7a -r b216b730cb69 external/gpl3/binutils/lib/libbfd/Makefile
--- a/external/gpl3/binutils/lib/libbfd/Makefile        Sun Aug 04 23:41:43 2013 +0000
+++ b/external/gpl3/binutils/lib/libbfd/Makefile        Mon Aug 05 00:08:58 2013 +0000
@@ -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 @@
 
 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 @@
                -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
 
diff -r ff9b09008d7a -r b216b730cb69 external/gpl3/binutils/lib/libiberty/Makefile
--- a/external/gpl3/binutils/lib/libiberty/Makefile     Sun Aug 04 23:41:43 2013 +0000
+++ b/external/gpl3/binutils/lib/libiberty/Makefile     Mon Aug 05 00:08:58 2013 +0000
@@ -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 @@
 
 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 @@
 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
diff -r ff9b09008d7a -r b216b730cb69 external/gpl3/binutils/lib/libopcodes/Makefile
--- a/external/gpl3/binutils/lib/libopcodes/Makefile    Sun Aug 04 23:41:43 2013 +0000
+++ b/external/gpl3/binutils/lib/libopcodes/Makefile    Mon Aug 05 00:08:58 2013 +0000
@@ -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 @@
 
 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"
diff -r ff9b09008d7a -r b216b730cb69 external/gpl3/binutils/usr.bin/Makefile
--- a/external/gpl3/binutils/usr.bin/Makefile   Sun Aug 04 23:41:43 2013 +0000
+++ b/external/gpl3/binutils/usr.bin/Makefile   Mon Aug 05 00:08:58 2013 +0000
@@ -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
diff -r ff9b09008d7a -r b216b730cb69 external/gpl3/binutils/usr.bin/Makefile.inc
--- a/external/gpl3/binutils/usr.bin/Makefile.inc       Sun Aug 04 23:41:43 2013 +0000
+++ b/external/gpl3/binutils/usr.bin/Makefile.inc       Mon Aug 05 00:08:58 2013 +0000
@@ -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 @@
 
 .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
diff -r ff9b09008d7a -r b216b730cb69 external/gpl3/binutils/usr.bin/common/Makefile
--- a/external/gpl3/binutils/usr.bin/common/Makefile    Sun Aug 04 23:41:43 2013 +0000
+++ b/external/gpl3/binutils/usr.bin/common/Makefile    Mon Aug 05 00:08:58 2013 +0000
@@ -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 @@
 
 ${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}"; \
diff -r ff9b09008d7a -r b216b730cb69 external/gpl3/binutils/usr.bin/common/Makefile.inc
--- a/external/gpl3/binutils/usr.bin/common/Makefile.inc        Sun Aug 04 23:41:43 2013 +0000
+++ b/external/gpl3/binutils/usr.bin/common/Makefile.inc        Mon Aug 05 00:08:58 2013 +0000
@@ -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
 
diff -r ff9b09008d7a -r b216b730cb69 external/gpl3/binutils/usr.bin/common/Makefile.prog
--- a/external/gpl3/binutils/usr.bin/common/Makefile.prog       Sun Aug 04 23:41:43 2013 +0000
+++ b/external/gpl3/binutils/usr.bin/common/Makefile.prog       Mon Aug 05 00:08:58 2013 +0000
@@ -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 @@
                ${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
diff -r ff9b09008d7a -r b216b730cb69 external/gpl3/binutils/usr.bin/gas/Makefile
--- a/external/gpl3/binutils/usr.bin/gas/Makefile       Sun Aug 04 23:41:43 2013 +0000
+++ b/external/gpl3/binutils/usr.bin/gas/Makefile       Mon Aug 05 00:08:58 2013 +0000
@@ -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.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}
 
diff -r ff9b09008d7a -r b216b730cb69 external/gpl3/binutils/usr.bin/gprof/Makefile
--- a/external/gpl3/binutils/usr.bin/gprof/Makefile     Sun Aug 04 23:41:43 2013 +0000
+++ b/external/gpl3/binutils/usr.bin/gprof/Makefile     Mon Aug 05 00:08:58 2013 +0000
@@ -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
diff -r ff9b09008d7a -r b216b730cb69 external/gpl3/binutils/usr.bin/ld/Makefile
--- a/external/gpl3/binutils/usr.bin/ld/Makefile        Sun Aug 04 23:41:43 2013 +0000
+++ b/external/gpl3/binutils/usr.bin/ld/Makefile        Mon Aug 05 00:08:58 2013 +0000
@@ -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 @@
 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 @@
                ${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 @@
 .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*)
Prev by Date: [src/trunk]: src/external/gpl3/gdb Use GDB_MACHINE_ARCH instead of MACHINE_ARCH.
Next by Date: [src/trunk]: src/external/gpl3/binutils/usr.sbin Use BINUTILS_MACHINE_ARCH in...
Previous by Thread: [src/trunk]: src/external/gpl3/gdb Use GDB_MACHINE_ARCH instead of MACHINE_ARCH.
Next by Thread: [src/trunk]: src/external/gpl3/binutils/usr.sbin Use BINUTILS_MACHINE_ARCH in...
Indexes:
Home | Main Index | Thread Index | Old Index