diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rwxr-xr-x | configure | 12 | ||||
| -rw-r--r-- | configure.in | 16 |
3 files changed, 14 insertions, 21 deletions
diff --git a/ChangeLog b/ChangeLog index b65061f532..e8b43e4a1b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,11 @@ 2012-03-21 Thomas Schwinge <thomas@codesourcery.com> + Joseph Myers <joseph@codesourcery.com> + + * configure.in (libc_cv_ssp): Use LIBC_TRY_CC_OPTION instead of a + link test. + * configure: Regenerated. + +2012-03-21 Thomas Schwinge <thomas@codesourcery.com> * conform/conformtest.pl: Handle --tmpdir argument, defaulting to /tmp. * conform/run-conformtest.sh: Pass --tmpdir argument when invoking diff --git a/configure b/configure index dc50c16c72..e131070718 100755 --- a/configure +++ b/configure @@ -6643,23 +6643,17 @@ $as_echo_n "checking for -fstack-protector... " >&6; } if ${libc_cv_ssp+:} false; then : $as_echo_n "(cached) " >&6 else - cat > conftest.c <<EOF -int foo; -main () { return 0;} -EOF -if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -Werror -fstack-protector - -o conftest conftest.c 1>&5' + if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS -Werror -fstack-protector -xc /dev/null -S -o /dev/null' { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 (eval $ac_try) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; } -then + test $ac_status = 0; }; }; then : libc_cv_ssp=yes else libc_cv_ssp=no fi -rm -f conftest* + fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_ssp" >&5 $as_echo "$libc_cv_ssp" >&6; } diff --git a/configure.in b/configure.in index bb3b057a36..b2fed4bd1c 100644 --- a/configure.in +++ b/configure.in @@ -1753,18 +1753,10 @@ fi AC_SUBST(fno_unit_at_a_time) AC_CACHE_CHECK(for -fstack-protector, libc_cv_ssp, [dnl -cat > conftest.c <<EOF -int foo; -main () { return 0;} -EOF -if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -Werror -fstack-protector - -o conftest conftest.c 1>&AS_MESSAGE_LOG_FD]) -then - libc_cv_ssp=yes -else - libc_cv_ssp=no -fi -rm -f conftest*]) +LIBC_TRY_CC_OPTION([$CFLAGS $CPPFLAGS -Werror -fstack-protector], + [libc_cv_ssp=yes], + [libc_cv_ssp=no]) +]) AC_SUBST(libc_cv_ssp) AC_CACHE_CHECK(for -fgnu89-inline, libc_cv_gnu89_inline, [dnl |