From patchwork Wed Dec 19 16:47:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Klose X-Patchwork-Id: 207458 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 84A572C008E for ; Thu, 20 Dec 2012 03:47:28 +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=1356540449; h=Comment: DomainKey-Signature:Received:Received:Received:Received: Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject: Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:Sender:Delivered-To; bh=j/gwfw2 kwSYY3NLeJYiXcywOYAk=; b=IkSzO2zVKYwf0ydGthDXO1zALaK1VTyD37ncExD RFJRbcEipnLfhB5UQSnas4+XUDQvu/kOFxNYlyvxuLdg25PitCrXvDsSjt/+ZVrq xQDw7idNhQWzSt2oh/I+XAMDXrUtTTDAnqt5euojGJ3jNR81Rg4h+h0OZIZGiLdw gtEs= 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:Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=uken9PWUdfamEezeLNfMlFYYgSDxlg3yIp45I6+TuxXJnWWaWVXzq3JmA8mVlE Cdjb+OTJofAzBSWJQqVBKdDm+nOJVH0xGlQEPLB9JQ2pxAq5F20TUt4Yow5jItGn Rp22htE8RoZCQnwj/jcWb00Sd+/aruFYZTPzY/ncWHMwI=; Received: (qmail 18157 invoked by alias); 19 Dec 2012 16:47:22 -0000 Received: (qmail 18147 invoked by uid 22791); 19 Dec 2012 16:47:20 -0000 X-SWARE-Spam-Status: No, hits=-2.2 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, RCVD_IN_DNSWL_LOW X-Spam-Check-By: sourceware.org Received: from youngberry.canonical.com (HELO youngberry.canonical.com) (91.189.89.112) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 19 Dec 2012 16:47:14 +0000 Received: from dslb-088-073-108-045.pools.arcor-ip.net ([88.73.108.45] helo=[192.168.42.216]) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1TlMnY-0003cx-Rj; Wed, 19 Dec 2012 16:47:12 +0000 Message-ID: <50D1EF8D.5050702@ubuntu.com> Date: Wed, 19 Dec 2012 17:47:09 +0100 From: Matthias Klose User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: GCC Patches , David Edelsohn CC: Roland Stigge Subject: [patch] fix multiarch definition for powerpcspe-linux-gnu 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 The definition of the multiarch tuple for powerpcspe-linux-gnu was wrong. The t-spe fragment isn't included for the powerpc*-linux* case, so move it to t-linux, and use tm_file_list (tm_file is only used in config.gcc). Ok for the trunk? Matthias 2012-12-19 Roland Stigge Matthias Klose * config/rs6000/t-spe (MULTIARCH_DIRNAME): Remove. * config/rs6000/t-linux (MULTIARCH_DIRNAME): Define name for powerpc-linux-gnuspe. Index: config/rs6000/t-spe =================================================================== --- config/rs6000/t-spe (Revision 194615) +++ config/rs6000/t-spe (Arbeitskopie) @@ -71,7 +71,3 @@ mabi=altivec/mlittle \ maltivec/mlittle \ maltivec/mabi=altivec/mlittle - -ifneq (,$(findstring linux, $(target))) -MULTIARCH_DIRNAME = powerpc-linux-gnuspe$(if $(findstring rs6000/e500-double.h, $(tm_file)),,v1) -endif Index: config/rs6000/t-linux =================================================================== --- config/rs6000/t-linux (Revision 194615) +++ config/rs6000/t-linux (Arbeitskopie) @@ -1,5 +1,9 @@ # do not define the multiarch name if configured for a soft-float cpu # or soft-float. ifeq (,$(filter $(with_cpu),$(SOFT_FLOAT_CPUS))$(findstring soft,$(with_float))) +ifneq (,$(findstring spe,$(target))) +MULTIARCH_DIRNAME = powerpc-linux-gnuspe$(if $(findstring rs6000/e500-double.h, $(tm_file_list)),,v1) +else MULTIARCH_DIRNAME = powerpc-linux-gnu endif +endif