From patchwork Mon Aug 22 10:44:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Klose X-Patchwork-Id: 110904 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 B95EBB6F57 for ; Mon, 22 Aug 2011 20:45:09 +1000 (EST) Received: (qmail 26085 invoked by alias); 22 Aug 2011 10:45:06 -0000 Received: (qmail 26010 invoked by uid 22791); 22 Aug 2011 10:45:02 -0000 X-SWARE-Spam-Status: No, hits=-2.9 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW X-Spam-Check-By: sourceware.org Received: from einhorn.in-berlin.de (HELO einhorn.in-berlin.de) (192.109.42.8) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 22 Aug 2011 10:44:45 +0000 X-Envelope-From: doko@debian.org Received: from [192.168.42.109] (dslb-088-073-106-122.pools.arcor-ip.net [88.73.106.122]) (authenticated bits=0) by einhorn.in-berlin.de (8.13.6/8.13.6/Debian-1) with ESMTP id p7MAihhk025845; Mon, 22 Aug 2011 12:44:43 +0200 Message-ID: <4E523319.5060605@debian.org> Date: Mon, 22 Aug 2011 12:44:41 +0200 From: Matthias Klose User-Agent: Mozilla/5.0 (X11; Linux i686; rv:6.0) Gecko/20110809 Thunderbird/6.0 MIME-Version: 1.0 To: GCC Patches CC: Richard Sandiford Subject: [patch] revert an obsolete part from the mips-triarch checkin X-IsSubscribed: yes 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 While looking at the multiarch patches, I noticed that a previous change is not necessary. MULTILIB_DEFAULTS is handled in config/mips/mips.h. Matthias gcc/ 2011-08-22 Matthias Klose Revert: 2011-07-11 Arthur Loiret Matthias Klose * config/mips/t-linux64 (MULTILIB_DIRNAMES): Set to 'n32 . 64' if tm_defines contains MIPS_ABI_DEFAULT ABI_32, to follow the glibc convention. Index: gcc/config/mips/t-linux64 =================================================================== --- gcc/config/mips/t-linux64 (revision 177952) +++ gcc/config/mips/t-linux64 (working copy) @@ -17,11 +17,7 @@ # . MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64 -ifneq ($(filter MIPS_ABI_DEFAULT=ABI_32,$(tm_defines)),) -MULTILIB_DIRNAMES = n32 . 64 -else MULTILIB_DIRNAMES = n32 32 64 -endif MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64 EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o