crosstool-ng: patches/glibc/2.14.1/900-cpuid-include.patch@5c67476c7342

     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

    23 @@ -16,23 +16,6 @@

    24    as_fn_set_status $1

    25    exit $1

    26  } # as_fn_exit

    27 -# as_fn_arith ARG...

    28 -# ------------------

    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 ()

    34 -  {

    35 -    as_val=$(( $* ))

    36 -  }'

    37 -else

    38 -  as_fn_arith ()

    39 -  {

    40 -    as_val=`expr "$@" || test $? -eq 1`

    41 -  }

    42 -fi # as_fn_arith

    43 -

    44  if expr a : '\(a\)' >/dev/null 2>&1 &&

    45     test "X`expr 00001 : '.*\(...\)'`" = X001; then

    46    as_expr=expr

    47 @@ -89,6 +72,10 @@

    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).

    58 @@ -97,42 +84,6 @@

    59    exit

    60  }

    62 -# Factoring default headers for most tests.

    63 -ac_includes_default="\

    64 -#include <stdio.h>

    65 -#ifdef HAVE_SYS_TYPES_H

    66 -# include <sys/types.h>

    67 -#endif

    68 -#ifdef HAVE_SYS_STAT_H

    69 -# include <sys/stat.h>

    70 -#endif

    71 -#ifdef STDC_HEADERS

    72 -# include <stdlib.h>

    73 -# include <stddef.h>

    74 -#else

    75 -# ifdef HAVE_STDLIB_H

    76 -#  include <stdlib.h>

    77 -# endif

    78 -#endif

    79 -#ifdef HAVE_STRING_H

    80 -# if !defined STDC_HEADERS && defined HAVE_MEMORY_H

    81 -#  include <memory.h>

    82 -# endif

    83 -# include <string.h>

    84 -#endif

    85 -#ifdef HAVE_STRINGS_H

    86 -# include <strings.h>

    87 -#endif

    88 -#ifdef HAVE_INTTYPES_H

    89 -# include <inttypes.h>

    90 -#endif

    91 -#ifdef HAVE_STDINT_H

    92 -# include <stdint.h>

    93 -#endif

    94 -#ifdef HAVE_UNISTD_H

    95 -# include <unistd.h>

    96 -#endif"

    97 -

    99  # ac_fn_c_try_compile LINENO

   100  # --------------------------

   101 @@ -167,177 +118,11 @@

   103  	ac_retval=1

   104  fi

   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.

   114 -ac_fn_c_try_cpp ()

   115 -{

   116 -  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

   117 -  if { { ac_try="$ac_cpp conftest.$ac_ext"

   118 -case "(($ac_try" in

   119 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

   120 -  *) ac_try_echo=$ac_try;;

   121 -esac

   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

   125 -  ac_status=$?

   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

   130 -  fi

   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

   135 -       }; then :

   136 -  ac_retval=0

   137 -else

   138 -  $as_echo "$as_me: failed program was:" >&5

   139 -sed 's/^/| /' conftest.$ac_ext >&5

   140 -

   141 -    ac_retval=1

   142 -fi

   143 -  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

   144 -  as_fn_set_status $ac_retval

   145 -

   146 -} # ac_fn_c_try_cpp

   147 -

   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

   152 -# accordingly.

   153 -ac_fn_c_check_header_mongrel ()

   154 -{

   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

   161 -fi

   162 -eval ac_res=\$$3

   163 -	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5

   164 -$as_echo "$ac_res" >&6; }

   165 -else

   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.  */

   171 -$4

   172 -#include <$2>

   173 -_ACEOF

   174 -if ac_fn_c_try_compile "$LINENO"; then :

   175 -  ac_header_compiler=yes

   176 -else

   177 -  ac_header_compiler=no

   178 -fi

   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; }

   182 -

   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.  */

   188 -#include <$2>

   189 -_ACEOF

   190 -if ac_fn_c_try_cpp "$LINENO"; then :

   191 -  ac_header_preproc=yes

   192 -else

   193 -  ac_header_preproc=no

   194 -fi

   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; }

   198 -

   199 -# So?  What about this header?

   200 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((

   201 -  yes:no: )

   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;}

   206 -    ;;

   207 -  no:yes:* )

   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;}

   218 -    ;;

   219 -esac

   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

   224 -else

   225 -  eval "$3=\$ac_header_compiler"

   226 -fi

   227 -eval ac_res=\$$3

   228 -	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5

   229 -$as_echo "$ac_res" >&6; }

   230 -fi

   231 -  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}

   232 -

   233 -} # ac_fn_c_check_header_mongrel

   234 -

   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.

   239 -ac_fn_c_try_run ()

   240 -{

   241 -  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

   242 -  if { { ac_try="$ac_link"

   243 -case "(($ac_try" in

   244 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

   245 -  *) ac_try_echo=$ac_try;;

   246 -esac

   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

   250 -  ac_status=$?

   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;;

   256 -esac

   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

   260 -  ac_status=$?

   261 -  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

   262 -  test $ac_status = 0; }; }; then :

   263 -  ac_retval=0

   264 -else

   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

   268 -

   269 -       ac_retval=$ac_status

   270 -fi

   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

   274 -

   275 -} # ac_fn_c_try_run

   276 -

   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

   280 @@ -347,7 +132,7 @@

   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

   287  else

   288    cat confdefs.h - <<_ACEOF >conftest.$ac_ext

   289 @@ -365,275 +150,16 @@

   290  eval ac_res=\$$3

   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.

   301 -

   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

   306 -else

   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

   312 -do

   313 -  IFS=$as_save_IFS

   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

   322 -*GNU*)

   323 -  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;

   324 -*)

   325 -  ac_count=0

   326 -  $as_echo_n 0123456789 >"conftest.in"

   327 -  while :

   328 -  do

   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

   340 -    fi

   341 -    # 10*(2^10) chars as input seems more than enough

   342 -    test $ac_count -gt 10 && break

   343 -  done

   344 -  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;

   345 -esac

   346 -

   347 -      $ac_path_GREP_found && break 3

   348 -    done

   349 -  done

   350 -  done

   351 -IFS=$as_save_IFS

   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

   354 -  fi

   355 -else

   356 -  ac_cv_path_GREP=$GREP

   357 -fi

   358 -

   359 -fi

   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"

   363 -

   364 -

   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

   369 -else

   370 -  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1

   371 -   then ac_cv_path_EGREP="$GREP -E"

   372 -   else

   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

   378 -do

   379 -  IFS=$as_save_IFS

   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

   388 -*GNU*)

   389 -  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;

   390 -*)

   391 -  ac_count=0

   392 -  $as_echo_n 0123456789 >"conftest.in"

   393 -  while :

   394 -  do

   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

   406 -    fi

   407 -    # 10*(2^10) chars as input seems more than enough

   408 -    test $ac_count -gt 10 && break

   409 -  done

   410 -  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;

   411 -esac

   412 -

   413 -      $ac_path_EGREP_found && break 3

   414 -    done

   415 -  done

   416 -  done

   417 -IFS=$as_save_IFS

   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

   420 -  fi

   421 -else

   422 -  ac_cv_path_EGREP=$EGREP

   423 -fi

   424 -

   425 -   fi

   426 -fi

   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"

   430 -

   431 -

   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

   436 -else

   437 -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext

   438 -/* end confdefs.h.  */

   439 -#include <stdlib.h>

   440 -#include <stdarg.h>

   441 -#include <string.h>

   442 -#include <float.h>

   443 -

   444 -int

   445 -main ()

   446 -{

   447 -

   448 -  ;

   449 -  return 0;

   450 -}

   451 -_ACEOF

   452 -if ac_fn_c_try_compile "$LINENO"; then :

   453 -  ac_cv_header_stdc=yes

   454 -else

   455 -  ac_cv_header_stdc=no

   456 -fi

   457 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

   458 -

   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.  */

   463 -#include <string.h>

   464 -

   465 -_ACEOF

   466 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |

   467 -  $EGREP "memchr" >/dev/null 2>&1; then :

   468 -

   469 -else

   470 -  ac_cv_header_stdc=no

   471 -fi

   472 -rm -f conftest*

   473 -

   474 -fi

   475 -

   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.  */

   480 -#include <stdlib.h>

   481 -

   482 -_ACEOF

   483 -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |

   484 -  $EGREP "free" >/dev/null 2>&1; then :

   485 -

   486 -else

   487 -  ac_cv_header_stdc=no

   488 -fi

   489 -rm -f conftest*

   490 -

   491 -fi

   492 -

   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 :

   496 -  :

   497 -else

   498 -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext

   499 -/* end confdefs.h.  */

   500 -#include <ctype.h>

   501 -#include <stdlib.h>

   502 -#if ((' ' & 0x0FF) == 0x020)

   503 -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')

   504 -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))

   505 -#else

   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))

   511 -#endif

   512 -

   513 -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))

   514 -int

   515 -main ()

   516 -{

   517 -  int i;

   518 -  for (i = 0; i < 256; i++)

   519 -    if (XOR (islower (i), ISLOWER (i))

   520 -	|| toupper (i) != TOUPPER (i))

   521 -      return 2;

   522 -  return 0;

   523 -}

   524 -_ACEOF

   525 -if ac_fn_c_try_run "$LINENO"; then :

   526 -

   527 -else

   528 -  ac_cv_header_stdc=no

   529 -fi

   530 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \

   531 -  conftest.$ac_objext conftest.beam conftest.$ac_ext

   532 -fi

   533 -

   534 -fi

   535 -fi

   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

   539 -

   540 -$as_echo "#define STDC_HEADERS 1" >>confdefs.h

   541 -

   542 -fi

   543 -

   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

   547 -do :

   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.  */

   551  "

   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

   555 -_ACEOF

   556 -

   557 -fi

   558 -

   559 -done

   560 -

   561 -

   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 :

   566  else

   567    as_fn_error $? "gcc must provide the <cpuid.h> header" "$LINENO" 5

   568 @@ -643,7 +169,7 @@

   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

   575  else

   576    cat > conftest.S <<EOF

   577 @@ -693,7 +219,7 @@

   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

   584  else

   585    if { ac_try='${CC-cc} -msse4 -xc /dev/null -S -o /dev/null'

   586 @@ -716,7 +242,7 @@

   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

   593  else

   594    if { ac_try='${CC-cc} -Wa,-mtune=i686 -xc /dev/null -S -o /dev/null'

   595 @@ -735,7 +261,7 @@

   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

   602  else

   603    if { ac_try='${CC-cc} -mavx -xc /dev/null -S -o /dev/null'

   604 @@ -758,7 +284,7 @@

   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

   611  else

   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

   616 @@ -1,8 +1,9 @@

   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

author	Johannes Stezenbach <js@sig21.net>
	Tue Oct 30 00:22:25 2012 +0000 (2012-10-30)
changeset 3097	5c67476c7342
permissions	-rw-r--r--