This is the mail archive of the
libc-ports@sources.redhat.com
mailing list for the libc-ports project.
Fix alpha preconfigure fragment.
- From: Tom de Vries <Tom_deVries at mentor dot com>
- To: <libc-ports at sources dot redhat dot com>
- Cc: <rth at twiddle dot net>
- Date: Tue, 14 Feb 2012 17:43:41 +0100
- Subject: Fix alpha preconfigure fragment.
Hi,
while doing a glibc trunk build with host i686-pc-linux-gnu and target
mips-linux-gnu, I ran into the following build failure:
...
configure:6203: checking for -z relro option
configure:6273: error: linker with -z relro support required
...
This error originates from sysdeps/alpha/preconfigure, that contains some
settings that aren't conditioned on the machine being alpha*.
Fixed by:
- moving the setting of libc_cv_gcc_unwind_find_fde to
sysdeps/unix/sysv/linux/alpha/configure.in.
- making the setting of libc_commonpagesize and
libc_relro_required conditional on the machine being alpha*.
Tested by finishing the MIPS build.
Thanks,
- Tom
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.
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