From patchwork Sat Aug 4 05:38:27 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: 175074 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 61C6D2C0092 for ; Sat, 4 Aug 2012 15:38:47 +1000 (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=1344663527; h=Comment: DomainKey-Signature:Received:Received:Received:Received: MIME-Version:Received:Received:In-Reply-To:References:Date: Message-ID:Subject:From:To:Cc:Content-Type:Mailing-List: Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:Sender:Delivered-To; bh=79Bznv736al8FoyHJA2GmmA3BIk=; b=R3nDMQtwZ14jJXFoxTr5pzinrazImGzGGuNId1tAbRk8Wf0TZUcztLDa9Mx6Zt sSKsqvUbYFAxLgE5CLiaVC6CQnMtIvaDkNC1IatikNmepjZXmsXpGbXKqbR5D2a5 2lMtAIB0sNZuIJmjDOUPQq68ZSPUgDKxuvQejnbNKCqA8= 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:MIME-Version:Received:Received:In-Reply-To:References:Date:Message-ID:Subject:From:To:Cc:Content-Type:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=B1nc+yqDqiqCgG1MSfsBGCM59IeysVBi7ZP73MPehtSXcuj//HwGKD0lXgrEqQ EUWvxolfSU0hLFBtCmOd8bPhx0HeZF6hZBnwyz6onRbNxtS5fz3CIzVlwxsr1qxy AbRGiSLZ3fo4gHe+MDt8fcb2LHSllcoEXXVLmt1uaDpLU=; Received: (qmail 19381 invoked by alias); 4 Aug 2012 05:38:42 -0000 Received: (qmail 19370 invoked by uid 22791); 4 Aug 2012 05:38:40 -0000 X-SWARE-Spam-Status: No, hits=-5.0 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, KHOP_RCVD_TRUST, KHOP_THREADED, RCVD_IN_DNSWL_LOW, RCVD_IN_HOSTKARMA_YE, TW_LG X-Spam-Check-By: sourceware.org Received: from mail-vc0-f175.google.com (HELO mail-vc0-f175.google.com) (209.85.220.175) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sat, 04 Aug 2012 05:38:28 +0000 Received: by vcbfy27 with SMTP id fy27so1422491vcb.20 for ; Fri, 03 Aug 2012 22:38:27 -0700 (PDT) MIME-Version: 1.0 Received: by 10.58.151.197 with SMTP id us5mr3676246veb.14.1344058707263; Fri, 03 Aug 2012 22:38:27 -0700 (PDT) Received: by 10.58.165.104 with HTTP; Fri, 3 Aug 2012 22:38:27 -0700 (PDT) In-Reply-To: References: <501BD9C5.9060106@users.sourceforge.net> <501BE7EE.3010600@users.sourceforge.net> <501BF67A.4030700@users.sourceforge.net> Date: Fri, 3 Aug 2012 22:38:27 -0700 Message-ID: Subject: Re: [PATCH] Fix libgcc version for Canadian cross compile From: "H.J. Lu" To: Ian Lance Taylor Cc: JonY , Gcc Patch List 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 Fri, Aug 3, 2012 at 10:36 PM, Ian Lance Taylor wrote: > On Fri, Aug 3, 2012 at 10:24 PM, H.J. Lu wrote: >> On Fri, Aug 3, 2012 at 10:14 PM, H.J. Lu wrote: >>> On Fri, Aug 3, 2012 at 4:42 PM, Ian Lance Taylor wrote: >>>> On Fri, Aug 3, 2012 at 9:04 AM, JonY wrote: >>>>> >>>>> OK. Btw, I don't actually have write access, so please commit if the >>>>> ChangeLog is good. >>>>> >>>>> 2012-08-03 Jonathan Yong >>>>> >>>>> * Makefile.in (version): set to BASE-VER file from gcc >>>>> directory. >>>> >>>> Committed. >>> >>> This totally breaks the installed GCC: >>> >>> [hjl@gnu-35 tmp]$ cat x.c >>> int >>> main () >>> { >>> } >>> [hjl@gnu-35 tmp]$ /export/gnu/import/git/gcc-test-spec/usr/bin/gcc x.c >>> /usr/local/bin/ld: cannot find crtbegin.o: No such file or directory >>> /usr/local/bin/ld: cannot find -lgcc >>> collect2: error: ld returned 1 exit status >>> [hjl@gnu-35 tmp]$ >>> >>> -- >>> H.J. >> >> top_srcdir is never defined in libgcc/Makefile.in. > > Thanks for fixing it. > > Ian This is the patch I checked in. diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 391c9e7..73f7c95 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,8 @@ +2012-08-03 H.J. Lu + + PR driver/54171 + * Makefile.in (version): Replace top_srcdir with srcdir. + 2012-08-03 Jonathan Yong * Makefile.in (version): set to BASE-VER file from gcc directory. diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in index fb7f9bd..4904a37 100644 --- a/libgcc/Makefile.in +++ b/libgcc/Makefile.in @@ -207,7 +207,7 @@ export slibdir export toolexecdir export toolexeclibdir -version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) +version := $(shell cat $(srcdir)/../gcc/BASE-VER) ifeq ($(decimal_float),yes) ifeq ($(enable_decimal_float),bid)