From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 28622 invoked by alias); 14 Feb 2012 16:45:09 -0000 Received: (qmail 28592 invoked by uid 22791); 14 Feb 2012 16:45:05 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: sourceware.org Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 14 Feb 2012 16:44:15 +0000 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1RxLUE-0002TJ-Gy from Tom_deVries@mentor.com ; Tue, 14 Feb 2012 08:44:14 -0800 Received: from SVR-IES-FEM-01.mgc.mentorg.com ([137.202.0.104]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Tue, 14 Feb 2012 08:43:41 -0800 Received: from [127.0.0.1] (137.202.0.76) by SVR-IES-FEM-01.mgc.mentorg.com (137.202.0.104) with Microsoft SMTP Server id 14.1.289.1; Tue, 14 Feb 2012 16:44:12 +0000 Message-ID: <4F3A8F3D.80604@mentor.com> Date: Tue, 14 Feb 2012 16:45:00 -0000 From: Tom de Vries User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.26) Gecko/20120131 Lightning/1.0b2 Thunderbird/3.1.18 MIME-Version: 1.0 To: CC: Subject: Fix alpha preconfigure fragment. Content-Type: multipart/mixed; boundary="------------040300020800060000050709" Mailing-List: contact libc-ports-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: libc-ports-owner@sourceware.org X-SW-Source: 2012-02/txt/msg00036.txt.bz2 --------------040300020800060000050709 Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit Content-length: 658 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 --------------040300020800060000050709 Content-Type: text/x-patch; name="glibc-alpha-preconfigure.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="glibc-alpha-preconfigure.patch" Content-length: 1958 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. 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 --------------040300020800060000050709--