aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rwxr-xr-xconfigure12
-rw-r--r--configure.in14
3 files changed, 11 insertions, 21 deletions
diff --git a/ChangeLog b/ChangeLog
index ee68357ce1..bc1401b1ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-30 Joseph Myers <joseph@codesourcery.com>
+
+ * configure.in (libc_cv_fpie): Weaken to a compile test using
+ LIBC_TRY_CC_OPTION.
+ * configure: Regenerated.
+
2012-05-29 Andreas Krebbel <Andreas.Krebbel@de.ibm.com>
* sysdeps/unix/sysv/linux/s390/s390-32/nptl/ld.abilist: Refreshed.
diff --git a/configure b/configure
index c92d4a5126..4d5d9e49f9 100755
--- a/configure
+++ b/configure
@@ -6490,23 +6490,17 @@ $as_echo_n "checking for -fpie... " >&6; }
if ${libc_cv_fpie+:} 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 -pie -fpie
- -o conftest conftest.c 1>&5'
+ if { ac_try='${CC-cc} -fpie -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_fpie=yes
else
libc_cv_fpie=no
fi
-rm -f conftest*
+
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_fpie" >&5
$as_echo "$libc_cv_fpie" >&6; }
diff --git a/configure.in b/configure.in
index 6fac0855e3..81b14c9de7 100644
--- a/configure.in
+++ b/configure.in
@@ -1618,18 +1618,8 @@ rm -f conftest*])
AC_SUBST(libc_cv_z_execstack)
AC_CACHE_CHECK(for -fpie, libc_cv_fpie, [dnl
-cat > conftest.c <<EOF
-int foo;
-main () { return 0;}
-EOF
-if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -pie -fpie
- -o conftest conftest.c 1>&AS_MESSAGE_LOG_FD])
-then
- libc_cv_fpie=yes
-else
- libc_cv_fpie=no
-fi
-rm -f conftest*])
+LIBC_TRY_CC_OPTION([-fpie], [libc_cv_fpie=yes], [libc_cv_fpie=no])
+])
AC_SUBST(libc_cv_fpie)