[Gmp-commit] /var/hg/gmp: 2 new changesets

mercurial at gmplib.org mercurial at gmplib.org
Wed Oct 1 16:29:07 UTC 2014


details:   /var/hg/gmp/rev/199a49032ba5
changeset: 16498:199a49032ba5
user:      Torbjorn Granlund <torbjorng at google.com>
date:      Wed Oct 01 18:20:34 2014 +0200
description:
Set gcc_cflags_maybe to enable Neon.

details:   /var/hg/gmp/rev/9b996c4b2da9
changeset: 16499:9b996c4b2da9
user:      Torbjorn Granlund <torbjorng at google.com>
date:      Wed Oct 01 18:26:36 2014 +0200
description:
INCLUDES => AM_CPPFLAGS.

diffstat:

 ChangeLog               |  7 +++++++
 Makefile.am             |  2 +-
 configure.ac            |  4 ++++
 cxx/Makefile.am         |  2 +-
 demos/Makefile.am       |  2 +-
 demos/calc/Makefile.am  |  2 +-
 demos/expr/Makefile.am  |  2 +-
 mpf/Makefile.am         |  2 +-
 mpn/Makefile.am         |  2 +-
 mpq/Makefile.am         |  2 +-
 mpz/Makefile.am         |  2 +-
 printf/Makefile.am      |  2 +-
 rand/Makefile.am        |  2 +-
 scanf/Makefile.am       |  2 +-
 tests/Makefile.am       |  2 +-
 tests/cxx/Makefile.am   |  2 +-
 tests/devel/Makefile.am |  2 +-
 tests/misc/Makefile.am  |  2 +-
 tests/mpf/Makefile.am   |  2 +-
 tests/mpn/Makefile.am   |  2 +-
 tests/mpq/Makefile.am   |  2 +-
 tests/mpz/Makefile.am   |  2 +-
 tests/rand/Makefile.am  |  2 +-
 tune/Makefile.am        |  2 +-
 24 files changed, 33 insertions(+), 22 deletions(-)

diffs (292 lines):

diff -r 0a45369a0c1b -r 9b996c4b2da9 ChangeLog
--- a/ChangeLog	Wed Sep 24 19:40:36 2014 +0200
+++ b/ChangeLog	Wed Oct 01 18:26:36 2014 +0200
@@ -1,3 +1,10 @@
+2014-10-01  Torbjörn Granlund  <torbjorng at google.com>
+
+	* All Makefile.am: INCLUDES => AM_CPPFLAGS.
+
+	* configure.ac (arm64): Set gcc_cflags_maybe to enable Neon (for clang
+	pretending to be gcc).
+
 2014-09-24  Marc Glisse  <marc.glisse at inria.fr>
 
 	* longlong.h (arm64 count_trailing_zeros, count_leading_zeros): Use
diff -r 0a45369a0c1b -r 9b996c4b2da9 Makefile.am
--- a/Makefile.am	Wed Sep 24 19:40:36 2014 +0200
+++ b/Makefile.am	Wed Oct 01 18:26:36 2014 +0200
@@ -137,7 +137,7 @@
 DISTCLEANFILES = $(BUILT_SOURCES) config.m4 @gmp_srclinks@
 
 # Tell gmp.h it's building gmp, not an application, used by windows DLL stuff.
-INCLUDES=-D__GMP_WITHIN_GMP
+AM_CPPFLAGS=-D__GMP_WITHIN_GMP
 
 
 MPF_OBJECTS = mpf/init$U.lo mpf/init2$U.lo mpf/inits$U.lo mpf/set$U.lo	    \
diff -r 0a45369a0c1b -r 9b996c4b2da9 configure.ac
--- a/configure.ac	Wed Sep 24 19:40:36 2014 +0200
+++ b/configure.ac	Wed Oct 01 18:26:36 2014 +0200
@@ -597,6 +597,10 @@
 
 
   arm64*-*-* | aarch64*-*-*)
+    # The compiler clang version 3.4 or earlier requires an explicit -mfpu=neon
+    # for out assembly code.  Since this compiler cloaks as gcc, we have to
+    # fake too.
+    gcc_cflags_maybe="-mfpu=neon"
     path="arm64"
     ;;
 
diff -r 0a45369a0c1b -r 9b996c4b2da9 cxx/Makefile.am
--- a/cxx/Makefile.am	Wed Sep 24 19:40:36 2014 +0200
+++ b/cxx/Makefile.am	Wed Oct 01 18:26:36 2014 +0200
@@ -29,7 +29,7 @@
 #  see https://www.gnu.org/licenses/.
 
 
-INCLUDES = -D__GMP_WITHIN_GMPXX -I$(top_srcdir)
+AM_CPPFLAGS = -D__GMP_WITHIN_GMPXX -I$(top_srcdir)
 
 if WANT_CXX
 noinst_LTLIBRARIES = libcxx.la
diff -r 0a45369a0c1b -r 9b996c4b2da9 demos/Makefile.am
--- a/demos/Makefile.am	Wed Sep 24 19:40:36 2014 +0200
+++ b/demos/Makefile.am	Wed Oct 01 18:26:36 2014 +0200
@@ -32,7 +32,7 @@
 SUBDIRS = calc expr
 EXTRA_DIST = perl primes.h
 
-INCLUDES = -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_srcdir)
 LDADD = $(top_builddir)/libgmp.la
 
 qcn_LDADD = $(LDADD) $(LIBM)
diff -r 0a45369a0c1b -r 9b996c4b2da9 demos/calc/Makefile.am
--- a/demos/calc/Makefile.am	Wed Sep 24 19:40:36 2014 +0200
+++ b/demos/calc/Makefile.am	Wed Oct 01 18:26:36 2014 +0200
@@ -29,7 +29,7 @@
 #  see https://www.gnu.org/licenses/.
 
 
-INCLUDES = -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_srcdir)
 
 # $(LEXLIB) is not actually needed for flex (which means the distributed
 # calclex.c), but it's included here for the benefit of anyone rebuilding
diff -r 0a45369a0c1b -r 9b996c4b2da9 demos/expr/Makefile.am
--- a/demos/expr/Makefile.am	Wed Sep 24 19:40:36 2014 +0200
+++ b/demos/expr/Makefile.am	Wed Oct 01 18:26:36 2014 +0200
@@ -29,7 +29,7 @@
 #  see https://www.gnu.org/licenses/.
 
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tests
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/tests
 
 # FIXME: This is a workaround for a bug in automake 1.8.4.  When the only
 # library is in EXTRA_LIBRARIES, $(ARFLAGS) is used but no default setting
diff -r 0a45369a0c1b -r 9b996c4b2da9 mpf/Makefile.am
--- a/mpf/Makefile.am	Wed Sep 24 19:40:36 2014 +0200
+++ b/mpf/Makefile.am	Wed Oct 01 18:26:36 2014 +0200
@@ -29,7 +29,7 @@
 #  see https://www.gnu.org/licenses/.
 
 
-INCLUDES = -D__GMP_WITHIN_GMP -I$(top_srcdir)
+AM_CPPFLAGS = -D__GMP_WITHIN_GMP -I$(top_srcdir)
 
 noinst_LTLIBRARIES = libmpf.la
 libmpf_la_SOURCES = \
diff -r 0a45369a0c1b -r 9b996c4b2da9 mpn/Makefile.am
--- a/mpn/Makefile.am	Wed Sep 24 19:40:36 2014 +0200
+++ b/mpn/Makefile.am	Wed Oct 01 18:26:36 2014 +0200
@@ -29,7 +29,7 @@
 #  see https://www.gnu.org/licenses/.
 
 
-INCLUDES = -D__GMP_WITHIN_GMP -I$(top_srcdir) \
+AM_CPPFLAGS = -D__GMP_WITHIN_GMP -I$(top_srcdir) \
   -DOPERATION_`echo $* | sed 's/_$$//'`
 
 OFILES = @mpn_objects@
diff -r 0a45369a0c1b -r 9b996c4b2da9 mpq/Makefile.am
--- a/mpq/Makefile.am	Wed Sep 24 19:40:36 2014 +0200
+++ b/mpq/Makefile.am	Wed Oct 01 18:26:36 2014 +0200
@@ -29,7 +29,7 @@
 #  see https://www.gnu.org/licenses/.
 
 
-INCLUDES = -D__GMP_WITHIN_GMP -I$(top_srcdir)
+AM_CPPFLAGS = -D__GMP_WITHIN_GMP -I$(top_srcdir)
 
 noinst_LTLIBRARIES = libmpq.la
 libmpq_la_SOURCES =							\
diff -r 0a45369a0c1b -r 9b996c4b2da9 mpz/Makefile.am
--- a/mpz/Makefile.am	Wed Sep 24 19:40:36 2014 +0200
+++ b/mpz/Makefile.am	Wed Oct 01 18:26:36 2014 +0200
@@ -29,7 +29,7 @@
 #  see https://www.gnu.org/licenses/.
 
 
-INCLUDES = -D__GMP_WITHIN_GMP -I$(top_srcdir)
+AM_CPPFLAGS = -D__GMP_WITHIN_GMP -I$(top_srcdir)
 
 noinst_LTLIBRARIES = libmpz.la
 libmpz_la_SOURCES = aors.h aors_ui.h fits_s.h mul_i.h \
diff -r 0a45369a0c1b -r 9b996c4b2da9 printf/Makefile.am
--- a/printf/Makefile.am	Wed Sep 24 19:40:36 2014 +0200
+++ b/printf/Makefile.am	Wed Oct 01 18:26:36 2014 +0200
@@ -29,7 +29,7 @@
 #  see https://www.gnu.org/licenses/.
 
 
-INCLUDES = -D__GMP_WITHIN_GMP -I$(top_srcdir)
+AM_CPPFLAGS = -D__GMP_WITHIN_GMP -I$(top_srcdir)
 
 noinst_LTLIBRARIES = libprintf.la
 
diff -r 0a45369a0c1b -r 9b996c4b2da9 rand/Makefile.am
--- a/rand/Makefile.am	Wed Sep 24 19:40:36 2014 +0200
+++ b/rand/Makefile.am	Wed Oct 01 18:26:36 2014 +0200
@@ -29,7 +29,7 @@
 #  see https://www.gnu.org/licenses/.
 
 
-INCLUDES = -D__GMP_WITHIN_GMP -I$(top_srcdir)
+AM_CPPFLAGS = -D__GMP_WITHIN_GMP -I$(top_srcdir)
 
 noinst_LTLIBRARIES = librandom.la
 
diff -r 0a45369a0c1b -r 9b996c4b2da9 scanf/Makefile.am
--- a/scanf/Makefile.am	Wed Sep 24 19:40:36 2014 +0200
+++ b/scanf/Makefile.am	Wed Oct 01 18:26:36 2014 +0200
@@ -29,7 +29,7 @@
 #  see https://www.gnu.org/licenses/.
 
 
-INCLUDES = -D__GMP_WITHIN_GMP -I$(top_srcdir)
+AM_CPPFLAGS = -D__GMP_WITHIN_GMP -I$(top_srcdir)
 
 noinst_LTLIBRARIES = libscanf.la
 
diff -r 0a45369a0c1b -r 9b996c4b2da9 tests/Makefile.am
--- a/tests/Makefile.am	Wed Sep 24 19:40:36 2014 +0200
+++ b/tests/Makefile.am	Wed Oct 01 18:26:36 2014 +0200
@@ -22,7 +22,7 @@
 
 include ../mpn/Makeasm.am
 
-INCLUDES = -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_srcdir)
 LDADD = libtests.la $(top_builddir)/libgmp.la
 
 check_LTLIBRARIES = libtests.la
diff -r 0a45369a0c1b -r 9b996c4b2da9 tests/cxx/Makefile.am
--- a/tests/cxx/Makefile.am	Wed Sep 24 19:40:36 2014 +0200
+++ b/tests/cxx/Makefile.am	Wed Oct 01 18:26:36 2014 +0200
@@ -24,7 +24,7 @@
 # linker.  FIXME: Presumably libtool should do something about this itself.
 # -lm is needed for t-ops2 which compares the results of trunc and mpf_trunc.
 #
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tests
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/tests
 LDADD = -L$(top_builddir)/.libs \
   $(top_builddir)/tests/libtests.la \
   $(top_builddir)/libgmpxx.la \
diff -r 0a45369a0c1b -r 9b996c4b2da9 tests/devel/Makefile.am
--- a/tests/devel/Makefile.am	Wed Sep 24 19:40:36 2014 +0200
+++ b/tests/devel/Makefile.am	Wed Oct 01 18:26:36 2014 +0200
@@ -18,7 +18,7 @@
 # the GNU MP Library test suite.  If not, see https://www.gnu.org/licenses/.
 
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tests
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/tests
 LDADD = $(top_builddir)/tests/libtests.la $(top_builddir)/libgmp.la
 
 # add_n_sub_n add_n_sub_n_2 not yet built since mpn_add_n_sub_n doesn't yet exist
diff -r 0a45369a0c1b -r 9b996c4b2da9 tests/misc/Makefile.am
--- a/tests/misc/Makefile.am	Wed Sep 24 19:40:36 2014 +0200
+++ b/tests/misc/Makefile.am	Wed Oct 01 18:26:36 2014 +0200
@@ -18,7 +18,7 @@
 # the GNU MP Library test suite.  If not, see https://www.gnu.org/licenses/.
 
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tests
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/tests
 LDADD = $(top_builddir)/tests/libtests.la $(top_builddir)/libgmp.la
 
 check_PROGRAMS = t-printf t-scanf t-locale
diff -r 0a45369a0c1b -r 9b996c4b2da9 tests/mpf/Makefile.am
--- a/tests/mpf/Makefile.am	Wed Sep 24 19:40:36 2014 +0200
+++ b/tests/mpf/Makefile.am	Wed Oct 01 18:26:36 2014 +0200
@@ -18,7 +18,7 @@
 # the GNU MP Library test suite.  If not, see https://www.gnu.org/licenses/.
 
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tests
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/tests
 LDADD = $(top_builddir)/tests/libtests.la $(top_builddir)/libgmp.la
 
 check_PROGRAMS = t-add t-sub t-conv t-sqrt t-sqrt_ui t-muldiv t-dm2exp reuse \
diff -r 0a45369a0c1b -r 9b996c4b2da9 tests/mpn/Makefile.am
--- a/tests/mpn/Makefile.am	Wed Sep 24 19:40:36 2014 +0200
+++ b/tests/mpn/Makefile.am	Wed Oct 01 18:26:36 2014 +0200
@@ -18,7 +18,7 @@
 # the GNU MP Library test suite.  If not, see https://www.gnu.org/licenses/.
 
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tests
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/tests
 LDADD = $(top_builddir)/tests/libtests.la $(top_builddir)/libgmp.la
 
 check_PROGRAMS = t-asmtype t-aors_1 t-divrem_1 t-mod_1 t-fat t-get_d	\
diff -r 0a45369a0c1b -r 9b996c4b2da9 tests/mpq/Makefile.am
--- a/tests/mpq/Makefile.am	Wed Sep 24 19:40:36 2014 +0200
+++ b/tests/mpq/Makefile.am	Wed Oct 01 18:26:36 2014 +0200
@@ -18,7 +18,7 @@
 # the GNU MP Library test suite.  If not, see https://www.gnu.org/licenses/.
 
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tests
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/tests
 LDADD = $(top_builddir)/tests/libtests.la $(top_builddir)/libgmp.la
 
 check_PROGRAMS = t-aors t-cmp t-cmp_ui t-cmp_si t-equal t-get_d t-get_str \
diff -r 0a45369a0c1b -r 9b996c4b2da9 tests/mpz/Makefile.am
--- a/tests/mpz/Makefile.am	Wed Sep 24 19:40:36 2014 +0200
+++ b/tests/mpz/Makefile.am	Wed Oct 01 18:26:36 2014 +0200
@@ -18,7 +18,7 @@
 # the GNU MP Library test suite.  If not, see https://www.gnu.org/licenses/.
 
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tests
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/tests
 LDADD = $(top_builddir)/tests/libtests.la $(top_builddir)/libgmp.la
 
 check_PROGRAMS = t-addsub t-cmp t-mul t-mul_i t-tdiv t-tdiv_ui t-fdiv   \
diff -r 0a45369a0c1b -r 9b996c4b2da9 tests/rand/Makefile.am
--- a/tests/rand/Makefile.am	Wed Sep 24 19:40:36 2014 +0200
+++ b/tests/rand/Makefile.am	Wed Oct 01 18:26:36 2014 +0200
@@ -18,7 +18,7 @@
 # the GNU MP Library test suite.  If not, see https://www.gnu.org/licenses/.
 
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tests
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/tests
 LDADD = $(top_builddir)/tests/libtests.la $(top_builddir)/libgmp.la
 
 check_PROGRAMS = t-iset t-lc2exp t-mt t-rand t-urbui t-urmui t-urndmm
diff -r 0a45369a0c1b -r 9b996c4b2da9 tune/Makefile.am
--- a/tune/Makefile.am	Wed Sep 24 19:40:36 2014 +0200
+++ b/tune/Makefile.am	Wed Oct 01 18:26:36 2014 +0200
@@ -29,7 +29,7 @@
 #  see https://www.gnu.org/licenses/.
 
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tests
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/tests
 
 EXTRA_DIST = alpha.asm pentium.asm sparcv9.asm hppa.asm hppa2.asm hppa2w.asm \
   ia64.asm powerpc.asm powerpc64.asm x86_64.asm many.pl


More information about the gmp-commit mailing list