Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use armv[4-7] to be consistend

This commit is contained in:
matt 2013-08-06 05:35:56 +00:00
parent b6fc3edfec
commit 0d76fcf318
12 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
external/gpl3/binutils/lib/libbfd/Makefile vendored
View File

@ -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

4
external/gpl3/binutils/lib/libiberty/Makefile vendored
View File

@ -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"

4
external/gpl3/binutils/lib/libopcodes/Makefile vendored
View File

@ -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"

4
external/gpl3/binutils/usr.bin/Makefile vendored
View File

@ -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"

4
external/gpl3/binutils/usr.bin/Makefile.inc vendored
View File

@ -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}

4
external/gpl3/binutils/usr.bin/common/Makefile.inc vendored
View File

@ -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

4
external/gpl3/binutils/usr.bin/common/Makefile.prog vendored
View File

@ -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

4
external/gpl3/binutils/usr.sbin/Makefile.inc vendored
View File

@ -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

4
external/gpl3/gdb/Makefile.inc vendored
View File

@ -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 \

4
external/lgpl2/mpc/lib/libmpc/Makefile vendored
View File

@ -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

14
external/lgpl3/gmp/lib/libgmp/Makefile vendored
View File

@ -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

4
external/lgpl3/mpfr/lib/libmpfr/Makefile vendored
View File

@ -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