net147@3033: This patch fixes another configure test issue when bootstrapping.
net147@3033: sysdeps/i386/configure.in uses the obsolete AC_HEADER_CHECK macro to
net147@3033: test for cpuid.h, and that macro tries to include various other
net147@3033: standard headers (which come from the library, unlike cpuid.h which
net147@3033: comes from the compiler, so aren't available when bootstrapping) in
net147@3033: the test code it compiles.  This patch changes the code to use
net147@3033: AC_CHECK_HEADER, with the fourth argument used to prevent any default
net147@3033: includes being used in the test.
net147@3033: 
net147@3033: Tested x86_64 (native).
net147@3033: 
net147@3033: 2012-03-07  Joseph Myers  <joseph@codesourcery.com>
net147@3033: 
net147@3033: 	* sysdeps/i386/configure.in (cpuid.h): Use AC_CHECK_HEADER with no
net147@3033: 	default includes instead of AC_HEADER_CHECK.
net147@3033: 	* sysdeps/i386/configure: Regenerated.
net147@3033: 
net147@3033: Origin: http://sourceware.org/ml/libc-alpha/2012-03/msg00177.html
net147@3033: 
net147@3033: diff -Nur glibc-2.14.1.orig/sysdeps/i386/configure glibc-2.14.1/sysdeps/i386/configure
net147@3033: --- glibc-2.14.1.orig/sysdeps/i386/configure	2011-10-07 20:48:55.000000000 +1100
net147@3033: +++ glibc-2.14.1/sysdeps/i386/configure	2012-07-25 01:23:11.799118927 +1000
net147@3033: @@ -16,23 +16,6 @@
net147@3033:    as_fn_set_status $1
net147@3033:    exit $1
net147@3033:  } # as_fn_exit
net147@3033: -# as_fn_arith ARG...
net147@3033: -# ------------------
net147@3033: -# Perform arithmetic evaluation on the ARGs, and store the result in the
net147@3033: -# global $as_val. Take advantage of shells that can avoid forks. The arguments
net147@3033: -# must be portable across $(()) and expr.
net147@3033: -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
net147@3033: -  eval 'as_fn_arith ()
net147@3033: -  {
net147@3033: -    as_val=$(( $* ))
net147@3033: -  }'
net147@3033: -else
net147@3033: -  as_fn_arith ()
net147@3033: -  {
net147@3033: -    as_val=`expr "$@" || test $? -eq 1`
net147@3033: -  }
net147@3033: -fi # as_fn_arith
net147@3033: -
net147@3033:  if expr a : '\(a\)' >/dev/null 2>&1 &&
net147@3033:     test "X`expr 00001 : '.*\(...\)'`" = X001; then
net147@3033:    as_expr=expr
net147@3033: @@ -89,6 +72,10 @@
net147@3033:    chmod +x "$as_me.lineno" ||
net147@3033:      { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
net147@3033:  
net147@3033: +  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
net147@3033: +  # already done that, so ensure we don't try to do so again and fall
net147@3033: +  # in an infinite loop.  This has already happened in practice.
net147@3033: +  _as_can_reexec=no; export _as_can_reexec
net147@3033:    # Don't try to exec as it changes $[0], causing all sort of problems
net147@3033:    # (the dirname of $[0] is not the place where we might find the
net147@3033:    # original and so on.  Autoconf is especially sensitive to this).
net147@3033: @@ -97,42 +84,6 @@
net147@3033:    exit
net147@3033:  }
net147@3033:  
net147@3033: -# Factoring default headers for most tests.
net147@3033: -ac_includes_default="\
net147@3033: -#include <stdio.h>
net147@3033: -#ifdef HAVE_SYS_TYPES_H
net147@3033: -# include <sys/types.h>
net147@3033: -#endif
net147@3033: -#ifdef HAVE_SYS_STAT_H
net147@3033: -# include <sys/stat.h>
net147@3033: -#endif
net147@3033: -#ifdef STDC_HEADERS
net147@3033: -# include <stdlib.h>
net147@3033: -# include <stddef.h>
net147@3033: -#else
net147@3033: -# ifdef HAVE_STDLIB_H
net147@3033: -#  include <stdlib.h>
net147@3033: -# endif
net147@3033: -#endif
net147@3033: -#ifdef HAVE_STRING_H
net147@3033: -# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
net147@3033: -#  include <memory.h>
net147@3033: -# endif
net147@3033: -# include <string.h>
net147@3033: -#endif
net147@3033: -#ifdef HAVE_STRINGS_H
net147@3033: -# include <strings.h>
net147@3033: -#endif
net147@3033: -#ifdef HAVE_INTTYPES_H
net147@3033: -# include <inttypes.h>
net147@3033: -#endif
net147@3033: -#ifdef HAVE_STDINT_H
net147@3033: -# include <stdint.h>
net147@3033: -#endif
net147@3033: -#ifdef HAVE_UNISTD_H
net147@3033: -# include <unistd.h>
net147@3033: -#endif"
net147@3033: -
net147@3033:  
net147@3033:  # ac_fn_c_try_compile LINENO
net147@3033:  # --------------------------
net147@3033: @@ -167,177 +118,11 @@
net147@3033:  
net147@3033:  	ac_retval=1
net147@3033:  fi
net147@3033: -  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
net147@3033: +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
net147@3033:    as_fn_set_status $ac_retval
net147@3033:  
net147@3033:  } # ac_fn_c_try_compile
net147@3033:  
net147@3033: -# ac_fn_c_try_cpp LINENO
net147@3033: -# ----------------------
net147@3033: -# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
net147@3033: -ac_fn_c_try_cpp ()
net147@3033: -{
net147@3033: -  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
net147@3033: -  if { { ac_try="$ac_cpp conftest.$ac_ext"
net147@3033: -case "(($ac_try" in
net147@3033: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
net147@3033: -  *) ac_try_echo=$ac_try;;
net147@3033: -esac
net147@3033: -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
net147@3033: -$as_echo "$ac_try_echo"; } >&5
net147@3033: -  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
net147@3033: -  ac_status=$?
net147@3033: -  if test -s conftest.err; then
net147@3033: -    grep -v '^ *+' conftest.err >conftest.er1
net147@3033: -    cat conftest.er1 >&5
net147@3033: -    mv -f conftest.er1 conftest.err
net147@3033: -  fi
net147@3033: -  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
net147@3033: -  test $ac_status = 0; } >/dev/null && {
net147@3033: -	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
net147@3033: -	 test ! -s conftest.err
net147@3033: -       }; then :
net147@3033: -  ac_retval=0
net147@3033: -else
net147@3033: -  $as_echo "$as_me: failed program was:" >&5
net147@3033: -sed 's/^/| /' conftest.$ac_ext >&5
net147@3033: -
net147@3033: -    ac_retval=1
net147@3033: -fi
net147@3033: -  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
net147@3033: -  as_fn_set_status $ac_retval
net147@3033: -
net147@3033: -} # ac_fn_c_try_cpp
net147@3033: -
net147@3033: -# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
net147@3033: -# -------------------------------------------------------
net147@3033: -# Tests whether HEADER exists, giving a warning if it cannot be compiled using
net147@3033: -# the include files in INCLUDES and setting the cache variable VAR
net147@3033: -# accordingly.
net147@3033: -ac_fn_c_check_header_mongrel ()
net147@3033: -{
net147@3033: -  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
net147@3033: -  if eval "test \"\${$3+set}\"" = set; then :
net147@3033: -  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
net147@3033: -$as_echo_n "checking for $2... " >&6; }
net147@3033: -if eval "test \"\${$3+set}\"" = set; then :
net147@3033: -  $as_echo_n "(cached) " >&6
net147@3033: -fi
net147@3033: -eval ac_res=\$$3
net147@3033: -	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
net147@3033: -$as_echo "$ac_res" >&6; }
net147@3033: -else
net147@3033: -  # Is the header compilable?
net147@3033: -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
net147@3033: -$as_echo_n "checking $2 usability... " >&6; }
net147@3033: -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
net147@3033: -/* end confdefs.h.  */
net147@3033: -$4
net147@3033: -#include <$2>
net147@3033: -_ACEOF
net147@3033: -if ac_fn_c_try_compile "$LINENO"; then :
net147@3033: -  ac_header_compiler=yes
net147@3033: -else
net147@3033: -  ac_header_compiler=no
net147@3033: -fi
net147@3033: -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
net147@3033: -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
net147@3033: -$as_echo "$ac_header_compiler" >&6; }
net147@3033: -
net147@3033: -# Is the header present?
net147@3033: -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
net147@3033: -$as_echo_n "checking $2 presence... " >&6; }
net147@3033: -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
net147@3033: -/* end confdefs.h.  */
net147@3033: -#include <$2>
net147@3033: -_ACEOF
net147@3033: -if ac_fn_c_try_cpp "$LINENO"; then :
net147@3033: -  ac_header_preproc=yes
net147@3033: -else
net147@3033: -  ac_header_preproc=no
net147@3033: -fi
net147@3033: -rm -f conftest.err conftest.$ac_ext
net147@3033: -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
net147@3033: -$as_echo "$ac_header_preproc" >&6; }
net147@3033: -
net147@3033: -# So?  What about this header?
net147@3033: -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
net147@3033: -  yes:no: )
net147@3033: -    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
net147@3033: -$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
net147@3033: -    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
net147@3033: -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
net147@3033: -    ;;
net147@3033: -  no:yes:* )
net147@3033: -    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
net147@3033: -$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
net147@3033: -    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
net147@3033: -$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
net147@3033: -    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
net147@3033: -$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
net147@3033: -    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
net147@3033: -$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
net147@3033: -    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
net147@3033: -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
net147@3033: -    ;;
net147@3033: -esac
net147@3033: -  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
net147@3033: -$as_echo_n "checking for $2... " >&6; }
net147@3033: -if eval "test \"\${$3+set}\"" = set; then :
net147@3033: -  $as_echo_n "(cached) " >&6
net147@3033: -else
net147@3033: -  eval "$3=\$ac_header_compiler"
net147@3033: -fi
net147@3033: -eval ac_res=\$$3
net147@3033: -	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
net147@3033: -$as_echo "$ac_res" >&6; }
net147@3033: -fi
net147@3033: -  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
net147@3033: -
net147@3033: -} # ac_fn_c_check_header_mongrel
net147@3033: -
net147@3033: -# ac_fn_c_try_run LINENO
net147@3033: -# ----------------------
net147@3033: -# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
net147@3033: -# that executables *can* be run.
net147@3033: -ac_fn_c_try_run ()
net147@3033: -{
net147@3033: -  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
net147@3033: -  if { { ac_try="$ac_link"
net147@3033: -case "(($ac_try" in
net147@3033: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
net147@3033: -  *) ac_try_echo=$ac_try;;
net147@3033: -esac
net147@3033: -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
net147@3033: -$as_echo "$ac_try_echo"; } >&5
net147@3033: -  (eval "$ac_link") 2>&5
net147@3033: -  ac_status=$?
net147@3033: -  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
net147@3033: -  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
net147@3033: -  { { case "(($ac_try" in
net147@3033: -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
net147@3033: -  *) ac_try_echo=$ac_try;;
net147@3033: -esac
net147@3033: -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
net147@3033: -$as_echo "$ac_try_echo"; } >&5
net147@3033: -  (eval "$ac_try") 2>&5
net147@3033: -  ac_status=$?
net147@3033: -  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
net147@3033: -  test $ac_status = 0; }; }; then :
net147@3033: -  ac_retval=0
net147@3033: -else
net147@3033: -  $as_echo "$as_me: program exited with status $ac_status" >&5
net147@3033: -       $as_echo "$as_me: failed program was:" >&5
net147@3033: -sed 's/^/| /' conftest.$ac_ext >&5
net147@3033: -
net147@3033: -       ac_retval=$ac_status
net147@3033: -fi
net147@3033: -  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
net147@3033: -  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
net147@3033: -  as_fn_set_status $ac_retval
net147@3033: -
net147@3033: -} # ac_fn_c_try_run
net147@3033: -
net147@3033:  # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
net147@3033:  # -------------------------------------------------------
net147@3033:  # Tests whether HEADER exists and can be compiled using the include files in
net147@3033: @@ -347,7 +132,7 @@
net147@3033:    as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
net147@3033:    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
net147@3033:  $as_echo_n "checking for $2... " >&6; }
net147@3033: -if eval "test \"\${$3+set}\"" = set; then :
net147@3033: +if eval \${$3+:} false; then :
net147@3033:    $as_echo_n "(cached) " >&6
net147@3033:  else
net147@3033:    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
net147@3033: @@ -365,275 +150,16 @@
net147@3033:  eval ac_res=\$$3
net147@3033:  	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
net147@3033:  $as_echo "$ac_res" >&6; }
net147@3033: -  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
net147@3033: +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
net147@3033:  
net147@3033:  } # ac_fn_c_check_header_compile
net147@3033:  # This file is generated from configure.in by Autoconf.  DO NOT EDIT!
net147@3033:   # Local configure fragment for sysdeps/i386.
net147@3033:  
net147@3033:  
net147@3033: -
net147@3033: -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
net147@3033: -$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
net147@3033: -if test "${ac_cv_path_GREP+set}" = set; then :
net147@3033: -  $as_echo_n "(cached) " >&6
net147@3033: -else
net147@3033: -  if test -z "$GREP"; then
net147@3033: -  ac_path_GREP_found=false
net147@3033: -  # Loop through the user's path and test for each of PROGNAME-LIST
net147@3033: -  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
net147@3033: -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
net147@3033: -do
net147@3033: -  IFS=$as_save_IFS
net147@3033: -  test -z "$as_dir" && as_dir=.
net147@3033: -    for ac_prog in grep ggrep; do
net147@3033: -    for ac_exec_ext in '' $ac_executable_extensions; do
net147@3033: -      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
net147@3033: -      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
net147@3033: -# Check for GNU ac_path_GREP and select it if it is found.
net147@3033: -  # Check for GNU $ac_path_GREP
net147@3033: -case `"$ac_path_GREP" --version 2>&1` in
net147@3033: -*GNU*)
net147@3033: -  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
net147@3033: -*)
net147@3033: -  ac_count=0
net147@3033: -  $as_echo_n 0123456789 >"conftest.in"
net147@3033: -  while :
net147@3033: -  do
net147@3033: -    cat "conftest.in" "conftest.in" >"conftest.tmp"
net147@3033: -    mv "conftest.tmp" "conftest.in"
net147@3033: -    cp "conftest.in" "conftest.nl"
net147@3033: -    $as_echo 'GREP' >> "conftest.nl"
net147@3033: -    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
net147@3033: -    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
net147@3033: -    as_fn_arith $ac_count + 1 && ac_count=$as_val
net147@3033: -    if test $ac_count -gt ${ac_path_GREP_max-0}; then
net147@3033: -      # Best one so far, save it but keep looking for a better one
net147@3033: -      ac_cv_path_GREP="$ac_path_GREP"
net147@3033: -      ac_path_GREP_max=$ac_count
net147@3033: -    fi
net147@3033: -    # 10*(2^10) chars as input seems more than enough
net147@3033: -    test $ac_count -gt 10 && break
net147@3033: -  done
net147@3033: -  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
net147@3033: -esac
net147@3033: -
net147@3033: -      $ac_path_GREP_found && break 3
net147@3033: -    done
net147@3033: -  done
net147@3033: -  done
net147@3033: -IFS=$as_save_IFS
net147@3033: -  if test -z "$ac_cv_path_GREP"; then
net147@3033: -    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
net147@3033: -  fi
net147@3033: -else
net147@3033: -  ac_cv_path_GREP=$GREP
net147@3033: -fi
net147@3033: -
net147@3033: -fi
net147@3033: -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
net147@3033: -$as_echo "$ac_cv_path_GREP" >&6; }
net147@3033: - GREP="$ac_cv_path_GREP"
net147@3033: -
net147@3033: -
net147@3033: -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
net147@3033: -$as_echo_n "checking for egrep... " >&6; }
net147@3033: -if test "${ac_cv_path_EGREP+set}" = set; then :
net147@3033: -  $as_echo_n "(cached) " >&6
net147@3033: -else
net147@3033: -  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
net147@3033: -   then ac_cv_path_EGREP="$GREP -E"
net147@3033: -   else
net147@3033: -     if test -z "$EGREP"; then
net147@3033: -  ac_path_EGREP_found=false
net147@3033: -  # Loop through the user's path and test for each of PROGNAME-LIST
net147@3033: -  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
net147@3033: -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
net147@3033: -do
net147@3033: -  IFS=$as_save_IFS
net147@3033: -  test -z "$as_dir" && as_dir=.
net147@3033: -    for ac_prog in egrep; do
net147@3033: -    for ac_exec_ext in '' $ac_executable_extensions; do
net147@3033: -      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
net147@3033: -      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
net147@3033: -# Check for GNU ac_path_EGREP and select it if it is found.
net147@3033: -  # Check for GNU $ac_path_EGREP
net147@3033: -case `"$ac_path_EGREP" --version 2>&1` in
net147@3033: -*GNU*)
net147@3033: -  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
net147@3033: -*)
net147@3033: -  ac_count=0
net147@3033: -  $as_echo_n 0123456789 >"conftest.in"
net147@3033: -  while :
net147@3033: -  do
net147@3033: -    cat "conftest.in" "conftest.in" >"conftest.tmp"
net147@3033: -    mv "conftest.tmp" "conftest.in"
net147@3033: -    cp "conftest.in" "conftest.nl"
net147@3033: -    $as_echo 'EGREP' >> "conftest.nl"
net147@3033: -    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
net147@3033: -    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
net147@3033: -    as_fn_arith $ac_count + 1 && ac_count=$as_val
net147@3033: -    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
net147@3033: -      # Best one so far, save it but keep looking for a better one
net147@3033: -      ac_cv_path_EGREP="$ac_path_EGREP"
net147@3033: -      ac_path_EGREP_max=$ac_count
net147@3033: -    fi
net147@3033: -    # 10*(2^10) chars as input seems more than enough
net147@3033: -    test $ac_count -gt 10 && break
net147@3033: -  done
net147@3033: -  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
net147@3033: -esac
net147@3033: -
net147@3033: -      $ac_path_EGREP_found && break 3
net147@3033: -    done
net147@3033: -  done
net147@3033: -  done
net147@3033: -IFS=$as_save_IFS
net147@3033: -  if test -z "$ac_cv_path_EGREP"; then
net147@3033: -    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
net147@3033: -  fi
net147@3033: -else
net147@3033: -  ac_cv_path_EGREP=$EGREP
net147@3033: -fi
net147@3033: -
net147@3033: -   fi
net147@3033: -fi
net147@3033: -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
net147@3033: -$as_echo "$ac_cv_path_EGREP" >&6; }
net147@3033: - EGREP="$ac_cv_path_EGREP"
net147@3033: -
net147@3033: -
net147@3033: -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
net147@3033: -$as_echo_n "checking for ANSI C header files... " >&6; }
net147@3033: -if test "${ac_cv_header_stdc+set}" = set; then :
net147@3033: -  $as_echo_n "(cached) " >&6
net147@3033: -else
net147@3033: -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
net147@3033: -/* end confdefs.h.  */
net147@3033: -#include <stdlib.h>
net147@3033: -#include <stdarg.h>
net147@3033: -#include <string.h>
net147@3033: -#include <float.h>
net147@3033: -
net147@3033: -int
net147@3033: -main ()
net147@3033: -{
net147@3033: -
net147@3033: -  ;
net147@3033: -  return 0;
net147@3033: -}
net147@3033: -_ACEOF
net147@3033: -if ac_fn_c_try_compile "$LINENO"; then :
net147@3033: -  ac_cv_header_stdc=yes
net147@3033: -else
net147@3033: -  ac_cv_header_stdc=no
net147@3033: -fi
net147@3033: -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
net147@3033: -
net147@3033: -if test $ac_cv_header_stdc = yes; then
net147@3033: -  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
net147@3033: -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
net147@3033: -/* end confdefs.h.  */
net147@3033: -#include <string.h>
net147@3033: -
net147@3033: -_ACEOF
net147@3033: -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
net147@3033: -  $EGREP "memchr" >/dev/null 2>&1; then :
net147@3033: -
net147@3033: -else
net147@3033: -  ac_cv_header_stdc=no
net147@3033: -fi
net147@3033: -rm -f conftest*
net147@3033: -
net147@3033: -fi
net147@3033: -
net147@3033: -if test $ac_cv_header_stdc = yes; then
net147@3033: -  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
net147@3033: -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
net147@3033: -/* end confdefs.h.  */
net147@3033: -#include <stdlib.h>
net147@3033: -
net147@3033: -_ACEOF
net147@3033: -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
net147@3033: -  $EGREP "free" >/dev/null 2>&1; then :
net147@3033: -
net147@3033: -else
net147@3033: -  ac_cv_header_stdc=no
net147@3033: -fi
net147@3033: -rm -f conftest*
net147@3033: -
net147@3033: -fi
net147@3033: -
net147@3033: -if test $ac_cv_header_stdc = yes; then
net147@3033: -  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
net147@3033: -  if test "$cross_compiling" = yes; then :
net147@3033: -  :
net147@3033: -else
net147@3033: -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
net147@3033: -/* end confdefs.h.  */
net147@3033: -#include <ctype.h>
net147@3033: -#include <stdlib.h>
net147@3033: -#if ((' ' & 0x0FF) == 0x020)
net147@3033: -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
net147@3033: -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
net147@3033: -#else
net147@3033: -# define ISLOWER(c) \
net147@3033: -		   (('a' <= (c) && (c) <= 'i') \
net147@3033: -		     || ('j' <= (c) && (c) <= 'r') \
net147@3033: -		     || ('s' <= (c) && (c) <= 'z'))
net147@3033: -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
net147@3033: -#endif
net147@3033: -
net147@3033: -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
net147@3033: -int
net147@3033: -main ()
net147@3033: -{
net147@3033: -  int i;
net147@3033: -  for (i = 0; i < 256; i++)
net147@3033: -    if (XOR (islower (i), ISLOWER (i))
net147@3033: -	|| toupper (i) != TOUPPER (i))
net147@3033: -      return 2;
net147@3033: -  return 0;
net147@3033: -}
net147@3033: -_ACEOF
net147@3033: -if ac_fn_c_try_run "$LINENO"; then :
net147@3033: -
net147@3033: -else
net147@3033: -  ac_cv_header_stdc=no
net147@3033: -fi
net147@3033: -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
net147@3033: -  conftest.$ac_objext conftest.beam conftest.$ac_ext
net147@3033: -fi
net147@3033: -
net147@3033: -fi
net147@3033: -fi
net147@3033: -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
net147@3033: -$as_echo "$ac_cv_header_stdc" >&6; }
net147@3033: -if test $ac_cv_header_stdc = yes; then
net147@3033: -
net147@3033: -$as_echo "#define STDC_HEADERS 1" >>confdefs.h
net147@3033: -
net147@3033: -fi
net147@3033: -
net147@3033: -# On IRIX 5.3, sys/types and inttypes.h are conflicting.
net147@3033: -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
net147@3033: -		  inttypes.h stdint.h unistd.h
net147@3033: -do :
net147@3033: -  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
net147@3033: -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
net147@3033: +ac_fn_c_check_header_compile "$LINENO" "cpuid.h" "ac_cv_header_cpuid_h" "/* No default includes.  */
net147@3033:  "
net147@3033: -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
net147@3033: -  cat >>confdefs.h <<_ACEOF
net147@3033: -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
net147@3033: -_ACEOF
net147@3033: -
net147@3033: -fi
net147@3033: -
net147@3033: -done
net147@3033: -
net147@3033: -
net147@3033: -ac_fn_c_check_header_mongrel "$LINENO" "cpuid.h" "ac_cv_header_cpuid_h" "$ac_includes_default"
net147@3033: -if test "x$ac_cv_header_cpuid_h" = x""yes; then :
net147@3033: +if test "x$ac_cv_header_cpuid_h" = xyes; then :
net147@3033:  
net147@3033:  else
net147@3033:    as_fn_error $? "gcc must provide the <cpuid.h> header" "$LINENO" 5
net147@3033: @@ -643,7 +169,7 @@
net147@3033:  
net147@3033:  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -g produces usable source locations for assembler-with-cpp" >&5
net147@3033:  $as_echo_n "checking if -g produces usable source locations for assembler-with-cpp... " >&6; }
net147@3033: -if test "${libc_cv_cpp_asm_debuginfo+set}" = set; then :
net147@3033: +if ${libc_cv_cpp_asm_debuginfo+:} false; then :
net147@3033:    $as_echo_n "(cached) " >&6
net147@3033:  else
net147@3033:    cat > conftest.S <<EOF
net147@3033: @@ -693,7 +219,7 @@
net147@3033:  
net147@3033:  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSE4 support" >&5
net147@3033:  $as_echo_n "checking for SSE4 support... " >&6; }
net147@3033: -if test "${libc_cv_cc_sse4+set}" = set; then :
net147@3033: +if ${libc_cv_cc_sse4+:} false; then :
net147@3033:    $as_echo_n "(cached) " >&6
net147@3033:  else
net147@3033:    if { ac_try='${CC-cc} -msse4 -xc /dev/null -S -o /dev/null'
net147@3033: @@ -716,7 +242,7 @@
net147@3033:  
net147@3033:  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for assembler -mtune=i686 support" >&5
net147@3033:  $as_echo_n "checking for assembler -mtune=i686 support... " >&6; }
net147@3033: -if test "${libc_cv_as_i686+set}" = set; then :
net147@3033: +if ${libc_cv_as_i686+:} false; then :
net147@3033:    $as_echo_n "(cached) " >&6
net147@3033:  else
net147@3033:    if { ac_try='${CC-cc} -Wa,-mtune=i686 -xc /dev/null -S -o /dev/null'
net147@3033: @@ -735,7 +261,7 @@
net147@3033:  
net147@3033:  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AVX support" >&5
net147@3033:  $as_echo_n "checking for AVX support... " >&6; }
net147@3033: -if test "${libc_cv_cc_avx+set}" = set; then :
net147@3033: +if ${libc_cv_cc_avx+:} false; then :
net147@3033:    $as_echo_n "(cached) " >&6
net147@3033:  else
net147@3033:    if { ac_try='${CC-cc} -mavx -xc /dev/null -S -o /dev/null'
net147@3033: @@ -758,7 +284,7 @@
net147@3033:  
net147@3033:  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -mno-vzeroupper support" >&5
net147@3033:  $as_echo_n "checking for -mno-vzeroupper support... " >&6; }
net147@3033: -if test "${libc_cv_cc_novzeroupper+set}" = set; then :
net147@3033: +if ${libc_cv_cc_novzeroupper+:} false; then :
net147@3033:    $as_echo_n "(cached) " >&6
net147@3033:  else
net147@3033:    if { ac_try='${CC-cc} -mno-vzeroupper -xc /dev/null -S -o /dev/null'
net147@3033: diff -Nur glibc-2.14.1.orig/sysdeps/i386/configure.in glibc-2.14.1/sysdeps/i386/configure.in
net147@3033: --- glibc-2.14.1.orig/sysdeps/i386/configure.in	2011-10-07 20:48:55.000000000 +1100
net147@3033: +++ glibc-2.14.1/sysdeps/i386/configure.in	2012-07-25 01:00:49.345025022 +1000
net147@3033: @@ -1,8 +1,9 @@
net147@3033:  GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
net147@3033:  # Local configure fragment for sysdeps/i386.
net147@3033:  
net147@3033: -AC_HEADER_CHECK([cpuid.h], ,
net147@3033: -  [AC_MSG_ERROR([gcc must provide the <cpuid.h> header])])
net147@3033: +AC_CHECK_HEADER([cpuid.h], ,
net147@3033: +  [AC_MSG_ERROR([gcc must provide the <cpuid.h> header])],
net147@3033: +  [/* No default includes.  */])
net147@3033:  
net147@3033:  AC_CACHE_CHECK(if -g produces usable source locations for assembler-with-cpp,
net147@3033:  	       libc_cv_cpp_asm_debuginfo, [dnl
net147@3033: