[src/trunk]: src/external/lgpl3 always compile GMP and MPFR as ARM

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

details:   https://anonhg.NetBSD.org/src/rev/6b0efc99b5e0
branches:  trunk
changeset: 789475:6b0efc99b5e0
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Aug 19 22:25:32 2013 +0000

description:
always compile GMP and MPFR as ARM

diffstat:

 external/lgpl3/gmp/lib/libgmp/Makefile   |  7 +++++--
 external/lgpl3/mpfr/lib/libmpfr/Makefile |  7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diffs (54 lines):

diff -r b0d4504f6c38 -r 6b0efc99b5e0 external/lgpl3/gmp/lib/libgmp/Makefile
--- a/external/lgpl3/gmp/lib/libgmp/Makefile    Mon Aug 19 22:23:12 2013 +0000
+++ b/external/lgpl3/gmp/lib/libgmp/Makefile    Mon Aug 19 22:25:32 2013 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: Makefile,v 1.16 2013/08/06 05:35:57 matt Exp $
+#      $NetBSD: Makefile,v 1.17 2013/08/19 22:25:32 matt 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[67]/arm/}
+GMP_MACHINE_ARCH?=     ${MACHINE_ARCH:S/earmv4/arm/:C/armv[5-7]/arm/}
 
 .if ${LIBISPRIVATE} != "yes"
 INCS=         gmp.h
@@ -228,5 +228,8 @@
 # Don't warn about functions which cannot be stack smash protected as
 # there are a lot of them.
 COPTS += -Wno-stack-protector
+.if !empty(GMP_MACHINE_ARCH:M*arm*)
+COPTS += -marm
+.endif
 
 CWARNFLAGS.clang+=     -Wno-unused-value -Wno-tautological-compare
diff -r b0d4504f6c38 -r 6b0efc99b5e0 external/lgpl3/mpfr/lib/libmpfr/Makefile
--- a/external/lgpl3/mpfr/lib/libmpfr/Makefile  Mon Aug 19 22:23:12 2013 +0000
+++ b/external/lgpl3/mpfr/lib/libmpfr/Makefile  Mon Aug 19 22:25:32 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.12 2013/08/06 05:35:57 matt Exp $
+#      $NetBSD: Makefile,v 1.13 2013/08/19 22:25:32 matt Exp $
 
 .include <bsd.init.mk>
 
@@ -476,7 +476,7 @@
                -DHAVE_ATTRIBUTE_MODE=1
 
 # Find <gmp.h>
-GMP_MACHINE_ARCH=${MACHINE_ARCH:C/armv[4-7]/arm/}
+GMP_MACHINE_ARCH=${MACHINE_ARCH:S/earmv4/arm/:C/arm[5-7]/arm/}
 CPPFLAGS+=     -I${NETBSDSRCDIR}/external/lgpl3/gmp/lib/libgmp/arch/${GMP_MACHINE_ARCH}
 
 # XXX
@@ -515,6 +515,9 @@
 
 .PATH: ${.CURDIR}/../../dist
 
+.if !empty(MACHINE_ARCH:M*arm*)
+COPTS += -marm
+.endif
 .if ${MACHINE_ARCH} == "vax"
 COPTS.set_ld.c+=       -Wno-error
 .endif