2008-08-08 Thomas Quinot <quinot@adacore.com>

[pf3gnuchains/gcc-fork.git] / gcc / ada / gcc-interface / Make-lang.in

diff --git a/gcc/ada/gcc-interface/Make-lang.in b/gcc/ada/gcc-interface/Make-lang.in
index a0af9a4..cff834b 100644 (file)
--- 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
-
 \f
 # Build hooks:
 
@@ -934,8 +923,6 @@ ada/nmake.ads :  ada/sinfo.ads ada/nmake.adt ada/xnmake.adb ada/nmake.adb ada/xu
        $(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
@@ -946,16 +933,16 @@ OSCONS_EXTRACT=../../../$(DECC) -DNATIVE \
   ./s-oscons-tmplt.exe > s-oscons-tmplt.s
 
 else
-OSCONS_CPP=../../../xgcc -B../../../ -E -C \
+OSCONS_CPP=$(GCC_FOR_TARGET) -E -C \
   -DTARGET=\"$(target)\" s-oscons-tmplt.c > s-oscons-tmplt.i
-OSCONS_EXTRACT=../../../xgcc -S -B../../../ s-oscons-tmplt.i
+OSCONS_EXTRACT=$(GCC_FOR_TARGET) -S 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 ; \
+       (cd ada/bldtools/oscons ; gnatmake -q xoscons ; \
                $(RM) s-oscons-tmplt.i s-oscons-tmplt.s ; \
                $(OSCONS_CPP) ; \
                $(OSCONS_EXTRACT) ; \