Use armv[4-7] to be consistend
This commit is contained in:
parent
b6fc3edfec
commit
0d76fcf318
|
@ -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
|
NOLINKLIB= # defined
|
||||||
NOLINT= # defined
|
NOLINT= # defined
|
||||||
|
@ -18,7 +18,7 @@ libinstall: # do nothing
|
||||||
|
|
||||||
LIB= bfd
|
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
|
DEFS_MK=${.CURDIR}/arch/${BFD_MACHINE_ARCH}/defs.mk
|
||||||
|
|
||||||
|
|
|
@ -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
|
NOLINT= # defined
|
||||||
NOPROFILE= # defined
|
NOPROFILE= # defined
|
||||||
|
@ -10,7 +10,7 @@ NOCLANGERROR= # defined
|
||||||
|
|
||||||
LIB= iberty
|
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"
|
.include "${.CURDIR}/arch/${BINUTILS_MACHINE_ARCH}/defs.mk"
|
||||||
|
|
||||||
|
|
|
@ -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
|
NOLINKLIB= # defined
|
||||||
NOLINT= # defined
|
NOLINT= # defined
|
||||||
|
@ -10,7 +10,7 @@ NOCLANGERROR= # defined
|
||||||
|
|
||||||
LIB= opcodes
|
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)
|
.if exists(${.CURDIR}/arch/${BFD_MACHINE_ARCH}/defs.mk)
|
||||||
.include "${.CURDIR}/arch/${BFD_MACHINE_ARCH}/defs.mk"
|
.include "${.CURDIR}/arch/${BFD_MACHINE_ARCH}/defs.mk"
|
||||||
|
|
|
@ -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>
|
.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)
|
.if ${MKBINUTILS} != "no" && exists(${.CURDIR}/common/arch/${BINUTILS_MACHINE_ARCH}/defs.mk)
|
||||||
.include "${.CURDIR}/common/arch/${BINUTILS_MACHINE_ARCH}/defs.mk"
|
.include "${.CURDIR}/common/arch/${BINUTILS_MACHINE_ARCH}/defs.mk"
|
||||||
|
|
|
@ -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
|
BINDIR?= /usr/bin
|
||||||
|
|
||||||
|
@ -7,7 +7,7 @@ __MAKEFILE_INC_INCLUDED__=1
|
||||||
|
|
||||||
.include <bsd.own.mk>
|
.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}
|
GNUHOSTDIST= ${DIST}
|
||||||
GNUCPPFLAGS= ${G_DEFS} ${G_INCLUDES}
|
GNUCPPFLAGS= ${G_DEFS} ${G_INCLUDES}
|
||||||
|
|
|
@ -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__)
|
.if !defined(__COMMON_MAKEFILE_INC_INCLUDED__)
|
||||||
__COMMON_MAKEFILE_INC_INCLUDED__=1
|
__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
|
DIST= ${NETBSDSRCDIR}/external/gpl3/binutils/dist
|
||||||
BFDSUBDIR= lib
|
BFDSUBDIR= lib
|
||||||
|
|
||||||
|
|
|
@ -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.
|
# Common Makefile fragment for a binutils program.
|
||||||
#
|
#
|
||||||
|
|
||||||
.include <bsd.own.mk>
|
.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
|
TOP= ${NETBSDSRCDIR}/external/gpl3/binutils
|
||||||
|
|
||||||
|
|
|
@ -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
|
BINDIR?= /usr/sbin
|
||||||
WARNS?= 1
|
WARNS?= 1
|
||||||
|
|
||||||
LDADD+=-lz
|
LDADD+=-lz
|
||||||
.ifndef HOSTPROG
|
.ifndef HOSTPROG
|
||||||
BINUTILS_MACHINE_ARCH=${MACHINE_ARCH:C/armv[457]/arm/}
|
BINUTILS_MACHINE_ARCH=${MACHINE_ARCH:C/armv[4-7]/arm/}
|
||||||
DPADD+=${LIBZ}
|
DPADD+=${LIBZ}
|
||||||
.endif
|
.endif
|
||||||
|
|
|
@ -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_LIBEDIT=no
|
||||||
USE_TUI=yes
|
USE_TUI=yes
|
||||||
BINDIR=/usr/bin
|
BINDIR=/usr/bin
|
||||||
WARNS?= 0
|
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 \
|
CWARNFLAGS.clang+= -Wno-unused-value -Wno-conversion \
|
||||||
-Wno-switch-enum -Wno-parentheses -Wno-comment \
|
-Wno-switch-enum -Wno-parentheses -Wno-comment \
|
||||||
|
|
|
@ -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>
|
.include <bsd.init.mk>
|
||||||
|
|
||||||
|
@ -94,7 +94,7 @@ SRCS= \
|
||||||
CPPFLAGS+= -I${.CURDIR}
|
CPPFLAGS+= -I${.CURDIR}
|
||||||
|
|
||||||
# Find <mpfr.h> and <gmp.h>
|
# 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/gmp/lib/libgmp/arch/${GMP_MACHINE_ARCH}
|
||||||
CPPFLAGS+= -I${NETBSDSRCDIR}/external/lgpl3/mpfr/dist
|
CPPFLAGS+= -I${NETBSDSRCDIR}/external/lgpl3/mpfr/dist
|
||||||
|
|
||||||
|
|
|
@ -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>
|
.include <bsd.init.mk>
|
||||||
|
|
||||||
# We don't install gmp, just provide it for GCC.
|
# We don't install gmp, just provide it for GCC.
|
||||||
LIBISPRIVATE?= yes
|
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"
|
.if ${LIBISPRIVATE} != "yes"
|
||||||
INCS= gmp.h
|
INCS= gmp.h
|
||||||
|
@ -147,7 +147,7 @@ CLEANFILES+= ${_dir}_${_srcfile}
|
||||||
|
|
||||||
.endfor
|
.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
|
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
|
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"
|
# XXX stuff looks for "../config.m4"
|
||||||
dummy:
|
dummy:
|
||||||
mkdir dummy
|
mkdir dummy
|
||||||
${.OBJDIR}/config.m4: ${.CURDIR}/arch/${LIBGMP_MACHINE_ARCH}/config.m4
|
${.OBJDIR}/config.m4: ${.CURDIR}/arch/${GMP_MACHINE_ARCH}/config.m4
|
||||||
cp ${.CURDIR}/arch/${LIBGMP_MACHINE_ARCH}/config.m4 ${.OBJDIR}/config.m4
|
cp ${.CURDIR}/arch/${GMP_MACHINE_ARCH}/config.m4 ${.OBJDIR}/config.m4
|
||||||
|
|
||||||
CLEANFILES+= config.m4
|
CLEANFILES+= config.m4
|
||||||
clean: cleandummy
|
clean: cleandummy
|
||||||
|
@ -221,7 +221,7 @@ CLEANFILES+= mpn_${_build}
|
||||||
|
|
||||||
.PATH: ${DIST} \
|
.PATH: ${DIST} \
|
||||||
${DIST}/mpn/generic \
|
${DIST}/mpn/generic \
|
||||||
${.CURDIR}/arch/${LIBGMP_MACHINE_ARCH} \
|
${.CURDIR}/arch/${GMP_MACHINE_ARCH} \
|
||||||
${DIST}/mpf \
|
${DIST}/mpf \
|
||||||
${DIST}/mpz
|
${DIST}/mpz
|
||||||
|
|
||||||
|
|
|
@ -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>
|
.include <bsd.init.mk>
|
||||||
|
|
||||||
|
@ -476,7 +476,7 @@ CPPFLAGS+= -I. \
|
||||||
-DHAVE_ATTRIBUTE_MODE=1
|
-DHAVE_ATTRIBUTE_MODE=1
|
||||||
|
|
||||||
# Find <gmp.h>
|
# 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}
|
CPPFLAGS+= -I${NETBSDSRCDIR}/external/lgpl3/gmp/lib/libgmp/arch/${GMP_MACHINE_ARCH}
|
||||||
|
|
||||||
# XXX
|
# XXX
|
||||||
|
|
Loading…
Reference in New Issue