alpha: Don't let preconfigure interfere with other targets.

diff --git a/ChangeLog.alpha b/ChangeLog.alpha
index 7eea90429051d4e9ff03514ebed3a547494225df..a5271de4252a35a690a74376fb2b31d5eb314f79 100644 (file)
--- a/ChangeLog.alpha
+++ b/ChangeLog.alpha
@@ -1,3 +1,11 @@
+2012-02-14  Joseph Myers  <joseph@codesourcery.com>
+           Tom de Vries  <tom@codesourcery.com>
+
+       * 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  <rth@twiddle.net>
 
         * sysdeps/unix/sysv/linux/alpha/bits/eventfd.h: New file.

diff --git a/sysdeps/alpha/preconfigure b/sysdeps/alpha/preconfigure
index 1a66d103f7566a819833b265e4adbede35eadfcc..09559b9de48fe0a52734795cbef8236e5889194b 100644 (file)
--- 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 80528ee54a9d200fb46fe2cc0302bb0911dfa559..c7c4feeea187e82f020dbfae95c0498477839d31 100644 (file)
--- 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 7136b858e0a97e650d37d54af208ccf18c158b5a..5a1af620732b00623a16a748c89a3b30898742c3 100644 (file)
--- 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