diff options
| author | Thomas Quinot <quinot@adacore.com> | 2008-08-05 13:26:24 +0000 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2008-08-05 15:26:24 +0200 |
| commit | 2d4d7e29a30b93fa29501252d9074f73866034fe (patch) | |
| tree | df92d36c4cd6a8237bc09429c4ab0dac874d986c /gcc/ada/gcc-interface | |
| parent | 4ae23b62c661788be5046ff466c7b2be2dfaeef6 (diff) | |
| download | gcc-2d4d7e29a30b93fa29501252d9074f73866034fe.zip gcc-2d4d7e29a30b93fa29501252d9074f73866034fe.tar.gz gcc-2d4d7e29a30b93fa29501252d9074f73866034fe.tar.bz2 | |
xoscons.adb, [...]: New files.
2008-08-05 Thomas Quinot <quinot@adacore.com>
* xoscons.adb, xutil.ads, xutil.adb, s-oscons-tmplt.c: New files.
* gcc-interface/Makefile.in, gcc-interface/Make-lang.in: Generate
s-oscons.ads
From-SVN: r138705
Diffstat (limited to 'gcc/ada/gcc-interface')
| -rw-r--r-- | gcc/ada/gcc-interface/Make-lang.in | 33 | ||||
| -rw-r--r-- | gcc/ada/gcc-interface/Makefile.in | 3 |
2 files changed, 34 insertions, 2 deletions
diff --git a/gcc/ada/gcc-interface/Make-lang.in b/gcc/ada/gcc-interface/Make-lang.in index 1254793..a0af9a4 100644 --- a/gcc/ada/gcc-interface/Make-lang.in +++ b/gcc/ada/gcc-interface/Make-lang.in @@ -922,18 +922,47 @@ ada/sinfo.h : ada/sinfo.ads ada/xsinfo.adb $(CP) $^ ada/bldtools/sinfo (cd ada/bldtools/sinfo && $(GNATMAKE) -q xsinfo && ./xsinfo ../../sinfo.h ) -ada/nmake.adb : ada/sinfo.ads ada/nmake.adt ada/xnmake.adb +ada/nmake.adb : ada/sinfo.ads ada/nmake.adt ada/xnmake.adb ada/xutil.ads ada/xutil.adb -$(MKDIR) ada/bldtools/nmake_b $(RM) $(addprefix ada/bldtools/nmake_b/,$(notdir $^)) $(CP) $^ ada/bldtools/nmake_b (cd ada/bldtools/nmake_b && $(GNATMAKE) -q xnmake && ./xnmake -b ../../nmake.adb ) -ada/nmake.ads : ada/sinfo.ads ada/nmake.adt ada/xnmake.adb ada/nmake.adb +ada/nmake.ads : ada/sinfo.ads ada/nmake.adt ada/xnmake.adb ada/nmake.adb ada/xutil.ads ada/xutil.adb -$(MKDIR) ada/bldtools/nmake_s $(RM) $(addprefix ada/bldtools/nmake_s/,$(notdir $^)) $(CP) $^ ada/bldtools/nmake_s (cd ada/bldtools/nmake_s && $(GNATMAKE) -q xnmake && ./xnmake -s ../../nmake.ads ) +OSCONS_CPPFLAGS=-DTHREAD_KIND_$(THREAD_KIND) s-oscons-tmplt.c + +ifeq ($(strip $(filter-out alpha64 ia64 dec hp vms% openvms% alphavms%,$(subst -, ,$(host)))),) +OSCONS_CPP=../../../$(DECC) -E /comment=as_is -DNATIVE \ + -DTARGET='""$(target)""' s-oscons-tmplt.c + +OSCONS_EXTRACT=../../../$(DECC) -DNATIVE \ + -DTARGET='""$(target)""' s-oscons-tmplt.c ; \ + ld -o s-oscons-tmplt.exe s-oscons-tmplt.obj; \ + ./s-oscons-tmplt.exe > s-oscons-tmplt.s + +else +OSCONS_CPP=../../../xgcc -B../../../ -E -C \ + -DTARGET=\"$(target)\" s-oscons-tmplt.c > s-oscons-tmplt.i +OSCONS_EXTRACT=../../../xgcc -S -B../../../ s-oscons-tmplt.i +endif + +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 + (cd ada/bldtools/oscons; gnatmake -q xoscons ; \ + $(RM) s-oscons-tmplt.i s-oscons-tmplt.s ; \ + $(OSCONS_CPP) ; \ + $(OSCONS_EXTRACT) ; \ + ./xoscons ; \ + $(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 $(RM) $(addprefix $(srcdir)/ada/,$(notdir $^)) diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in index 058094c..b40c474 100644 --- a/gcc/ada/gcc-interface/Makefile.in +++ b/gcc/ada/gcc-interface/Makefile.in @@ -1948,6 +1948,9 @@ install-gnatlib: ../stamp-gnatlib-$(RTSDIR) $(foreach PAIR,$(LIBGNAT_TARGET_PAIRS), \ $(LN_S) $(fsrcpfx)$(word 2,$(subst <, ,$(PAIR))) \ $(RTSDIR)/$(word 1,$(subst <, ,$(PAIR)));) +# Copy generated target dependent sources + $(RM) $(RTSDIR)/s-oscons.ads + (cd $(RTSDIR); $(LN_S) ../s-oscons.ads s-oscons.ads) $(RM) ../stamp-gnatlib-$(RTSDIR) touch ../stamp-gnatlib1-$(RTSDIR) |