aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--configure.in24
2 files changed, 17 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index efb0a17594..dd8c407cbc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-02 Ulrich Drepper <drepper@redhat.com>
+
+ * configure.in: Work around ld --help change and avoid -z relro
+ test completely if the architecture doesn't care about security.
+
2006-11-01 Ulrich Drepper <drepper@redhat.com>
* po/sv.po: Update from translation team.
diff --git a/configure.in b/configure.in
index 5cb3035a65..71ceb04b33 100644
--- a/configure.in
+++ b/configure.in
@@ -1436,26 +1436,26 @@ EOF
fi
rm -f conftest*])
- AC_CACHE_CHECK(for -z relro option,
- libc_cv_z_relro, [dnl
+ case "$base_machine" in
+changequote(,)dnl
+ i[34567]86 | x86_64 | powerpc* | s390* | sparc* | alpha*)
+changequote([,])dnl
+ AC_CACHE_CHECK(for -z relro option,
+ libc_cv_z_relro, [dnl
libc_cv_z_relro=no
if AC_TRY_COMMAND([${CC-cc} -v --help 2>&1|grep "z relro" 1>&AS_MESSAGE_LOG_FD])
then
if AC_TRY_COMMAND([${CC-cc} -Wl,--verbose 2>&1|grep DATA_SEGMENT_RELRO_END 1>&AS_MESSAGE_LOG_FD])
then
libc_cv_z_relro=yes
- else
-changequote(,)dnl
- case "$base_machine" in
- i[34567]86 | x86_64 | powerpc* | s390* | sparc* | alpha*) ;;
- *) libc_cv_z_relro="not required" ;;
- esac
-changequote([,])dnl
fi
fi])
- if test "$libc_cv_z_relro" = no; then
- AC_MSG_ERROR(linker with -z relro support required)
- fi
+ if test "$libc_cv_z_relro" = no; then
+ AC_MSG_ERROR(linker with -z relro support required)
+ fi
+ ;;
+ *) ;;
+ esac
AC_CACHE_CHECK(for -Bgroup option,
libc_cv_Bgroup, [dnl