From patchwork Mon Jun 14 09:10:28 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Kuvyrkov X-Patchwork-Id: 55495 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 877721007D1 for ; Mon, 14 Jun 2010 19:10:41 +1000 (EST) Received: (qmail 29636 invoked by alias); 14 Jun 2010 09:10:39 -0000 Received: (qmail 29621 invoked by uid 22791); 14 Jun 2010 09:10:39 -0000 X-SWARE-Spam-Status: No, hits=-2.0 required=5.0 tests=AWL, BAYES_00, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mail.codesourcery.com (HELO mail.codesourcery.com) (38.113.113.100) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 14 Jun 2010 09:10:33 +0000 Received: (qmail 19026 invoked from network); 14 Jun 2010 09:10:31 -0000 Received: from unknown (HELO ?172.16.1.24?) (maxim@127.0.0.2) by mail.codesourcery.com with ESMTPA; 14 Jun 2010 09:10:31 -0000 Message-ID: <4C15F204.2090708@codesourcery.com> Date: Mon, 14 Jun 2010 13:10:28 +0400 From: Maxim Kuvyrkov User-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.1.9) Gecko/20100317 Thunderbird/3.0.4 MIME-Version: 1.0 To: Laurent GUERBY CC: gcc-patches , Jing Yu , Mark Mitchell , Richard Sandiford Subject: Re: mips-linux bootstrap broken was: [PATCH 2/6] Add support for Bionic C library References: <4BF55C4F.4080202@codesourcery.com> <4BF55D60.4080104@codesourcery.com> <4BF55DEB.7010003@codesourcery.com> <1276453016.3393.14.camel@pc2.unassigned-domain> In-Reply-To: <1276453016.3393.14.camel@pc2.unassigned-domain> 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 On 6/13/10 10:16 PM, Laurent GUERBY wrote: > On Thu, 2010-05-20 at 20:06 +0400, Maxim Kuvyrkov wrote: >> On 5/20/10 8:03 PM, Maxim Kuvyrkov wrote: >>> This patch adds new -mbionic option to select Bionic C library. The >>> option is made similar to -mglibc and -muclibc. >>> >>> OK to check in? >>> >>> Thank you, >> >> And here is the patch. > > Hi Maxim, > > I think your patch broke bootstrap on mips64el-linux platforms: > > http://gcc.gnu.org/bugzilla/show_bug.cgi?id=44456 ... > ../../trunk/gcc/gcc.c:827:32: error: macro "CHOOSE_DYNAMIC_LINKER" requires 3 > arguments, but only 2 given > ../../trunk/gcc/gcc.c:827: error: expected ',' or ';' before ')' token > make[3]: *** [gcc.o] Error 1 > make[3]: Leaving directory `/home/guerby/build/gcc' Laurent, Does the attached patch fix the bootstrap for you? Richard, OK to check in the patch if Laurent reports success? Thank you, Index: config/mips/linux64.h =================================================================== --- config/mips/linux64.h (revision 160712) +++ config/mips/linux64.h (working copy) @@ -39,8 +39,10 @@ along with GCC; see the file COPYING3. #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1" #define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1" #define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0" +#define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" #define LINUX_DYNAMIC_LINKERN32 \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32) + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \ + BIONIC_DYNAMIC_LINKERN32) #undef LINK_SPEC #define LINK_SPEC "\