Module Name: src
Committed By: matt
Date: Mon Aug 19 22:25:32 UTC 2013
Modified Files:
src/external/lgpl3/gmp/lib/libgmp: Makefile
src/external/lgpl3/mpfr/lib/libmpfr: Makefile
Log Message:
always compile GMP and MPFR as ARM
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/lgpl3/gmp/lib/libgmp/Makefile
cvs rdiff -u -r1.12 -r1.13 src/external/lgpl3/mpfr/lib/libmpfr/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/lgpl3/gmp/lib/libgmp/Makefile
diff -u src/external/lgpl3/gmp/lib/libgmp/Makefile:1.16 src/external/lgpl3/gmp/lib/libgmp/Makefile:1.17
--- src/external/lgpl3/gmp/lib/libgmp/Makefile:1.16 Tue Aug 6 05:35:57 2013
+++ src/external/lgpl3/gmp/lib/libgmp/Makefile Mon Aug 19 22:25:32 2013
@@ -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 @@ CLEANFILES+= mpn_${_build}
# 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
Index: src/external/lgpl3/mpfr/lib/libmpfr/Makefile
diff -u src/external/lgpl3/mpfr/lib/libmpfr/Makefile:1.12 src/external/lgpl3/mpfr/lib/libmpfr/Makefile:1.13
--- src/external/lgpl3/mpfr/lib/libmpfr/Makefile:1.12 Tue Aug 6 05:35:57 2013
+++ src/external/lgpl3/mpfr/lib/libmpfr/Makefile Mon Aug 19 22:25:32 2013
@@ -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 @@ CPPFLAGS+= -I. \
-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 @@ CLEANFILES+= mparam.h
.PATH: ${.CURDIR}/../../dist
+.if !empty(MACHINE_ARCH:M*arm*)
+COPTS += -marm
+.endif
.if ${MACHINE_ARCH} == "vax"
COPTS.set_ld.c+= -Wno-error
.endif
