From patchwork Wed Mar 28 23:43:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 149328 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 04368B6F6E for ; Thu, 29 Mar 2012 10:44:26 +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=1333583068; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Date:From:To:Cc:Subject:Message-ID:Reply-To: MIME-Version:Content-Type:Content-Disposition:User-Agent: Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:Sender:Delivered-To; bh=uDXBxX4rX3XwoPpJFrOx TPQA0io=; b=BR4N6Z+n0GFAsqawCItPnyNmjCgM74nrryn3FK4odnkL2dCXWI8l Tqw8T+V6wB9pUNppuLVcHMwPE7DcEBMbjC7AXGK6YV2xblqfYeypIfdtytrg+fQb 9TCep6RpLzAaZmtcbFiIyZAY8hT6Zpie4YRHDm6379v4OheomA0JhSo= 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:X-ExtLoop1:Received:Received:Date:From:To:Cc:Subject:Message-ID:Reply-To:MIME-Version:Content-Type:Content-Disposition:User-Agent:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=styZZ3zLnX7bdAKfCeHA4WnIHcXF0NjecrlxXvvCXR0ZL/8hYJVyQiZ5a924o2 5UYg57XKk9rCwGJqJu6mEyJsHBGOYmGhudXvTGkftA74wp7KoQOTq8kNUhiVt81I V3Sljg14dgDOe0iyY78bHPIWg4AKgSn7BojJcgVCXzvRk=; Received: (qmail 7995 invoked by alias); 28 Mar 2012 23:43:41 -0000 Received: (qmail 7821 invoked by uid 22791); 28 Mar 2012 23:43:38 -0000 X-SWARE-Spam-Status: No, hits=-4.2 required=5.0 tests=AWL, BAYES_00, NO_DNS_FOR_FROM, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mga09.intel.com (HELO mga09.intel.com) (134.134.136.24) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 28 Mar 2012 23:43:14 +0000 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 28 Mar 2012 16:43:03 -0700 X-ExtLoop1: 1 Received: from gnu-6.sc.intel.com ([10.3.194.135]) by orsmga001.jf.intel.com with ESMTP; 28 Mar 2012 16:43:03 -0700 Received: by gnu-6.sc.intel.com (Postfix, from userid 500) id EC664C20B9; Wed, 28 Mar 2012 16:43:02 -0700 (PDT) Date: Wed, 28 Mar 2012 16:43:02 -0700 From: "H.J. Lu" To: gcc-patches@gcc.gnu.org Cc: Uros Bizjak Subject: PATCH: Don't set TM_MULTILIB_CONFIG if --disable-multilib is used Message-ID: <20120328234302.GA7822@intel.com> Reply-To: "H.J. Lu" MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) 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 Hi, When --disable-multilib is used on Linux/x86-64 target, we still set TM_MULTILIB_CONFIG=m64,m32 It isn't necessary and doesn't work if the default ABI is -mx32. This patch checks --with-multilib-list for x86-64 Linux targets only if multilib is enabled. OK for trunk? Thanks. H.J. --- 2012-03-28 H.J. Lu * config.gcc: Check --with-multilib-list for x86-64 Linux targets only if multilib is enabled. diff --git a/gcc/config.gcc b/gcc/config.gcc index 1f2baee..86d12db 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -1275,22 +1296,24 @@ x86_64-*-linux* | x86_64-*-kfreebsd*-gnu | x86_64-*-knetbsd*-gnu) ;; esac tmake_file="${tmake_file} i386/t-linux64" - x86_multilibs="${with_multilib_list}" - if test "$x86_multilibs" = "default"; then - x86_multilibs="m64,m32" + if test "x$enable_multilib" = "xyes"; then + x86_multilibs="${with_multilib_list}" + if test "$x86_multilibs" = "default"; then + x86_multilibs="m64,m32" + fi + x86_multilibs=`echo $x86_multilibs | sed -e 's/,/ /g'` + for x86_multilib in ${x86_multilibs}; do + case ${x86_multilib} in + m32 | m64 | mx32) + TM_MULTILIB_CONFIG="${TM_MULTILIB_CONFIG},${x86_multilib}" + ;; + *) + echo "--with-multilib-list=${x86_with_multilib} not supported." + exit 1 + esac + done + TM_MULTILIB_CONFIG=`echo $TM_MULTILIB_CONFIG | sed 's/^,//'` fi - x86_multilibs=`echo $x86_multilibs | sed -e 's/,/ /g'` - for x86_multilib in ${x86_multilibs}; do - case ${x86_multilib} in - m32 | m64 | mx32) - TM_MULTILIB_CONFIG="${TM_MULTILIB_CONFIG},${x86_multilib}" - ;; - *) - echo "--with-multilib-list=${x86_with_multilib} not supported." - exit 1 - esac - done - TM_MULTILIB_CONFIG=`echo $TM_MULTILIB_CONFIG | sed 's/^,//'` ;; i[34567]86-pc-msdosdjgpp*) xm_file=i386/xm-djgpp.h