Commit a7dafa20 by Laurent GUERBY Committed by Laurent Guerby

re PR ada/5911 (Support for multilib in Ada)

gcc/ChangeLog
2008-07-29  Laurent Guerby <laurent@guerby.net>

        PR ada/5911
        * gnattools/Makefile.in: Replace stamp-gnatlib by
        stamp-gnatlib-rts.

gcc/ada/ChangeLog
2008-07-29  Laurent Guerby <laurent@guerby.net>

        PR ada/5911
        * gcc-interface/Makefile.in (MULTISUBDIR, RTSDIR): New variables.
        Pass MULTISUBDIR to recursive make. Use $(RTSDIR) instead of rts.
        Replace stamp-gnatlib* by stamp-gnatlib*-rts.
        * gcc-interface/Make-lang.in: Replace stamp-gnatlib2
        by stamp-gnatlib2-rts.

From-SVN: r138294
parent 70b1e376
2008-07-30 Laurent Guerby <laurent@guerby.net>
PR ada/5911
* gnattools/Makefile.in: Replace stamp-gnatlib by
stamp-gnatlib-rts.
2008-07-30 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> 2008-07-30 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* doc/cpp.texi: Update to GFDL 1.2. * doc/cpp.texi: Update to GFDL 1.2.
......
2008-07-30 Laurent Guerby <laurent@guerby.net>
PR ada/5911
* gcc-interface/Makefile.in (MULTISUBDIR, RTSDIR): New variables.
Pass MULTISUBDIR to recursive make. Use $(RTSDIR) instead of rts.
Replace stamp-gnatlib* by stamp-gnatlib*-rts.
* gcc-interface/Make-lang.in: Replace stamp-gnatlib2
by stamp-gnatlib2-rts.
2008-07-30 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> 2008-07-30 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
PR documentation/15479 PR documentation/15479
...@@ -302,7 +302,7 @@ TARGET_ADA_SRCS = ...@@ -302,7 +302,7 @@ TARGET_ADA_SRCS =
# stamp target in the parent directory whenever gnat1 is rebuilt # stamp target in the parent directory whenever gnat1 is rebuilt
gnat1$(exeext): $(TARGET_ADA_SRCS) $(GNAT1_OBJS) $(ADA_BACKEND) $(LIBDEPS) gnat1$(exeext): $(TARGET_ADA_SRCS) $(GNAT1_OBJS) $(ADA_BACKEND) $(LIBDEPS)
$(GCC_LINK) -o $@ $(GNAT1_OBJS) $(ADA_BACKEND) $(LIBS) $(SYSLIBS) $(GMPLIBS) $(GCC_LINK) -o $@ $(GNAT1_OBJS) $(ADA_BACKEND) $(LIBS) $(SYSLIBS) $(GMPLIBS)
$(RM) stamp-gnatlib2 stamp-tools $(RM) stamp-gnatlib2-rts stamp-tools
gnatbind$(exeext): ada/b_gnatb.o $(CONFIG_H) $(GNATBIND_OBJS) gnatbind$(exeext): ada/b_gnatb.o $(CONFIG_H) $(GNATBIND_OBJS)
$(GCC_LINK) -o $@ ada/b_gnatb.o $(GNATBIND_OBJS) $(ALL_CFLAGS) $(LIBS) $(SYSLIBS) $(GCC_LINK) -o $@ ada/b_gnatb.o $(GNATBIND_OBJS) $(ALL_CFLAGS) $(LIBS) $(SYSLIBS)
......
...@@ -153,8 +153,8 @@ TOOLS_TARGET_PAIRS = @TOOLS_TARGET_PAIRS@ ...@@ -153,8 +153,8 @@ TOOLS_TARGET_PAIRS = @TOOLS_TARGET_PAIRS@
gnattools: @default_gnattools_target@ gnattools: @default_gnattools_target@
# Sanity check # Sanity check
$(GCC_DIR)/stamp-gnatlib: $(GCC_DIR)/stamp-gnatlib-rts:
@if [ ! -f $(GCC_DIR)/stamp-gnatlib ] ; \ @if [ ! -f $(GCC_DIR)/stamp-gnatlib-rts ] ; \
then \ then \
echo "Cannot build gnattools while gnatlib is out of date or unbuilt" ; \ echo "Cannot build gnattools while gnatlib is out of date or unbuilt" ; \
false; \ false; \
...@@ -183,7 +183,7 @@ $(GCC_DIR)/stamp-tools: ...@@ -183,7 +183,7 @@ $(GCC_DIR)/stamp-tools:
# to be able to build gnatmake without a version of gnatmake around. Once # to be able to build gnatmake without a version of gnatmake around. Once
# everything has been compiled once, gnatmake can be recompiled with itself # everything has been compiled once, gnatmake can be recompiled with itself
# (see target regnattools) # (see target regnattools)
gnattools-native: $(GCC_DIR)/stamp-tools $(GCC_DIR)/stamp-gnatlib gnattools-native: $(GCC_DIR)/stamp-tools $(GCC_DIR)/stamp-gnatlib-rts
# gnattools1 # gnattools1
$(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \ $(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \
$(TOOLS_FLAGS_TO_PASS_1) \ $(TOOLS_FLAGS_TO_PASS_1) \
...@@ -195,7 +195,7 @@ gnattools-native: $(GCC_DIR)/stamp-tools $(GCC_DIR)/stamp-gnatlib ...@@ -195,7 +195,7 @@ gnattools-native: $(GCC_DIR)/stamp-tools $(GCC_DIR)/stamp-gnatlib
# gnatmake/link can be built with recent gnatmake/link if they are available. # gnatmake/link can be built with recent gnatmake/link if they are available.
# This is especially convenient for building cross tools or for rebuilding # This is especially convenient for building cross tools or for rebuilding
# the tools when the original bootstrap has already be done. # the tools when the original bootstrap has already be done.
regnattools: $(GCC_DIR)/stamp-gnatlib regnattools: $(GCC_DIR)/stamp-gnatlib-rts
# gnattools1-re # gnattools1-re
$(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \ $(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \
$(TOOLS_FLAGS_TO_PASS_1re) \ $(TOOLS_FLAGS_TO_PASS_1re) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment