aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-10-29 22:41:06 +0000
committerUlrich Drepper <drepper@redhat.com>2006-10-29 22:41:06 +0000
commit536e40e287df5438683e78e64867009f7a0d2698 (patch)
treef443ca0944428ed3897bb2fdebdeb8bbbdf80f58
parent6e6278064ab5f08b5e920f9f74b33cb2b7f42925 (diff)
downloadglibc-536e40e287df5438683e78e64867009f7a0d2698.tar
glibc-536e40e287df5438683e78e64867009f7a0d2698.tar.gz
glibc-536e40e287df5438683e78e64867009f7a0d2698.tar.bz2
glibc-536e40e287df5438683e78e64867009f7a0d2698.zip
* configure.in: Relax -z relro requirement a bit.cvs/fedora-glibc-20061029T2155
-rw-r--r--ChangeLog2
-rwxr-xr-xconfigure7
-rw-r--r--configure.in7
-rw-r--r--nptl/ChangeLog16
4 files changed, 30 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 11acd401f6..f97d54ce8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2006-10-29 Ulrich Drepper <drepper@redhat.com>
+ * configure.in: Relax -z relro requirement a bit.
+
* po/sv.po: Update from translation team.
2006-10-29 Jakub Jelinek <jakub@redhat.com>
diff --git a/configure b/configure
index b04bf8b71d..c9d321abd1 100755
--- a/configure
+++ b/configure
@@ -5650,12 +5650,17 @@ else
(exit $ac_status); }; }
then
libc_cv_z_relro=yes
+ else
+ case "$base_machine" in
+ i3456786 | x86_64 | powerpc* | s390* | sparc* | alpha*) ;;
+ *) libc_cv_z_relro="not required" ;;
+ esac
fi
fi
fi
echo "$as_me:$LINENO: result: $libc_cv_z_relro" >&5
echo "${ECHO_T}$libc_cv_z_relro" >&6
- if test $libc_cv_z_relro != yes; then
+ if test $libc_cv_z_relro = no; then
{ { echo "$as_me:$LINENO: error: linker with -z relro support required" >&5
echo "$as_me: error: linker with -z relro support required" >&2;}
{ (exit 1); exit 1; }; }
diff --git a/configure.in b/configure.in
index fb43804b1f..ca795c4486 100644
--- a/configure.in
+++ b/configure.in
@@ -1444,9 +1444,14 @@ EOF
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
+ case "$base_machine" in
+ i[34567]86 | x86_64 | powerpc* | s390* | sparc* | alpha*) ;;
+ *) libc_cv_z_relro="not required" ;;
+ esac
fi
fi])
- if test $libc_cv_z_relro != yes; then
+ if test "$libc_cv_z_relro" = no; then
AC_MSG_ERROR(linker with -z relro support required)
fi
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 2b79825485..121d9ed1f2 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,19 @@
+2006-10-29 Jakub Jelinek <jakub@redhat.com>
+
+ * sysdeps/unix/sysv/linux/i386/sysdep-cancel.h (RTLD_SINGLE_THREAD_P):
+ Define.
+ (SINGLE_THREAD_P): Define to 1 if IS_IN_rtld.
+ * sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h: Likewise.
+ * sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h: Likewise.
+ * sysdeps/unix/sysv/linux/s390/s390-32/sysdep-cancel.h: Likewise.
+ * sysdeps/unix/sysv/linux/s390/s390-64/sysdep-cancel.h: Likewise.
+ * sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep-cancel.h: Likewise.
+ * sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h: Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h: Likewise.
+ * sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h: Likewise.
+ * sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h: Likewise.
+ * sysdeps/unix/sysv/linux/sh/sysdep-cancel.h: Likewise.
+
2006-10-27 Ulrich Drepper <drepper@redhat.com>
* sysdeps/pthread/pthread_barrier_wait.c: Move to...