1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/patches/glibc/2.14.1/900-cpuid-include.patch Sun Aug 05 00:33:27 2012 +1000
1.3 @@ -0,0 +1,628 @@
1.4 +This patch fixes another configure test issue when bootstrapping.
1.5 +sysdeps/i386/configure.in uses the obsolete AC_HEADER_CHECK macro to
1.6 +test for cpuid.h, and that macro tries to include various other
1.7 +standard headers (which come from the library, unlike cpuid.h which
1.8 +comes from the compiler, so aren't available when bootstrapping) in
1.9 +the test code it compiles. This patch changes the code to use
1.10 +AC_CHECK_HEADER, with the fourth argument used to prevent any default
1.11 +includes being used in the test.
1.12 +
1.13 +Tested x86_64 (native).
1.14 +
1.15 +2012-03-07 Joseph Myers <joseph@codesourcery.com>
1.16 +
1.17 + * sysdeps/i386/configure.in (cpuid.h): Use AC_CHECK_HEADER with no
1.18 + default includes instead of AC_HEADER_CHECK.
1.19 + * sysdeps/i386/configure: Regenerated.
1.20 +
1.21 +Origin: http://sourceware.org/ml/libc-alpha/2012-03/msg00177.html
1.22 +
1.23 +diff -Nur glibc-2.14.1.orig/sysdeps/i386/configure glibc-2.14.1/sysdeps/i386/configure
1.24 +--- glibc-2.14.1.orig/sysdeps/i386/configure 2011-10-07 20:48:55.000000000 +1100
1.25 ++++ glibc-2.14.1/sysdeps/i386/configure 2012-07-25 01:23:11.799118927 +1000
1.26 +@@ -16,23 +16,6 @@
1.27 + as_fn_set_status $1
1.28 + exit $1
1.29 + } # as_fn_exit
1.30 +-# as_fn_arith ARG...
1.31 +-# ------------------
1.32 +-# Perform arithmetic evaluation on the ARGs, and store the result in the
1.33 +-# global $as_val. Take advantage of shells that can avoid forks. The arguments
1.34 +-# must be portable across $(()) and expr.
1.35 +-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
1.36 +- eval 'as_fn_arith ()
1.37 +- {
1.38 +- as_val=$(( $* ))
1.39 +- }'
1.40 +-else
1.41 +- as_fn_arith ()
1.42 +- {
1.43 +- as_val=`expr "$@" || test $? -eq 1`
1.44 +- }
1.45 +-fi # as_fn_arith
1.46 +-
1.47 + if expr a : '\(a\)' >/dev/null 2>&1 &&
1.48 + test "X`expr 00001 : '.*\(...\)'`" = X001; then
1.49 + as_expr=expr
1.50 +@@ -89,6 +72,10 @@
1.51 + chmod +x "$as_me.lineno" ||
1.52 + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
1.53 +
1.54 ++ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
1.55 ++ # already done that, so ensure we don't try to do so again and fall
1.56 ++ # in an infinite loop. This has already happened in practice.
1.57 ++ _as_can_reexec=no; export _as_can_reexec
1.58 + # Don't try to exec as it changes $[0], causing all sort of problems
1.59 + # (the dirname of $[0] is not the place where we might find the
1.60 + # original and so on. Autoconf is especially sensitive to this).
1.61 +@@ -97,42 +84,6 @@
1.62 + exit
1.63 + }
1.64 +
1.65 +-# Factoring default headers for most tests.
1.66 +-ac_includes_default="\
1.67 +-#include <stdio.h>
1.68 +-#ifdef HAVE_SYS_TYPES_H
1.69 +-# include <sys/types.h>
1.70 +-#endif
1.71 +-#ifdef HAVE_SYS_STAT_H
1.72 +-# include <sys/stat.h>
1.73 +-#endif
1.74 +-#ifdef STDC_HEADERS
1.75 +-# include <stdlib.h>
1.76 +-# include <stddef.h>
1.77 +-#else
1.78 +-# ifdef HAVE_STDLIB_H
1.79 +-# include <stdlib.h>
1.80 +-# endif
1.81 +-#endif
1.82 +-#ifdef HAVE_STRING_H
1.83 +-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
1.84 +-# include <memory.h>
1.85 +-# endif
1.86 +-# include <string.h>
1.87 +-#endif
1.88 +-#ifdef HAVE_STRINGS_H
1.89 +-# include <strings.h>
1.90 +-#endif
1.91 +-#ifdef HAVE_INTTYPES_H
1.92 +-# include <inttypes.h>
1.93 +-#endif
1.94 +-#ifdef HAVE_STDINT_H
1.95 +-# include <stdint.h>
1.96 +-#endif
1.97 +-#ifdef HAVE_UNISTD_H
1.98 +-# include <unistd.h>
1.99 +-#endif"
1.100 +-
1.101 +
1.102 + # ac_fn_c_try_compile LINENO
1.103 + # --------------------------
1.104 +@@ -167,177 +118,11 @@
1.105 +
1.106 + ac_retval=1
1.107 + fi
1.108 +- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1.109 ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1.110 + as_fn_set_status $ac_retval
1.111 +
1.112 + } # ac_fn_c_try_compile
1.113 +
1.114 +-# ac_fn_c_try_cpp LINENO
1.115 +-# ----------------------
1.116 +-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
1.117 +-ac_fn_c_try_cpp ()
1.118 +-{
1.119 +- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1.120 +- if { { ac_try="$ac_cpp conftest.$ac_ext"
1.121 +-case "(($ac_try" in
1.122 +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.123 +- *) ac_try_echo=$ac_try;;
1.124 +-esac
1.125 +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
1.126 +-$as_echo "$ac_try_echo"; } >&5
1.127 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
1.128 +- ac_status=$?
1.129 +- if test -s conftest.err; then
1.130 +- grep -v '^ *+' conftest.err >conftest.er1
1.131 +- cat conftest.er1 >&5
1.132 +- mv -f conftest.er1 conftest.err
1.133 +- fi
1.134 +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1.135 +- test $ac_status = 0; } >/dev/null && {
1.136 +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
1.137 +- test ! -s conftest.err
1.138 +- }; then :
1.139 +- ac_retval=0
1.140 +-else
1.141 +- $as_echo "$as_me: failed program was:" >&5
1.142 +-sed 's/^/| /' conftest.$ac_ext >&5
1.143 +-
1.144 +- ac_retval=1
1.145 +-fi
1.146 +- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1.147 +- as_fn_set_status $ac_retval
1.148 +-
1.149 +-} # ac_fn_c_try_cpp
1.150 +-
1.151 +-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
1.152 +-# -------------------------------------------------------
1.153 +-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
1.154 +-# the include files in INCLUDES and setting the cache variable VAR
1.155 +-# accordingly.
1.156 +-ac_fn_c_check_header_mongrel ()
1.157 +-{
1.158 +- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1.159 +- if eval "test \"\${$3+set}\"" = set; then :
1.160 +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1.161 +-$as_echo_n "checking for $2... " >&6; }
1.162 +-if eval "test \"\${$3+set}\"" = set; then :
1.163 +- $as_echo_n "(cached) " >&6
1.164 +-fi
1.165 +-eval ac_res=\$$3
1.166 +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1.167 +-$as_echo "$ac_res" >&6; }
1.168 +-else
1.169 +- # Is the header compilable?
1.170 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
1.171 +-$as_echo_n "checking $2 usability... " >&6; }
1.172 +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.173 +-/* end confdefs.h. */
1.174 +-$4
1.175 +-#include <$2>
1.176 +-_ACEOF
1.177 +-if ac_fn_c_try_compile "$LINENO"; then :
1.178 +- ac_header_compiler=yes
1.179 +-else
1.180 +- ac_header_compiler=no
1.181 +-fi
1.182 +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1.183 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
1.184 +-$as_echo "$ac_header_compiler" >&6; }
1.185 +-
1.186 +-# Is the header present?
1.187 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
1.188 +-$as_echo_n "checking $2 presence... " >&6; }
1.189 +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.190 +-/* end confdefs.h. */
1.191 +-#include <$2>
1.192 +-_ACEOF
1.193 +-if ac_fn_c_try_cpp "$LINENO"; then :
1.194 +- ac_header_preproc=yes
1.195 +-else
1.196 +- ac_header_preproc=no
1.197 +-fi
1.198 +-rm -f conftest.err conftest.$ac_ext
1.199 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
1.200 +-$as_echo "$ac_header_preproc" >&6; }
1.201 +-
1.202 +-# So? What about this header?
1.203 +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
1.204 +- yes:no: )
1.205 +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
1.206 +-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
1.207 +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
1.208 +-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
1.209 +- ;;
1.210 +- no:yes:* )
1.211 +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
1.212 +-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
1.213 +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
1.214 +-$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
1.215 +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
1.216 +-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
1.217 +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
1.218 +-$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
1.219 +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
1.220 +-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
1.221 +- ;;
1.222 +-esac
1.223 +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1.224 +-$as_echo_n "checking for $2... " >&6; }
1.225 +-if eval "test \"\${$3+set}\"" = set; then :
1.226 +- $as_echo_n "(cached) " >&6
1.227 +-else
1.228 +- eval "$3=\$ac_header_compiler"
1.229 +-fi
1.230 +-eval ac_res=\$$3
1.231 +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1.232 +-$as_echo "$ac_res" >&6; }
1.233 +-fi
1.234 +- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1.235 +-
1.236 +-} # ac_fn_c_check_header_mongrel
1.237 +-
1.238 +-# ac_fn_c_try_run LINENO
1.239 +-# ----------------------
1.240 +-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
1.241 +-# that executables *can* be run.
1.242 +-ac_fn_c_try_run ()
1.243 +-{
1.244 +- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1.245 +- if { { ac_try="$ac_link"
1.246 +-case "(($ac_try" in
1.247 +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.248 +- *) ac_try_echo=$ac_try;;
1.249 +-esac
1.250 +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
1.251 +-$as_echo "$ac_try_echo"; } >&5
1.252 +- (eval "$ac_link") 2>&5
1.253 +- ac_status=$?
1.254 +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1.255 +- test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
1.256 +- { { case "(($ac_try" in
1.257 +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.258 +- *) ac_try_echo=$ac_try;;
1.259 +-esac
1.260 +-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
1.261 +-$as_echo "$ac_try_echo"; } >&5
1.262 +- (eval "$ac_try") 2>&5
1.263 +- ac_status=$?
1.264 +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1.265 +- test $ac_status = 0; }; }; then :
1.266 +- ac_retval=0
1.267 +-else
1.268 +- $as_echo "$as_me: program exited with status $ac_status" >&5
1.269 +- $as_echo "$as_me: failed program was:" >&5
1.270 +-sed 's/^/| /' conftest.$ac_ext >&5
1.271 +-
1.272 +- ac_retval=$ac_status
1.273 +-fi
1.274 +- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
1.275 +- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1.276 +- as_fn_set_status $ac_retval
1.277 +-
1.278 +-} # ac_fn_c_try_run
1.279 +-
1.280 + # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
1.281 + # -------------------------------------------------------
1.282 + # Tests whether HEADER exists and can be compiled using the include files in
1.283 +@@ -347,7 +132,7 @@
1.284 + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1.285 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1.286 + $as_echo_n "checking for $2... " >&6; }
1.287 +-if eval "test \"\${$3+set}\"" = set; then :
1.288 ++if eval \${$3+:} false; then :
1.289 + $as_echo_n "(cached) " >&6
1.290 + else
1.291 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.292 +@@ -365,275 +150,16 @@
1.293 + eval ac_res=\$$3
1.294 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1.295 + $as_echo "$ac_res" >&6; }
1.296 +- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
1.297 ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1.298 +
1.299 + } # ac_fn_c_check_header_compile
1.300 + # This file is generated from configure.in by Autoconf. DO NOT EDIT!
1.301 + # Local configure fragment for sysdeps/i386.
1.302 +
1.303 +
1.304 +-
1.305 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
1.306 +-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
1.307 +-if test "${ac_cv_path_GREP+set}" = set; then :
1.308 +- $as_echo_n "(cached) " >&6
1.309 +-else
1.310 +- if test -z "$GREP"; then
1.311 +- ac_path_GREP_found=false
1.312 +- # Loop through the user's path and test for each of PROGNAME-LIST
1.313 +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.314 +-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
1.315 +-do
1.316 +- IFS=$as_save_IFS
1.317 +- test -z "$as_dir" && as_dir=.
1.318 +- for ac_prog in grep ggrep; do
1.319 +- for ac_exec_ext in '' $ac_executable_extensions; do
1.320 +- ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
1.321 +- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
1.322 +-# Check for GNU ac_path_GREP and select it if it is found.
1.323 +- # Check for GNU $ac_path_GREP
1.324 +-case `"$ac_path_GREP" --version 2>&1` in
1.325 +-*GNU*)
1.326 +- ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
1.327 +-*)
1.328 +- ac_count=0
1.329 +- $as_echo_n 0123456789 >"conftest.in"
1.330 +- while :
1.331 +- do
1.332 +- cat "conftest.in" "conftest.in" >"conftest.tmp"
1.333 +- mv "conftest.tmp" "conftest.in"
1.334 +- cp "conftest.in" "conftest.nl"
1.335 +- $as_echo 'GREP' >> "conftest.nl"
1.336 +- "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
1.337 +- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
1.338 +- as_fn_arith $ac_count + 1 && ac_count=$as_val
1.339 +- if test $ac_count -gt ${ac_path_GREP_max-0}; then
1.340 +- # Best one so far, save it but keep looking for a better one
1.341 +- ac_cv_path_GREP="$ac_path_GREP"
1.342 +- ac_path_GREP_max=$ac_count
1.343 +- fi
1.344 +- # 10*(2^10) chars as input seems more than enough
1.345 +- test $ac_count -gt 10 && break
1.346 +- done
1.347 +- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
1.348 +-esac
1.349 +-
1.350 +- $ac_path_GREP_found && break 3
1.351 +- done
1.352 +- done
1.353 +- done
1.354 +-IFS=$as_save_IFS
1.355 +- if test -z "$ac_cv_path_GREP"; then
1.356 +- as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
1.357 +- fi
1.358 +-else
1.359 +- ac_cv_path_GREP=$GREP
1.360 +-fi
1.361 +-
1.362 +-fi
1.363 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
1.364 +-$as_echo "$ac_cv_path_GREP" >&6; }
1.365 +- GREP="$ac_cv_path_GREP"
1.366 +-
1.367 +-
1.368 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
1.369 +-$as_echo_n "checking for egrep... " >&6; }
1.370 +-if test "${ac_cv_path_EGREP+set}" = set; then :
1.371 +- $as_echo_n "(cached) " >&6
1.372 +-else
1.373 +- if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
1.374 +- then ac_cv_path_EGREP="$GREP -E"
1.375 +- else
1.376 +- if test -z "$EGREP"; then
1.377 +- ac_path_EGREP_found=false
1.378 +- # Loop through the user's path and test for each of PROGNAME-LIST
1.379 +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.380 +-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
1.381 +-do
1.382 +- IFS=$as_save_IFS
1.383 +- test -z "$as_dir" && as_dir=.
1.384 +- for ac_prog in egrep; do
1.385 +- for ac_exec_ext in '' $ac_executable_extensions; do
1.386 +- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
1.387 +- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
1.388 +-# Check for GNU ac_path_EGREP and select it if it is found.
1.389 +- # Check for GNU $ac_path_EGREP
1.390 +-case `"$ac_path_EGREP" --version 2>&1` in
1.391 +-*GNU*)
1.392 +- ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
1.393 +-*)
1.394 +- ac_count=0
1.395 +- $as_echo_n 0123456789 >"conftest.in"
1.396 +- while :
1.397 +- do
1.398 +- cat "conftest.in" "conftest.in" >"conftest.tmp"
1.399 +- mv "conftest.tmp" "conftest.in"
1.400 +- cp "conftest.in" "conftest.nl"
1.401 +- $as_echo 'EGREP' >> "conftest.nl"
1.402 +- "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
1.403 +- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
1.404 +- as_fn_arith $ac_count + 1 && ac_count=$as_val
1.405 +- if test $ac_count -gt ${ac_path_EGREP_max-0}; then
1.406 +- # Best one so far, save it but keep looking for a better one
1.407 +- ac_cv_path_EGREP="$ac_path_EGREP"
1.408 +- ac_path_EGREP_max=$ac_count
1.409 +- fi
1.410 +- # 10*(2^10) chars as input seems more than enough
1.411 +- test $ac_count -gt 10 && break
1.412 +- done
1.413 +- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
1.414 +-esac
1.415 +-
1.416 +- $ac_path_EGREP_found && break 3
1.417 +- done
1.418 +- done
1.419 +- done
1.420 +-IFS=$as_save_IFS
1.421 +- if test -z "$ac_cv_path_EGREP"; then
1.422 +- as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
1.423 +- fi
1.424 +-else
1.425 +- ac_cv_path_EGREP=$EGREP
1.426 +-fi
1.427 +-
1.428 +- fi
1.429 +-fi
1.430 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
1.431 +-$as_echo "$ac_cv_path_EGREP" >&6; }
1.432 +- EGREP="$ac_cv_path_EGREP"
1.433 +-
1.434 +-
1.435 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
1.436 +-$as_echo_n "checking for ANSI C header files... " >&6; }
1.437 +-if test "${ac_cv_header_stdc+set}" = set; then :
1.438 +- $as_echo_n "(cached) " >&6
1.439 +-else
1.440 +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.441 +-/* end confdefs.h. */
1.442 +-#include <stdlib.h>
1.443 +-#include <stdarg.h>
1.444 +-#include <string.h>
1.445 +-#include <float.h>
1.446 +-
1.447 +-int
1.448 +-main ()
1.449 +-{
1.450 +-
1.451 +- ;
1.452 +- return 0;
1.453 +-}
1.454 +-_ACEOF
1.455 +-if ac_fn_c_try_compile "$LINENO"; then :
1.456 +- ac_cv_header_stdc=yes
1.457 +-else
1.458 +- ac_cv_header_stdc=no
1.459 +-fi
1.460 +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1.461 +-
1.462 +-if test $ac_cv_header_stdc = yes; then
1.463 +- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
1.464 +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.465 +-/* end confdefs.h. */
1.466 +-#include <string.h>
1.467 +-
1.468 +-_ACEOF
1.469 +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
1.470 +- $EGREP "memchr" >/dev/null 2>&1; then :
1.471 +-
1.472 +-else
1.473 +- ac_cv_header_stdc=no
1.474 +-fi
1.475 +-rm -f conftest*
1.476 +-
1.477 +-fi
1.478 +-
1.479 +-if test $ac_cv_header_stdc = yes; then
1.480 +- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
1.481 +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.482 +-/* end confdefs.h. */
1.483 +-#include <stdlib.h>
1.484 +-
1.485 +-_ACEOF
1.486 +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
1.487 +- $EGREP "free" >/dev/null 2>&1; then :
1.488 +-
1.489 +-else
1.490 +- ac_cv_header_stdc=no
1.491 +-fi
1.492 +-rm -f conftest*
1.493 +-
1.494 +-fi
1.495 +-
1.496 +-if test $ac_cv_header_stdc = yes; then
1.497 +- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
1.498 +- if test "$cross_compiling" = yes; then :
1.499 +- :
1.500 +-else
1.501 +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1.502 +-/* end confdefs.h. */
1.503 +-#include <ctype.h>
1.504 +-#include <stdlib.h>
1.505 +-#if ((' ' & 0x0FF) == 0x020)
1.506 +-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
1.507 +-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
1.508 +-#else
1.509 +-# define ISLOWER(c) \
1.510 +- (('a' <= (c) && (c) <= 'i') \
1.511 +- || ('j' <= (c) && (c) <= 'r') \
1.512 +- || ('s' <= (c) && (c) <= 'z'))
1.513 +-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
1.514 +-#endif
1.515 +-
1.516 +-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
1.517 +-int
1.518 +-main ()
1.519 +-{
1.520 +- int i;
1.521 +- for (i = 0; i < 256; i++)
1.522 +- if (XOR (islower (i), ISLOWER (i))
1.523 +- || toupper (i) != TOUPPER (i))
1.524 +- return 2;
1.525 +- return 0;
1.526 +-}
1.527 +-_ACEOF
1.528 +-if ac_fn_c_try_run "$LINENO"; then :
1.529 +-
1.530 +-else
1.531 +- ac_cv_header_stdc=no
1.532 +-fi
1.533 +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
1.534 +- conftest.$ac_objext conftest.beam conftest.$ac_ext
1.535 +-fi
1.536 +-
1.537 +-fi
1.538 +-fi
1.539 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
1.540 +-$as_echo "$ac_cv_header_stdc" >&6; }
1.541 +-if test $ac_cv_header_stdc = yes; then
1.542 +-
1.543 +-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
1.544 +-
1.545 +-fi
1.546 +-
1.547 +-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
1.548 +-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
1.549 +- inttypes.h stdint.h unistd.h
1.550 +-do :
1.551 +- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
1.552 +-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
1.553 ++ac_fn_c_check_header_compile "$LINENO" "cpuid.h" "ac_cv_header_cpuid_h" "/* No default includes. */
1.554 + "
1.555 +-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
1.556 +- cat >>confdefs.h <<_ACEOF
1.557 +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
1.558 +-_ACEOF
1.559 +-
1.560 +-fi
1.561 +-
1.562 +-done
1.563 +-
1.564 +-
1.565 +-ac_fn_c_check_header_mongrel "$LINENO" "cpuid.h" "ac_cv_header_cpuid_h" "$ac_includes_default"
1.566 +-if test "x$ac_cv_header_cpuid_h" = x""yes; then :
1.567 ++if test "x$ac_cv_header_cpuid_h" = xyes; then :
1.568 +
1.569 + else
1.570 + as_fn_error $? "gcc must provide the <cpuid.h> header" "$LINENO" 5
1.571 +@@ -643,7 +169,7 @@
1.572 +
1.573 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -g produces usable source locations for assembler-with-cpp" >&5
1.574 + $as_echo_n "checking if -g produces usable source locations for assembler-with-cpp... " >&6; }
1.575 +-if test "${libc_cv_cpp_asm_debuginfo+set}" = set; then :
1.576 ++if ${libc_cv_cpp_asm_debuginfo+:} false; then :
1.577 + $as_echo_n "(cached) " >&6
1.578 + else
1.579 + cat > conftest.S <<EOF
1.580 +@@ -693,7 +219,7 @@
1.581 +
1.582 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSE4 support" >&5
1.583 + $as_echo_n "checking for SSE4 support... " >&6; }
1.584 +-if test "${libc_cv_cc_sse4+set}" = set; then :
1.585 ++if ${libc_cv_cc_sse4+:} false; then :
1.586 + $as_echo_n "(cached) " >&6
1.587 + else
1.588 + if { ac_try='${CC-cc} -msse4 -xc /dev/null -S -o /dev/null'
1.589 +@@ -716,7 +242,7 @@
1.590 +
1.591 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for assembler -mtune=i686 support" >&5
1.592 + $as_echo_n "checking for assembler -mtune=i686 support... " >&6; }
1.593 +-if test "${libc_cv_as_i686+set}" = set; then :
1.594 ++if ${libc_cv_as_i686+:} false; then :
1.595 + $as_echo_n "(cached) " >&6
1.596 + else
1.597 + if { ac_try='${CC-cc} -Wa,-mtune=i686 -xc /dev/null -S -o /dev/null'
1.598 +@@ -735,7 +261,7 @@
1.599 +
1.600 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AVX support" >&5
1.601 + $as_echo_n "checking for AVX support... " >&6; }
1.602 +-if test "${libc_cv_cc_avx+set}" = set; then :
1.603 ++if ${libc_cv_cc_avx+:} false; then :
1.604 + $as_echo_n "(cached) " >&6
1.605 + else
1.606 + if { ac_try='${CC-cc} -mavx -xc /dev/null -S -o /dev/null'
1.607 +@@ -758,7 +284,7 @@
1.608 +
1.609 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -mno-vzeroupper support" >&5
1.610 + $as_echo_n "checking for -mno-vzeroupper support... " >&6; }
1.611 +-if test "${libc_cv_cc_novzeroupper+set}" = set; then :
1.612 ++if ${libc_cv_cc_novzeroupper+:} false; then :
1.613 + $as_echo_n "(cached) " >&6
1.614 + else
1.615 + if { ac_try='${CC-cc} -mno-vzeroupper -xc /dev/null -S -o /dev/null'
1.616 +diff -Nur glibc-2.14.1.orig/sysdeps/i386/configure.in glibc-2.14.1/sysdeps/i386/configure.in
1.617 +--- glibc-2.14.1.orig/sysdeps/i386/configure.in 2011-10-07 20:48:55.000000000 +1100
1.618 ++++ glibc-2.14.1/sysdeps/i386/configure.in 2012-07-25 01:00:49.345025022 +1000
1.619 +@@ -1,8 +1,9 @@
1.620 + GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
1.621 + # Local configure fragment for sysdeps/i386.
1.622 +
1.623 +-AC_HEADER_CHECK([cpuid.h], ,
1.624 +- [AC_MSG_ERROR([gcc must provide the <cpuid.h> header])])
1.625 ++AC_CHECK_HEADER([cpuid.h], ,
1.626 ++ [AC_MSG_ERROR([gcc must provide the <cpuid.h> header])],
1.627 ++ [/* No default includes. */])
1.628 +
1.629 + AC_CACHE_CHECK(if -g produces usable source locations for assembler-with-cpp,
1.630 + libc_cv_cpp_asm_debuginfo, [dnl
1.631 +