diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-08-06 15:26:42 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-08-06 15:26:42 +0000 |
| commit | 04fa393515487bde6dc2a0bc318398d983825365 (patch) | |
| tree | b0c2fbe3bb30a4c2bdfe6c42b5a41adf0f13bdd7 /gcc/ada/gcc-interface/Make-lang.in | |
| parent | b74be4501645c0e07e4e468058ebfc4b711196c2 (diff) | |
| download | gcc-04fa393515487bde6dc2a0bc318398d983825365.tar.gz | |
2008-08-06 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk r138800
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@138805 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/gcc-interface/Make-lang.in')
| -rw-r--r-- | gcc/ada/gcc-interface/Make-lang.in | 42 |
1 files changed, 29 insertions, 13 deletions
diff --git a/gcc/ada/gcc-interface/Make-lang.in b/gcc/ada/gcc-interface/Make-lang.in index 1254793dc2d..9af841d2915 100644 --- a/gcc/ada/gcc-interface/Make-lang.in +++ b/gcc/ada/gcc-interface/Make-lang.in @@ -309,17 +309,6 @@ gnatbind$(exeext): ada/b_gnatb.o $(CONFIG_H) $(GNATBIND_OBJS) gnat-cross: force make $(GNAT1_ADA_OBJS) CC="gcc -B../stage1/" CFLAGS="-S -gnatp" \ $(FLAGS_TO_PASS) $(ADA_FLAGS_TO_PASS) HOST_CFLAGS= HOST_CC=cc - -gen-soccon: force - $(MAKE) -C ada $(FLAGS_TO_PASS) \ - GNATLIBFLAGS="$(GNATLIBFLAGS)" \ - GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \ - TARGET_LIBGCC2_CFLAGS="$(TARGET_LIBGCC2_CFLAGS)" \ - THREAD_KIND="$(THREAD_KIND)" \ - TRACE="$(TRACE)" \ - LIBGNAT_OBJS=gen-soccon \ - gnatlib - # Build hooks: @@ -922,18 +911,45 @@ 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 ) +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=$(GCC_FOR_TARGET) -E -C \ + -DTARGET=\"$(target)\" s-oscons-tmplt.c > s-oscons-tmplt.i +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 + -$(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-$(THREAD_KIND).ads ; \ + $(CP) s-oscons.ads ../../s-oscons-$(THREAD_KIND).ads) + update-sources : ada/treeprs.ads ada/einfo.h ada/sinfo.h ada/nmake.adb \ ada/nmake.ads $(RM) $(addprefix $(srcdir)/ada/,$(notdir $^)) |