scripts/addToolsVersion: properly handle .in vs. .in.2
While most components have their version in the .in file, some
have it in the .in.2 (eg. elf2flt).
Currently, to handle this case, we indiscriminately munge both files,
but this is wrong: in the elf2flt case, if we add a binutils version,
we do not want it to be added to elf2flt, and conversely.
So, for each tool, we need to explicitly know what file to munge.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
1 This patch fixes another configure test issue when bootstrapping.
2 sysdeps/i386/configure.in uses the obsolete AC_HEADER_CHECK macro to
3 test for cpuid.h, and that macro tries to include various other
4 standard headers (which come from the library, unlike cpuid.h which
5 comes from the compiler, so aren't available when bootstrapping) in
6 the test code it compiles. This patch changes the code to use
7 AC_CHECK_HEADER, with the fourth argument used to prevent any default
8 includes being used in the test.
10 Tested x86_64 (native).
12 2012-03-07 Joseph Myers <joseph@codesourcery.com>
14 * sysdeps/i386/configure.in (cpuid.h): Use AC_CHECK_HEADER with no
15 default includes instead of AC_HEADER_CHECK.
16 * sysdeps/i386/configure: Regenerated.
18 Origin: http://sourceware.org/ml/libc-alpha/2012-03/msg00177.html
20 diff -Nur glibc-2.14.1.orig/sysdeps/i386/configure glibc-2.14.1/sysdeps/i386/configure
21 --- glibc-2.14.1.orig/sysdeps/i386/configure 2011-10-07 20:48:55.000000000 +1100
22 +++ glibc-2.14.1/sysdeps/i386/configure 2012-07-25 01:23:11.799118927 +1000
29 -# Perform arithmetic evaluation on the ARGs, and store the result in the
30 -# global $as_val. Take advantage of shells that can avoid forks. The arguments
31 -# must be portable across $(()) and expr.
32 -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
33 - eval 'as_fn_arith ()
40 - as_val=`expr "$@" || test $? -eq 1`
44 if expr a : '\(a\)' >/dev/null 2>&1 &&
45 test "X`expr 00001 : '.*\(...\)'`" = X001; then
48 chmod +x "$as_me.lineno" ||
49 { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
51 + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
52 + # already done that, so ensure we don't try to do so again and fall
53 + # in an infinite loop. This has already happened in practice.
54 + _as_can_reexec=no; export _as_can_reexec
55 # Don't try to exec as it changes $[0], causing all sort of problems
56 # (the dirname of $[0] is not the place where we might find the
57 # original and so on. Autoconf is especially sensitive to this).
62 -# Factoring default headers for most tests.
63 -ac_includes_default="\
65 -#ifdef HAVE_SYS_TYPES_H
66 -# include <sys/types.h>
68 -#ifdef HAVE_SYS_STAT_H
69 -# include <sys/stat.h>
75 -# ifdef HAVE_STDLIB_H
80 -# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
85 -#ifdef HAVE_STRINGS_H
86 -# include <strings.h>
88 -#ifdef HAVE_INTTYPES_H
89 -# include <inttypes.h>
99 # ac_fn_c_try_compile LINENO
100 # --------------------------
101 @@ -167,177 +118,11 @@
105 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
106 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
107 as_fn_set_status $ac_retval
109 } # ac_fn_c_try_compile
111 -# ac_fn_c_try_cpp LINENO
112 -# ----------------------
113 -# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
116 - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
117 - if { { ac_try="$ac_cpp conftest.$ac_ext"
119 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
120 - *) ac_try_echo=$ac_try;;
122 -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
123 -$as_echo "$ac_try_echo"; } >&5
124 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
126 - if test -s conftest.err; then
127 - grep -v '^ *+' conftest.err >conftest.er1
128 - cat conftest.er1 >&5
129 - mv -f conftest.er1 conftest.err
131 - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
132 - test $ac_status = 0; } >/dev/null && {
133 - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
134 - test ! -s conftest.err
138 - $as_echo "$as_me: failed program was:" >&5
139 -sed 's/^/| /' conftest.$ac_ext >&5
143 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
144 - as_fn_set_status $ac_retval
148 -# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
149 -# -------------------------------------------------------
150 -# Tests whether HEADER exists, giving a warning if it cannot be compiled using
151 -# the include files in INCLUDES and setting the cache variable VAR
153 -ac_fn_c_check_header_mongrel ()
155 - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
156 - if eval "test \"\${$3+set}\"" = set; then :
157 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
158 -$as_echo_n "checking for $2... " >&6; }
159 -if eval "test \"\${$3+set}\"" = set; then :
160 - $as_echo_n "(cached) " >&6
163 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
164 -$as_echo "$ac_res" >&6; }
166 - # Is the header compilable?
167 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
168 -$as_echo_n "checking $2 usability... " >&6; }
169 -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
170 -/* end confdefs.h. */
174 -if ac_fn_c_try_compile "$LINENO"; then :
175 - ac_header_compiler=yes
177 - ac_header_compiler=no
179 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
180 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
181 -$as_echo "$ac_header_compiler" >&6; }
183 -# Is the header present?
184 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
185 -$as_echo_n "checking $2 presence... " >&6; }
186 -cat confdefs.h - <<_ACEOF >conftest.$ac_ext
187 -/* end confdefs.h. */
190 -if ac_fn_c_try_cpp "$LINENO"; then :
191 - ac_header_preproc=yes
193 - ac_header_preproc=no
195 -rm -f conftest.err conftest.$ac_ext
196 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
197 -$as_echo "$ac_header_preproc" >&6; }
199 -# So? What about this header?
200 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
202 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
203 -$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
204 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
205 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
208 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
209 -$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
210 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
211 -$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
212 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
213 -$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
214 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
215 -$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
216 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
217 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
220 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
221 -$as_echo_n "checking for $2... " >&6; }
222 -if eval "test \"\${$3+set}\"" = set; then :
223 - $as_echo_n "(cached) " >&6
225 - eval "$3=\$ac_header_compiler"
228 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
229 -$as_echo "$ac_res" >&6; }
231 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
233 -} # ac_fn_c_check_header_mongrel
235 -# ac_fn_c_try_run LINENO
236 -# ----------------------
237 -# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
238 -# that executables *can* be run.
241 - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
242 - if { { ac_try="$ac_link"
244 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
245 - *) ac_try_echo=$ac_try;;
247 -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
248 -$as_echo "$ac_try_echo"; } >&5
249 - (eval "$ac_link") 2>&5
251 - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
252 - test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
253 - { { case "(($ac_try" in
254 - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
255 - *) ac_try_echo=$ac_try;;
257 -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
258 -$as_echo "$ac_try_echo"; } >&5
259 - (eval "$ac_try") 2>&5
261 - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
262 - test $ac_status = 0; }; }; then :
265 - $as_echo "$as_me: program exited with status $ac_status" >&5
266 - $as_echo "$as_me: failed program was:" >&5
267 -sed 's/^/| /' conftest.$ac_ext >&5
269 - ac_retval=$ac_status
271 - rm -rf conftest.dSYM conftest_ipa8_conftest.oo
272 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
273 - as_fn_set_status $ac_retval
277 # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
278 # -------------------------------------------------------
279 # Tests whether HEADER exists and can be compiled using the include files in
281 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
282 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
283 $as_echo_n "checking for $2... " >&6; }
284 -if eval "test \"\${$3+set}\"" = set; then :
285 +if eval \${$3+:} false; then :
286 $as_echo_n "(cached) " >&6
288 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
289 @@ -365,275 +150,16 @@
291 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
292 $as_echo "$ac_res" >&6; }
293 - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
294 + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
296 } # ac_fn_c_check_header_compile
297 # This file is generated from configure.in by Autoconf. DO NOT EDIT!
298 # Local configure fragment for sysdeps/i386.
302 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
303 -$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
304 -if test "${ac_cv_path_GREP+set}" = set; then :
305 - $as_echo_n "(cached) " >&6
307 - if test -z "$GREP"; then
308 - ac_path_GREP_found=false
309 - # Loop through the user's path and test for each of PROGNAME-LIST
310 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
311 -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
314 - test -z "$as_dir" && as_dir=.
315 - for ac_prog in grep ggrep; do
316 - for ac_exec_ext in '' $ac_executable_extensions; do
317 - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
318 - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
319 -# Check for GNU ac_path_GREP and select it if it is found.
320 - # Check for GNU $ac_path_GREP
321 -case `"$ac_path_GREP" --version 2>&1` in
323 - ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
326 - $as_echo_n 0123456789 >"conftest.in"
329 - cat "conftest.in" "conftest.in" >"conftest.tmp"
330 - mv "conftest.tmp" "conftest.in"
331 - cp "conftest.in" "conftest.nl"
332 - $as_echo 'GREP' >> "conftest.nl"
333 - "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
334 - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
335 - as_fn_arith $ac_count + 1 && ac_count=$as_val
336 - if test $ac_count -gt ${ac_path_GREP_max-0}; then
337 - # Best one so far, save it but keep looking for a better one
338 - ac_cv_path_GREP="$ac_path_GREP"
339 - ac_path_GREP_max=$ac_count
341 - # 10*(2^10) chars as input seems more than enough
342 - test $ac_count -gt 10 && break
344 - rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
347 - $ac_path_GREP_found && break 3
352 - if test -z "$ac_cv_path_GREP"; then
353 - as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
356 - ac_cv_path_GREP=$GREP
360 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
361 -$as_echo "$ac_cv_path_GREP" >&6; }
362 - GREP="$ac_cv_path_GREP"
365 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
366 -$as_echo_n "checking for egrep... " >&6; }
367 -if test "${ac_cv_path_EGREP+set}" = set; then :
368 - $as_echo_n "(cached) " >&6
370 - if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
371 - then ac_cv_path_EGREP="$GREP -E"
373 - if test -z "$EGREP"; then
374 - ac_path_EGREP_found=false
375 - # Loop through the user's path and test for each of PROGNAME-LIST
376 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
377 -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
380 - test -z "$as_dir" && as_dir=.
381 - for ac_prog in egrep; do
382 - for ac_exec_ext in '' $ac_executable_extensions; do
383 - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
384 - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
385 -# Check for GNU ac_path_EGREP and select it if it is found.
386 - # Check for GNU $ac_path_EGREP
387 -case `"$ac_path_EGREP" --version 2>&1` in
389 - ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
392 - $as_echo_n 0123456789 >"conftest.in"
395 - cat "conftest.in" "conftest.in" >"conftest.tmp"
396 - mv "conftest.tmp" "conftest.in"
397 - cp "conftest.in" "conftest.nl"
398 - $as_echo 'EGREP' >> "conftest.nl"
399 - "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
400 - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
401 - as_fn_arith $ac_count + 1 && ac_count=$as_val
402 - if test $ac_count -gt ${ac_path_EGREP_max-0}; then
403 - # Best one so far, save it but keep looking for a better one
404 - ac_cv_path_EGREP="$ac_path_EGREP"
405 - ac_path_EGREP_max=$ac_count
407 - # 10*(2^10) chars as input seems more than enough
408 - test $ac_count -gt 10 && break
410 - rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
413 - $ac_path_EGREP_found && break 3
418 - if test -z "$ac_cv_path_EGREP"; then
419 - as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
422 - ac_cv_path_EGREP=$EGREP
427 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
428 -$as_echo "$ac_cv_path_EGREP" >&6; }
429 - EGREP="$ac_cv_path_EGREP"
432 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
433 -$as_echo_n "checking for ANSI C header files... " >&6; }
434 -if test "${ac_cv_header_stdc+set}" = set; then :
435 - $as_echo_n "(cached) " >&6
437 - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
438 -/* end confdefs.h. */
452 -if ac_fn_c_try_compile "$LINENO"; then :
453 - ac_cv_header_stdc=yes
455 - ac_cv_header_stdc=no
457 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
459 -if test $ac_cv_header_stdc = yes; then
460 - # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
461 - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
462 -/* end confdefs.h. */
466 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
467 - $EGREP "memchr" >/dev/null 2>&1; then :
470 - ac_cv_header_stdc=no
476 -if test $ac_cv_header_stdc = yes; then
477 - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
478 - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
479 -/* end confdefs.h. */
483 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
484 - $EGREP "free" >/dev/null 2>&1; then :
487 - ac_cv_header_stdc=no
493 -if test $ac_cv_header_stdc = yes; then
494 - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
495 - if test "$cross_compiling" = yes; then :
498 - cat confdefs.h - <<_ACEOF >conftest.$ac_ext
499 -/* end confdefs.h. */
502 -#if ((' ' & 0x0FF) == 0x020)
503 -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
504 -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
506 -# define ISLOWER(c) \
507 - (('a' <= (c) && (c) <= 'i') \
508 - || ('j' <= (c) && (c) <= 'r') \
509 - || ('s' <= (c) && (c) <= 'z'))
510 -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
513 -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
518 - for (i = 0; i < 256; i++)
519 - if (XOR (islower (i), ISLOWER (i))
520 - || toupper (i) != TOUPPER (i))
525 -if ac_fn_c_try_run "$LINENO"; then :
528 - ac_cv_header_stdc=no
530 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
531 - conftest.$ac_objext conftest.beam conftest.$ac_ext
536 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
537 -$as_echo "$ac_cv_header_stdc" >&6; }
538 -if test $ac_cv_header_stdc = yes; then
540 -$as_echo "#define STDC_HEADERS 1" >>confdefs.h
544 -# On IRIX 5.3, sys/types and inttypes.h are conflicting.
545 -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
546 - inttypes.h stdint.h unistd.h
548 - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
549 -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
550 +ac_fn_c_check_header_compile "$LINENO" "cpuid.h" "ac_cv_header_cpuid_h" "/* No default includes. */
552 -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
553 - cat >>confdefs.h <<_ACEOF
554 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
562 -ac_fn_c_check_header_mongrel "$LINENO" "cpuid.h" "ac_cv_header_cpuid_h" "$ac_includes_default"
563 -if test "x$ac_cv_header_cpuid_h" = x""yes; then :
564 +if test "x$ac_cv_header_cpuid_h" = xyes; then :
567 as_fn_error $? "gcc must provide the <cpuid.h> header" "$LINENO" 5
570 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -g produces usable source locations for assembler-with-cpp" >&5
571 $as_echo_n "checking if -g produces usable source locations for assembler-with-cpp... " >&6; }
572 -if test "${libc_cv_cpp_asm_debuginfo+set}" = set; then :
573 +if ${libc_cv_cpp_asm_debuginfo+:} false; then :
574 $as_echo_n "(cached) " >&6
576 cat > conftest.S <<EOF
579 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSE4 support" >&5
580 $as_echo_n "checking for SSE4 support... " >&6; }
581 -if test "${libc_cv_cc_sse4+set}" = set; then :
582 +if ${libc_cv_cc_sse4+:} false; then :
583 $as_echo_n "(cached) " >&6
585 if { ac_try='${CC-cc} -msse4 -xc /dev/null -S -o /dev/null'
588 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for assembler -mtune=i686 support" >&5
589 $as_echo_n "checking for assembler -mtune=i686 support... " >&6; }
590 -if test "${libc_cv_as_i686+set}" = set; then :
591 +if ${libc_cv_as_i686+:} false; then :
592 $as_echo_n "(cached) " >&6
594 if { ac_try='${CC-cc} -Wa,-mtune=i686 -xc /dev/null -S -o /dev/null'
597 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AVX support" >&5
598 $as_echo_n "checking for AVX support... " >&6; }
599 -if test "${libc_cv_cc_avx+set}" = set; then :
600 +if ${libc_cv_cc_avx+:} false; then :
601 $as_echo_n "(cached) " >&6
603 if { ac_try='${CC-cc} -mavx -xc /dev/null -S -o /dev/null'
606 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -mno-vzeroupper support" >&5
607 $as_echo_n "checking for -mno-vzeroupper support... " >&6; }
608 -if test "${libc_cv_cc_novzeroupper+set}" = set; then :
609 +if ${libc_cv_cc_novzeroupper+:} false; then :
610 $as_echo_n "(cached) " >&6
612 if { ac_try='${CC-cc} -mno-vzeroupper -xc /dev/null -S -o /dev/null'
613 diff -Nur glibc-2.14.1.orig/sysdeps/i386/configure.in glibc-2.14.1/sysdeps/i386/configure.in
614 --- glibc-2.14.1.orig/sysdeps/i386/configure.in 2011-10-07 20:48:55.000000000 +1100
615 +++ glibc-2.14.1/sysdeps/i386/configure.in 2012-07-25 01:00:49.345025022 +1000
617 GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
618 # Local configure fragment for sysdeps/i386.
620 -AC_HEADER_CHECK([cpuid.h], ,
621 - [AC_MSG_ERROR([gcc must provide the <cpuid.h> header])])
622 +AC_CHECK_HEADER([cpuid.h], ,
623 + [AC_MSG_ERROR([gcc must provide the <cpuid.h> header])],
624 + [/* No default includes. */])
626 AC_CACHE_CHECK(if -g produces usable source locations for assembler-with-cpp,
627 libc_cv_cpp_asm_debuginfo, [dnl