Import 6ce49a4d036b patch to fix ASan build

Tighten gurkmacka detection.

https://gmplib.org/repo/gmp/rev/6ce49a4d036b

Change-Id: Idc2dde2b654bf7c1fb1cb8574eef066f0a12dc9a

diff --git a/ChangeLog b/ChangeLog
index f4ddcf3b725eeed6eba710d4aa7b1776fe8e9e4d..e555977fe3b069e6de928f67dee086c11f8d7dcb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,11 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 MA 02110-1301, USA.
 
+2016-02-25  Marc Glisse  <marc.glisse@inria.fr>
+
+       * acinclude.m4 (GMP_ASM_UNDERSCORE): Tighten gurkmacka detection.
+
+
 2006-05-04  Torbjorn Granlund  <tege@swox.com>
 
        * Version 4.2.1 released.

diff --git a/acinclude.m4 b/acinclude.m4
index 559d7f5a9ff714622d0391fad626d59f1c860d83..7d5a404c6d8a1cbe64f8471de0dd09329d45709e 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1674,9 +1674,9 @@ EOF
 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