public inbox for libc-ports@sourceware.org
 help / color / mirror / Atom feed
From: Tom de Vries <Tom_deVries@mentor.com>
To: <libc-ports@sources.redhat.com>
Cc: <rth@twiddle.net>
Subject: Fix alpha preconfigure fragment.
Date: Tue, 14 Feb 2012 16:45:00 -0000	[thread overview]
Message-ID: <4F3A8F3D.80604@mentor.com> (raw)

[-- Attachment #1: Type: text/plain, Size: 658 bytes --]

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

[-- Attachment #2: glibc-alpha-preconfigure.patch --]
[-- Type: text/x-patch, Size: 1958 bytes --]

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

             reply	other threads:[~2012-02-14 16:45 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-14 16:45 Tom de Vries [this message]
2012-02-14 20:03 ` Richard Henderson
2012-02-15  0:50   ` Joseph S. Myers

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4F3A8F3D.80604@mentor.com \
    --to=tom_devries@mentor.com \
    --cc=libc-ports@sources.redhat.com \
    --cc=rth@twiddle.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).