Mercurial > hg > octave-nkf > gnulib-hg
changeset 15434:2cf9eb4a011c
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.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Tue, 19 Jul 2011 23:43:05 +0200 |
parents | 2b7d01b95963 |
children | ca6931d3b78b |
files | ChangeLog m4/strstr.m4 |
diffstat | 2 files changed, 13 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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 @@ 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