[Gmp-commit] /var/hg/gmp-6.1: Backport improved GMP_ASM_UNDERSCORE detection ...

[mercurial at gmplib.org]

details:   /var/hg/gmp-6.1/rev/ae64c48b5cd8
changeset: 16947:ae64c48b5cd8
user:      Marc Glisse <marc.glisse at inria.fr>
date:      Wed Apr 13 10:20:35 2016 +0200
description:
Backport improved GMP_ASM_UNDERSCORE detection and NO_ASM in config.h.

diffstat:

 ChangeLog    |  10 ++++++++++
 acinclude.m4 |   4 ++--
 configure.ac |   7 +------
 tests/misc.c |   4 ++--
 4 files changed, 15 insertions(+), 10 deletions(-)

diffs (77 lines):

diff -r e225fb40ca63 -r ae64c48b5cd8 ChangeLog
--- a/ChangeLog	Mon Jan 04 08:12:07 2016 +0100
+++ b/ChangeLog	Wed Apr 13 10:20:35 2016 +0200
@@ -1,3 +1,13 @@
+2015-03-20  Marc Glisse  <marc.glisse at inria.fr>
+
+	* configure.ac (WANT_ASSEMBLY): Remove.
+	(NO_ASM): Remove from CFLAGS, add to AC_DEFINE.
+	* tests/misc.c: Test NO_ASM instead of WANT_ASSEMBLY.
+
+2016-02-25  Pavel Kopyl  <p.kopyl at samsung.com>
+
+	* acinclude.m4 (GMP_ASM_UNDERSCORE): Tighten gurkmacka detection.
+
 2016-01-04 Marco Bodrato <bodrato at mail.dm.unipi.it>
 
 	* Makefile.am (LIBGMP_LT_*, LIBGMPXX_LT_*): Bump version info.
diff -r e225fb40ca63 -r ae64c48b5cd8 acinclude.m4
--- a/acinclude.m4	Mon Jan 04 08:12:07 2016 +0100
+++ b/acinclude.m4	Wed Apr 13 10:20:35 2016 +0200
@@ -1754,9 +1754,9 @@
 gmp_compile="$CC $CFLAGS $CPPFLAGS -c conftest.c >&AC_FD_CC"
 if AC_TRY_EVAL(gmp_compile); then
   $NM conftest.$OBJEXT >conftest.out
-  if grep _gurkmacka conftest.out >/dev/null; then
+  if grep "[[ 	]]_gurkmacka" conftest.out >/dev/null; then
     gmp_cv_asm_underscore=yes
-  elif grep gurkmacka conftest.out >/dev/null; then
+  elif grep "[[ 	]]gurkmacka" conftest.out >/dev/null; then
     gmp_cv_asm_underscore=no
   else
     echo "configure: $NM doesn't have gurkmacka:" >&AC_FD_CC
diff -r e225fb40ca63 -r ae64c48b5cd8 configure.ac
--- a/configure.ac	Mon Jan 04 08:12:07 2016 +0100
+++ b/configure.ac	Wed Apr 13 10:20:35 2016 +0200
@@ -142,11 +142,6 @@
 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]]),
@@ -2460,7 +2455,7 @@
 
 if test "$enable_assembly" = "no"; then
   path="generic"
-  CFLAGS="$CFLAGS -DNO_ASM"
+  AC_DEFINE([NO_ASM],1,[Define to 1 to disable the use of inline assembly])
 #  for abi in $abilist; do
 #    eval unset "path_\$abi"
 #    eval gcc_${abi}_cflags=\"\$gcc_${abi}_cflags -DNO_ASM\"
diff -r e225fb40ca63 -r ae64c48b5cd8 tests/misc.c
--- a/tests/misc.c	Mon Jan 04 08:12:07 2016 +0100
+++ b/tests/misc.c	Wed Apr 13 10:20:35 2016 +0200
@@ -479,7 +479,7 @@
 int
 tests_hardware_setround (int mode)
 {
-#if WANT_ASSEMBLY && HAVE_HOST_CPU_FAMILY_x86
+#if ! defined NO_ASM && HAVE_HOST_CPU_FAMILY_x86
   int  rc;
   switch (mode) {
   case 0: rc = 0; break;  /* nearest */
@@ -500,7 +500,7 @@
 int
 tests_hardware_getround (void)
 {
-#if WANT_ASSEMBLY && HAVE_HOST_CPU_FAMILY_x86
+#if ! defined NO_ASM && HAVE_HOST_CPU_FAMILY_x86
   switch ((x86_fstcw () & ~0xC00) >> 10) {
   case 0: return 0; break;  /* nearest */
   case 1: return 3; break;  /* down    */