Makefile.in (stamp-gnatlib-$(RTSDIR)): Don't link s-oscons.ads.
ada: * gcc-interface/Makefile.in (stamp-gnatlib-$(RTSDIR)): Don't link s-oscons.ads. (OSCONS_CPP, OSCONS_EXTRACT): New. (./bldtools/oscons/xoscons): New Target. ($(RTSDIR)/s-oscons.ads): New Target. (gnatlib): Depend on $(RTSDIR)/s-oscons.ads. * gcc-interface/Make-lang.in (ada/s-oscons.ads) Remove as dependency. * Make-generated.in: Remove machinery to generate xoscons and ada/s-oscons.ads. libada: Makefile.in: Change dependency on oscons to depend on the generator tool. From-SVN: r181319
This commit is contained in:
Iain Sandoe
parent
0eb5d9c427
commit
5f41422fc7
|
|
@ -1,3 +1,15 @@
|
|||
2011-11-12 Iain Sandoe <iains@gcc.gnu.org>
|
||||
|
||||
* gcc-interface/Makefile.in (stamp-gnatlib-$(RTSDIR)): Don't link
|
||||
s-oscons.ads.
|
||||
(OSCONS_CPP, OSCONS_EXTRACT): New.
|
||||
(./bldtools/oscons/xoscons): New Target.
|
||||
($(RTSDIR)/s-oscons.ads): New Target.
|
||||
(gnatlib): Depend on $(RTSDIR)/s-oscons.ads.
|
||||
* gcc-interface/Make-lang.in (ada/s-oscons.ads) Remove as dependency.
|
||||
* Make-generated.in: Remove machinery to generate xoscons and
|
||||
ada/s-oscons.ads.
|
||||
|
||||
2011-11-10 Eric Botcazou <ebotcazou@adacore.com>
|
||||
|
||||
* fe.h (Serious_Errors_Detected): New macro.
|
||||
|
|
|
|||
|
|
@ -64,37 +64,6 @@ $(ADA_GEN_SUBDIR)/nmake.ads : $(ADA_GEN_SUBDIR)/sinfo.ads $(ADA_GEN_SUBDIR)/nma
|
|||
$(CP) $^ $(ADA_GEN_SUBDIR)/bldtools/nmake_s
|
||||
(cd $(ADA_GEN_SUBDIR)/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
|
||||
# GCC_FOR_TARGET has paths relative to the gcc directory, so we need to adjust
|
||||
# for running it from $(ADA_GEN_SUBDIR)/bldtools/oscons
|
||||
OSCONS_CC=`echo "$(GCC_FOR_TARGET)" \
|
||||
| sed -e 's^\./xgcc^../../../xgcc^' -e 's^-B./^-B../../../^'`
|
||||
OSCONS_CPP=$(OSCONS_CC) $(GNATLIBCFLAGS) -E -C \
|
||||
-DTARGET=\"$(target)\" s-oscons-tmplt.c > s-oscons-tmplt.i
|
||||
OSCONS_EXTRACT=$(OSCONS_CC) -S s-oscons-tmplt.i
|
||||
endif
|
||||
|
||||
$(ADA_GEN_SUBDIR)/s-oscons.ads : $(ADA_GEN_SUBDIR)/s-oscons-tmplt.c $(ADA_GEN_SUBDIR)/gsocket.h $(ADA_GEN_SUBDIR)/xoscons.adb $(ADA_GEN_SUBDIR)/xutil.ads $(ADA_GEN_SUBDIR)/xutil.adb
|
||||
-$(MKDIR) $(ADA_GEN_SUBDIR)/bldtools/oscons
|
||||
$(RM) $(addprefix $(ADA_GEN_SUBDIR)/bldtools/oscons/,$(notdir $^))
|
||||
$(CP) $^ $(ADA_GEN_SUBDIR)/bldtools/oscons
|
||||
(cd $(ADA_GEN_SUBDIR)/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.h ../../)
|
||||
|
||||
$(ADA_GEN_SUBDIR)/sdefault.adb: $(ADA_GEN_SUBDIR)/stamp-sdefault ; @true
|
||||
$(ADA_GEN_SUBDIR)/stamp-sdefault : $(srcdir)/version.c Makefile
|
||||
$(ECHO) "pragma Style_Checks (Off);" >tmp-sdefault.adb
|
||||
|
|
|
|||
|
|
@ -568,7 +568,7 @@ canadian-gnattools: force
|
|||
$(MAKE) -C ada $(ADA_TOOLS_FLAGS_TO_PASS) gnattools1-re
|
||||
$(MAKE) -C ada $(ADA_TOOLS_FLAGS_TO_PASS) gnattools2
|
||||
|
||||
gnatlib gnatlib-sjlj gnatlib-zcx gnatlib-shared: ada/s-oscons.ads force
|
||||
gnatlib gnatlib-sjlj gnatlib-zcx gnatlib-shared: force
|
||||
$(MAKE) -C ada $(COMMON_FLAGS_TO_PASS) \
|
||||
GNATLIBFLAGS="$(GNATLIBFLAGS)" \
|
||||
GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
|
||||
|
|
|
|||
|
|
@ -2495,21 +2495,50 @@ install-gnatlib: ../stamp-gnatlib-$(RTSDIR)
|
|||
$(RTSDIR)/$(word 1,$(subst <, ,$(PAIR)));)
|
||||
# Copy tsystem.h
|
||||
$(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)
|
||||
$(RM) ../stamp-gnatlib-$(RTSDIR)
|
||||
touch ../stamp-gnatlib1-$(RTSDIR)
|
||||
|
||||
# GNULLI End #############################################################
|
||||
|
||||
ifeq ($(strip $(filter-out alpha64 ia64 dec hp vms% openvms% alphavms%,$(subst -, ,$(host)))),)
|
||||
OSCONS_CPP=../../$(DECC) -E /comment=as_is -DNATIVE \
|
||||
-DTARGET='""$(target)""' $(fsrcpfx)ada/s-oscons-tmplt.c
|
||||
|
||||
OSCONS_EXTRACT=../../$(DECC) -DNATIVE \
|
||||
-DTARGET='""$(target)""' $(fsrcpfx)ada/s-oscons-tmplt.c ; \
|
||||
ld -o s-oscons-tmplt.exe s-oscons-tmplt.obj; \
|
||||
./s-oscons-tmplt.exe > s-oscons-tmplt.s
|
||||
|
||||
else
|
||||
# GCC_FOR_TARGET has paths relative to the gcc directory, so we need to adjust
|
||||
# for running it from $(RTSDIR)
|
||||
OSCONS_CC=`echo "$(GCC_FOR_TARGET)" \
|
||||
| sed -e 's^\./xgcc^../../xgcc^' -e 's^-B./^-B../../^'`
|
||||
OSCONS_CPP=$(OSCONS_CC) $(GNATLIBCFLAGS) -E -C \
|
||||
-DTARGET=\"$(target)\" $(fsrcpfx)ada/s-oscons-tmplt.c > s-oscons-tmplt.i
|
||||
OSCONS_EXTRACT=$(OSCONS_CC) -S s-oscons-tmplt.i
|
||||
endif
|
||||
|
||||
./bldtools/oscons/xoscons: xoscons.adb xutil.ads xutil.adb
|
||||
-$(MKDIR) ./bldtools/oscons
|
||||
$(RM) $(addprefix ./bldtools/oscons/,$(notdir $^))
|
||||
$(CP) $^ ./bldtools/oscons
|
||||
(cd ./bldtools/oscons ; gnatmake -q xoscons)
|
||||
|
||||
$(RTSDIR)/s-oscons.ads: ../stamp-gnatlib1-$(RTSDIR) s-oscons-tmplt.c gsocket.h ./bldtools/oscons/xoscons
|
||||
$(RM) $(RTSDIR)/s-oscons-tmplt.i $(RTSDIR)/s-oscons-tmplt.s
|
||||
(cd $(RTSDIR) ; \
|
||||
$(OSCONS_CPP) ; \
|
||||
$(OSCONS_EXTRACT) ; \
|
||||
../bldtools/oscons/xoscons)
|
||||
|
||||
# Don't use semicolon separated shell commands that involve list expansions.
|
||||
# The semicolon triggers a call to DCL on VMS and DCL can't handle command
|
||||
# line lengths in excess of 256 characters.
|
||||
# Example: cd $(RTSDIR); ar rc libfoo.a $(LONG_LIST_OF_OBJS)
|
||||
# is guaranteed to overflow the buffer.
|
||||
|
||||
gnatlib: ../stamp-gnatlib1-$(RTSDIR) ../stamp-gnatlib2-$(RTSDIR)
|
||||
gnatlib: ../stamp-gnatlib1-$(RTSDIR) ../stamp-gnatlib2-$(RTSDIR) $(RTSDIR)/s-oscons.ads
|
||||
$(MAKE) -C $(RTSDIR) \
|
||||
CC="`echo \"$(GCC_FOR_TARGET)\" \
|
||||
| sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'`" \
|
||||
|
|
|
|||
|
|
@ -1,3 +1,8 @@
|
|||
2011-11-12 Iain Sandoe <iains@gcc.gnu.org>
|
||||
|
||||
Makefile.in: Change dependency on oscons to depend on the generator
|
||||
tool.
|
||||
|
||||
2011-10-12 Eric Botcazou <ebotcazou@adacore.com>
|
||||
|
||||
* Makefile.in (LOOSE_WARN): Delete.
|
||||
|
|
|
|||
|
|
@ -64,6 +64,7 @@ target_noncanonical:=@target_noncanonical@
|
|||
version := $(shell cat $(srcdir)/../gcc/BASE-VER)
|
||||
libsubdir := $(libdir)/gcc/$(target_noncanonical)/$(version)$(MULTISUBDIR)
|
||||
ADA_RTS_DIR=$(GCC_DIR)/ada/rts$(subst /,_,$(MULTISUBDIR))
|
||||
ADA_RTS_SUBDIR=./rts$(subst /,_,$(MULTISUBDIR))
|
||||
|
||||
# exeext should not be used because it's the *host* exeext. We're building
|
||||
# a *target* library, aren't we?!? Likewise for CC. Still, provide bogus
|
||||
|
|
@ -90,10 +91,10 @@ LIBADA_FLAGS_TO_PASS = \
|
|||
"CFLAGS=$(CFLAGS)"
|
||||
|
||||
# Rules to build gnatlib.
|
||||
.PHONY: gnatlib gnatlib-plain gnatlib-sjlj gnatlib-zcx gnatlib-shared oscons
|
||||
.PHONY: gnatlib gnatlib-plain gnatlib-sjlj gnatlib-zcx gnatlib-shared osconstool
|
||||
gnatlib: @default_gnatlib_target@
|
||||
|
||||
gnatlib-plain: oscons $(GCC_DIR)/ada/Makefile
|
||||
gnatlib-plain: osconstool $(GCC_DIR)/ada/Makefile
|
||||
test -f stamp-libada || \
|
||||
$(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) gnatlib \
|
||||
&& touch stamp-libada
|
||||
|
|
@ -102,7 +103,7 @@ gnatlib-plain: oscons $(GCC_DIR)/ada/Makefile
|
|||
$(LN_S) $(ADA_RTS_DIR) adainclude
|
||||
$(LN_S) $(ADA_RTS_DIR) adalib
|
||||
|
||||
gnatlib-sjlj gnatlib-zcx gnatlib-shared: oscons $(GCC_DIR)/ada/Makefile
|
||||
gnatlib-sjlj gnatlib-zcx gnatlib-shared: osconstool $(GCC_DIR)/ada/Makefile
|
||||
test -f stamp-libada || \
|
||||
$(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) $@ \
|
||||
&& touch stamp-libada
|
||||
|
|
@ -111,8 +112,8 @@ gnatlib-sjlj gnatlib-zcx gnatlib-shared: oscons $(GCC_DIR)/ada/Makefile
|
|||
$(LN_S) $(ADA_RTS_DIR) adainclude
|
||||
$(LN_S) $(ADA_RTS_DIR) adalib
|
||||
|
||||
oscons:
|
||||
$(MAKE) -C $(GCC_DIR) $(LIBADA_FLAGS_TO_PASS) ada/s-oscons.ads
|
||||
osconstool:
|
||||
$(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) ./bldtools/oscons/xoscons
|
||||
|
||||
install-gnatlib: $(GCC_DIR)/ada/Makefile
|
||||
$(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) install-gnatlib
|
||||
|
|
|
|||
Loading…
Reference in New Issue