From patchwork Mon Oct 8 14:41:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 190043 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 2786F2C00D9 for ; Tue, 9 Oct 2012 01:41:20 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1350312081; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject: References:In-Reply-To:Content-Type:Mailing-List:Precedence: List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=WaWEIt5XkGFwKRuRVYjGnjHifvU=; b=eaUCYqr1UWcNAyu TSnWCz0Oyx7XifYJddIG9q9fIqnxxYeSLno3E4nDa6q79Zk29eS5Diqtnxwz6ffX 0WwcgkdGUhqDsbnTNcoAB2Lzn/Zl5tWuKdnSW5uevbjh8LG6ANdHc9S0O15L16wc jnA3mvQwzHC6c7rw7lfruNRMXmKE= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject:References:In-Reply-To:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=q5M1NsfGKHgjg3Gt58N9mw/0aP8XaXO2+w8SGKYe3o2JYckj1oZtTRxxYJMcMj cf0D9fkJyhHSKdnOJxgr6squmT6OjEmJqp97V6pmG6/my0SOxwrLLeSIDdTrL340 iau+3k6JwArF1laA41ud+TQEkYfY8O1Z7C/JL4BX5kQlM=; Received: (qmail 2020 invoked by alias); 8 Oct 2012 14:41:15 -0000 Received: (qmail 2008 invoked by uid 22791); 8 Oct 2012 14:41:14 -0000 X-SWARE-Spam-Status: No, hits=-8.1 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, KHOP_SPAMHAUS_DROP, KHOP_THREADED, RCVD_IN_DNSWL_HI, RCVD_IN_HOSTKARMA_W, RP_MATCHES_RCVD, SPF_HELO_PASS X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 08 Oct 2012 14:41:04 +0000 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q98Ef4KY019860 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 8 Oct 2012 10:41:04 -0400 Received: from [10.3.113.153] (ovpn-113-153.phx2.redhat.com [10.3.113.153]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q98Ef3pe032157; Mon, 8 Oct 2012 10:41:03 -0400 Message-ID: <5072E5FF.9020608@redhat.com> Date: Mon, 08 Oct 2012 10:41:03 -0400 From: Jason Merrill User-Agent: Mozilla/5.0 (X11; Linux i686; rv:15.0) Gecko/20120911 Thunderbird/15.0.1 MIME-Version: 1.0 To: Jakub Jelinek CC: gcc-patches List Subject: RFA: PATCH to acinclude.m4 to fix gas version detection References: <506DADF6.7070905@redhat.com> In-Reply-To: <506DADF6.7070905@redhat.com> Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org On 10/04/2012 11:40 AM, Jason Merrill wrote: > Recent versions of binutils seem to have started putting ' around the > version number in bfd/configure.in, which was confusing gcc configure. When this change was made to binutils, the other directories changed to using bfd/configure --version to get the version number, so this version of my patch uses that instead of changing the regexp. This patch also fixes another issue I noticed with AIX configury. OK for trunk? Jason commit 94d42e379702606ec09b241d54ed7ad72cfaff99 Author: Jason Merrill Date: Fri Oct 5 18:59:08 2012 -0400 * acinclude.m4 (gcc_cv_gas_version): Try bfd/configure --version first. * configure.ac (gcc_cv_gld_version): Likewise. (gcc_cv_as_aix_ref): Fix typo. * configure: Regenerate. diff --git a/gcc/acinclude.m4 b/gcc/acinclude.m4 index c24464b..f7699ea 100644 --- a/gcc/acinclude.m4 +++ b/gcc/acinclude.m4 @@ -389,6 +389,8 @@ dnl # gcc_cv_as_gas_srcdir must be defined before this. dnl # This gross requirement will go away eventually. AC_DEFUN([_gcc_COMPUTE_GAS_VERSION], [gcc_cv_as_bfd_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/bfd +gcc_cv_gas_version=`$gcc_cv_as_bfd_srcdir/configure --version | sed -n -e '1s,.* ,VERSION=,p'` +if test x$gcc_cv_gas_version != x; then true; else for f in $gcc_cv_as_bfd_srcdir/configure \ $gcc_cv_as_gas_srcdir/configure \ $gcc_cv_as_gas_srcdir/configure.in \ @@ -397,7 +399,7 @@ for f in $gcc_cv_as_bfd_srcdir/configure \ if test x$gcc_cv_gas_version != x; then break fi -done +done; fi gcc_cv_gas_major_version=`expr "$gcc_cv_gas_version" : "VERSION=\([[0-9]]*\)"` gcc_cv_gas_minor_version=`expr "$gcc_cv_gas_version" : "VERSION=[[0-9]]*\.\([[0-9]]*\)"` gcc_cv_gas_patch_version=`expr "$gcc_cv_gas_version" : "VERSION=[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)"` diff --git a/gcc/configure b/gcc/configure index 45bba8e..fe4f3c7 100755 --- a/gcc/configure +++ b/gcc/configure @@ -21233,6 +21233,8 @@ if test "$gcc_cv_as" = ../gas/as-new$build_exeext; then $as_echo "newly built gas" >&6; } in_tree_gas=yes gcc_cv_as_bfd_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/bfd +gcc_cv_gas_version=`$gcc_cv_as_bfd_srcdir/configure --version | sed -n -e '1s,.* ,VERSION=,p'` +if test x$gcc_cv_gas_version != x; then true; else for f in $gcc_cv_as_bfd_srcdir/configure \ $gcc_cv_as_gas_srcdir/configure \ $gcc_cv_as_gas_srcdir/configure.in \ @@ -21241,7 +21243,7 @@ for f in $gcc_cv_as_bfd_srcdir/configure \ if test x$gcc_cv_gas_version != x; then break fi -done +done; fi gcc_cv_gas_major_version=`expr "$gcc_cv_gas_version" : "VERSION=\([0-9]*\)"` gcc_cv_gas_minor_version=`expr "$gcc_cv_gas_version" : "VERSION=[0-9]*\.\([0-9]*\)"` gcc_cv_gas_patch_version=`expr "$gcc_cv_gas_version" : "VERSION=[0-9]*\.[0-9]*\.\([0-9]*\)"` @@ -21393,13 +21395,15 @@ $as_echo "newly built ld" >&6; } elif test "$ld_is_gold" = yes; then in_tree_ld_is_elf=yes fi + gcc_cv_gld_version=`$gcc_cv_ld_bfd_srcdir/configure --version | sed -n -e '1s,.* ,VERSION=,p'` + if test x$gcc_cv_gld_version != x; then true; else for f in $gcc_cv_ld_bfd_srcdir/configure $gcc_cv_ld_gld_srcdir/configure $gcc_cv_ld_gld_srcdir/configure.in $gcc_cv_ld_gld_srcdir/Makefile.in do gcc_cv_gld_version=`sed -n -e 's/^[ ]*\(VERSION=[0-9]*\.[0-9]*.*\)/\1/p' < $f` if test x$gcc_cv_gld_version != x; then break fi - done + done; fi gcc_cv_gld_major_version=`expr "$gcc_cv_gld_version" : "VERSION=\([0-9]*\)"` gcc_cv_gld_minor_version=`expr "$gcc_cv_gld_version" : "VERSION=[0-9]*\.\([0-9]*\)"` else @@ -25346,8 +25350,8 @@ if test "${gcc_cv_as_aix_ref+set}" = set; then : else gcc_cv_as_aix_ref=no if test $in_tree_gas = yes; then - if test $gcc_cv_gas_vers -ge `expr \( \( 2.21.0 \* 1000 \) + gcc_cv_as_aix_ref=yes \) \* 1000 + ` - then : + if test $gcc_cv_gas_vers -ge `expr \( \( 2 \* 1000 \) + 21 \) \* 1000 + 0` + then gcc_cv_as_aix_ref=yes fi elif test x$gcc_cv_as != x; then $as_echo ' .csect stuff[rw] diff --git a/gcc/configure.ac b/gcc/configure.ac index 6ad6d19..3013555 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -2046,6 +2046,8 @@ if test "$gcc_cv_ld" = ../ld/ld-new$build_exeext \ elif test "$ld_is_gold" = yes; then in_tree_ld_is_elf=yes fi + gcc_cv_gld_version=`$gcc_cv_ld_bfd_srcdir/configure --version | sed -n -e '1s,.* ,VERSION=,p'` + if test x$gcc_cv_gld_version != x; then true; else for f in $gcc_cv_ld_bfd_srcdir/configure $gcc_cv_ld_gld_srcdir/configure $gcc_cv_ld_gld_srcdir/configure.in $gcc_cv_ld_gld_srcdir/Makefile.in do changequote(,)dnl @@ -2053,7 +2055,7 @@ changequote(,)dnl if test x$gcc_cv_gld_version != x; then break fi - done + done; fi gcc_cv_gld_major_version=`expr "$gcc_cv_gld_version" : "VERSION=\([0-9]*\)"` gcc_cv_gld_minor_version=`expr "$gcc_cv_gld_version" : "VERSION=[0-9]*\.\([0-9]*\)"` changequote([,])dnl @@ -3878,7 +3880,7 @@ LCF0: case $target in *-*-aix*) gcc_GAS_CHECK_FEATURE([.ref support], - gcc_cv_as_aix_ref, [2.21.0],, + gcc_cv_as_aix_ref, [2,21,0],, [ .csect stuff[[rw]] stuff: .long 1