From fecafcc8c53402438221e93e238d0c928cfe3624 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 19 Jul 2011 23:43:05 +0200 Subject: [PATCH] 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 . Suggested by Eric Blake. Reported by Reuben Thomas. --- ChangeLog | 8 ++++++++ m4/strstr.m4 | 8 +++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index e72af4c8c..7a7c08299 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2011-07-19 Bruno Haible + + 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 . + Suggested by Eric Blake. Reported by Reuben Thomas. + 2011-07-19 Pádraig Brady getopt-gnu: suppress core dumps from detection code diff --git a/m4/strstr.m4 b/m4/strstr.m4 index 010bd7ffe..bf6a750dc 100644 --- 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 #ifdef __GNU_LIBRARY__ #if ((__GLIBC__ == 2 && __GLIBC_MINOR__ > 12) || (__GLIBC__ > 2)) \ + && !(defined __i386__ || defined __x86_64__) \ && !defined __UCLIBC__ Lucky user #endif -- 2.11.0