aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.alpha8
-rw-r--r--sysdeps/alpha/preconfigure11
-rw-r--r--sysdeps/unix/sysv/linux/alpha/configure3
-rw-r--r--sysdeps/unix/sysv/linux/alpha/configure.in3
4 files changed, 18 insertions, 7 deletions
diff --git a/ChangeLog.alpha b/ChangeLog.alpha
index 7eea904290..a5271de425 100644
--- 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 1a66d103f7..09559b9de4 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 80528ee54a..c7c4feeea1 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 7136b858e0..5a1af62073 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