From patchwork Tue Sep 9 17:44:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Ellcey X-Patchwork-Id: 2710 Received: (qmail 24981 invoked by alias); 9 Sep 2014 17:44:55 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 24970 invoked by uid 89); 9 Sep 2014 17:44:54 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.3 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mailapp01.imgtec.com Message-ID: <1410284684.2740.162.camel@ubuntu-sellcey> Subject: Re: [PATCH] Cleanup MIPS preconfigure script From: Steve Ellcey To: "Joseph S. Myers" CC: Adhemerval Zanella , Date: Tue, 9 Sep 2014 10:44:44 -0700 In-Reply-To: References: <6b5ce132-2a69-4ee9-aaa5-d07792e72b50@BAMAIL02.ba.imgtec.org> <1409871127.2740.76.camel@ubuntu-sellcey> <1409948236.2740.110.camel@ubuntu-sellcey> <1410279506.2740.158.camel@ubuntu-sellcey> <1410282834.2740.159.camel@ubuntu-sellcey> <540F3760.5010203@linux.vnet.ibm.com> MIME-Version: 1.0 On Tue, 2014-09-09 at 17:24 +0000, Joseph S. Myers wrote: > On Tue, 9 Sep 2014, Adhemerval Zanella wrote: > > > And patch 0febba23ddabcd971be5259ee20236b9e3efa690 broke powerpc64 configure: > > Steve, you need to put preconfigure back inside a case statement so > nothing runs for non-mips* machines. > Ack, I didn't realize that was necessary. Here is a patch to fix that, should I go ahead and check it in? I also made the capitalization changes that Maciej recommended. Steve Ellcey sellcey@mips.com 2014-09-09 Steve Ellcey * sysdeps/mips/preconfigure: Put code inside mips* case statement. Fix capitalization of error message. -if test "$abiflag" != "_ABIO32" -a "$mips16flag" = "1"; then - as_fn_error $? "mips16 is only supported with the O32 ABI." "$LINENO" 5 -fi + if test "$abiflag" != "_ABIO32" -a "$mips16flag" = "1"; then + as_fn_error $? "MIPS16 is only supported with the o32 ABI." "$LINENO" 5 + fi + ;; +esac diff --git a/sysdeps/mips/preconfigure b/sysdeps/mips/preconfigure index fb572d7..c118592 100644 --- a/sysdeps/mips/preconfigure +++ b/sysdeps/mips/preconfigure @@ -1,24 +1,29 @@ -abiflag=`$CC $CFLAGS $CPPFLAGS -E -dM -xc /dev/null | sed -n 's/^#define _MIPS_SIM \(.*\)/\1/p'` -mips16flag=`$CC $CFLAGS $CPPFLAGS -E -dM -xc /dev/null | sed -n 's/^#define __mips16 \(.*\)/\1/p'` +case "$machine" in +mips*) + abiflag=`$CC $CFLAGS $CPPFLAGS -E -dM -xc /dev/null | sed -n 's/^#define _MIPS_SIM \(.*\)/\1/p'` + mips16flag=`$CC $CFLAGS $CPPFLAGS -E -dM -xc /dev/null | sed -n 's/^#define __mips16 \(.*\)/\1/p'` -base_machine=mips -if test "$abiflag" = "_ABIO32" ; then - if test "$mips16flag" = "1" ; then - machine=mips/mips32/mips16 + base_machine=mips + if test "$abiflag" = "_ABIO32" ; then + if test "$mips16flag" = "1" ; then + machine=mips/mips32/mips16 + else + machine=mips/mips32 + fi + elif test "$abiflag" = "_ABIN32" ; then + machine=mips/mips64/n32 + elif test "$abiflag" = "_ABI64" ; then + machine=mips/mips64/n64 else - machine=mips/mips32 + as_fn_error $? "Unable to determine ABI." "$LINENO" 5 fi -elif test "$abiflag" = "_ABIN32" ; then - machine=mips/mips64/n32 -elif test "$abiflag" = "_ABI64" ; then - machine=mips/mips64/n64 -else - as_fn_error $? "Unable to determine ABI." "$LINENO" 5 -fi -# $config_machine is not really needed here but the slash after $machine is -# needed by the case statement in sysdeps/unix/sysv/linux/mips/configure.ac. -machine=$machine/$config_machine + # $config_machine is not really needed here but the slash after + # $machine is needed by the case statement in + # sysdeps/unix/sysv/linux/mips/configure.ac. + machine=$machine/$config_machine