From patchwork Thu Nov 3 12:52:29 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rainer Orth X-Patchwork-Id: 123441 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 3FDEAB6F71 for ; Thu, 3 Nov 2011 23:52:55 +1100 (EST) Received: (qmail 28003 invoked by alias); 3 Nov 2011 12:52:53 -0000 Received: (qmail 27991 invoked by uid 22791); 3 Nov 2011 12:52:52 -0000 X-SWARE-Spam-Status: No, hits=-1.1 required=5.0 tests=AWL, BAYES_50, RP_MATCHES_RCVD, T_TVD_MIME_NO_HEADERS X-Spam-Check-By: sourceware.org Received: from snape.CeBiTec.Uni-Bielefeld.DE (HELO smtp-relay.CeBiTec.Uni-Bielefeld.DE) (129.70.160.84) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 03 Nov 2011 12:52:37 +0000 Received: from localhost (localhost.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) by smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTP id 08860663; Thu, 3 Nov 2011 13:52:35 +0100 (CET) Received: from smtp-relay.CeBiTec.Uni-Bielefeld.DE ([127.0.0.1]) by localhost (malfoy.CeBiTec.Uni-Bielefeld.DE [127.0.0.1]) (amavisd-new, port 10024) with LMTP id XJbvf7OYmNK6; Thu, 3 Nov 2011 13:52:33 +0100 (CET) Received: from manam.CeBiTec.Uni-Bielefeld.DE (manam.CeBiTec.Uni-Bielefeld.DE [129.70.161.120]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp-relay.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTPS id D0FA5662; Thu, 3 Nov 2011 13:52:32 +0100 (CET) Received: (from ro@localhost) by manam.CeBiTec.Uni-Bielefeld.DE (8.14.5+Sun/8.14.5/Submit) id pA3CqUSo004233; Thu, 3 Nov 2011 13:52:30 +0100 (MET) From: Rainer Orth To: Jason Merrill Cc: gcc-patches@gcc.gnu.org, Paolo Bonzini , Steve Ellcey , Hans-Peter Nilsson Subject: Re: CFT: [build] Move crtstuff support to toplevel libgcc References: <4EB1B1C3.5080709@redhat.com> Date: Thu, 03 Nov 2011 13:52:29 +0100 In-Reply-To: <4EB1B1C3.5080709@redhat.com> (Jason Merrill's message of "Wed, 02 Nov 2011 17:10:27 -0400") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (usg-unix-v) MIME-Version: 1.0 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 Jason Merrill writes: > This broke bootstrap on powerpc64-unknown-linux-gnu, due to a couple of > problems with t-ppccomm. I fixed the missing backslashes, but the startup > file recipes are clearly wrong as well: > > ecrti$(objext): $(srcdir)/config/rs6000/eabi-ci.S > $(crt_compile) -c ecrti.S > > Note that they try to compile a source file which no longer exists. They do, but not by that name. In gcc/config, ecrti.S was generated as a copy of eabi-ci.S, but in libgcc, this isn't necessary any longer. I fixed the dependencies, but forgot to adapt the source files Could you please try the following patch? Sorry for all the breakage. Rainer 2011-11-03 Rainer Orth libgcc: * config/rs6000/t-ppccomm (ecrti$(objext)): Use $<. (ecrtn$(objext)): Likewise. (ncrti$(objext)): Likewise. (ncrtn$(objext)): Likewise. diff --git a/libgcc/config/rs6000/t-ppccomm b/libgcc/config/rs6000/t-ppccomm --- a/libgcc/config/rs6000/t-ppccomm +++ b/libgcc/config/rs6000/t-ppccomm @@ -29,13 +29,13 @@ LIB2ADD_ST += \ # Assemble startup files. ecrti$(objext): $(srcdir)/config/rs6000/eabi-ci.S - $(crt_compile) -c ecrti.S + $(crt_compile) -c $< ecrtn$(objext): $(srcdir)/config/rs6000/eabi-cn.S - $(crt_compile) -c ecrtn.S + $(crt_compile) -c $< ncrti$(objext): $(srcdir)/config/rs6000/sol-ci.S - $(crt_compile) -c ncrti.S + $(crt_compile) -c $< ncrtn$(objext): $(srcdir)/config/rs6000/sol-cn.S - $(crt_compile) -c ncrtn.S + $(crt_compile) -c <