From patchwork Wed Nov 21 13:15:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcus Shawcroft X-Patchwork-Id: 200683 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 50B842C00AC for ; Thu, 22 Nov 2012 00:16:02 +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=1354108562; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject: References:In-Reply-To:Content-Type:Mailing-List:Precedence: List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=bExooidzPtWZfiggVP370qQjMlE=; b=HGgQvv5dCBDki60 ZmvLf8pbpk3+mgl0Aqo1qupJhEqUQ7bJKgulT25WDZo+j4VHsPFn3rItYYgPzuRH iXHt5oOkonHuuSzPZsceZVpgDyjWIcz4J/ynyfqgVX5BkK7uFng6Ynxpnmog51m3 LAAsMmTANa8J0ZnwoROsmvqBmQ+g= 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:Received:Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject:References:In-Reply-To:X-MC-Unique:Content-Type:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=Nl7kXzDF+EoRrRnNZggo2fR+efwN/72Vz+Cy7xms3+wKTNBxsWecUlZFwjIala iuOKiEM7g7YWaMMtdQS05t0FQFKWDPyu/UmOa3VOCeDD39ILlFgxsmT89/y3XGgo 1xHimAsjTALjt6vdBStle3jT3wKJXFWDqI0c13tb3/FLY=; Received: (qmail 18659 invoked by alias); 21 Nov 2012 13:15:48 -0000 Received: (qmail 18623 invoked by uid 22791); 21 Nov 2012 13:15:46 -0000 X-SWARE-Spam-Status: No, hits=-2.7 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, KHOP_THREADED, RCVD_IN_DNSWL_LOW X-Spam-Check-By: sourceware.org Received: from service87.mimecast.com (HELO service87.mimecast.com) (91.220.42.44) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 21 Nov 2012 13:15:37 +0000 Received: from cam-owa2.Emea.Arm.com (fw-tnat.cambridge.arm.com [217.140.96.21]) by service87.mimecast.com; Wed, 21 Nov 2012 13:15:35 +0000 Received: from [10.1.72.50] ([10.1.255.212]) by cam-owa2.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 21 Nov 2012 13:15:34 +0000 Message-ID: <50ACD3F6.3060108@arm.com> Date: Wed, 21 Nov 2012 13:15:34 +0000 From: Marcus Shawcroft 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@gcc.gnu.org" CC: Laurynas Biveinis Subject: Re: [RFC] Parallel build broken on trunk. References: In-Reply-To: X-MC-Unique: 112112113153500901 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 21/11/12 09:48, Laurynas Biveinis wrote: > Probably not, but I see your patch not as papering over but rather a > missing piece of what's been committed in 2010. Fixing parallel builds > does not preclude a better fix for build/host separation later. > >> diff --git a/gcc/Makefile.in b/gcc/Makefile.in >> index d74e7b3..8e8f4d3 100644 >> --- a/gcc/Makefile.in >> +++ b/gcc/Makefile.in >> @@ -3885,7 +3885,7 @@ build/gengenrtl.o : gengenrtl.c $(BCONFIG_H) >> $(SYSTEM_H) rtl.def >> # the build-%: rule doesn't apply to them. >> >> gengtype-lex.o build/gengtype-lex.o : gengtype-lex.c gengtype.h $(SYSTEM_H) >> -gengtype-lex.o: $(CONFIG_H) >> +gengtype-lex.o: $(CONFIG_H) $(BCONFIG_H) >> CFLAGS-gengtype-lex.o += -DGENERATOR_FILE >> build/gengtype-lex.o: $(BCONFIG_H) > > This is OK with a proper ChangeLog entry. Hopefully I am not > overstepping my gengtype reviewer powers here. > Thanks for looking at this Laurynas. I've committed the attached to trunk. /Marcus 2012-11-21 Marcus Shawcroft * Makefile.in (gengtype-lex.o): Add dependency on $(BCONFIG_H). diff --git a/gcc/Makefile.in b/gcc/Makefile.in index d74e7b3..8e8f4d3 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -3885,7 +3885,7 @@ build/gengenrtl.o : gengenrtl.c $(BCONFIG_H) $(SYSTEM_H) rtl.def # the build-%: rule doesn't apply to them. gengtype-lex.o build/gengtype-lex.o : gengtype-lex.c gengtype.h $(SYSTEM_H) -gengtype-lex.o: $(CONFIG_H) +gengtype-lex.o: $(CONFIG_H) $(BCONFIG_H) CFLAGS-gengtype-lex.o += -DGENERATOR_FILE build/gengtype-lex.o: $(BCONFIG_H)