1.1 --- a/patches/eglibc/2_15/110-aclocal-LIBC_TRY_CC_OPTION.patch	Mon Jun 18 13:36:29 2012 +0200
     1.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.3 @@ -1,56 +0,0 @@
     1.4 -Define missing LIBC_TRY_CC_OPTION macro
     1.5 -
     1.6 -diff --git a/aclocal.m4 b/aclocal.m4
     1.7 -index 86c07f7..32e9266 100644
     1.8 ---- a/aclocal.m4
     1.9 -+++ b/aclocal.m4
    1.10 -@@ -88,6 +88,12 @@ else
    1.11 - fi
    1.12 - rm -fr contest*])
    1.13 -
    1.14 -+dnl Test a compiler option or options with an empty input file.
    1.15 -+dnl LIBC_TRY_CC_OPTION([options], [action-if-true], [action-if-false])
    1.16 -+AC_DEFUN([LIBC_TRY_CC_OPTION],
    1.17 -+[AS_IF([AC_TRY_COMMAND([${CC-cc} $1 -xc /dev/null -S -o /dev/null])],
    1.18 -+ [$2], [$3])])
    1.19 -+
    1.20 - AC_DEFUN([LIBC_PROG_BINUTILS],
    1.21 - [# Was a --with-binutils option given?
    1.22 - if test -n "$path_binutils"; then
    1.23 -diff --git a/configure b/configure
    1.24 -index fc6abe6..196a214 100755
    1.25 ---- a/configure
    1.26 -+++ b/configure
    1.27 -@@ -7698,7 +7698,14 @@ if test "${libc_cv_cc_nofma+set}" = set; then
    1.28 - else
    1.29 -   libc_cv_cc_nofma=
    1.30 - for opt in -ffp-contract=off -mno-fused-madd; do
    1.31 --  LIBC_TRY_CC_OPTION($opt, libc_cv_cc_nofma=$opt; break)
    1.32 -+  if { ac_try='${CC-cc} $opt -xc /dev/null -S -o /dev/null'
    1.33 -+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
    1.34 -+  (eval $ac_try) 2>&5
    1.35 -+  ac_status=$?
    1.36 -+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    1.37 -+  test $ac_status = 0; }; }; then :
    1.38 -+  libc_cv_cc_nofma=$opt; break
    1.39 -+fi
    1.40 - done
    1.41 - fi
    1.42 - { $as_echo "$as_me:$LINENO: result: $libc_cv_cc_nofma" >&5
    1.43 -diff --git a/configure.in b/configure.in
    1.44 -index 09cbeea..7ccc802 100644
    1.45 ---- a/configure.in
    1.46 -+++ b/configure.in
    1.47 -@@ -2216,10 +2216,9 @@ if test -n "$submachine"; then
    1.48 - 		 libc_cv_cc_submachine, [dnl
    1.49 -   libc_cv_cc_submachine=no
    1.50 -   for opt in "-march=$submachine" "-mcpu=$submachine"; do
    1.51 --    if AC_TRY_COMMAND([${CC-cc} $opt -xc /dev/null -S -o /dev/null]); then
    1.52 -+    LIBC_TRY_CC_OPTION([$opt], [
    1.53 -       libc_cv_cc_submachine="$opt"
    1.54 --      break
    1.55 --    fi
    1.56 -+      break], [])
    1.57 -   done])
    1.58 -   if test "x$libc_cv_cc_submachine" = xno; then
    1.59 -     AC_MSG_ERROR([${CC-cc} does not support $submachine])