X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fstrstr.m4;h=a2e3e80a37c56f99e0ac5e8521e93648b8079ee0;hb=270e2d3e2966d9a5bc16dd0b367b71740b8994d5;hp=2b46c3da3347f6f36768ad4056696b53351f7752;hpb=5762122bbc691d3c62f9a9c226d3388c4421db58;p=gnulib.git

diff --git a/m4/strstr.m4 b/m4/strstr.m4
index 2b46c3da3..a2e3e80a3 100644
--- a/m4/strstr.m4
+++ b/m4/strstr.m4
@@ -1,5 +1,5 @@
-# strstr.m4 serial 13
-dnl Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+# strstr.m4 serial 15
+dnl Copyright (C) 2008-2012 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -11,7 +11,6 @@ AC_DEFUN([gl_FUNC_STRSTR_SIMPLE],
   AC_REQUIRE([gl_FUNC_MEMCHR])
   if test "$gl_cv_func_memchr_works" != yes; then
     REPLACE_STRSTR=1
-    AC_LIBOBJ([strstr])
   else
     dnl Detect http://sourceware.org/bugzilla/show_bug.cgi?id=12092.
     AC_CACHE_CHECK([whether strstr works],
@@ -53,7 +52,6 @@ AC_DEFUN([gl_FUNC_STRSTR_SIMPLE],
       ])
     if test "$gl_cv_func_strstr_works_always" != yes; then
       REPLACE_STRSTR=1
-      AC_LIBOBJ([strstr])
     fi
   fi
 ]) # gl_FUNC_STRSTR_SIMPLE
@@ -95,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
@@ -121,7 +121,4 @@ static void quit (int sig) { exit (sig + 128); }
       REPLACE_STRSTR=1
     fi
   fi
-  if test $REPLACE_STRSTR = 1; then
-    AC_LIBOBJ([strstr])
-  fi
 ]) # gl_FUNC_STRSTR