[src/trunk]: src move the GMP_MACHINE_ARCH definition into external/lgpl3/gmp...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/591ae37b1373
branches:  trunk
changeset: 355922:591ae37b1373
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Aug 22 09:17:50 2017 +0000

description:
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.

diffstat:

 external/gpl3/gcc.old/usr.bin/Makefile.inc |  4 ++--
 external/gpl3/gcc/usr.bin/Makefile.inc     |  4 ++--
 external/lgpl3/gmp/Makefile.arch           |  4 ++++
 external/lgpl3/gmp/lib/libgmp/Makefile     |  4 ++--
 external/lgpl3/mpc/lib/libmpc/Makefile     |  4 ++--
 external/lgpl3/mpfr/lib/libmpfr/Makefile   |  4 ++--
 tools/gcc/Makefile                         |  4 ++--
 7 files changed, 16 insertions(+), 12 deletions(-)

diffs (115 lines):

diff -r b3daf2ad39c9 -r 591ae37b1373 external/gpl3/gcc.old/usr.bin/Makefile.inc
--- a/external/gpl3/gcc.old/usr.bin/Makefile.inc        Tue Aug 22 09:12:49 2017 +0000
+++ b/external/gpl3/gcc.old/usr.bin/Makefile.inc        Tue Aug 22 09:17:50 2017 +0000
@@ -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 @@
 .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}
diff -r b3daf2ad39c9 -r 591ae37b1373 external/gpl3/gcc/usr.bin/Makefile.inc
--- a/external/gpl3/gcc/usr.bin/Makefile.inc    Tue Aug 22 09:12:49 2017 +0000
+++ b/external/gpl3/gcc/usr.bin/Makefile.inc    Tue Aug 22 09:17:50 2017 +0000
@@ -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 @@
 .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}
diff -r b3daf2ad39c9 -r 591ae37b1373 external/lgpl3/gmp/Makefile.arch
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/lgpl3/gmp/Makefile.arch  Tue Aug 22 09:17:50 2017 +0000
@@ -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/}
diff -r b3daf2ad39c9 -r 591ae37b1373 external/lgpl3/gmp/lib/libgmp/Makefile
--- a/external/lgpl3/gmp/lib/libgmp/Makefile    Tue Aug 22 09:12:49 2017 +0000
+++ b/external/lgpl3/gmp/lib/libgmp/Makefile    Tue Aug 22 09:17:50 2017 +0000
@@ -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
diff -r b3daf2ad39c9 -r 591ae37b1373 external/lgpl3/mpc/lib/libmpc/Makefile
--- a/external/lgpl3/mpc/lib/libmpc/Makefile    Tue Aug 22 09:12:49 2017 +0000
+++ b/external/lgpl3/mpc/lib/libmpc/Makefile    Tue Aug 22 09:17:50 2017 +0000
@@ -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 @@
 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
 
diff -r b3daf2ad39c9 -r 591ae37b1373 external/lgpl3/mpfr/lib/libmpfr/Makefile
--- a/external/lgpl3/mpfr/lib/libmpfr/Makefile  Tue Aug 22 09:12:49 2017 +0000
+++ b/external/lgpl3/mpfr/lib/libmpfr/Makefile  Tue Aug 22 09:17:50 2017 +0000
@@ -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 @@
                -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
 
diff -r b3daf2ad39c9 -r 591ae37b1373 tools/gcc/Makefile
--- a/tools/gcc/Makefile        Tue Aug 22 09:12:49 2017 +0000
+++ b/tools/gcc/Makefile        Tue Aug 22 09:17:50 2017 +0000
@@ -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 @@
 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} \