diff --git a/external/gpl3/gcc.old/usr.bin/Makefile.inc b/external/gpl3/gcc.old/usr.bin/Makefile.inc
index 9c5bb5ca4bd1..d2c4eec14cfb 100644
--- a/external/gpl3/gcc.old/usr.bin/Makefile.inc
+++ b/external/gpl3/gcc.old/usr.bin/Makefile.inc
@@ -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_=1
 .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 --git a/external/gpl3/gcc/usr.bin/Makefile.inc b/external/gpl3/gcc/usr.bin/Makefile.inc
index 8117f49793fe..803728c32f99 100644
--- a/external/gpl3/gcc/usr.bin/Makefile.inc
+++ b/external/gpl3/gcc/usr.bin/Makefile.inc
@@ -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_=1
 .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 --git a/external/lgpl3/gmp/Makefile.arch b/external/lgpl3/gmp/Makefile.arch
new file mode 100644
index 000000000000..a7a0e606b50e
--- /dev/null
+++ b/external/lgpl3/gmp/Makefile.arch
@@ -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 --git a/external/lgpl3/gmp/lib/libgmp/Makefile b/external/lgpl3/gmp/lib/libgmp/Makefile
index 2b89b8a77802..fd18f62f83e8 100644
--- a/external/lgpl3/gmp/lib/libgmp/Makefile
+++ b/external/lgpl3/gmp/lib/libgmp/Makefile
@@ -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 --git a/external/lgpl3/mpc/lib/libmpc/Makefile b/external/lgpl3/mpc/lib/libmpc/Makefile
index 62d4853fb4ee..b7f054bc5125 100644
--- a/external/lgpl3/mpc/lib/libmpc/Makefile
+++ b/external/lgpl3/mpc/lib/libmpc/Makefile
@@ -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
 
diff --git a/external/lgpl3/mpfr/lib/libmpfr/Makefile b/external/lgpl3/mpfr/lib/libmpfr/Makefile
index db9f34fac8b7..9a49ac6060ad 100644
--- a/external/lgpl3/mpfr/lib/libmpfr/Makefile
+++ b/external/lgpl3/mpfr/lib/libmpfr/Makefile
@@ -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
 
diff --git a/tools/gcc/Makefile b/tools/gcc/Makefile
index 1114c851f6cf..a82d5183d2df 100644
--- a/tools/gcc/Makefile
+++ b/tools/gcc/Makefile
@@ -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 && ${PRINTOBJDIR}
 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} \