Patchwork CFT: [build] Move crtstuff support to toplevel libgcc

login
register
mail settings
Submitter Rainer Orth
Date Nov. 3, 2011, 12:52 p.m.
Message ID <yddfwi55pwy.fsf@manam.CeBiTec.Uni-Bielefeld.DE>
Download mbox | patch
Permalink /patch/123441/
State New
Headers show

Comments

Rainer Orth - Nov. 3, 2011, 12:52 p.m.
Jason Merrill <jason@redhat.com> 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  <ro@CeBiTec.Uni-Bielefeld.DE>

	libgcc:
	* config/rs6000/t-ppccomm (ecrti$(objext)): Use $<.
	(ecrtn$(objext)): Likewise.
	(ncrti$(objext)): Likewise.
	(ncrtn$(objext)): Likewise.
Paolo Bonzini - Nov. 3, 2011, 12:58 p.m.
On 11/03/2011 01:52 PM, Rainer Orth wrote:
>
>   ncrtn$(objext): $(srcdir)/config/rs6000/sol-cn.S
> -	$(crt_compile) -c ncrtn.S
> +	$(crt_compile) -c <

Oops.  Missing dollar sign.

Paolo
Jason Merrill - Nov. 3, 2011, 3:42 p.m.
That fixed bootstrap, so I committed it.

Jason

Patch

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 <