From b991ef778a9e56dce09664f24dd35b0ae5c4b4e2 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Wed, 15 Feb 2012 08:02:19 -0800 Subject: [PATCH] alpha: Don't let preconfigure interfere with other targets. --- ChangeLog.alpha | 8 ++++++++ sysdeps/alpha/preconfigure | 11 ++++------- sysdeps/unix/sysv/linux/alpha/configure | 3 +++ sysdeps/unix/sysv/linux/alpha/configure.in | 3 +++ 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/ChangeLog.alpha b/ChangeLog.alpha index 7eea904..a5271de 100644 --- a/ChangeLog.alpha +++ b/ChangeLog.alpha @@ -1,3 +1,11 @@ +2012-02-14 Joseph Myers + Tom de Vries + + * sysdeps/alpha/preconfigure: Make setting of libc_commonpagesize and + libc_relro_required conditional on alpha machine. Move setting of + libc_cv_gcc_unwind_find_fde ... + * sysdeps/unix/sysv/linux/alpha/configure.in: ... here. + 2012-02-13 Richard Henderson * sysdeps/unix/sysv/linux/alpha/bits/eventfd.h: New file. diff --git a/sysdeps/alpha/preconfigure b/sysdeps/alpha/preconfigure index 1a66d10..09559b9 100644 --- a/sysdeps/alpha/preconfigure +++ b/sysdeps/alpha/preconfigure @@ -1,10 +1,7 @@ case "$machine" in -alpha*) base_machine=alpha machine=alpha/$machine ;; +alpha*) base_machine=alpha machine=alpha/$machine + # Parameters to allow auto-detection of -z relro. + libc_commonpagesize=0x2000 + libc_relro_required=yes ;; esac -# We did historically export the unwinder from glibc. -libc_cv_gcc_unwind_find_fde=yes - -# Parameters to allow auto-detection of -z relro. -libc_commonpagesize=0x2000 -libc_relro_required=yes diff --git a/sysdeps/unix/sysv/linux/alpha/configure b/sysdeps/unix/sysv/linux/alpha/configure index 80528ee..c7c4fee 100644 --- a/sysdeps/unix/sysv/linux/alpha/configure +++ b/sysdeps/unix/sysv/linux/alpha/configure @@ -6,3 +6,6 @@ # require TLS (ver 2.6.0), it seems pointless to fix them. # ??? Surely this should now be the generic default. arch_minimum_kernel=2.6.0 + +# We did historically export the unwinder from glibc. +libc_cv_gcc_unwind_find_fde=yes diff --git a/sysdeps/unix/sysv/linux/alpha/configure.in b/sysdeps/unix/sysv/linux/alpha/configure.in index 7136b85..5a1af62 100644 --- a/sysdeps/unix/sysv/linux/alpha/configure.in +++ b/sysdeps/unix/sysv/linux/alpha/configure.in @@ -6,3 +6,6 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. # require TLS (ver 2.6.0), it seems pointless to fix them. # ??? Surely this should now be the generic default. arch_minimum_kernel=2.6.0 + +# We did historically export the unwinder from glibc. +libc_cv_gcc_unwind_find_fde=yes -- 2.7.4