[src/trunk]: src/external Use armv[4-7] to be consistend

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/external Use armv[4-7] to be consistend
From: matt <matt%NetBSD.org@localhost>
Date: Tue, 07 Apr 2020 01:07:19 +0000
details:   https://anonhg.NetBSD.org/src/rev/6ca1c0e8fabe
branches:  trunk
changeset: 789066:6ca1c0e8fabe
user:      matt <matt%NetBSD.org@localhost>
date:      Tue Aug 06 05:35:56 2013 +0000

description:
Use armv[4-7] to be consistend

diffstat:

 external/gpl3/binutils/lib/libbfd/Makefile          |   4 ++--
 external/gpl3/binutils/lib/libiberty/Makefile       |   4 ++--
 external/gpl3/binutils/lib/libopcodes/Makefile      |   4 ++--
 external/gpl3/binutils/usr.bin/Makefile             |   4 ++--
 external/gpl3/binutils/usr.bin/Makefile.inc         |   4 ++--
 external/gpl3/binutils/usr.bin/common/Makefile.inc  |   4 ++--
 external/gpl3/binutils/usr.bin/common/Makefile.prog |   4 ++--
 external/gpl3/binutils/usr.sbin/Makefile.inc        |   4 ++--
 external/gpl3/gdb/Makefile.inc                      |   4 ++--
 external/lgpl2/mpc/lib/libmpc/Makefile              |   4 ++--
 external/lgpl3/gmp/lib/libgmp/Makefile              |  14 +++++++-------
 external/lgpl3/mpfr/lib/libmpfr/Makefile            |   4 ++--
 12 files changed, 29 insertions(+), 29 deletions(-)

diffs (239 lines):

diff -r 495ad53d3980 -r 6ca1c0e8fabe external/gpl3/binutils/lib/libbfd/Makefile
--- a/external/gpl3/binutils/lib/libbfd/Makefile        Tue Aug 06 00:28:52 2013 +0000
+++ b/external/gpl3/binutils/lib/libbfd/Makefile        Tue Aug 06 05:35:56 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.8 2013/08/05 00:08:58 matt Exp $
+#      $NetBSD: Makefile,v 1.9 2013/08/06 05:35:57 matt Exp $
 
 NOLINKLIB=     # defined
 NOLINT=                # defined
@@ -18,7 +18,7 @@
 
 LIB=           bfd
 
-BFD_MACHINE_ARCH?=     ${MACHINE_ARCH:C/armv[467]/arm/}
+BFD_MACHINE_ARCH?=     ${MACHINE_ARCH:C/armv[4-7]/arm/}
 
 DEFS_MK=${.CURDIR}/arch/${BFD_MACHINE_ARCH}/defs.mk
 
diff -r 495ad53d3980 -r 6ca1c0e8fabe external/gpl3/binutils/lib/libiberty/Makefile
--- a/external/gpl3/binutils/lib/libiberty/Makefile     Tue Aug 06 00:28:52 2013 +0000
+++ b/external/gpl3/binutils/lib/libiberty/Makefile     Tue Aug 06 05:35:56 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2013/08/05 00:08:58 matt Exp $
+#      $NetBSD: Makefile,v 1.4 2013/08/06 05:35:57 matt Exp $
 
 NOLINT=                # defined
 NOPROFILE=     # defined
@@ -10,7 +10,7 @@
 
 LIB=           iberty
 
-BINUTILS_MACHINE_ARCH=${MACHINE_ARCH:C/armv[467]/arm/}
+BINUTILS_MACHINE_ARCH=${MACHINE_ARCH:C/armv[4-7]/arm/}
 
 .include "${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH}/defs.mk"
 
diff -r 495ad53d3980 -r 6ca1c0e8fabe external/gpl3/binutils/lib/libopcodes/Makefile
--- a/external/gpl3/binutils/lib/libopcodes/Makefile    Tue Aug 06 00:28:52 2013 +0000
+++ b/external/gpl3/binutils/lib/libopcodes/Makefile    Tue Aug 06 05:35:56 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2013/08/05 00:08:58 matt Exp $
+#      $NetBSD: Makefile,v 1.6 2013/08/06 05:35:57 matt Exp $
 
 NOLINKLIB=     # defined
 NOLINT=                # defined
@@ -10,7 +10,7 @@
 
 LIB=           opcodes
 
-BFD_MACHINE_ARCH?=     ${MACHINE_ARCH:C/armv[467]/arm/}
+BFD_MACHINE_ARCH?=     ${MACHINE_ARCH:C/armv[4-7]/arm/}
 
 .if exists(${.CURDIR}/arch/${BFD_MACHINE_ARCH}/defs.mk)
 .include "${.CURDIR}/arch/${BFD_MACHINE_ARCH}/defs.mk"
diff -r 495ad53d3980 -r 6ca1c0e8fabe external/gpl3/binutils/usr.bin/Makefile
--- a/external/gpl3/binutils/usr.bin/Makefile   Tue Aug 06 00:28:52 2013 +0000
+++ b/external/gpl3/binutils/usr.bin/Makefile   Tue Aug 06 05:35:56 2013 +0000
@@ -1,8 +1,8 @@
-#      $NetBSD: Makefile,v 1.4 2013/08/05 00:08:58 matt Exp $
+#      $NetBSD: Makefile,v 1.5 2013/08/06 05:35:57 matt Exp $
 
 .include <bsd.own.mk>
 
-BINUTILS_MACHINE_ARCH=${MACHINE_ARCH:C/armv[457]/arm/}
+BINUTILS_MACHINE_ARCH=${MACHINE_ARCH:C/armv[4-7]/arm/}
 
 .if ${MKBINUTILS} != "no" && exists(${.CURDIR}/common/arch/${BINUTILS_MACHINE_ARCH}/defs.mk)
 .include "${.CURDIR}/common/arch/${BINUTILS_MACHINE_ARCH}/defs.mk"
diff -r 495ad53d3980 -r 6ca1c0e8fabe external/gpl3/binutils/usr.bin/Makefile.inc
--- a/external/gpl3/binutils/usr.bin/Makefile.inc       Tue Aug 06 00:28:52 2013 +0000
+++ b/external/gpl3/binutils/usr.bin/Makefile.inc       Tue Aug 06 05:35:56 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.5 2013/08/05 00:08:58 matt Exp $
+#      $NetBSD: Makefile.inc,v 1.6 2013/08/06 05:35:57 matt Exp $
 
 BINDIR?=       /usr/bin
 
@@ -7,7 +7,7 @@
 
 .include <bsd.own.mk>
 
-BINUTILS_MACHINE_ARCH= ${MACHINE_ARCH:C/armv[467]/arm/}
+BINUTILS_MACHINE_ARCH= ${MACHINE_ARCH:C/armv[4-7]/arm/}
 
 GNUHOSTDIST=   ${DIST}
 GNUCPPFLAGS=   ${G_DEFS} ${G_INCLUDES}
diff -r 495ad53d3980 -r 6ca1c0e8fabe external/gpl3/binutils/usr.bin/common/Makefile.inc
--- a/external/gpl3/binutils/usr.bin/common/Makefile.inc        Tue Aug 06 00:28:52 2013 +0000
+++ b/external/gpl3/binutils/usr.bin/common/Makefile.inc        Tue Aug 06 05:35:56 2013 +0000
@@ -1,9 +1,9 @@
-#      $NetBSD: Makefile.inc,v 1.2 2013/08/05 00:08:58 matt Exp $
+#      $NetBSD: Makefile.inc,v 1.3 2013/08/06 05:35:57 matt Exp $
 
 .if !defined(__COMMON_MAKEFILE_INC_INCLUDED__)
 __COMMON_MAKEFILE_INC_INCLUDED__=1
 
-BINUTILS_MACHINE_ARCH=${MACHINE_ARCH:C/armv[467]/arm/}
+BINUTILS_MACHINE_ARCH=${MACHINE_ARCH:C/armv[4-7]/arm/}
 DIST=          ${NETBSDSRCDIR}/external/gpl3/binutils/dist
 BFDSUBDIR=     lib
 
diff -r 495ad53d3980 -r 6ca1c0e8fabe external/gpl3/binutils/usr.bin/common/Makefile.prog
--- a/external/gpl3/binutils/usr.bin/common/Makefile.prog       Tue Aug 06 00:28:52 2013 +0000
+++ b/external/gpl3/binutils/usr.bin/common/Makefile.prog       Tue Aug 06 05:35:56 2013 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: Makefile.prog,v 1.8 2013/08/05 00:08:58 matt Exp $
+#      $NetBSD: Makefile.prog,v 1.9 2013/08/06 05:35:57 matt Exp $
 #
 # Common Makefile fragment for a binutils program.
 #
 
 .include <bsd.own.mk>
 
-BINUTILS_MACHINE_ARCH=${MACHINE_ARCH:C/armv[467]/arm/}
+BINUTILS_MACHINE_ARCH=${MACHINE_ARCH:C/armv[4-7]/arm/}
 
 TOP=           ${NETBSDSRCDIR}/external/gpl3/binutils
 
diff -r 495ad53d3980 -r 6ca1c0e8fabe external/gpl3/binutils/usr.sbin/Makefile.inc
--- a/external/gpl3/binutils/usr.sbin/Makefile.inc      Tue Aug 06 00:28:52 2013 +0000
+++ b/external/gpl3/binutils/usr.sbin/Makefile.inc      Tue Aug 06 05:35:56 2013 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: Makefile.inc,v 1.4 2013/08/05 00:17:52 matt Exp $
+#      $NetBSD: Makefile.inc,v 1.5 2013/08/06 05:35:57 matt Exp $
 
 BINDIR?=       /usr/sbin
 WARNS?=                1
 
 LDADD+=-lz
 .ifndef HOSTPROG
-BINUTILS_MACHINE_ARCH=${MACHINE_ARCH:C/armv[457]/arm/}
+BINUTILS_MACHINE_ARCH=${MACHINE_ARCH:C/armv[4-7]/arm/}
 DPADD+=${LIBZ}
 .endif
diff -r 495ad53d3980 -r 6ca1c0e8fabe external/gpl3/gdb/Makefile.inc
--- a/external/gpl3/gdb/Makefile.inc    Tue Aug 06 00:28:52 2013 +0000
+++ b/external/gpl3/gdb/Makefile.inc    Tue Aug 06 05:35:56 2013 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.inc,v 1.7 2013/08/04 23:41:43 matt Exp $
+# $NetBSD: Makefile.inc,v 1.8 2013/08/06 05:35:57 matt Exp $
 
 USE_LIBEDIT=no
 USE_TUI=yes
 BINDIR=/usr/bin
 WARNS?=                0
 
-GDB_MACHINE_ARCH=      ${MACHINE_ARCH:C/armv[457]/arm/}
+GDB_MACHINE_ARCH=      ${MACHINE_ARCH:C/armv[4-7]/arm/}
 
 CWARNFLAGS.clang+=     -Wno-unused-value -Wno-conversion \
                        -Wno-switch-enum -Wno-parentheses -Wno-comment \
diff -r 495ad53d3980 -r 6ca1c0e8fabe external/lgpl2/mpc/lib/libmpc/Makefile
--- a/external/lgpl2/mpc/lib/libmpc/Makefile    Tue Aug 06 00:28:52 2013 +0000
+++ b/external/lgpl2/mpc/lib/libmpc/Makefile    Tue Aug 06 05:35:56 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2013/08/05 01:53:42 matt Exp $
+#      $NetBSD: Makefile,v 1.7 2013/08/06 05:35:56 matt Exp $
 
 .include <bsd.init.mk>
 
@@ -94,7 +94,7 @@
 CPPFLAGS+=     -I${.CURDIR}
 
 # Find <mpfr.h> and <gmp.h>
-GMP_MACHINE_ARCH=${MACHINE_ARCH:C/armv[467]/arm/}
+GMP_MACHINE_ARCH=${MACHINE_ARCH:C/armv[4-7]/arm/}
 CPPFLAGS+=     -I${NETBSDSRCDIR}/external/lgpl3/gmp/lib/libgmp/arch/${GMP_MACHINE_ARCH}
 CPPFLAGS+=     -I${NETBSDSRCDIR}/external/lgpl3/mpfr/dist
 
diff -r 495ad53d3980 -r 6ca1c0e8fabe external/lgpl3/gmp/lib/libgmp/Makefile
--- a/external/lgpl3/gmp/lib/libgmp/Makefile    Tue Aug 06 00:28:52 2013 +0000
+++ b/external/lgpl3/gmp/lib/libgmp/Makefile    Tue Aug 06 05:35:56 2013 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: Makefile,v 1.15 2013/08/04 23:37:54 matt Exp $
+#      $NetBSD: Makefile,v 1.16 2013/08/06 05:35:57 matt Exp $
 
 .include <bsd.init.mk>
 
 # We don't install gmp, just provide it for GCC.
 LIBISPRIVATE?= yes
 
-LIBGMP_MACHINE_ARCH?=  ${MACHINE_ARCH:C/armv[467]/arm/}
+GMP_MACHINE_ARCH?=     ${MACHINE_ARCH:S/earmv4/arm/:C/armv[67]/arm/}
 
 .if ${LIBISPRIVATE} != "yes"
 INCS=         gmp.h
@@ -147,7 +147,7 @@
 
 .endfor
 
-CPPFLAGS+=     -I. -I${DIST} -I${.CURDIR}/arch/${LIBGMP_MACHINE_ARCH} -D__GMP_WITHIN_GMP -DHAVE_CONFIG_H
+CPPFLAGS+=     -I. -I${DIST} -I${.CURDIR}/arch/${GMP_MACHINE_ARCH} -D__GMP_WITHIN_GMP -DHAVE_CONFIG_H
 
 WITHOUT_MAN=   yes
 
@@ -182,13 +182,13 @@
 CLEANFILES+=   ${DPSRCS} gen-fac_ui gen-fib gen-bases gen-psqr gen-trialdivtab
 
 
-.include "${.CURDIR}/arch/${LIBGMP_MACHINE_ARCH}/Makefile.inc"
+.include "${.CURDIR}/arch/${GMP_MACHINE_ARCH}/Makefile.inc"
 
 # XXX stuff looks for "../config.m4"
 dummy:
        mkdir dummy
-${.OBJDIR}/config.m4: ${.CURDIR}/arch/${LIBGMP_MACHINE_ARCH}/config.m4
-       cp ${.CURDIR}/arch/${LIBGMP_MACHINE_ARCH}/config.m4 ${.OBJDIR}/config.m4
+${.OBJDIR}/config.m4: ${.CURDIR}/arch/${GMP_MACHINE_ARCH}/config.m4
+       cp ${.CURDIR}/arch/${GMP_MACHINE_ARCH}/config.m4 ${.OBJDIR}/config.m4
 
 CLEANFILES+=   config.m4
 clean: cleandummy
@@ -221,7 +221,7 @@
 
 .PATH: ${DIST} \
        ${DIST}/mpn/generic \
-       ${.CURDIR}/arch/${LIBGMP_MACHINE_ARCH} \
+       ${.CURDIR}/arch/${GMP_MACHINE_ARCH} \
        ${DIST}/mpf \
        ${DIST}/mpz
 
diff -r 495ad53d3980 -r 6ca1c0e8fabe external/lgpl3/mpfr/lib/libmpfr/Makefile
--- a/external/lgpl3/mpfr/lib/libmpfr/Makefile  Tue Aug 06 00:28:52 2013 +0000
+++ b/external/lgpl3/mpfr/lib/libmpfr/Makefile  Tue Aug 06 05:35:56 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.11 2013/08/05 01:46:57 matt Exp $
+#      $NetBSD: Makefile,v 1.12 2013/08/06 05:35:57 matt Exp $
 
 .include <bsd.init.mk>
 
@@ -476,7 +476,7 @@
                -DHAVE_ATTRIBUTE_MODE=1
 
 # Find <gmp.h>
-GMP_MACHINE_ARCH=${MACHINE_ARCH:C/armv[467]/arm/}
+GMP_MACHINE_ARCH=${MACHINE_ARCH:C/armv[4-7]/arm/}
 CPPFLAGS+=     -I${NETBSDSRCDIR}/external/lgpl3/gmp/lib/libgmp/arch/${GMP_MACHINE_ARCH}
 
 # XXX
Prev by Date: [src/trunk]: src/sys/arch/arm/omap fix a bug in obiosdhc_bus_clock where SYSC...
Next by Date: [src/trunk]: src/external/gpl3/gcc/usr.bin Use armv[4-7] to be consistent
Previous by Thread: [src/trunk]: src/sys/arch/arm/omap fix a bug in obiosdhc_bus_clock where SYSC...
Next by Thread: [src/trunk]: src/external/gpl3/gcc/usr.bin Use armv[4-7] to be consistent
Indexes:
Home | Main Index | Thread Index | Old Index