Patchwork Fix Ada bootstrap

login
register
mail settings
Submitter Jakub Jelinek
Date Aug. 29, 2011, 8:39 p.m.
Message ID <20110829203923.GE2687@tyan-ft48-01.lab.bos.redhat.com>
Download mbox | patch
Permalink /patch/112130/
State New
Headers show

Comments

Jakub Jelinek - Aug. 29, 2011, 8:39 p.m.
Hi!

One of the Ada changes committed today, most likely
http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=178176
(couldn't find it posted on gcc-patches) broke x86_64-linux
bootstrap, with errors like:
ctrl_c.c:34:21: fatal error: tsystem.h: No such file or directory
compilation terminated.
make[9]: *** [ctrl_c.o] Error 1
exit.c:42:21: fatal error: tsystem.h: No such file or directory
compilation terminated.
make[9]: *** [exit.o] Error 1
make[9]: Leaving directory `/usr/src/gcc/obj790/gcc/ada/rts_32'
make[8]: *** [gnatlib] Error 2

The following patch fixed the bootstrap for me, will commit it
as obvious once also regtesting finishes.

2011-08-29  Jakub Jelinek  <jakub@redhat.com>

	* gcc-interface/Makefile.in (../stamp-gnatlib1-$(RTSDIR)): Copy
	tsystem.h into $(RTSDIR) instead of rts.



	Jakub
Arnaud Charlet - Aug. 30, 2011, 6:56 a.m.
> The following patch fixed the bootstrap for me, will commit it
> as obvious once also regtesting finishes.
> 
> 2011-08-29  Jakub Jelinek  <jakub@redhat.com>
> 
> 	* gcc-interface/Makefile.in (../stamp-gnatlib1-$(RTSDIR)): Copy
> 	tsystem.h into $(RTSDIR) instead of rts.

Patch is certainly fine, thanks for looking into it, and sorry for the
breakage.

Arno

Patch

--- gcc/ada/gcc-interface/Makefile.in.jj	2011-08-29 19:26:21.000000000 +0200
+++ gcc/ada/gcc-interface/Makefile.in	2011-08-29 21:17:42.227402089 +0200
@@ -2467,7 +2467,7 @@  install-gnatlib: ../stamp-gnatlib-$(RTSD
 	          $(LN_S) $(fsrcpfx)ada/$(word 2,$(subst <, ,$(PAIR))) \
 	                $(RTSDIR)/$(word 1,$(subst <, ,$(PAIR)));)
 # Copy tsystem.h
-	$(CP) $(srcdir)/tsystem.h rts
+	$(CP) $(srcdir)/tsystem.h $(RTSDIR)
 # Copy generated target dependent sources
 	$(RM) $(RTSDIR)/s-oscons.ads
 	(cd $(RTSDIR); $(LN_S) ../s-oscons.ads s-oscons.ads)