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

[mercurial at gmplib.org]

details:   /var/hg/gmp-5.1/rev/fb3ed7f45b92
changeset: 15415:fb3ed7f45b92
user:      Torbjorn Granlund <tege at gmplib.org>
date:      Thu May 16 20:11:22 2013 +0200
description:
(WANT_ASSEMBLY): Conditionally define.

details:   /var/hg/gmp-5.1/rev/e1fbebea84e2
changeset: 15416:e1fbebea84e2
user:      Torbjorn Granlund <tege at gmplib.org>
date:      Thu May 16 20:12:12 2013 +0200
description:
(tests_hardware_getround, tests_hardware_setround): Avoid assembly dependency unless WANT_ASSEMBLY.

details:   /var/hg/gmp-5.1/rev/0e6037c63217
changeset: 15417:0e6037c63217
user:      Torbjorn Granlund <tege at gmplib.org>
date:      Thu May 16 20:15:53 2013 +0200
description:
Bump version.

details:   /var/hg/gmp-5.1/rev/453e6006ff0b
changeset: 15418:453e6006ff0b
user:      Torbjorn Granlund <tege at gmplib.org>
date:      Thu May 16 20:16:11 2013 +0200
description:
ChangeLog

diffstat:

 ChangeLog    |  10 ++++++++++
 Makefile.am  |   5 +++--
 configure.ac |   5 +++++
 gmp-h.in     |   2 +-
 tests/misc.c |   6 +++---
 5 files changed, 22 insertions(+), 6 deletions(-)

diffs (98 lines):

diff -r aa40d0c7f7ae -r 453e6006ff0b ChangeLog
--- a/ChangeLog	Thu May 16 13:11:15 2013 +0200
+++ b/ChangeLog	Thu May 16 20:16:11 2013 +0200
@@ -1,3 +1,13 @@
+2013-05-16  Torbjorn Granlund  <tege at gmplib.org>
+
+	* Makefile.am (LIBGMP_LT_*, LIBGMPXX_LT_*): Bump version info.
+	* gmp-h.in: Bump version.
+
+	* tests/misc.c (tests_hardware_getround, tests_hardware_setround): 
+	Avoid assembly dependency unless WANT_ASSEMBLY.
+
+	* configure.ac (WANT_ASSEMBLY): Conditionally define.
+
 2013-05-14  Torbjorn Granlund  <tege at gmplib.org>
 
 	* configure.ac (arm1156): Don't fall back to plain v6 compiler option.
diff -r aa40d0c7f7ae -r 453e6006ff0b Makefile.am
--- a/Makefile.am	Thu May 16 13:11:15 2013 +0200
+++ b/Makefile.am	Thu May 16 20:16:11 2013 +0200
@@ -73,6 +73,7 @@
 #        5.0.5   10:5:0    6:5:2   4:25:1
 #        5.1.0   11:0:1    7:0:3     -
 #        5.1.1   11:1:1    7:1:3     -
+#        5.1.2   11:2:1    7:2:3     -
 #
 # Starting at 3:0:0 is a slight abuse of the versioning system, but it
 # ensures we're past soname libgmp.so.2, which was used on Debian GNU/Linux
@@ -86,11 +87,11 @@
 # libgmpxx.so.3.0.4) incrementing, to make it clear which GMP it's from.
 
 LIBGMP_LT_CURRENT    = 11
-LIBGMP_LT_REVISION   = 1
+LIBGMP_LT_REVISION   = 2
 LIBGMP_LT_AGE        = 1
 
 LIBGMPXX_LT_CURRENT  = 7
-LIBGMPXX_LT_REVISION = 1
+LIBGMPXX_LT_REVISION = 2
 LIBGMPXX_LT_AGE      = 3
 
 
diff -r aa40d0c7f7ae -r 453e6006ff0b configure.ac
--- a/configure.ac	Thu May 16 13:11:15 2013 +0200
+++ b/configure.ac	Thu May 16 20:16:11 2013 +0200
@@ -131,6 +131,11 @@
 esac],
 [enable_assembly=yes])
 
+if test "$enable_assembly" = "yes"; then
+  AC_DEFINE(WANT_ASSEMBLY,1,
+  [Defined to 1 as per --enable-assembly])
+fi
+
 
 AC_ARG_ENABLE(fft,
 AC_HELP_STRING([--enable-fft],[enable FFTs for multiplication [[default=yes]]]),
diff -r aa40d0c7f7ae -r 453e6006ff0b gmp-h.in
--- a/gmp-h.in	Thu May 16 13:11:15 2013 +0200
+++ b/gmp-h.in	Thu May 16 20:16:11 2013 +0200
@@ -2222,7 +2222,7 @@
 /* Major version number is the value of __GNU_MP__ too, above and in mp.h. */
 #define __GNU_MP_VERSION            5
 #define __GNU_MP_VERSION_MINOR      1
-#define __GNU_MP_VERSION_PATCHLEVEL 1
+#define __GNU_MP_VERSION_PATCHLEVEL 2
 #define __GNU_MP_RELEASE (__GNU_MP_VERSION * 10000 + __GNU_MP_VERSION_MINOR * 100 + __GNU_MP_VERSION_PATCHLEVEL)
 
 #define __GMP_H__
diff -r aa40d0c7f7ae -r 453e6006ff0b tests/misc.c
--- a/tests/misc.c	Thu May 16 13:11:15 2013 +0200
+++ b/tests/misc.c	Thu May 16 20:16:11 2013 +0200
@@ -1,6 +1,6 @@
 /* Miscellaneous test program support routines.
 
-Copyright 2000, 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+Copyright 2000, 2001, 2002, 2003, 2005, 2013 Free Software Foundation, Inc.
 
 This file is part of the GNU MP Library test suite.
 
@@ -465,7 +465,7 @@
 int
 tests_hardware_setround (int mode)
 {
-#if HAVE_HOST_CPU_FAMILY_x86
+#if WANT_ASSEMBLY && HAVE_HOST_CPU_FAMILY_x86
   int  rc;
   switch (mode) {
   case 0: rc = 0; break;  /* nearest */
@@ -486,7 +486,7 @@
 int
 tests_hardware_getround (void)
 {
-#if HAVE_HOST_CPU_FAMILY_x86
+#if WANT_ASSEMBLY && HAVE_HOST_CPU_FAMILY_x86
   switch ((x86_fstcw () & ~0xC00) >> 10) {
   case 0: return 0; break;  /* nearest */
   case 1: return 3; break;  /* down    */