diff options
| author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-08-08 12:23:28 +0000 |
|---|---|---|
| committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-08-08 12:23:28 +0000 |
| commit | db3b8d9ff18126e24a8b03cb241788e2a3534fd7 (patch) | |
| tree | b41583c84e9f7488a07f87b64dd83bc99d4f69e7 | |
| parent | 9cba1736e64c08fa90d82748679c553cc8f48c62 (diff) | |
| download | ppe42-gcc-db3b8d9ff18126e24a8b03cb241788e2a3534fd7.tar.gz ppe42-gcc-db3b8d9ff18126e24a8b03cb241788e2a3534fd7.zip | |
2008-08-08 Thomas Quinot <quinot@adacore.com>
* gcc-interface/Makefile.in, gcc-interface/Make-lang.in: Revert
previous change, not needed after all.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@138871 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ada/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/ada/gcc-interface/Make-lang.in | 6 | ||||
| -rw-r--r-- | gcc/ada/gcc-interface/Makefile.in | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index e275cd38897..eda74581182 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2008-08-08 Thomas Quinot <quinot@adacore.com> + + * gcc-interface/Makefile.in, gcc-interface/Make-lang.in: Revert + previous change, not needed after all. + 2008-08-08 Ed Schonberg <schonberg@adacore.com> * exp_ch4.adb (Expand_Allocator_Expression): add check if null diff --git a/gcc/ada/gcc-interface/Make-lang.in b/gcc/ada/gcc-interface/Make-lang.in index 9af841d2915..cff834b5e1d 100644 --- a/gcc/ada/gcc-interface/Make-lang.in +++ b/gcc/ada/gcc-interface/Make-lang.in @@ -938,7 +938,7 @@ OSCONS_CPP=$(GCC_FOR_TARGET) -E -C \ OSCONS_EXTRACT=$(GCC_FOR_TARGET) -S s-oscons-tmplt.i endif -ada/s-oscons-$(THREAD_KIND).ads : ada/s-oscons-tmplt.c ada/gsocket.h ada/xoscons.adb ada/xutil.ads ada/xutil.adb +ada/s-oscons.ads : ada/s-oscons-tmplt.c ada/gsocket.h ada/xoscons.adb ada/xutil.ads ada/xutil.adb -$(MKDIR) ada/bldtools/oscons $(RM) $(addprefix ada/bldtools/oscons/,$(notdir $^)) $(CP) $^ ada/bldtools/oscons @@ -947,8 +947,8 @@ ada/s-oscons-$(THREAD_KIND).ads : ada/s-oscons-tmplt.c ada/gsocket.h ada/xoscons $(OSCONS_CPP) ; \ $(OSCONS_EXTRACT) ; \ ./xoscons ; \ - $(RM) ../../s-oscons-$(THREAD_KIND).ads ; \ - $(CP) s-oscons.ads ../../s-oscons-$(THREAD_KIND).ads) + $(RM) ../../s-oscons.ads ; \ + $(CP) s-oscons.ads ../../s-oscons.ads) update-sources : ada/treeprs.ads ada/einfo.h ada/sinfo.h ada/nmake.adb \ ada/nmake.ads diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in index 49a32cc9171..ac5955e1e11 100644 --- a/gcc/ada/gcc-interface/Makefile.in +++ b/gcc/ada/gcc-interface/Makefile.in @@ -1931,7 +1931,7 @@ install-gnatlib: ../stamp-gnatlib-$(RTSDIR) $(RTSDIR)/$(word 1,$(subst <, ,$(PAIR)));) # Copy generated target dependent sources $(RM) $(RTSDIR)/s-oscons.ads - (cd $(RTSDIR); $(LN_S) ../s-oscons-$(THREAD_KIND).ads s-oscons.ads) + (cd $(RTSDIR); $(LN_S) ../s-oscons.ads s-oscons.ads) $(RM) ../stamp-gnatlib-$(RTSDIR) touch ../stamp-gnatlib1-$(RTSDIR) |
