commit changelogs for previous change

[pf3gnuchains/gcc-fork.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 9739732..e413718 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -252,6 +252,8 @@ BUILD_PREFIX_1 = @BUILD_PREFIX_1@
 # Flags to pass to stage2 and later makes.  They are defined
 # here so that they can be overridden by Makefile fragments.
 BOOT_CFLAGS= -g -O2
+BOOT_ADAFLAGS=
+BOOT_LDFLAGS=
 
 BISON = @BISON@
 YACC = @YACC@
@@ -431,12 +433,17 @@ BASE_FLAGS_TO_PASS = \
        "RUNTESTFLAGS=$(RUNTESTFLAGS)" \
        "SHELL=$(SHELL)" \
        "YACC=$(YACC)" \
+       "ADAFLAGS=$(ADAFLAGS)" \
        "AR_FLAGS=$(AR_FLAGS)" \
+       "BOOT_ADAFLAGS=$(BOOT_ADAFLAGS)" \
+       "BOOT_CFLAGS=$(BOOT_CFLAGS)" \
+       "BOOT_LDFLAGS=$(BOOT_LDFLAGS)" \
        "CFLAGS=$(CFLAGS)" \
        "CXXFLAGS=$(CXXFLAGS)" \
        "LDFLAGS=$(LDFLAGS)" \
        "LIBCFLAGS=$(LIBCFLAGS)" \
        "LIBCXXFLAGS=$(LIBCXXFLAGS)" \
+       "ADAFLAGS_FOR_TARGET=$(ADAFLAGS_FOR_TARGET)" \
        "AR_FOR_TARGET=$(AR_FOR_TARGET)" \
        "AS_FOR_TARGET=$(AS_FOR_TARGET)" \
        "CC_FOR_TARGET=$(CC_FOR_TARGET)" \
@@ -497,6 +504,7 @@ X11_FLAGS_TO_PASS = \
 # are set in BASE_FLAGS_TO_PASS, and the sub-make will expand them.  The
 # COMPILER_ prefixed variables are not passed down so we expand them here.
 EXTRA_TARGET_FLAGS = \
+       'ADAFLAGS=$$(ADAFLAGS_FOR_TARGET)' \
        'AR=$$(AR_FOR_TARGET)' \
        'AS=$(COMPILER_AS_FOR_TARGET)' \
        'CC=$$(CC_FOR_TARGET)' \
@@ -646,7 +654,6 @@ all:
        else \
          $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-host all-target; \
        fi
-       @: $(MAKE); $(stage)
 
 .PHONY: all-build
 all-build:  \
@@ -761,7 +768,6 @@ do-info:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(MAKE) $(RECURSE_FLAGS_TO_PASS) info-host \
          info-target
-       @: $(MAKE); $(stage)
 
 
 .PHONY: info-host
@@ -864,7 +870,6 @@ do-dvi:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(MAKE) $(RECURSE_FLAGS_TO_PASS) dvi-host \
          dvi-target
-       @: $(MAKE); $(stage)
 
 
 .PHONY: dvi-host
@@ -967,7 +972,6 @@ do-html:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(MAKE) $(RECURSE_FLAGS_TO_PASS) html-host \
          html-target
-       @: $(MAKE); $(stage)
 
 
 .PHONY: html-host
@@ -1070,7 +1074,6 @@ do-TAGS:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(MAKE) $(RECURSE_FLAGS_TO_PASS) TAGS-host \
          TAGS-target
-       @: $(MAKE); $(stage)
 
 
 .PHONY: TAGS-host
@@ -1173,7 +1176,6 @@ do-install-info:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(MAKE) $(RECURSE_FLAGS_TO_PASS) install-info-host \
          install-info-target
-       @: $(MAKE); $(stage)
 
 
 .PHONY: install-info-host
@@ -1276,7 +1278,6 @@ do-installcheck:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(MAKE) $(RECURSE_FLAGS_TO_PASS) installcheck-host \
          installcheck-target
-       @: $(MAKE); $(stage)
 
 
 .PHONY: installcheck-host
@@ -1379,7 +1380,6 @@ do-mostlyclean:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(MAKE) $(RECURSE_FLAGS_TO_PASS) mostlyclean-host \
          mostlyclean-target
-       @: $(MAKE); $(stage)
 
 
 .PHONY: mostlyclean-host
@@ -1482,7 +1482,6 @@ do-clean:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(MAKE) $(RECURSE_FLAGS_TO_PASS) clean-host \
          clean-target
-       @: $(MAKE); $(stage)
 
 
 .PHONY: clean-host
@@ -1585,7 +1584,6 @@ do-distclean:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(MAKE) $(RECURSE_FLAGS_TO_PASS) distclean-host \
          distclean-target
-       @: $(MAKE); $(stage)
 
 
 .PHONY: distclean-host
@@ -1688,7 +1686,6 @@ do-maintainer-clean:
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(MAKE) $(RECURSE_FLAGS_TO_PASS) maintainer-clean-host \
          maintainer-clean-target
-       @: $(MAKE); $(stage)
 
 
 .PHONY: maintainer-clean-host
@@ -1944,7 +1941,6 @@ do-check:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(MAKE) $(RECURSE_FLAGS_TO_PASS) check-host check-target
-       @: $(MAKE); $(stage)
 
 # Automated reporting of test results.
 
@@ -1975,7 +1971,6 @@ install:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(MAKE) $(RECURSE_FLAGS_TO_PASS) installdirs install-host install-target
-       @: $(MAKE); $(stage)
 
 .PHONY: install-host-nogcc
 install-host-nogcc:  \
@@ -35680,7 +35675,7 @@ stage = :
 
 @if gcc-bootstrap
 unstage = [ -f stage_current ] || $(MAKE) `cat stage_last`-start
-stage = [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+stage = if [ -f stage_current ]; then $(MAKE) `cat stage_current`-end || exit 1; else :; fi
 @endif gcc-bootstrap
 
 .PHONY: unstage stage
@@ -35720,6 +35715,8 @@ POSTSTAGE1_FLAGS_TO_PASS = \
        CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \
        STAGE_PREFIX=$$r/prev-gcc/ \
        CFLAGS="$(BOOT_CFLAGS)" \
+       ADAFLAGS="$(BOOT_ADAFLAGS)" \
+       LDFLAGS="$(BOOT_LDFLAGS)" \
        ADAC="\$$(CC)"
 
 # For stage 1:
@@ -36150,7 +36147,6 @@ bootstrap2:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
-       @: $(MAKE); $(stage)
 
 
 # Rules to wipe a stage and all the following ones, also used for cleanstrap
@@ -36377,7 +36373,7 @@ stage3-bubble:: stage2-bubble
          $(MAKE) stage3-start; \
          $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage3; \
        fi
-       $(MAKE) compare
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) compare
 
 .PHONY: all-stage3 clean-stage3
 do-clean: clean-stage3
@@ -36432,7 +36428,6 @@ bootstrap:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
-       @: $(MAKE); $(stage)
 
 
 # Rules to wipe a stage and all the following ones, also used for cleanstrap
@@ -36662,7 +36657,7 @@ stage4-bubble:: stage3-bubble
          $(MAKE) stage4-start; \
          $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage4; \
        fi
-       $(MAKE) compare3
+       $(MAKE) $(RECURSE_FLAGS_TO_PASS) compare3
 
 .PHONY: all-stage4 clean-stage4
 do-clean: clean-stage4
@@ -36717,7 +36712,6 @@ bootstrap4:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
-       @: $(MAKE); $(stage)
 
 
 # Rules to wipe a stage and all the following ones, also used for cleanstrap
@@ -37197,7 +37191,6 @@ profiledbootstrap:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
-       @: $(MAKE); $(stage)
 
 
 # Rules to wipe a stage and all the following ones, also used for cleanstrap