strstr: Update cross-compilation guess.

* m4/strstr.m4 (gl_FUNC_STRSTR): On glibc > 2.12 with x86 or x86_64
CPUs, guess no, in view of glibc
BZ #12100 <http://sourceware.org/bugzilla/show_bug.cgi?id=12100>.
Suggested by Eric Blake. Reported by Reuben Thomas.

diff --git a/ChangeLog b/ChangeLog
index e72af4c8c524a468cf8bf9b58e0cf80eaaf9c30e..7a7c082998ab956992315aca418eaae2edeba2c4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-07-19  Bruno Haible  <bruno@clisp.org>
+
+       strstr: Update cross-compilation guess.
+       * m4/strstr.m4 (gl_FUNC_STRSTR): On glibc > 2.12 with x86 or x86_64
+       CPUs, guess no, in view of glibc
+       BZ #12100 <http://sourceware.org/bugzilla/show_bug.cgi?id=12100>.
+       Suggested by Eric Blake. Reported by Reuben Thomas.
+
 2011-07-19  Pádraig Brady  <P@draigBrady.com>
 
        getopt-gnu: suppress core dumps from detection code

diff --git a/m4/strstr.m4 b/m4/strstr.m4
index 010bd7ffe5c370891fd6d6fd1a8b31d9c6985ac2..bf6a750dc9f2eb61ed7603659b46d6f03db38528 100644 (file)
--- a/m4/strstr.m4
+++ b/m4/strstr.m4
@@ -1,4 +1,4 @@
-# strstr.m4 serial 14
+# strstr.m4 serial 15
 dnl Copyright (C) 2008-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -93,13 +93,15 @@ static void quit (int sig) { exit (sig + 128); }
     return result;
     ]])],
         [gl_cv_func_strstr_linear=yes], [gl_cv_func_strstr_linear=no],
-        [dnl Only glibc > 2.12 and cygwin > 1.7.7 are known to have a
-         dnl bug-free strstr that works in linear time.
+        [dnl Only glibc > 2.12 on processors without SSE 4.2 instructions and
+         dnl cygwin > 1.7.7 are known to have a bug-free strstr that works in
+         dnl linear time.
          AC_EGREP_CPP([Lucky user],
            [
 #include <features.h>
 #ifdef __GNU_LIBRARY__
  #if ((__GLIBC__ == 2 && __GLIBC_MINOR__ > 12) || (__GLIBC__ > 2)) \
+     && !(defined __i386__ || defined __x86_64__) \
      && !defined __UCLIBC__
   Lucky user
  #endif