From patchwork Wed Nov 14 22:33:23 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Klose X-Patchwork-Id: 199045 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 1238B2C007D for ; Thu, 15 Nov 2012 09:33:38 +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=1353537219; h=Comment: DomainKey-Signature:Received:Received:Received:Received: Message-ID:Date:From:User-Agent:MIME-Version:To:Subject: Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:Sender:Delivered-To; bh=3o22TX2 jf7YNZBJt3UGRUe9qdRI=; b=yxCu5AOUMhRF50McQPYch5mhPYtYzrGNqG+INMd 8IRWFtTVObezdxMaIXkoHSQ+1yKbT6ImePxKlVZVyHMk9/WHLGOqVolw48ja9xNi AnmXm9FCta3qTYsNWi3npoSHcaWo1C2hdBGvXrqGPm6YUzozCTJimxYpTknBV1VC JTAA= 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:Subject:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=P7nvvdr0yOhA7jcgaSorBgNbwjckGtWZk/y1HIjOR5hVMI4Ky9D98oL40ukQ0u Z7cJ80G40DP4tUhdlMGRr0dVfPyFiL9TU21AzIvqd+LrFIS80/g9gQqvHXpeLosR XYfYJzDYwFPn4O8C/gb4rZi/q8Kd34uAN8kGkjKnEvCJg=; Received: (qmail 28636 invoked by alias); 14 Nov 2012 22:33:35 -0000 Received: (qmail 28626 invoked by uid 22791); 14 Nov 2012 22:33:35 -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, 14 Nov 2012 22:33:26 +0000 Received: from dslb-088-073-077-103.pools.arcor-ip.net ([88.73.77.103] 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 1TYlWP-000849-Cd for gcc-patches@gcc.gnu.org; Wed, 14 Nov 2012 22:33:25 +0000 Message-ID: <50A41C33.6040509@ubuntu.com> Date: Wed, 14 Nov 2012 23:33:23 +0100 From: Matthias Klose User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121028 Thunderbird/16.0.2 MIME-Version: 1.0 To: GCC Patches Subject: [patch] [mips] add multiarch definitions for mips-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 following patch adds the multiarch definitions for mips-linux-gnu. Tested using a Debian/Ubuntu package build. Ok for the trunk? Matthias 2012-11-14 Matthias Klose * config/mips/t-linux64: Add multiarch names in MULTILIB_OSDIRNAMES. Index: config/mips/t-linux64 =================================================================== --- config/mips/t-linux64 (revision 193508) +++ config/mips/t-linux64 (working copy) @@ -18,4 +18,9 @@ MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64 MULTILIB_DIRNAMES = n32 32 64 -MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64 +MIPS_EL = $(if $(filter %el, $(firstword $(subst -, ,$(target)))),el) +MIPS_SOFT = $(if $(strip $(filter MASK_SOFT_FLOAT_ABI, $(target_cpu_default)) $(filter soft, $(with_float))),soft) +MULTILIB_OSDIRNAMES = \ + ../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \ + ../lib$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \ + ../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT))