Module Name: src
Committed By: mrg
Date: Tue Aug 22 09:17:50 UTC 2017
Modified Files:
src/external/gpl3/gcc.old/usr.bin: Makefile.inc
src/external/gpl3/gcc/usr.bin: Makefile.inc
src/external/lgpl3/gmp/lib/libgmp: Makefile
src/external/lgpl3/mpc/lib/libmpc: Makefile
src/external/lgpl3/mpfr/lib/libmpfr: Makefile
src/tools/gcc: Makefile
Added Files:
src/external/lgpl3/gmp: Makefile.arch
Log Message:
move the GMP_MACHINE_ARCH definition into external/lgpl3/gmp/Makefile.arch.
soon to be GMP 6 allows us to have only two arm copies.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc.old/usr.bin/Makefile.inc
cvs rdiff -u -r1.28 -r1.29 src/external/gpl3/gcc/usr.bin/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/external/lgpl3/gmp/Makefile.arch
cvs rdiff -u -r1.25 -r1.26 src/external/lgpl3/gmp/lib/libgmp/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/lgpl3/mpc/lib/libmpc/Makefile
cvs rdiff -u -r1.16 -r1.17 src/external/lgpl3/mpfr/lib/libmpfr/Makefile
cvs rdiff -u -r1.81 -r1.82 src/tools/gcc/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/gcc.old/usr.bin/Makefile.inc
diff -u src/external/gpl3/gcc.old/usr.bin/Makefile.inc:1.7 src/external/gpl3/gcc.old/usr.bin/Makefile.inc:1.8
--- src/external/gpl3/gcc.old/usr.bin/Makefile.inc:1.7 Fri Aug 4 01:18:39 2017
+++ src/external/gpl3/gcc.old/usr.bin/Makefile.inc Tue Aug 22 09:17:50 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.7 2017/08/04 01:18:39 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.8 2017/08/22 09:17:50 mrg Exp $
.ifndef _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_
_EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_=1
@@ -8,7 +8,7 @@ _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_
.sinclude "../../Makefile.gcc_path"
GCC_MACHINE_ARCH=${MACHINE_ARCH:S/earmv5/earm/}
-GMP_MACHINE_ARCH=${MACHINE_ARCH:C/armv[4-7]/arm/}
+.include "../../../lgpl3/gmp/Makefile.arch"
TOP= ${NETBSDSRCDIR}
DIST= ${GCCDIST}
Index: src/external/gpl3/gcc/usr.bin/Makefile.inc
diff -u src/external/gpl3/gcc/usr.bin/Makefile.inc:1.28 src/external/gpl3/gcc/usr.bin/Makefile.inc:1.29
--- src/external/gpl3/gcc/usr.bin/Makefile.inc:1.28 Fri Aug 4 01:18:39 2017
+++ src/external/gpl3/gcc/usr.bin/Makefile.inc Tue Aug 22 09:17:50 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.28 2017/08/04 01:18:39 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.29 2017/08/22 09:17:50 mrg Exp $
.ifndef _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_
_EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_=1
@@ -8,7 +8,7 @@ _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_
.sinclude "../../Makefile.gcc_path"
GCC_MACHINE_ARCH=${MACHINE_ARCH:S/earmv5/earm/}
-GMP_MACHINE_ARCH=${MACHINE_ARCH:C/armv[4-7]/arm/}
+.include "../../../lgpl3/gmp/Makefile.arch"
TOP= ${NETBSDSRCDIR}
DIST= ${GCCDIST}
Index: src/external/lgpl3/gmp/lib/libgmp/Makefile
diff -u src/external/lgpl3/gmp/lib/libgmp/Makefile:1.25 src/external/lgpl3/gmp/lib/libgmp/Makefile:1.26
--- src/external/lgpl3/gmp/lib/libgmp/Makefile:1.25 Tue Apr 12 19:38:41 2016
+++ src/external/lgpl3/gmp/lib/libgmp/Makefile Tue Aug 22 09:17:50 2017
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.25 2016/04/12 19:38:41 christos Exp $
+# $NetBSD: Makefile,v 1.26 2017/08/22 09:17:50 mrg Exp $
.include <bsd.init.mk>
# We don't install gmp, just provide it for GCC.
LIBISPRIVATE?= yes
-GMP_MACHINE_ARCH?= ${MACHINE_ARCH:S/earmv4/arm/:C/armv[5-7]/arm/}
+.include "../../Makefile.arch"
.if ${LIBISPRIVATE} != "yes"
INCS= gmp.h
Index: src/external/lgpl3/mpc/lib/libmpc/Makefile
diff -u src/external/lgpl3/mpc/lib/libmpc/Makefile:1.2 src/external/lgpl3/mpc/lib/libmpc/Makefile:1.3
--- src/external/lgpl3/mpc/lib/libmpc/Makefile:1.2 Thu Nov 28 14:21:31 2013
+++ src/external/lgpl3/mpc/lib/libmpc/Makefile Tue Aug 22 09:17:50 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/11/28 14:21:31 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2017/08/22 09:17:50 mrg Exp $
.include <bsd.init.mk>
@@ -98,7 +98,7 @@ SRCS= \
CPPFLAGS+= -I${.CURDIR}
# Find <mpfr.h> and <gmp.h>
-GMP_MACHINE_ARCH=${MACHINE_ARCH:C/armv[4-7]/arm/}
+.include "../../../gmp/Makefile.arch"
CPPFLAGS+= -I${NETBSDSRCDIR}/external/lgpl3/gmp/lib/libgmp/arch/${GMP_MACHINE_ARCH}
CPPFLAGS+= -I${NETBSDSRCDIR}/external/lgpl3/mpfr/dist/src
Index: src/external/lgpl3/mpfr/lib/libmpfr/Makefile
diff -u src/external/lgpl3/mpfr/lib/libmpfr/Makefile:1.16 src/external/lgpl3/mpfr/lib/libmpfr/Makefile:1.17
--- src/external/lgpl3/mpfr/lib/libmpfr/Makefile:1.16 Thu Dec 19 01:10:19 2013
+++ src/external/lgpl3/mpfr/lib/libmpfr/Makefile Tue Aug 22 09:17:50 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2013/12/19 01:10:19 gdt Exp $
+# $NetBSD: Makefile,v 1.17 2017/08/22 09:17:50 mrg Exp $
.include <bsd.init.mk>
@@ -478,7 +478,7 @@ CPPFLAGS+= -I. \
-DHAVE_ATTRIBUTE_MODE=1
# Find <gmp.h>
-GMP_MACHINE_ARCH=${MACHINE_ARCH:S/earmv4/arm/:C/armv[5-7]/arm/}
+.include "../../../gmp/Makefile.arch"
CPPFLAGS+= -I${NETBSDSRCDIR}/external/lgpl3/gmp/lib/libgmp/arch/${GMP_MACHINE_ARCH}
CPPFLAGS+= -I${.CURDIR}/../../dist/src
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.81 src/tools/gcc/Makefile:1.82
--- src/tools/gcc/Makefile:1.81 Wed Mar 22 23:11:10 2017
+++ src/tools/gcc/Makefile Tue Aug 22 09:17:50 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2017/03/22 23:11:10 chs Exp $
+# $NetBSD: Makefile,v 1.82 2017/08/22 09:17:50 mrg Exp $
.include <bsd.own.mk>
@@ -161,7 +161,7 @@ MPCOBJ!= cd ${MPC}/lib/libmpc && ${PRINT
MPFROBJ!= cd ${MPFR}/lib/libmpfr && ${PRINTOBJDIR}
GMPOBJ!= cd ${GMP}/lib/libgmp && ${PRINTOBJDIR}
-GMP_MACHINE_ARCH?= ${MACHINE_ARCH:S/earmv4/arm/:C/armv[5-7]/arm/}
+.include "../../external/lgpl3/gmp/Makefile.arch"
NATIVE_CONFIGURE_ARGS+= \
--with-mpc-lib=${MPCOBJ} \
Added files:
Index: src/external/lgpl3/gmp/Makefile.arch
diff -u /dev/null src/external/lgpl3/gmp/Makefile.arch:1.1
--- /dev/null Tue Aug 22 09:17:50 2017
+++ src/external/lgpl3/gmp/Makefile.arch Tue Aug 22 09:17:50 2017
@@ -0,0 +1,4 @@
+# $NetBSD: Makefile.arch,v 1.1 2017/08/22 09:17:50 mrg Exp $
+
+#GMP_MACHINE_ARCH?= ${MACHINE_ARCH:C/e?arm(v[4567])?(hf)?/arm/}
+GMP_MACHINE_ARCH?= ${MACHINE_ARCH:C/armv[4-7]/arm/}
