Module Name: src
Committed By: matt
Date: Tue Aug 6 05:35:57 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.inc Makefile.prog
src/external/gpl3/binutils/usr.sbin: Makefile.inc
src/external/gpl3/gdb: Makefile.inc
src/external/lgpl2/mpc/lib/libmpc: Makefile
src/external/lgpl3/gmp/lib/libgmp: Makefile
src/external/lgpl3/mpfr/lib/libmpfr: Makefile
Log Message:
Use armv[4-7] to be consistend
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/binutils/lib/libbfd/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/binutils/lib/libiberty/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/binutils/lib/libopcodes/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/binutils/usr.bin/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/binutils/usr.bin/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/binutils/usr.bin/common/Makefile.inc
cvs rdiff -u -r1.8 -r1.9 \
src/external/gpl3/binutils/usr.bin/common/Makefile.prog
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/binutils/usr.sbin/Makefile.inc
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gdb/Makefile.inc
cvs rdiff -u -r1.6 -r1.7 src/external/lgpl2/mpc/lib/libmpc/Makefile
cvs rdiff -u -r1.15 -r1.16 src/external/lgpl3/gmp/lib/libgmp/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/lgpl3/mpfr/lib/libmpfr/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.8 src/external/gpl3/binutils/lib/libbfd/Makefile:1.9
--- src/external/gpl3/binutils/lib/libbfd/Makefile:1.8 Mon Aug 5 00:08:58 2013
+++ src/external/gpl3/binutils/lib/libbfd/Makefile Tue Aug 6 05:35:57 2013
@@ -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 @@ libinstall: # do nothing
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
Index: src/external/gpl3/binutils/lib/libiberty/Makefile
diff -u src/external/gpl3/binutils/lib/libiberty/Makefile:1.3 src/external/gpl3/binutils/lib/libiberty/Makefile:1.4
--- src/external/gpl3/binutils/lib/libiberty/Makefile:1.3 Mon Aug 5 00:08:58 2013
+++ src/external/gpl3/binutils/lib/libiberty/Makefile Tue Aug 6 05:35:57 2013
@@ -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 @@ NOCLANGERROR= # defined
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"
Index: src/external/gpl3/binutils/lib/libopcodes/Makefile
diff -u src/external/gpl3/binutils/lib/libopcodes/Makefile:1.5 src/external/gpl3/binutils/lib/libopcodes/Makefile:1.6
--- src/external/gpl3/binutils/lib/libopcodes/Makefile:1.5 Mon Aug 5 00:08:58 2013
+++ src/external/gpl3/binutils/lib/libopcodes/Makefile Tue Aug 6 05:35:57 2013
@@ -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 @@ NOCLANGERROR= # defined
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"
Index: src/external/gpl3/binutils/usr.bin/Makefile
diff -u src/external/gpl3/binutils/usr.bin/Makefile:1.4 src/external/gpl3/binutils/usr.bin/Makefile:1.5
--- src/external/gpl3/binutils/usr.bin/Makefile:1.4 Mon Aug 5 00:08:58 2013
+++ src/external/gpl3/binutils/usr.bin/Makefile Tue Aug 6 05:35:57 2013
@@ -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"
Index: src/external/gpl3/binutils/usr.bin/Makefile.inc
diff -u src/external/gpl3/binutils/usr.bin/Makefile.inc:1.5 src/external/gpl3/binutils/usr.bin/Makefile.inc:1.6
--- src/external/gpl3/binutils/usr.bin/Makefile.inc:1.5 Mon Aug 5 00:08:58 2013
+++ src/external/gpl3/binutils/usr.bin/Makefile.inc Tue Aug 6 05:35:57 2013
@@ -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 @@ __MAKEFILE_INC_INCLUDED__=1
.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}
Index: src/external/gpl3/binutils/usr.bin/common/Makefile.inc
diff -u src/external/gpl3/binutils/usr.bin/common/Makefile.inc:1.2 src/external/gpl3/binutils/usr.bin/common/Makefile.inc:1.3
--- src/external/gpl3/binutils/usr.bin/common/Makefile.inc:1.2 Mon Aug 5 00:08:58 2013
+++ src/external/gpl3/binutils/usr.bin/common/Makefile.inc Tue Aug 6 05:35:57 2013
@@ -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
Index: src/external/gpl3/binutils/usr.bin/common/Makefile.prog
diff -u src/external/gpl3/binutils/usr.bin/common/Makefile.prog:1.8 src/external/gpl3/binutils/usr.bin/common/Makefile.prog:1.9
--- src/external/gpl3/binutils/usr.bin/common/Makefile.prog:1.8 Mon Aug 5 00:08:58 2013
+++ src/external/gpl3/binutils/usr.bin/common/Makefile.prog Tue Aug 6 05:35:57 2013
@@ -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
Index: src/external/gpl3/binutils/usr.sbin/Makefile.inc
diff -u src/external/gpl3/binutils/usr.sbin/Makefile.inc:1.4 src/external/gpl3/binutils/usr.sbin/Makefile.inc:1.5
--- src/external/gpl3/binutils/usr.sbin/Makefile.inc:1.4 Mon Aug 5 00:17:52 2013
+++ src/external/gpl3/binutils/usr.sbin/Makefile.inc Tue Aug 6 05:35:57 2013
@@ -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
Index: src/external/gpl3/gdb/Makefile.inc
diff -u src/external/gpl3/gdb/Makefile.inc:1.7 src/external/gpl3/gdb/Makefile.inc:1.8
--- src/external/gpl3/gdb/Makefile.inc:1.7 Sun Aug 4 23:41:43 2013
+++ src/external/gpl3/gdb/Makefile.inc Tue Aug 6 05:35:57 2013
@@ -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 \
Index: src/external/lgpl2/mpc/lib/libmpc/Makefile
diff -u src/external/lgpl2/mpc/lib/libmpc/Makefile:1.6 src/external/lgpl2/mpc/lib/libmpc/Makefile:1.7
--- src/external/lgpl2/mpc/lib/libmpc/Makefile:1.6 Mon Aug 5 01:53:42 2013
+++ src/external/lgpl2/mpc/lib/libmpc/Makefile Tue Aug 6 05:35:56 2013
@@ -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 @@ SRCS= \
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
Index: src/external/lgpl3/gmp/lib/libgmp/Makefile
diff -u src/external/lgpl3/gmp/lib/libgmp/Makefile:1.15 src/external/lgpl3/gmp/lib/libgmp/Makefile:1.16
--- src/external/lgpl3/gmp/lib/libgmp/Makefile:1.15 Sun Aug 4 23:37:54 2013
+++ src/external/lgpl3/gmp/lib/libgmp/Makefile Tue Aug 6 05:35:57 2013
@@ -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 @@ CLEANFILES+= ${_dir}_${_srcfile}
.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 @@ perfsqr.h: gen-psqr.c
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 @@ CLEANFILES+= mpn_${_build}
.PATH: ${DIST} \
${DIST}/mpn/generic \
- ${.CURDIR}/arch/${LIBGMP_MACHINE_ARCH} \
+ ${.CURDIR}/arch/${GMP_MACHINE_ARCH} \
${DIST}/mpf \
${DIST}/mpz
Index: src/external/lgpl3/mpfr/lib/libmpfr/Makefile
diff -u src/external/lgpl3/mpfr/lib/libmpfr/Makefile:1.11 src/external/lgpl3/mpfr/lib/libmpfr/Makefile:1.12
--- src/external/lgpl3/mpfr/lib/libmpfr/Makefile:1.11 Mon Aug 5 01:46:57 2013
+++ src/external/lgpl3/mpfr/lib/libmpfr/Makefile Tue Aug 6 05:35:57 2013
@@ -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 @@ CPPFLAGS+= -I. \
-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
