PR java/28754:

[pf3gnuchains/gcc-fork.git] / Makefile.in
diff --git a/Makefile.in b/Makefile.in

index b208df7..85c4013 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -177,7 +177,9 @@ POSTSTAGE1_HOST_EXPORTS = \
         CC_FOR_BUILD="$(STAGE_CC_WRAPPER) \
           $$r/$(HOST_SUBDIR)/prev-gcc/xgcc$(exeext) \
           -B$$r/$(HOST_SUBDIR)/prev-gcc/ \
-         -B$(build_tooldir)/bin/"; export CC_FOR_BUILD;
+         -B$(build_tooldir)/bin/"; export CC_FOR_BUILD; \
+       CFLAGS="$(BOOT_CFLAGS)"; export CFLAGS; \
+       LDFLAGS="$(BOOT_LDFLAGS)"; export LDFLAGS;
  
  # Target libraries are put under this directory:
  TARGET_SUBDIR = @target_subdir@
@@ -386,12 +388,12 @@ HOST_LIB_PATH_gcc = $$r/$(HOST_SUBDIR)/gcc:$$r/$(HOST_SUBDIR)/prev-gcc:
  
  @if bfd
  HOST_LIB_PATH_bfd = \
-  $$r/$(HOST_SUBDIR)/bfd/.:$$r/$(HOST_SUBDIR)/prev-bfd/.:
+  $$r/$(HOST_SUBDIR)/bfd/.libs:$$r/$(HOST_SUBDIR)/prev-bfd/.libs:
  @endif bfd
  
  @if opcodes
  HOST_LIB_PATH_opcodes = \
-  $$r/$(HOST_SUBDIR)/opcodes/.:$$r/$(HOST_SUBDIR)/prev-opcodes/.:
+  $$r/$(HOST_SUBDIR)/opcodes/.libs:$$r/$(HOST_SUBDIR)/prev-opcodes/.libs:
  @endif opcodes
  
  
@@ -2346,6 +2348,9 @@ TAGS: do-TAGS
  
  .PHONY: configure-build-libiberty maybe-configure-build-libiberty
  maybe-configure-build-libiberty:
+@if gcc-bootstrap
+configure-build-libiberty: stage_current
+@endif gcc-bootstrap
  @if build-libiberty
  maybe-configure-build-libiberty: configure-build-libiberty
  configure-build-libiberty: 
@@ -2376,6 +2381,9 @@ configure-build-libiberty:
  
  .PHONY: all-build-libiberty maybe-all-build-libiberty
  maybe-all-build-libiberty:
+@if gcc-bootstrap
+all-build-libiberty: stage_current
+@endif gcc-bootstrap
  @if build-libiberty
  TARGET-build-libiberty=all
  maybe-all-build-libiberty: all-build-libiberty
@@ -2394,6 +2402,9 @@ all-build-libiberty: configure-build-libiberty
  
  .PHONY: configure-build-bison maybe-configure-build-bison
  maybe-configure-build-bison:
+@if gcc-bootstrap
+configure-build-bison: stage_current
+@endif gcc-bootstrap
  @if build-bison
  maybe-configure-build-bison: configure-build-bison
  configure-build-bison: 
@@ -2424,6 +2435,9 @@ configure-build-bison:
  
  .PHONY: all-build-bison maybe-all-build-bison
  maybe-all-build-bison:
+@if gcc-bootstrap
+all-build-bison: stage_current
+@endif gcc-bootstrap
  @if build-bison
  TARGET-build-bison=all
  maybe-all-build-bison: all-build-bison
@@ -2442,6 +2456,9 @@ all-build-bison: configure-build-bison
  
  .PHONY: configure-build-byacc maybe-configure-build-byacc
  maybe-configure-build-byacc:
+@if gcc-bootstrap
+configure-build-byacc: stage_current
+@endif gcc-bootstrap
  @if build-byacc
  maybe-configure-build-byacc: configure-build-byacc
  configure-build-byacc: 
@@ -2472,6 +2489,9 @@ configure-build-byacc:
  
  .PHONY: all-build-byacc maybe-all-build-byacc
  maybe-all-build-byacc:
+@if gcc-bootstrap
+all-build-byacc: stage_current
+@endif gcc-bootstrap
  @if build-byacc
  TARGET-build-byacc=all
  maybe-all-build-byacc: all-build-byacc
@@ -2490,6 +2510,9 @@ all-build-byacc: configure-build-byacc
  
  .PHONY: configure-build-flex maybe-configure-build-flex
  maybe-configure-build-flex:
+@if gcc-bootstrap
+configure-build-flex: stage_current
+@endif gcc-bootstrap
  @if build-flex
  maybe-configure-build-flex: configure-build-flex
  configure-build-flex: 
@@ -2520,6 +2543,9 @@ configure-build-flex:
  
  .PHONY: all-build-flex maybe-all-build-flex
  maybe-all-build-flex:
+@if gcc-bootstrap
+all-build-flex: stage_current
+@endif gcc-bootstrap
  @if build-flex
  TARGET-build-flex=all
  maybe-all-build-flex: all-build-flex
@@ -2538,6 +2564,9 @@ all-build-flex: configure-build-flex
  
  .PHONY: configure-build-m4 maybe-configure-build-m4
  maybe-configure-build-m4:
+@if gcc-bootstrap
+configure-build-m4: stage_current
+@endif gcc-bootstrap
  @if build-m4
  maybe-configure-build-m4: configure-build-m4
  configure-build-m4: 
@@ -2568,6 +2597,9 @@ configure-build-m4:
  
  .PHONY: all-build-m4 maybe-all-build-m4
  maybe-all-build-m4:
+@if gcc-bootstrap
+all-build-m4: stage_current
+@endif gcc-bootstrap
  @if build-m4
  TARGET-build-m4=all
  maybe-all-build-m4: all-build-m4
@@ -2586,6 +2618,9 @@ all-build-m4: configure-build-m4
  
  .PHONY: configure-build-texinfo maybe-configure-build-texinfo
  maybe-configure-build-texinfo:
+@if gcc-bootstrap
+configure-build-texinfo: stage_current
+@endif gcc-bootstrap
  @if build-texinfo
  maybe-configure-build-texinfo: configure-build-texinfo
  configure-build-texinfo: 
@@ -2616,6 +2651,9 @@ configure-build-texinfo:
  
  .PHONY: all-build-texinfo maybe-all-build-texinfo
  maybe-all-build-texinfo:
+@if gcc-bootstrap
+all-build-texinfo: stage_current
+@endif gcc-bootstrap
  @if build-texinfo
  TARGET-build-texinfo=all
  maybe-all-build-texinfo: all-build-texinfo
@@ -2634,6 +2672,9 @@ all-build-texinfo: configure-build-texinfo
  
  .PHONY: configure-build-fixincludes maybe-configure-build-fixincludes
  maybe-configure-build-fixincludes:
+@if gcc-bootstrap
+configure-build-fixincludes: stage_current
+@endif gcc-bootstrap
  @if build-fixincludes
  maybe-configure-build-fixincludes: configure-build-fixincludes
  configure-build-fixincludes: 
@@ -2664,6 +2705,9 @@ configure-build-fixincludes:
  
  .PHONY: all-build-fixincludes maybe-all-build-fixincludes
  maybe-all-build-fixincludes:
+@if gcc-bootstrap
+all-build-fixincludes: stage_current
+@endif gcc-bootstrap
  @if build-fixincludes
  TARGET-build-fixincludes=all
  maybe-all-build-fixincludes: all-build-fixincludes
@@ -2687,6 +2731,9 @@ all-build-fixincludes: configure-build-fixincludes
  
  .PHONY: configure-ash maybe-configure-ash
  maybe-configure-ash:
+@if gcc-bootstrap
+configure-ash: stage_current
+@endif gcc-bootstrap
  @if ash
  maybe-configure-ash: configure-ash
  configure-ash: 
@@ -2716,6 +2763,9 @@ configure-ash:
  
  .PHONY: all-ash maybe-all-ash
  maybe-all-ash:
+@if gcc-bootstrap
+all-ash: stage_current
+@endif gcc-bootstrap
  @if ash
  TARGET-ash=all
  maybe-all-ash: all-ash
@@ -3051,6 +3101,9 @@ maintainer-clean-ash:
  
  .PHONY: configure-autoconf maybe-configure-autoconf
  maybe-configure-autoconf:
+@if gcc-bootstrap
+configure-autoconf: stage_current
+@endif gcc-bootstrap
  @if autoconf
  maybe-configure-autoconf: configure-autoconf
  configure-autoconf: 
@@ -3080,6 +3133,9 @@ configure-autoconf:
  
  .PHONY: all-autoconf maybe-all-autoconf
  maybe-all-autoconf:
+@if gcc-bootstrap
+all-autoconf: stage_current
+@endif gcc-bootstrap
  @if autoconf
  TARGET-autoconf=all
  maybe-all-autoconf: all-autoconf
@@ -3415,6 +3471,9 @@ maintainer-clean-autoconf:
  
  .PHONY: configure-automake maybe-configure-automake
  maybe-configure-automake:
+@if gcc-bootstrap
+configure-automake: stage_current
+@endif gcc-bootstrap
  @if automake
  maybe-configure-automake: configure-automake
  configure-automake: 
@@ -3444,6 +3503,9 @@ configure-automake:
  
  .PHONY: all-automake maybe-all-automake
  maybe-all-automake:
+@if gcc-bootstrap
+all-automake: stage_current
+@endif gcc-bootstrap
  @if automake
  TARGET-automake=all
  maybe-all-automake: all-automake
@@ -3779,6 +3841,9 @@ maintainer-clean-automake:
  
  .PHONY: configure-bash maybe-configure-bash
  maybe-configure-bash:
+@if gcc-bootstrap
+configure-bash: stage_current
+@endif gcc-bootstrap
  @if bash
  maybe-configure-bash: configure-bash
  configure-bash: 
@@ -3808,6 +3873,9 @@ configure-bash:
  
  .PHONY: all-bash maybe-all-bash
  maybe-all-bash:
+@if gcc-bootstrap
+all-bash: stage_current
+@endif gcc-bootstrap
  @if bash
  TARGET-bash=all
  maybe-all-bash: all-bash
@@ -4143,14 +4211,12 @@ maintainer-clean-bash:
  
  .PHONY: configure-bfd maybe-configure-bfd
  maybe-configure-bfd:
+@if gcc-bootstrap
+configure-bfd: stage_current
+@endif gcc-bootstrap
  @if bfd
  maybe-configure-bfd: configure-bfd
  configure-bfd: 
-@endif bfd
-@if bfd-bootstrap
-       @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif bfd-bootstrap
-@if bfd
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
@@ -4195,6 +4261,7 @@ configure-stage1-bfd:
         libsrcdir="$$s/bfd"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+          \
           --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
  @endif bfd-bootstrap
  
@@ -4222,6 +4289,7 @@ configure-stage2-bfd:
         libsrcdir="$$s/bfd"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif bfd-bootstrap
  
@@ -4249,6 +4317,7 @@ configure-stage3-bfd:
         libsrcdir="$$s/bfd"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif bfd-bootstrap
  
@@ -4276,6 +4345,7 @@ configure-stage4-bfd:
         libsrcdir="$$s/bfd"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif bfd-bootstrap
  
@@ -4303,6 +4373,7 @@ configure-stageprofile-bfd:
         libsrcdir="$$s/bfd"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif bfd-bootstrap
  
@@ -4330,6 +4401,7 @@ configure-stagefeedback-bfd:
         libsrcdir="$$s/bfd"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif bfd-bootstrap
  
@@ -4339,15 +4411,13 @@ configure-stagefeedback-bfd:
  
  .PHONY: all-bfd maybe-all-bfd
  maybe-all-bfd:
+@if gcc-bootstrap
+all-bfd: stage_current
+@endif gcc-bootstrap
  @if bfd
  TARGET-bfd=all
  maybe-all-bfd: all-bfd
  all-bfd: configure-bfd
-@endif bfd
-@if bfd-bootstrap
-       @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif bfd-bootstrap
-@if bfd
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -4853,14 +4923,12 @@ maintainer-clean-bfd:
  
  .PHONY: configure-opcodes maybe-configure-opcodes
  maybe-configure-opcodes:
+@if gcc-bootstrap
+configure-opcodes: stage_current
+@endif gcc-bootstrap
  @if opcodes
  maybe-configure-opcodes: configure-opcodes
  configure-opcodes: 
-@endif opcodes
-@if opcodes-bootstrap
-       @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif opcodes-bootstrap
-@if opcodes
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
@@ -4905,6 +4973,7 @@ configure-stage1-opcodes:
         libsrcdir="$$s/opcodes"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+          \
           --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
  @endif opcodes-bootstrap
  
@@ -4932,6 +5001,7 @@ configure-stage2-opcodes:
         libsrcdir="$$s/opcodes"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif opcodes-bootstrap
  
@@ -4959,6 +5029,7 @@ configure-stage3-opcodes:
         libsrcdir="$$s/opcodes"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif opcodes-bootstrap
  
@@ -4986,6 +5057,7 @@ configure-stage4-opcodes:
         libsrcdir="$$s/opcodes"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif opcodes-bootstrap
  
@@ -5013,6 +5085,7 @@ configure-stageprofile-opcodes:
         libsrcdir="$$s/opcodes"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif opcodes-bootstrap
  
@@ -5040,6 +5113,7 @@ configure-stagefeedback-opcodes:
         libsrcdir="$$s/opcodes"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif opcodes-bootstrap
  
@@ -5049,15 +5123,13 @@ configure-stagefeedback-opcodes:
  
  .PHONY: all-opcodes maybe-all-opcodes
  maybe-all-opcodes:
+@if gcc-bootstrap
+all-opcodes: stage_current
+@endif gcc-bootstrap
  @if opcodes
  TARGET-opcodes=all
  maybe-all-opcodes: all-opcodes
  all-opcodes: configure-opcodes
-@endif opcodes
-@if opcodes-bootstrap
-       @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif opcodes-bootstrap
-@if opcodes
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -5563,14 +5635,12 @@ maintainer-clean-opcodes:
  
  .PHONY: configure-binutils maybe-configure-binutils
  maybe-configure-binutils:
+@if gcc-bootstrap
+configure-binutils: stage_current
+@endif gcc-bootstrap
  @if binutils
  maybe-configure-binutils: configure-binutils
  configure-binutils: 
-@endif binutils
-@if binutils-bootstrap
-       @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif binutils-bootstrap
-@if binutils
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
@@ -5615,6 +5685,7 @@ configure-stage1-binutils:
         libsrcdir="$$s/binutils"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+          \
           --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
  @endif binutils-bootstrap
  
@@ -5642,6 +5713,7 @@ configure-stage2-binutils:
         libsrcdir="$$s/binutils"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif binutils-bootstrap
  
@@ -5669,6 +5741,7 @@ configure-stage3-binutils:
         libsrcdir="$$s/binutils"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif binutils-bootstrap
  
@@ -5696,6 +5769,7 @@ configure-stage4-binutils:
         libsrcdir="$$s/binutils"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif binutils-bootstrap
  
@@ -5723,6 +5797,7 @@ configure-stageprofile-binutils:
         libsrcdir="$$s/binutils"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif binutils-bootstrap
  
@@ -5750,6 +5825,7 @@ configure-stagefeedback-binutils:
         libsrcdir="$$s/binutils"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif binutils-bootstrap
  
@@ -5759,15 +5835,13 @@ configure-stagefeedback-binutils:
  
  .PHONY: all-binutils maybe-all-binutils
  maybe-all-binutils:
+@if gcc-bootstrap
+all-binutils: stage_current
+@endif gcc-bootstrap
  @if binutils
  TARGET-binutils=all
  maybe-all-binutils: all-binutils
  all-binutils: configure-binutils
-@endif binutils
-@if binutils-bootstrap
-       @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif binutils-bootstrap
-@if binutils
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -6273,6 +6347,9 @@ maintainer-clean-binutils:
  
  .PHONY: configure-bison maybe-configure-bison
  maybe-configure-bison:
+@if gcc-bootstrap
+configure-bison: stage_current
+@endif gcc-bootstrap
  @if bison
  maybe-configure-bison: configure-bison
  configure-bison: 
@@ -6302,6 +6379,9 @@ configure-bison:
  
  .PHONY: all-bison maybe-all-bison
  maybe-all-bison:
+@if gcc-bootstrap
+all-bison: stage_current
+@endif gcc-bootstrap
  @if bison
  TARGET-bison=all
  maybe-all-bison: all-bison
@@ -6640,6 +6720,9 @@ maintainer-clean-bison:
  
  .PHONY: configure-byacc maybe-configure-byacc
  maybe-configure-byacc:
+@if gcc-bootstrap
+configure-byacc: stage_current
+@endif gcc-bootstrap
  @if byacc
  maybe-configure-byacc: configure-byacc
  configure-byacc: 
@@ -6669,6 +6752,9 @@ configure-byacc:
  
  .PHONY: all-byacc maybe-all-byacc
  maybe-all-byacc:
+@if gcc-bootstrap
+all-byacc: stage_current
+@endif gcc-bootstrap
  @if byacc
  TARGET-byacc=all
  maybe-all-byacc: all-byacc
@@ -7007,6 +7093,9 @@ maintainer-clean-byacc:
  
  .PHONY: configure-bzip2 maybe-configure-bzip2
  maybe-configure-bzip2:
+@if gcc-bootstrap
+configure-bzip2: stage_current
+@endif gcc-bootstrap
  @if bzip2
  maybe-configure-bzip2: configure-bzip2
  configure-bzip2: 
@@ -7036,6 +7125,9 @@ configure-bzip2:
  
  .PHONY: all-bzip2 maybe-all-bzip2
  maybe-all-bzip2:
+@if gcc-bootstrap
+all-bzip2: stage_current
+@endif gcc-bootstrap
  @if bzip2
  TARGET-bzip2=all
  maybe-all-bzip2: all-bzip2
@@ -7371,6 +7463,9 @@ maintainer-clean-bzip2:
  
  .PHONY: configure-dejagnu maybe-configure-dejagnu
  maybe-configure-dejagnu:
+@if gcc-bootstrap
+configure-dejagnu: stage_current
+@endif gcc-bootstrap
  @if dejagnu
  maybe-configure-dejagnu: configure-dejagnu
  configure-dejagnu: 
@@ -7400,6 +7495,9 @@ configure-dejagnu:
  
  .PHONY: all-dejagnu maybe-all-dejagnu
  maybe-all-dejagnu:
+@if gcc-bootstrap
+all-dejagnu: stage_current
+@endif gcc-bootstrap
  @if dejagnu
  TARGET-dejagnu=all
  maybe-all-dejagnu: all-dejagnu
@@ -7735,6 +7833,9 @@ maintainer-clean-dejagnu:
  
  .PHONY: configure-diff maybe-configure-diff
  maybe-configure-diff:
+@if gcc-bootstrap
+configure-diff: stage_current
+@endif gcc-bootstrap
  @if diff
  maybe-configure-diff: configure-diff
  configure-diff: 
@@ -7764,6 +7865,9 @@ configure-diff:
  
  .PHONY: all-diff maybe-all-diff
  maybe-all-diff:
+@if gcc-bootstrap
+all-diff: stage_current
+@endif gcc-bootstrap
  @if diff
  TARGET-diff=all
  maybe-all-diff: all-diff
@@ -8099,6 +8203,9 @@ maintainer-clean-diff:
  
  .PHONY: configure-dosutils maybe-configure-dosutils
  maybe-configure-dosutils:
+@if gcc-bootstrap
+configure-dosutils: stage_current
+@endif gcc-bootstrap
  @if dosutils
  maybe-configure-dosutils: configure-dosutils
  configure-dosutils: 
@@ -8128,6 +8235,9 @@ configure-dosutils:
  
  .PHONY: all-dosutils maybe-all-dosutils
  maybe-all-dosutils:
+@if gcc-bootstrap
+all-dosutils: stage_current
+@endif gcc-bootstrap
  @if dosutils
  TARGET-dosutils=all
  maybe-all-dosutils: all-dosutils
@@ -8457,6 +8567,9 @@ maintainer-clean-dosutils:
  
  .PHONY: configure-etc maybe-configure-etc
  maybe-configure-etc:
+@if gcc-bootstrap
+configure-etc: stage_current
+@endif gcc-bootstrap
  @if etc
  maybe-configure-etc: configure-etc
  configure-etc: 
@@ -8486,6 +8599,9 @@ configure-etc:
  
  .PHONY: all-etc maybe-all-etc
  maybe-all-etc:
+@if gcc-bootstrap
+all-etc: stage_current
+@endif gcc-bootstrap
  @if etc
  TARGET-etc=all
  maybe-all-etc: all-etc
@@ -8821,6 +8937,9 @@ maintainer-clean-etc:
  
  .PHONY: configure-fastjar maybe-configure-fastjar
  maybe-configure-fastjar:
+@if gcc-bootstrap
+configure-fastjar: stage_current
+@endif gcc-bootstrap
  @if fastjar
  maybe-configure-fastjar: configure-fastjar
  configure-fastjar: 
@@ -8850,6 +8969,9 @@ configure-fastjar:
  
  .PHONY: all-fastjar maybe-all-fastjar
  maybe-all-fastjar:
+@if gcc-bootstrap
+all-fastjar: stage_current
+@endif gcc-bootstrap
  @if fastjar
  TARGET-fastjar=all
  maybe-all-fastjar: all-fastjar
@@ -9188,6 +9310,9 @@ maintainer-clean-fastjar:
  
  .PHONY: configure-fileutils maybe-configure-fileutils
  maybe-configure-fileutils:
+@if gcc-bootstrap
+configure-fileutils: stage_current
+@endif gcc-bootstrap
  @if fileutils
  maybe-configure-fileutils: configure-fileutils
  configure-fileutils: 
@@ -9217,6 +9342,9 @@ configure-fileutils:
  
  .PHONY: all-fileutils maybe-all-fileutils
  maybe-all-fileutils:
+@if gcc-bootstrap
+all-fileutils: stage_current
+@endif gcc-bootstrap
  @if fileutils
  TARGET-fileutils=all
  maybe-all-fileutils: all-fileutils
@@ -9552,6 +9680,9 @@ maintainer-clean-fileutils:
  
  .PHONY: configure-findutils maybe-configure-findutils
  maybe-configure-findutils:
+@if gcc-bootstrap
+configure-findutils: stage_current
+@endif gcc-bootstrap
  @if findutils
  maybe-configure-findutils: configure-findutils
  configure-findutils: 
@@ -9581,6 +9712,9 @@ configure-findutils:
  
  .PHONY: all-findutils maybe-all-findutils
  maybe-all-findutils:
+@if gcc-bootstrap
+all-findutils: stage_current
+@endif gcc-bootstrap
  @if findutils
  TARGET-findutils=all
  maybe-all-findutils: all-findutils
@@ -9916,6 +10050,9 @@ maintainer-clean-findutils:
  
  .PHONY: configure-find maybe-configure-find
  maybe-configure-find:
+@if gcc-bootstrap
+configure-find: stage_current
+@endif gcc-bootstrap
  @if find
  maybe-configure-find: configure-find
  configure-find: 
@@ -9945,6 +10082,9 @@ configure-find:
  
  .PHONY: all-find maybe-all-find
  maybe-all-find:
+@if gcc-bootstrap
+all-find: stage_current
+@endif gcc-bootstrap
  @if find
  TARGET-find=all
  maybe-all-find: all-find
@@ -10280,6 +10420,9 @@ maintainer-clean-find:
  
  .PHONY: configure-fixincludes maybe-configure-fixincludes
  maybe-configure-fixincludes:
+@if gcc-bootstrap
+configure-fixincludes: stage_current
+@endif gcc-bootstrap
  @if fixincludes
  maybe-configure-fixincludes: configure-fixincludes
  configure-fixincludes: 
@@ -10309,6 +10452,9 @@ configure-fixincludes:
  
  .PHONY: all-fixincludes maybe-all-fixincludes
  maybe-all-fixincludes:
+@if gcc-bootstrap
+all-fixincludes: stage_current
+@endif gcc-bootstrap
  @if fixincludes
  TARGET-fixincludes=all
  maybe-all-fixincludes: all-fixincludes
@@ -10563,6 +10709,9 @@ maintainer-clean-fixincludes:
  
  .PHONY: configure-flex maybe-configure-flex
  maybe-configure-flex:
+@if gcc-bootstrap
+configure-flex: stage_current
+@endif gcc-bootstrap
  @if flex
  maybe-configure-flex: configure-flex
  configure-flex: 
@@ -10592,6 +10741,9 @@ configure-flex:
  
  .PHONY: all-flex maybe-all-flex
  maybe-all-flex:
+@if gcc-bootstrap
+all-flex: stage_current
+@endif gcc-bootstrap
  @if flex
  TARGET-flex=all
  maybe-all-flex: all-flex
@@ -10930,14 +11082,12 @@ maintainer-clean-flex:
  
  .PHONY: configure-gas maybe-configure-gas
  maybe-configure-gas:
+@if gcc-bootstrap
+configure-gas: stage_current
+@endif gcc-bootstrap
  @if gas
  maybe-configure-gas: configure-gas
  configure-gas: 
-@endif gas
-@if gas-bootstrap
-       @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif gas-bootstrap
-@if gas
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
@@ -10982,6 +11132,7 @@ configure-stage1-gas:
         libsrcdir="$$s/gas"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+          \
           --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
  @endif gas-bootstrap
  
@@ -11009,6 +11160,7 @@ configure-stage2-gas:
         libsrcdir="$$s/gas"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif gas-bootstrap
  
@@ -11036,6 +11188,7 @@ configure-stage3-gas:
         libsrcdir="$$s/gas"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif gas-bootstrap
  
@@ -11063,6 +11216,7 @@ configure-stage4-gas:
         libsrcdir="$$s/gas"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif gas-bootstrap
  
@@ -11090,6 +11244,7 @@ configure-stageprofile-gas:
         libsrcdir="$$s/gas"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif gas-bootstrap
  
@@ -11117,6 +11272,7 @@ configure-stagefeedback-gas:
         libsrcdir="$$s/gas"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif gas-bootstrap
  
@@ -11126,15 +11282,13 @@ configure-stagefeedback-gas:
  
  .PHONY: all-gas maybe-all-gas
  maybe-all-gas:
+@if gcc-bootstrap
+all-gas: stage_current
+@endif gcc-bootstrap
  @if gas
  TARGET-gas=all
  maybe-all-gas: all-gas
  all-gas: configure-gas
-@endif gas
-@if gas-bootstrap
-       @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif gas-bootstrap
-@if gas
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -11640,14 +11794,12 @@ maintainer-clean-gas:
  
  .PHONY: configure-gcc maybe-configure-gcc
  maybe-configure-gcc:
-@if gcc
-maybe-configure-gcc: configure-gcc
-configure-gcc: 
-@endif gcc
  @if gcc-bootstrap
-       @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+configure-gcc: stage_current
  @endif gcc-bootstrap
  @if gcc
+maybe-configure-gcc: configure-gcc
+configure-gcc: 
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
@@ -11692,6 +11844,7 @@ configure-stage1-gcc:
         libsrcdir="$$s/gcc"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+          \
           --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
  @endif gcc-bootstrap
  
@@ -11719,6 +11872,7 @@ configure-stage2-gcc:
         libsrcdir="$$s/gcc"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif gcc-bootstrap
  
@@ -11746,6 +11900,7 @@ configure-stage3-gcc:
         libsrcdir="$$s/gcc"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif gcc-bootstrap
  
@@ -11773,6 +11928,7 @@ configure-stage4-gcc:
         libsrcdir="$$s/gcc"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif gcc-bootstrap
  
@@ -11800,6 +11956,7 @@ configure-stageprofile-gcc:
         libsrcdir="$$s/gcc"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif gcc-bootstrap
  
@@ -11827,6 +11984,7 @@ configure-stagefeedback-gcc:
         libsrcdir="$$s/gcc"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif gcc-bootstrap
  
@@ -11836,15 +11994,13 @@ configure-stagefeedback-gcc:
  
  .PHONY: all-gcc maybe-all-gcc
  maybe-all-gcc:
+@if gcc-bootstrap
+all-gcc: stage_current
+@endif gcc-bootstrap
  @if gcc
  TARGET-gcc=`if [ -f stage_last ]; then echo quickstrap ; else echo all; fi`
  maybe-all-gcc: all-gcc
  all-gcc: configure-gcc
-@endif gcc
-@if gcc-bootstrap
-       @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif gcc-bootstrap
-@if gcc
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -12350,6 +12506,9 @@ maintainer-clean-gcc:
  
  .PHONY: configure-gawk maybe-configure-gawk
  maybe-configure-gawk:
+@if gcc-bootstrap
+configure-gawk: stage_current
+@endif gcc-bootstrap
  @if gawk
  maybe-configure-gawk: configure-gawk
  configure-gawk: 
@@ -12379,6 +12538,9 @@ configure-gawk:
  
  .PHONY: all-gawk maybe-all-gawk
  maybe-all-gawk:
+@if gcc-bootstrap
+all-gawk: stage_current
+@endif gcc-bootstrap
  @if gawk
  TARGET-gawk=all
  maybe-all-gawk: all-gawk
@@ -12714,6 +12876,9 @@ maintainer-clean-gawk:
  
  .PHONY: configure-gettext maybe-configure-gettext
  maybe-configure-gettext:
+@if gcc-bootstrap
+configure-gettext: stage_current
+@endif gcc-bootstrap
  @if gettext
  maybe-configure-gettext: configure-gettext
  configure-gettext: 
@@ -12743,6 +12908,9 @@ configure-gettext:
  
  .PHONY: all-gettext maybe-all-gettext
  maybe-all-gettext:
+@if gcc-bootstrap
+all-gettext: stage_current
+@endif gcc-bootstrap
  @if gettext
  TARGET-gettext=all
  maybe-all-gettext: all-gettext
@@ -13078,6 +13246,9 @@ maintainer-clean-gettext:
  
  .PHONY: configure-gnuserv maybe-configure-gnuserv
  maybe-configure-gnuserv:
+@if gcc-bootstrap
+configure-gnuserv: stage_current
+@endif gcc-bootstrap
  @if gnuserv
  maybe-configure-gnuserv: configure-gnuserv
  configure-gnuserv: 
@@ -13107,6 +13278,9 @@ configure-gnuserv:
  
  .PHONY: all-gnuserv maybe-all-gnuserv
  maybe-all-gnuserv:
+@if gcc-bootstrap
+all-gnuserv: stage_current
+@endif gcc-bootstrap
  @if gnuserv
  TARGET-gnuserv=all
  maybe-all-gnuserv: all-gnuserv
@@ -13442,6 +13616,9 @@ maintainer-clean-gnuserv:
  
  .PHONY: configure-gprof maybe-configure-gprof
  maybe-configure-gprof:
+@if gcc-bootstrap
+configure-gprof: stage_current
+@endif gcc-bootstrap
  @if gprof
  maybe-configure-gprof: configure-gprof
  configure-gprof: 
@@ -13471,6 +13648,9 @@ configure-gprof:
  
  .PHONY: all-gprof maybe-all-gprof
  maybe-all-gprof:
+@if gcc-bootstrap
+all-gprof: stage_current
+@endif gcc-bootstrap
  @if gprof
  TARGET-gprof=all
  maybe-all-gprof: all-gprof
@@ -13806,6 +13986,9 @@ maintainer-clean-gprof:
  
  .PHONY: configure-gzip maybe-configure-gzip
  maybe-configure-gzip:
+@if gcc-bootstrap
+configure-gzip: stage_current
+@endif gcc-bootstrap
  @if gzip
  maybe-configure-gzip: configure-gzip
  configure-gzip: 
@@ -13835,6 +14018,9 @@ configure-gzip:
  
  .PHONY: all-gzip maybe-all-gzip
  maybe-all-gzip:
+@if gcc-bootstrap
+all-gzip: stage_current
+@endif gcc-bootstrap
  @if gzip
  TARGET-gzip=all
  maybe-all-gzip: all-gzip
@@ -14170,6 +14356,9 @@ maintainer-clean-gzip:
  
  .PHONY: configure-hello maybe-configure-hello
  maybe-configure-hello:
+@if gcc-bootstrap
+configure-hello: stage_current
+@endif gcc-bootstrap
  @if hello
  maybe-configure-hello: configure-hello
  configure-hello: 
@@ -14199,6 +14388,9 @@ configure-hello:
  
  .PHONY: all-hello maybe-all-hello
  maybe-all-hello:
+@if gcc-bootstrap
+all-hello: stage_current
+@endif gcc-bootstrap
  @if hello
  TARGET-hello=all
  maybe-all-hello: all-hello
@@ -14534,6 +14726,9 @@ maintainer-clean-hello:
  
  .PHONY: configure-indent maybe-configure-indent
  maybe-configure-indent:
+@if gcc-bootstrap
+configure-indent: stage_current
+@endif gcc-bootstrap
  @if indent
  maybe-configure-indent: configure-indent
  configure-indent: 
@@ -14563,6 +14758,9 @@ configure-indent:
  
  .PHONY: all-indent maybe-all-indent
  maybe-all-indent:
+@if gcc-bootstrap
+all-indent: stage_current
+@endif gcc-bootstrap
  @if indent
  TARGET-indent=all
  maybe-all-indent: all-indent
@@ -14898,14 +15096,12 @@ maintainer-clean-indent:
  
  .PHONY: configure-intl maybe-configure-intl
  maybe-configure-intl:
+@if gcc-bootstrap
+configure-intl: stage_current
+@endif gcc-bootstrap
  @if intl
  maybe-configure-intl: configure-intl
  configure-intl: 
-@endif intl
-@if intl-bootstrap
-       @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif intl-bootstrap
-@if intl
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
@@ -14950,6 +15146,7 @@ configure-stage1-intl:
         libsrcdir="$$s/intl"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+          \
           --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
  @endif intl-bootstrap
  
@@ -14977,6 +15174,7 @@ configure-stage2-intl:
         libsrcdir="$$s/intl"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif intl-bootstrap
  
@@ -15004,6 +15202,7 @@ configure-stage3-intl:
         libsrcdir="$$s/intl"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif intl-bootstrap
  
@@ -15031,6 +15230,7 @@ configure-stage4-intl:
         libsrcdir="$$s/intl"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif intl-bootstrap
  
@@ -15058,6 +15258,7 @@ configure-stageprofile-intl:
         libsrcdir="$$s/intl"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif intl-bootstrap
  
@@ -15085,6 +15286,7 @@ configure-stagefeedback-intl:
         libsrcdir="$$s/intl"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif intl-bootstrap
  
@@ -15094,15 +15296,13 @@ configure-stagefeedback-intl:
  
  .PHONY: all-intl maybe-all-intl
  maybe-all-intl:
+@if gcc-bootstrap
+all-intl: stage_current
+@endif gcc-bootstrap
  @if intl
  TARGET-intl=all
  maybe-all-intl: all-intl
  all-intl: configure-intl
-@endif intl
-@if intl-bootstrap
-       @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif intl-bootstrap
-@if intl
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -15608,6 +15808,9 @@ maintainer-clean-intl:
  
  .PHONY: configure-tcl maybe-configure-tcl
  maybe-configure-tcl:
+@if gcc-bootstrap
+configure-tcl: stage_current
+@endif gcc-bootstrap
  @if tcl
  maybe-configure-tcl: configure-tcl
  configure-tcl: 
@@ -15637,6 +15840,9 @@ configure-tcl:
  
  .PHONY: all-tcl maybe-all-tcl
  maybe-all-tcl:
+@if gcc-bootstrap
+all-tcl: stage_current
+@endif gcc-bootstrap
  @if tcl
  TARGET-tcl=all
  maybe-all-tcl: all-tcl
@@ -15957,6 +16163,9 @@ maintainer-clean-tcl:
  
  .PHONY: configure-itcl maybe-configure-itcl
  maybe-configure-itcl:
+@if gcc-bootstrap
+configure-itcl: stage_current
+@endif gcc-bootstrap
  @if itcl
  maybe-configure-itcl: configure-itcl
  configure-itcl: 
@@ -15986,6 +16195,9 @@ configure-itcl:
  
  .PHONY: all-itcl maybe-all-itcl
  maybe-all-itcl:
+@if gcc-bootstrap
+all-itcl: stage_current
+@endif gcc-bootstrap
  @if itcl
  TARGET-itcl=all
  maybe-all-itcl: all-itcl
@@ -16321,14 +16533,12 @@ maintainer-clean-itcl:
  
  .PHONY: configure-ld maybe-configure-ld
  maybe-configure-ld:
+@if gcc-bootstrap
+configure-ld: stage_current
+@endif gcc-bootstrap
  @if ld
  maybe-configure-ld: configure-ld
  configure-ld: 
-@endif ld
-@if ld-bootstrap
-       @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif ld-bootstrap
-@if ld
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
@@ -16373,6 +16583,7 @@ configure-stage1-ld:
         libsrcdir="$$s/ld"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+          \
           --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
  @endif ld-bootstrap
  
@@ -16400,6 +16611,7 @@ configure-stage2-ld:
         libsrcdir="$$s/ld"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif ld-bootstrap
  
@@ -16427,6 +16639,7 @@ configure-stage3-ld:
         libsrcdir="$$s/ld"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif ld-bootstrap
  
@@ -16454,6 +16667,7 @@ configure-stage4-ld:
         libsrcdir="$$s/ld"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif ld-bootstrap
  
@@ -16481,6 +16695,7 @@ configure-stageprofile-ld:
         libsrcdir="$$s/ld"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif ld-bootstrap
  
@@ -16508,6 +16723,7 @@ configure-stagefeedback-ld:
         libsrcdir="$$s/ld"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif ld-bootstrap
  
@@ -16517,15 +16733,13 @@ configure-stagefeedback-ld:
  
  .PHONY: all-ld maybe-all-ld
  maybe-all-ld:
+@if gcc-bootstrap
+all-ld: stage_current
+@endif gcc-bootstrap
  @if ld
  TARGET-ld=all
  maybe-all-ld: all-ld
  all-ld: configure-ld
-@endif ld
-@if ld-bootstrap
-       @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif ld-bootstrap
-@if ld
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -17031,14 +17245,12 @@ maintainer-clean-ld:
  
  .PHONY: configure-libcpp maybe-configure-libcpp
  maybe-configure-libcpp:
+@if gcc-bootstrap
+configure-libcpp: stage_current
+@endif gcc-bootstrap
  @if libcpp
  maybe-configure-libcpp: configure-libcpp
  configure-libcpp: 
-@endif libcpp
-@if libcpp-bootstrap
-       @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif libcpp-bootstrap
-@if libcpp
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
@@ -17083,6 +17295,7 @@ configure-stage1-libcpp:
         libsrcdir="$$s/libcpp"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+          \
           --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
  @endif libcpp-bootstrap
  
@@ -17110,6 +17323,7 @@ configure-stage2-libcpp:
         libsrcdir="$$s/libcpp"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif libcpp-bootstrap
  
@@ -17137,6 +17351,7 @@ configure-stage3-libcpp:
         libsrcdir="$$s/libcpp"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif libcpp-bootstrap
  
@@ -17164,6 +17379,7 @@ configure-stage4-libcpp:
         libsrcdir="$$s/libcpp"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif libcpp-bootstrap
  
@@ -17191,6 +17407,7 @@ configure-stageprofile-libcpp:
         libsrcdir="$$s/libcpp"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif libcpp-bootstrap
  
@@ -17218,6 +17435,7 @@ configure-stagefeedback-libcpp:
         libsrcdir="$$s/libcpp"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif libcpp-bootstrap
  
@@ -17227,15 +17445,13 @@ configure-stagefeedback-libcpp:
  
  .PHONY: all-libcpp maybe-all-libcpp
  maybe-all-libcpp:
+@if gcc-bootstrap
+all-libcpp: stage_current
+@endif gcc-bootstrap
  @if libcpp
  TARGET-libcpp=all
  maybe-all-libcpp: all-libcpp
  all-libcpp: configure-libcpp
-@endif libcpp
-@if libcpp-bootstrap
-       @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif libcpp-bootstrap
-@if libcpp
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -17741,14 +17957,12 @@ maintainer-clean-libcpp:
  
  .PHONY: configure-libdecnumber maybe-configure-libdecnumber
  maybe-configure-libdecnumber:
+@if gcc-bootstrap
+configure-libdecnumber: stage_current
+@endif gcc-bootstrap
  @if libdecnumber
  maybe-configure-libdecnumber: configure-libdecnumber
  configure-libdecnumber: 
-@endif libdecnumber
-@if libdecnumber-bootstrap
-       @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif libdecnumber-bootstrap
-@if libdecnumber
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
@@ -17793,6 +18007,7 @@ configure-stage1-libdecnumber:
         libsrcdir="$$s/libdecnumber"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+          \
           --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
  @endif libdecnumber-bootstrap
  
@@ -17820,6 +18035,7 @@ configure-stage2-libdecnumber:
         libsrcdir="$$s/libdecnumber"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif libdecnumber-bootstrap
  
@@ -17847,6 +18063,7 @@ configure-stage3-libdecnumber:
         libsrcdir="$$s/libdecnumber"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif libdecnumber-bootstrap
  
@@ -17874,6 +18091,7 @@ configure-stage4-libdecnumber:
         libsrcdir="$$s/libdecnumber"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif libdecnumber-bootstrap
  
@@ -17901,6 +18119,7 @@ configure-stageprofile-libdecnumber:
         libsrcdir="$$s/libdecnumber"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif libdecnumber-bootstrap
  
@@ -17928,6 +18147,7 @@ configure-stagefeedback-libdecnumber:
         libsrcdir="$$s/libdecnumber"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif libdecnumber-bootstrap
  
@@ -17937,15 +18157,13 @@ configure-stagefeedback-libdecnumber:
  
  .PHONY: all-libdecnumber maybe-all-libdecnumber
  maybe-all-libdecnumber:
+@if gcc-bootstrap
+all-libdecnumber: stage_current
+@endif gcc-bootstrap
  @if libdecnumber
  TARGET-libdecnumber=all
  maybe-all-libdecnumber: all-libdecnumber
  all-libdecnumber: configure-libdecnumber
-@endif libdecnumber
-@if libdecnumber-bootstrap
-       @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif libdecnumber-bootstrap
-@if libdecnumber
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -18451,6 +18669,9 @@ maintainer-clean-libdecnumber:
  
  .PHONY: configure-libgui maybe-configure-libgui
  maybe-configure-libgui:
+@if gcc-bootstrap
+configure-libgui: stage_current
+@endif gcc-bootstrap
  @if libgui
  maybe-configure-libgui: configure-libgui
  configure-libgui: 
@@ -18480,6 +18701,9 @@ configure-libgui:
  
  .PHONY: all-libgui maybe-all-libgui
  maybe-all-libgui:
+@if gcc-bootstrap
+all-libgui: stage_current
+@endif gcc-bootstrap
  @if libgui
  TARGET-libgui=all
  maybe-all-libgui: all-libgui
@@ -18815,14 +19039,12 @@ maintainer-clean-libgui:
  
  .PHONY: configure-libiberty maybe-configure-libiberty
  maybe-configure-libiberty:
+@if gcc-bootstrap
+configure-libiberty: stage_current
+@endif gcc-bootstrap
  @if libiberty
  maybe-configure-libiberty: configure-libiberty
  configure-libiberty: 
-@endif libiberty
-@if libiberty-bootstrap
-       @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif libiberty-bootstrap
-@if libiberty
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
@@ -18867,6 +19089,7 @@ configure-stage1-libiberty:
         libsrcdir="$$s/libiberty"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+          \
           --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
  @endif libiberty-bootstrap
  
@@ -18894,6 +19117,7 @@ configure-stage2-libiberty:
         libsrcdir="$$s/libiberty"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif libiberty-bootstrap
  
@@ -18921,6 +19145,7 @@ configure-stage3-libiberty:
         libsrcdir="$$s/libiberty"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif libiberty-bootstrap
  
@@ -18948,6 +19173,7 @@ configure-stage4-libiberty:
         libsrcdir="$$s/libiberty"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif libiberty-bootstrap
  
@@ -18975,6 +19201,7 @@ configure-stageprofile-libiberty:
         libsrcdir="$$s/libiberty"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif libiberty-bootstrap
  
@@ -19002,6 +19229,7 @@ configure-stagefeedback-libiberty:
         libsrcdir="$$s/libiberty"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif libiberty-bootstrap
  
@@ -19011,15 +19239,13 @@ configure-stagefeedback-libiberty:
  
  .PHONY: all-libiberty maybe-all-libiberty
  maybe-all-libiberty:
+@if gcc-bootstrap
+all-libiberty: stage_current
+@endif gcc-bootstrap
  @if libiberty
  TARGET-libiberty=all
  maybe-all-libiberty: all-libiberty
  all-libiberty: configure-libiberty
-@endif libiberty
-@if libiberty-bootstrap
-       @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif libiberty-bootstrap
-@if libiberty
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -19525,6 +19751,9 @@ maintainer-clean-libiberty:
  
  .PHONY: configure-libtool maybe-configure-libtool
  maybe-configure-libtool:
+@if gcc-bootstrap
+configure-libtool: stage_current
+@endif gcc-bootstrap
  @if libtool
  maybe-configure-libtool: configure-libtool
  configure-libtool: 
@@ -19554,6 +19783,9 @@ configure-libtool:
  
  .PHONY: all-libtool maybe-all-libtool
  maybe-all-libtool:
+@if gcc-bootstrap
+all-libtool: stage_current
+@endif gcc-bootstrap
  @if libtool
  TARGET-libtool=all
  maybe-all-libtool: all-libtool
@@ -19889,6 +20121,9 @@ maintainer-clean-libtool:
  
  .PHONY: configure-m4 maybe-configure-m4
  maybe-configure-m4:
+@if gcc-bootstrap
+configure-m4: stage_current
+@endif gcc-bootstrap
  @if m4
  maybe-configure-m4: configure-m4
  configure-m4: 
@@ -19918,6 +20153,9 @@ configure-m4:
  
  .PHONY: all-m4 maybe-all-m4
  maybe-all-m4:
+@if gcc-bootstrap
+all-m4: stage_current
+@endif gcc-bootstrap
  @if m4
  TARGET-m4=all
  maybe-all-m4: all-m4
@@ -20253,6 +20491,9 @@ maintainer-clean-m4:
  
  .PHONY: configure-make maybe-configure-make
  maybe-configure-make:
+@if gcc-bootstrap
+configure-make: stage_current
+@endif gcc-bootstrap
  @if make
  maybe-configure-make: configure-make
  configure-make: 
@@ -20282,6 +20523,9 @@ configure-make:
  
  .PHONY: all-make maybe-all-make
  maybe-all-make:
+@if gcc-bootstrap
+all-make: stage_current
+@endif gcc-bootstrap
  @if make
  TARGET-make=all
  maybe-all-make: all-make
@@ -20617,6 +20861,9 @@ maintainer-clean-make:
  
  .PHONY: configure-mmalloc maybe-configure-mmalloc
  maybe-configure-mmalloc:
+@if gcc-bootstrap
+configure-mmalloc: stage_current
+@endif gcc-bootstrap
  @if mmalloc
  maybe-configure-mmalloc: configure-mmalloc
  configure-mmalloc: 
@@ -20646,6 +20893,9 @@ configure-mmalloc:
  
  .PHONY: all-mmalloc maybe-all-mmalloc
  maybe-all-mmalloc:
+@if gcc-bootstrap
+all-mmalloc: stage_current
+@endif gcc-bootstrap
  @if mmalloc
  TARGET-mmalloc=all
  maybe-all-mmalloc: all-mmalloc
@@ -20975,6 +21225,9 @@ maintainer-clean-mmalloc:
  
  .PHONY: configure-patch maybe-configure-patch
  maybe-configure-patch:
+@if gcc-bootstrap
+configure-patch: stage_current
+@endif gcc-bootstrap
  @if patch
  maybe-configure-patch: configure-patch
  configure-patch: 
@@ -21004,6 +21257,9 @@ configure-patch:
  
  .PHONY: all-patch maybe-all-patch
  maybe-all-patch:
+@if gcc-bootstrap
+all-patch: stage_current
+@endif gcc-bootstrap
  @if patch
  TARGET-patch=all
  maybe-all-patch: all-patch
@@ -21339,6 +21595,9 @@ maintainer-clean-patch:
  
  .PHONY: configure-perl maybe-configure-perl
  maybe-configure-perl:
+@if gcc-bootstrap
+configure-perl: stage_current
+@endif gcc-bootstrap
  @if perl
  maybe-configure-perl: configure-perl
  configure-perl: 
@@ -21368,6 +21627,9 @@ configure-perl:
  
  .PHONY: all-perl maybe-all-perl
  maybe-all-perl:
+@if gcc-bootstrap
+all-perl: stage_current
+@endif gcc-bootstrap
  @if perl
  TARGET-perl=all
  maybe-all-perl: all-perl
@@ -21703,6 +21965,9 @@ maintainer-clean-perl:
  
  .PHONY: configure-prms maybe-configure-prms
  maybe-configure-prms:
+@if gcc-bootstrap
+configure-prms: stage_current
+@endif gcc-bootstrap
  @if prms
  maybe-configure-prms: configure-prms
  configure-prms: 
@@ -21732,6 +21997,9 @@ configure-prms:
  
  .PHONY: all-prms maybe-all-prms
  maybe-all-prms:
+@if gcc-bootstrap
+all-prms: stage_current
+@endif gcc-bootstrap
  @if prms
  TARGET-prms=all
  maybe-all-prms: all-prms
@@ -22067,6 +22335,9 @@ maintainer-clean-prms:
  
  .PHONY: configure-rcs maybe-configure-rcs
  maybe-configure-rcs:
+@if gcc-bootstrap
+configure-rcs: stage_current
+@endif gcc-bootstrap
  @if rcs
  maybe-configure-rcs: configure-rcs
  configure-rcs: 
@@ -22096,6 +22367,9 @@ configure-rcs:
  
  .PHONY: all-rcs maybe-all-rcs
  maybe-all-rcs:
+@if gcc-bootstrap
+all-rcs: stage_current
+@endif gcc-bootstrap
  @if rcs
  TARGET-rcs=all
  maybe-all-rcs: all-rcs
@@ -22431,6 +22705,9 @@ maintainer-clean-rcs:
  
  .PHONY: configure-readline maybe-configure-readline
  maybe-configure-readline:
+@if gcc-bootstrap
+configure-readline: stage_current
+@endif gcc-bootstrap
  @if readline
  maybe-configure-readline: configure-readline
  configure-readline: 
@@ -22460,6 +22737,9 @@ configure-readline:
  
  .PHONY: all-readline maybe-all-readline
  maybe-all-readline:
+@if gcc-bootstrap
+all-readline: stage_current
+@endif gcc-bootstrap
  @if readline
  TARGET-readline=all
  maybe-all-readline: all-readline
@@ -22795,6 +23075,9 @@ maintainer-clean-readline:
  
  .PHONY: configure-release maybe-configure-release
  maybe-configure-release:
+@if gcc-bootstrap
+configure-release: stage_current
+@endif gcc-bootstrap
  @if release
  maybe-configure-release: configure-release
  configure-release: 
@@ -22824,6 +23107,9 @@ configure-release:
  
  .PHONY: all-release maybe-all-release
  maybe-all-release:
+@if gcc-bootstrap
+all-release: stage_current
+@endif gcc-bootstrap
  @if release
  TARGET-release=all
  maybe-all-release: all-release
@@ -23147,6 +23433,9 @@ maintainer-clean-release:
  
  .PHONY: configure-recode maybe-configure-recode
  maybe-configure-recode:
+@if gcc-bootstrap
+configure-recode: stage_current
+@endif gcc-bootstrap
  @if recode
  maybe-configure-recode: configure-recode
  configure-recode: 
@@ -23176,6 +23465,9 @@ configure-recode:
  
  .PHONY: all-recode maybe-all-recode
  maybe-all-recode:
+@if gcc-bootstrap
+all-recode: stage_current
+@endif gcc-bootstrap
  @if recode
  TARGET-recode=all
  maybe-all-recode: all-recode
@@ -23511,6 +23803,9 @@ maintainer-clean-recode:
  
  .PHONY: configure-sed maybe-configure-sed
  maybe-configure-sed:
+@if gcc-bootstrap
+configure-sed: stage_current
+@endif gcc-bootstrap
  @if sed
  maybe-configure-sed: configure-sed
  configure-sed: 
@@ -23540,6 +23835,9 @@ configure-sed:
  
  .PHONY: all-sed maybe-all-sed
  maybe-all-sed:
+@if gcc-bootstrap
+all-sed: stage_current
+@endif gcc-bootstrap
  @if sed
  TARGET-sed=all
  maybe-all-sed: all-sed
@@ -23875,6 +24173,9 @@ maintainer-clean-sed:
  
  .PHONY: configure-send-pr maybe-configure-send-pr
  maybe-configure-send-pr:
+@if gcc-bootstrap
+configure-send-pr: stage_current
+@endif gcc-bootstrap
  @if send-pr
  maybe-configure-send-pr: configure-send-pr
  configure-send-pr: 
@@ -23904,6 +24205,9 @@ configure-send-pr:
  
  .PHONY: all-send-pr maybe-all-send-pr
  maybe-all-send-pr:
+@if gcc-bootstrap
+all-send-pr: stage_current
+@endif gcc-bootstrap
  @if send-pr
  TARGET-send-pr=all
  maybe-all-send-pr: all-send-pr
@@ -24239,6 +24543,9 @@ maintainer-clean-send-pr:
  
  .PHONY: configure-shellutils maybe-configure-shellutils
  maybe-configure-shellutils:
+@if gcc-bootstrap
+configure-shellutils: stage_current
+@endif gcc-bootstrap
  @if shellutils
  maybe-configure-shellutils: configure-shellutils
  configure-shellutils: 
@@ -24268,6 +24575,9 @@ configure-shellutils:
  
  .PHONY: all-shellutils maybe-all-shellutils
  maybe-all-shellutils:
+@if gcc-bootstrap
+all-shellutils: stage_current
+@endif gcc-bootstrap
  @if shellutils
  TARGET-shellutils=all
  maybe-all-shellutils: all-shellutils
@@ -24603,6 +24913,9 @@ maintainer-clean-shellutils:
  
  .PHONY: configure-sid maybe-configure-sid
  maybe-configure-sid:
+@if gcc-bootstrap
+configure-sid: stage_current
+@endif gcc-bootstrap
  @if sid
  maybe-configure-sid: configure-sid
  configure-sid: 
@@ -24632,6 +24945,9 @@ configure-sid:
  
  .PHONY: all-sid maybe-all-sid
  maybe-all-sid:
+@if gcc-bootstrap
+all-sid: stage_current
+@endif gcc-bootstrap
  @if sid
  TARGET-sid=all
  maybe-all-sid: all-sid
@@ -24967,6 +25283,9 @@ maintainer-clean-sid:
  
  .PHONY: configure-sim maybe-configure-sim
  maybe-configure-sim:
+@if gcc-bootstrap
+configure-sim: stage_current
+@endif gcc-bootstrap
  @if sim
  maybe-configure-sim: configure-sim
  configure-sim: 
@@ -24996,6 +25315,9 @@ configure-sim:
  
  .PHONY: all-sim maybe-all-sim
  maybe-all-sim:
+@if gcc-bootstrap
+all-sim: stage_current
+@endif gcc-bootstrap
  @if sim
  TARGET-sim=all
  maybe-all-sim: all-sim
@@ -25331,6 +25653,9 @@ maintainer-clean-sim:
  
  .PHONY: configure-tar maybe-configure-tar
  maybe-configure-tar:
+@if gcc-bootstrap
+configure-tar: stage_current
+@endif gcc-bootstrap
  @if tar
  maybe-configure-tar: configure-tar
  configure-tar: 
@@ -25360,6 +25685,9 @@ configure-tar:
  
  .PHONY: all-tar maybe-all-tar
  maybe-all-tar:
+@if gcc-bootstrap
+all-tar: stage_current
+@endif gcc-bootstrap
  @if tar
  TARGET-tar=all
  maybe-all-tar: all-tar
@@ -25695,6 +26023,9 @@ maintainer-clean-tar:
  
  .PHONY: configure-texinfo maybe-configure-texinfo
  maybe-configure-texinfo:
+@if gcc-bootstrap
+configure-texinfo: stage_current
+@endif gcc-bootstrap
  @if texinfo
  maybe-configure-texinfo: configure-texinfo
  configure-texinfo: 
@@ -25724,6 +26055,9 @@ configure-texinfo:
  
  .PHONY: all-texinfo maybe-all-texinfo
  maybe-all-texinfo:
+@if gcc-bootstrap
+all-texinfo: stage_current
+@endif gcc-bootstrap
  @if texinfo
  TARGET-texinfo=all
  maybe-all-texinfo: all-texinfo
@@ -26053,6 +26387,9 @@ maintainer-clean-texinfo:
  
  .PHONY: configure-textutils maybe-configure-textutils
  maybe-configure-textutils:
+@if gcc-bootstrap
+configure-textutils: stage_current
+@endif gcc-bootstrap
  @if textutils
  maybe-configure-textutils: configure-textutils
  configure-textutils: 
@@ -26082,6 +26419,9 @@ configure-textutils:
  
  .PHONY: all-textutils maybe-all-textutils
  maybe-all-textutils:
+@if gcc-bootstrap
+all-textutils: stage_current
+@endif gcc-bootstrap
  @if textutils
  TARGET-textutils=all
  maybe-all-textutils: all-textutils
@@ -26417,6 +26757,9 @@ maintainer-clean-textutils:
  
  .PHONY: configure-time maybe-configure-time
  maybe-configure-time:
+@if gcc-bootstrap
+configure-time: stage_current
+@endif gcc-bootstrap
  @if time
  maybe-configure-time: configure-time
  configure-time: 
@@ -26446,6 +26789,9 @@ configure-time:
  
  .PHONY: all-time maybe-all-time
  maybe-all-time:
+@if gcc-bootstrap
+all-time: stage_current
+@endif gcc-bootstrap
  @if time
  TARGET-time=all
  maybe-all-time: all-time
@@ -26781,6 +27127,9 @@ maintainer-clean-time:
  
  .PHONY: configure-uudecode maybe-configure-uudecode
  maybe-configure-uudecode:
+@if gcc-bootstrap
+configure-uudecode: stage_current
+@endif gcc-bootstrap
  @if uudecode
  maybe-configure-uudecode: configure-uudecode
  configure-uudecode: 
@@ -26810,6 +27159,9 @@ configure-uudecode:
  
  .PHONY: all-uudecode maybe-all-uudecode
  maybe-all-uudecode:
+@if gcc-bootstrap
+all-uudecode: stage_current
+@endif gcc-bootstrap
  @if uudecode
  TARGET-uudecode=all
  maybe-all-uudecode: all-uudecode
@@ -27145,6 +27497,9 @@ maintainer-clean-uudecode:
  
  .PHONY: configure-wdiff maybe-configure-wdiff
  maybe-configure-wdiff:
+@if gcc-bootstrap
+configure-wdiff: stage_current
+@endif gcc-bootstrap
  @if wdiff
  maybe-configure-wdiff: configure-wdiff
  configure-wdiff: 
@@ -27174,6 +27529,9 @@ configure-wdiff:
  
  .PHONY: all-wdiff maybe-all-wdiff
  maybe-all-wdiff:
+@if gcc-bootstrap
+all-wdiff: stage_current
+@endif gcc-bootstrap
  @if wdiff
  TARGET-wdiff=all
  maybe-all-wdiff: all-wdiff
@@ -27509,6 +27867,9 @@ maintainer-clean-wdiff:
  
  .PHONY: configure-zip maybe-configure-zip
  maybe-configure-zip:
+@if gcc-bootstrap
+configure-zip: stage_current
+@endif gcc-bootstrap
  @if zip
  maybe-configure-zip: configure-zip
  configure-zip: 
@@ -27538,6 +27899,9 @@ configure-zip:
  
  .PHONY: all-zip maybe-all-zip
  maybe-all-zip:
+@if gcc-bootstrap
+all-zip: stage_current
+@endif gcc-bootstrap
  @if zip
  TARGET-zip=all
  maybe-all-zip: all-zip
@@ -27876,14 +28240,12 @@ maintainer-clean-zip:
  
  .PHONY: configure-zlib maybe-configure-zlib
  maybe-configure-zlib:
+@if gcc-bootstrap
+configure-zlib: stage_current
+@endif gcc-bootstrap
  @if zlib
  maybe-configure-zlib: configure-zlib
  configure-zlib: 
-@endif zlib
-@if zlib-bootstrap
-       @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif zlib-bootstrap
-@if zlib
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
@@ -27928,6 +28290,7 @@ configure-stage1-zlib:
         libsrcdir="$$s/zlib"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+          \
           --disable-intermodule           --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
  @endif zlib-bootstrap
  
@@ -27955,6 +28318,7 @@ configure-stage2-zlib:
         libsrcdir="$$s/zlib"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif zlib-bootstrap
  
@@ -27982,6 +28346,7 @@ configure-stage3-zlib:
         libsrcdir="$$s/zlib"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif zlib-bootstrap
  
@@ -28009,6 +28374,7 @@ configure-stage4-zlib:
         libsrcdir="$$s/zlib"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif zlib-bootstrap
  
@@ -28036,6 +28402,7 @@ configure-stageprofile-zlib:
         libsrcdir="$$s/zlib"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif zlib-bootstrap
  
@@ -28063,6 +28430,7 @@ configure-stagefeedback-zlib:
         libsrcdir="$$s/zlib"; \
         $(SHELL) $${libsrcdir}/configure \
           $(HOST_CONFIGARGS) $${srcdiroption} \
+         --with-build-libsubdir=$(HOST_SUBDIR) \
           @stage2_werror_flag@ 
  @endif zlib-bootstrap
  
@@ -28072,15 +28440,13 @@ configure-stagefeedback-zlib:
  
  .PHONY: all-zlib maybe-all-zlib
  maybe-all-zlib:
+@if gcc-bootstrap
+all-zlib: stage_current
+@endif gcc-bootstrap
  @if zlib
  TARGET-zlib=all
  maybe-all-zlib: all-zlib
  all-zlib: configure-zlib
-@endif zlib
-@if zlib-bootstrap
-       @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
-@endif zlib-bootstrap
-@if zlib
         @r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
@@ -28574,6 +28940,9 @@ maintainer-clean-zlib:
  
  .PHONY: configure-gdb maybe-configure-gdb
  maybe-configure-gdb:
+@if gcc-bootstrap
+configure-gdb: stage_current
+@endif gcc-bootstrap
  @if gdb
  maybe-configure-gdb: configure-gdb
  configure-gdb: 
@@ -28603,6 +28972,9 @@ configure-gdb:
  
  .PHONY: all-gdb maybe-all-gdb
  maybe-all-gdb:
+@if gcc-bootstrap
+all-gdb: stage_current
+@endif gcc-bootstrap
  @if gdb
  TARGET-gdb=all
  maybe-all-gdb: all-gdb
@@ -28938,6 +29310,9 @@ maintainer-clean-gdb:
  
  .PHONY: configure-expect maybe-configure-expect
  maybe-configure-expect:
+@if gcc-bootstrap
+configure-expect: stage_current
+@endif gcc-bootstrap
  @if expect
  maybe-configure-expect: configure-expect
  configure-expect: 
@@ -28967,6 +29342,9 @@ configure-expect:
  
  .PHONY: all-expect maybe-all-expect
  maybe-all-expect:
+@if gcc-bootstrap
+all-expect: stage_current
+@endif gcc-bootstrap
  @if expect
  TARGET-expect=all
  maybe-all-expect: all-expect
@@ -29302,6 +29680,9 @@ maintainer-clean-expect:
  
  .PHONY: configure-guile maybe-configure-guile
  maybe-configure-guile:
+@if gcc-bootstrap
+configure-guile: stage_current
+@endif gcc-bootstrap
  @if guile
  maybe-configure-guile: configure-guile
  configure-guile: 
@@ -29331,6 +29712,9 @@ configure-guile:
  
  .PHONY: all-guile maybe-all-guile
  maybe-all-guile:
+@if gcc-bootstrap
+all-guile: stage_current
+@endif gcc-bootstrap
  @if guile
  TARGET-guile=all
  maybe-all-guile: all-guile
@@ -29666,6 +30050,9 @@ maintainer-clean-guile:
  
  .PHONY: configure-tk maybe-configure-tk
  maybe-configure-tk:
+@if gcc-bootstrap
+configure-tk: stage_current
+@endif gcc-bootstrap
  @if tk
  maybe-configure-tk: configure-tk
  configure-tk: 
@@ -29695,6 +30082,9 @@ configure-tk:
  
  .PHONY: all-tk maybe-all-tk
  maybe-all-tk:
+@if gcc-bootstrap
+all-tk: stage_current
+@endif gcc-bootstrap
  @if tk
  TARGET-tk=all
  maybe-all-tk: all-tk
@@ -30030,6 +30420,9 @@ maintainer-clean-tk:
  
  .PHONY: configure-libtermcap maybe-configure-libtermcap
  maybe-configure-libtermcap:
+@if gcc-bootstrap
+configure-libtermcap: stage_current
+@endif gcc-bootstrap
  @if libtermcap
  maybe-configure-libtermcap: configure-libtermcap
  configure-libtermcap: 
@@ -30059,6 +30452,9 @@ configure-libtermcap:
  
  .PHONY: all-libtermcap maybe-all-libtermcap
  maybe-all-libtermcap:
+@if gcc-bootstrap
+all-libtermcap: stage_current
+@endif gcc-bootstrap
  @if libtermcap
  TARGET-libtermcap=all
  maybe-all-libtermcap: all-libtermcap
@@ -30328,6 +30724,9 @@ maintainer-clean-libtermcap:
  
  .PHONY: configure-utils maybe-configure-utils
  maybe-configure-utils:
+@if gcc-bootstrap
+configure-utils: stage_current
+@endif gcc-bootstrap
  @if utils
  maybe-configure-utils: configure-utils
  configure-utils: 
@@ -30357,6 +30756,9 @@ configure-utils:
  
  .PHONY: all-utils maybe-all-utils
  maybe-all-utils:
+@if gcc-bootstrap
+all-utils: stage_current
+@endif gcc-bootstrap
  @if utils
  TARGET-utils=all
  maybe-all-utils: all-utils
@@ -30686,6 +31088,9 @@ maintainer-clean-utils:
  
  .PHONY: configure-gnattools maybe-configure-gnattools
  maybe-configure-gnattools:
+@if gcc-bootstrap
+configure-gnattools: stage_current
+@endif gcc-bootstrap
  @if gnattools
  maybe-configure-gnattools: configure-gnattools
  configure-gnattools: 
@@ -30715,6 +31120,9 @@ configure-gnattools:
  
  .PHONY: all-gnattools maybe-all-gnattools
  maybe-all-gnattools:
+@if gcc-bootstrap
+all-gnattools: stage_current
+@endif gcc-bootstrap
  @if gnattools
  TARGET-gnattools=all
  maybe-all-gnattools: all-gnattools
@@ -31057,6 +31465,9 @@ maintainer-clean-gnattools:
  
  .PHONY: configure-target-libstdc++-v3 maybe-configure-target-libstdc++-v3
  maybe-configure-target-libstdc++-v3:
+@if gcc-bootstrap
+configure-target-libstdc++-v3: stage_current
+@endif gcc-bootstrap
  @if target-libstdc++-v3
  maybe-configure-target-libstdc++-v3: configure-target-libstdc++-v3
  configure-target-libstdc++-v3: 
@@ -31100,6 +31511,9 @@ configure-target-libstdc++-v3:
  
  .PHONY: all-target-libstdc++-v3 maybe-all-target-libstdc++-v3
  maybe-all-target-libstdc++-v3:
+@if gcc-bootstrap
+all-target-libstdc++-v3: stage_current
+@endif gcc-bootstrap
  @if target-libstdc++-v3
  TARGET-target-libstdc++-v3=all
  maybe-all-target-libstdc++-v3: all-target-libstdc++-v3
@@ -31438,6 +31852,9 @@ maintainer-clean-target-libstdc++-v3:
  
  .PHONY: configure-target-libmudflap maybe-configure-target-libmudflap
  maybe-configure-target-libmudflap:
+@if gcc-bootstrap
+configure-target-libmudflap: stage_current
+@endif gcc-bootstrap
  @if target-libmudflap
  maybe-configure-target-libmudflap: configure-target-libmudflap
  configure-target-libmudflap: 
@@ -31481,6 +31898,9 @@ configure-target-libmudflap:
  
  .PHONY: all-target-libmudflap maybe-all-target-libmudflap
  maybe-all-target-libmudflap:
+@if gcc-bootstrap
+all-target-libmudflap: stage_current
+@endif gcc-bootstrap
  @if target-libmudflap
  TARGET-target-libmudflap=all
  maybe-all-target-libmudflap: all-target-libmudflap
@@ -31819,6 +32239,9 @@ maintainer-clean-target-libmudflap:
  
  .PHONY: configure-target-libssp maybe-configure-target-libssp
  maybe-configure-target-libssp:
+@if gcc-bootstrap
+configure-target-libssp: stage_current
+@endif gcc-bootstrap
  @if target-libssp
  maybe-configure-target-libssp: configure-target-libssp
  configure-target-libssp: 
@@ -31862,6 +32285,9 @@ configure-target-libssp:
  
  .PHONY: all-target-libssp maybe-all-target-libssp
  maybe-all-target-libssp:
+@if gcc-bootstrap
+all-target-libssp: stage_current
+@endif gcc-bootstrap
  @if target-libssp
  TARGET-target-libssp=all
  maybe-all-target-libssp: all-target-libssp
@@ -32200,6 +32626,9 @@ maintainer-clean-target-libssp:
  
  .PHONY: configure-target-newlib maybe-configure-target-newlib
  maybe-configure-target-newlib:
+@if gcc-bootstrap
+configure-target-newlib: stage_current
+@endif gcc-bootstrap
  @if target-newlib
  maybe-configure-target-newlib: configure-target-newlib
  configure-target-newlib: 
@@ -32243,6 +32672,9 @@ configure-target-newlib:
  
  .PHONY: all-target-newlib maybe-all-target-newlib
  maybe-all-target-newlib:
+@if gcc-bootstrap
+all-target-newlib: stage_current
+@endif gcc-bootstrap
  @if target-newlib
  TARGET-target-newlib=all
  maybe-all-target-newlib: all-target-newlib
@@ -32581,6 +33013,9 @@ maintainer-clean-target-newlib:
  
  .PHONY: configure-target-libgfortran maybe-configure-target-libgfortran
  maybe-configure-target-libgfortran:
+@if gcc-bootstrap
+configure-target-libgfortran: stage_current
+@endif gcc-bootstrap
  @if target-libgfortran
  maybe-configure-target-libgfortran: configure-target-libgfortran
  configure-target-libgfortran: 
@@ -32624,6 +33059,9 @@ configure-target-libgfortran:
  
  .PHONY: all-target-libgfortran maybe-all-target-libgfortran
  maybe-all-target-libgfortran:
+@if gcc-bootstrap
+all-target-libgfortran: stage_current
+@endif gcc-bootstrap
  @if target-libgfortran
  TARGET-target-libgfortran=all
  maybe-all-target-libgfortran: all-target-libgfortran
@@ -32962,6 +33400,9 @@ maintainer-clean-target-libgfortran:
  
  .PHONY: configure-target-libobjc maybe-configure-target-libobjc
  maybe-configure-target-libobjc:
+@if gcc-bootstrap
+configure-target-libobjc: stage_current
+@endif gcc-bootstrap
  @if target-libobjc
  maybe-configure-target-libobjc: configure-target-libobjc
  configure-target-libobjc: 
@@ -33005,6 +33446,9 @@ configure-target-libobjc:
  
  .PHONY: all-target-libobjc maybe-all-target-libobjc
  maybe-all-target-libobjc:
+@if gcc-bootstrap
+all-target-libobjc: stage_current
+@endif gcc-bootstrap
  @if target-libobjc
  TARGET-target-libobjc=all
  maybe-all-target-libobjc: all-target-libobjc
@@ -33343,6 +33787,9 @@ maintainer-clean-target-libobjc:
  
  .PHONY: configure-target-libtermcap maybe-configure-target-libtermcap
  maybe-configure-target-libtermcap:
+@if gcc-bootstrap
+configure-target-libtermcap: stage_current
+@endif gcc-bootstrap
  @if target-libtermcap
  maybe-configure-target-libtermcap: configure-target-libtermcap
  configure-target-libtermcap: 
@@ -33386,6 +33833,9 @@ configure-target-libtermcap:
  
  .PHONY: all-target-libtermcap maybe-all-target-libtermcap
  maybe-all-target-libtermcap:
+@if gcc-bootstrap
+all-target-libtermcap: stage_current
+@endif gcc-bootstrap
  @if target-libtermcap
  TARGET-target-libtermcap=all
  maybe-all-target-libtermcap: all-target-libtermcap
@@ -33659,6 +34109,9 @@ maintainer-clean-target-libtermcap:
  
  .PHONY: configure-target-winsup maybe-configure-target-winsup
  maybe-configure-target-winsup:
+@if gcc-bootstrap
+configure-target-winsup: stage_current
+@endif gcc-bootstrap
  @if target-winsup
  maybe-configure-target-winsup: configure-target-winsup
  configure-target-winsup: 
@@ -33702,6 +34155,9 @@ configure-target-winsup:
  
  .PHONY: all-target-winsup maybe-all-target-winsup
  maybe-all-target-winsup:
+@if gcc-bootstrap
+all-target-winsup: stage_current
+@endif gcc-bootstrap
  @if target-winsup
  TARGET-target-winsup=all
  maybe-all-target-winsup: all-target-winsup
@@ -34040,6 +34496,9 @@ maintainer-clean-target-winsup:
  
  .PHONY: configure-target-libgloss maybe-configure-target-libgloss
  maybe-configure-target-libgloss:
+@if gcc-bootstrap
+configure-target-libgloss: stage_current
+@endif gcc-bootstrap
  @if target-libgloss
  maybe-configure-target-libgloss: configure-target-libgloss
  configure-target-libgloss: 
@@ -34083,6 +34542,9 @@ configure-target-libgloss:
  
  .PHONY: all-target-libgloss maybe-all-target-libgloss
  maybe-all-target-libgloss:
+@if gcc-bootstrap
+all-target-libgloss: stage_current
+@endif gcc-bootstrap
  @if target-libgloss
  TARGET-target-libgloss=all
  maybe-all-target-libgloss: all-target-libgloss
@@ -34416,6 +34878,9 @@ maintainer-clean-target-libgloss:
  
  .PHONY: configure-target-libiberty maybe-configure-target-libiberty
  maybe-configure-target-libiberty:
+@if gcc-bootstrap
+configure-target-libiberty: stage_current
+@endif gcc-bootstrap
  @if target-libiberty
  maybe-configure-target-libiberty: configure-target-libiberty
  configure-target-libiberty: 
@@ -34459,6 +34924,9 @@ configure-target-libiberty:
  
  .PHONY: all-target-libiberty maybe-all-target-libiberty
  maybe-all-target-libiberty:
+@if gcc-bootstrap
+all-target-libiberty: stage_current
+@endif gcc-bootstrap
  @if target-libiberty
  TARGET-target-libiberty=all
  maybe-all-target-libiberty: all-target-libiberty
@@ -34797,6 +35265,9 @@ maintainer-clean-target-libiberty:
  
  .PHONY: configure-target-gperf maybe-configure-target-gperf
  maybe-configure-target-gperf:
+@if gcc-bootstrap
+configure-target-gperf: stage_current
+@endif gcc-bootstrap
  @if target-gperf
  maybe-configure-target-gperf: configure-target-gperf
  configure-target-gperf: 
@@ -34840,6 +35311,9 @@ configure-target-gperf:
  
  .PHONY: all-target-gperf maybe-all-target-gperf
  maybe-all-target-gperf:
+@if gcc-bootstrap
+all-target-gperf: stage_current
+@endif gcc-bootstrap
  @if target-gperf
  TARGET-target-gperf=all
  maybe-all-target-gperf: all-target-gperf
@@ -35178,6 +35652,9 @@ maintainer-clean-target-gperf:
  
  .PHONY: configure-target-examples maybe-configure-target-examples
  maybe-configure-target-examples:
+@if gcc-bootstrap
+configure-target-examples: stage_current
+@endif gcc-bootstrap
  @if target-examples
  maybe-configure-target-examples: configure-target-examples
  configure-target-examples: 
@@ -35221,6 +35698,9 @@ configure-target-examples:
  
  .PHONY: all-target-examples maybe-all-target-examples
  maybe-all-target-examples:
+@if gcc-bootstrap
+all-target-examples: stage_current
+@endif gcc-bootstrap
  @if target-examples
  TARGET-target-examples=all
  maybe-all-target-examples: all-target-examples
@@ -35549,6 +36029,9 @@ maintainer-clean-target-examples:
  
  .PHONY: configure-target-libffi maybe-configure-target-libffi
  maybe-configure-target-libffi:
+@if gcc-bootstrap
+configure-target-libffi: stage_current
+@endif gcc-bootstrap
  @if target-libffi
  maybe-configure-target-libffi: configure-target-libffi
  configure-target-libffi: 
@@ -35592,6 +36075,9 @@ configure-target-libffi:
  
  .PHONY: all-target-libffi maybe-all-target-libffi
  maybe-all-target-libffi:
+@if gcc-bootstrap
+all-target-libffi: stage_current
+@endif gcc-bootstrap
  @if target-libffi
  TARGET-target-libffi=all
  maybe-all-target-libffi: all-target-libffi
@@ -35930,6 +36416,9 @@ maintainer-clean-target-libffi:
  
  .PHONY: configure-target-libjava maybe-configure-target-libjava
  maybe-configure-target-libjava:
+@if gcc-bootstrap
+configure-target-libjava: stage_current
+@endif gcc-bootstrap
  @if target-libjava
  maybe-configure-target-libjava: configure-target-libjava
  configure-target-libjava: 
@@ -35973,6 +36462,9 @@ configure-target-libjava:
  
  .PHONY: all-target-libjava maybe-all-target-libjava
  maybe-all-target-libjava:
+@if gcc-bootstrap
+all-target-libjava: stage_current
+@endif gcc-bootstrap
  @if target-libjava
  TARGET-target-libjava=all
  maybe-all-target-libjava: all-target-libjava
@@ -36311,6 +36803,9 @@ maintainer-clean-target-libjava:
  
  .PHONY: configure-target-zlib maybe-configure-target-zlib
  maybe-configure-target-zlib:
+@if gcc-bootstrap
+configure-target-zlib: stage_current
+@endif gcc-bootstrap
  @if target-zlib
  maybe-configure-target-zlib: configure-target-zlib
  configure-target-zlib: 
@@ -36354,6 +36849,9 @@ configure-target-zlib:
  
  .PHONY: all-target-zlib maybe-all-target-zlib
  maybe-all-target-zlib:
+@if gcc-bootstrap
+all-target-zlib: stage_current
+@endif gcc-bootstrap
  @if target-zlib
  TARGET-target-zlib=all
  maybe-all-target-zlib: all-target-zlib
@@ -36692,6 +37190,9 @@ maintainer-clean-target-zlib:
  
  .PHONY: configure-target-boehm-gc maybe-configure-target-boehm-gc
  maybe-configure-target-boehm-gc:
+@if gcc-bootstrap
+configure-target-boehm-gc: stage_current
+@endif gcc-bootstrap
  @if target-boehm-gc
  maybe-configure-target-boehm-gc: configure-target-boehm-gc
  configure-target-boehm-gc: 
@@ -36735,6 +37236,9 @@ configure-target-boehm-gc:
  
  .PHONY: all-target-boehm-gc maybe-all-target-boehm-gc
  maybe-all-target-boehm-gc:
+@if gcc-bootstrap
+all-target-boehm-gc: stage_current
+@endif gcc-bootstrap
  @if target-boehm-gc
  TARGET-target-boehm-gc=all
  maybe-all-target-boehm-gc: all-target-boehm-gc
@@ -37073,6 +37577,9 @@ maintainer-clean-target-boehm-gc:
  
  .PHONY: configure-target-qthreads maybe-configure-target-qthreads
  maybe-configure-target-qthreads:
+@if gcc-bootstrap
+configure-target-qthreads: stage_current
+@endif gcc-bootstrap
  @if target-qthreads
  maybe-configure-target-qthreads: configure-target-qthreads
  configure-target-qthreads: 
@@ -37116,6 +37623,9 @@ configure-target-qthreads:
  
  .PHONY: all-target-qthreads maybe-all-target-qthreads
  maybe-all-target-qthreads:
+@if gcc-bootstrap
+all-target-qthreads: stage_current
+@endif gcc-bootstrap
  @if target-qthreads
  TARGET-target-qthreads=all
  maybe-all-target-qthreads: all-target-qthreads
@@ -37454,6 +37964,9 @@ maintainer-clean-target-qthreads:
  
  .PHONY: configure-target-rda maybe-configure-target-rda
  maybe-configure-target-rda:
+@if gcc-bootstrap
+configure-target-rda: stage_current
+@endif gcc-bootstrap
  @if target-rda
  maybe-configure-target-rda: configure-target-rda
  configure-target-rda: 
@@ -37497,6 +38010,9 @@ configure-target-rda:
  
  .PHONY: all-target-rda maybe-all-target-rda
  maybe-all-target-rda:
+@if gcc-bootstrap
+all-target-rda: stage_current
+@endif gcc-bootstrap
  @if target-rda
  TARGET-target-rda=all
  maybe-all-target-rda: all-target-rda
@@ -37835,6 +38351,9 @@ maintainer-clean-target-rda:
  
  .PHONY: configure-target-libada maybe-configure-target-libada
  maybe-configure-target-libada:
+@if gcc-bootstrap
+configure-target-libada: stage_current
+@endif gcc-bootstrap
  @if target-libada
  maybe-configure-target-libada: configure-target-libada
  configure-target-libada: 
@@ -37878,6 +38397,9 @@ configure-target-libada:
  
  .PHONY: all-target-libada maybe-all-target-libada
  maybe-all-target-libada:
+@if gcc-bootstrap
+all-target-libada: stage_current
+@endif gcc-bootstrap
  @if target-libada
  TARGET-target-libada=all
  maybe-all-target-libada: all-target-libada
@@ -38216,6 +38738,9 @@ maintainer-clean-target-libada:
  
  .PHONY: configure-target-libgomp maybe-configure-target-libgomp
  maybe-configure-target-libgomp:
+@if gcc-bootstrap
+configure-target-libgomp: stage_current
+@endif gcc-bootstrap
  @if target-libgomp
  maybe-configure-target-libgomp: configure-target-libgomp
  configure-target-libgomp: 
@@ -38259,6 +38784,9 @@ configure-target-libgomp:
  
  .PHONY: all-target-libgomp maybe-all-target-libgomp
  maybe-all-target-libgomp:
+@if gcc-bootstrap
+all-target-libgomp: stage_current
+@endif gcc-bootstrap
  @if target-libgomp
  TARGET-target-libgomp=all
  maybe-all-target-libgomp: all-target-libgomp
@@ -38768,7 +39296,7 @@ POSTSTAGE1_FLAGS_TO_PASS = \
         CFLAGS="$(BOOT_CFLAGS)" \
         LIBCFLAGS="$(BOOT_CFLAGS)" \
         LDFLAGS="$(BOOT_LDFLAGS)" \
-       ADAC="\$$(CC)"
+       "`echo 'ADAFLAGS=$(BOOT_ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`"
  
  # For stage 1:
  # * We force-disable intermodule optimizations, even if
@@ -40066,13 +40594,18 @@ do-distclean: distclean-stage1
  # not work as a dependency, just as the minimum necessary to avoid errors.
  stage_last:
         $(MAKE) $(RECURSE_FLAGS_TO_PASS) stage1-bubble
-@endif gcc-bootstrap
+
+# Same as unstage, but not phony and defaulting to stage1-start.  We place
+# it in the dependency so that for example `make -j3 all-gcc' works.
+stage_current:
+       @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
  
  .PHONY: restrap
  restrap:
         @: $(MAKE); $(stage)
-       rm -rf stage1-$(TARGET_SUBDIR) stage2 stage3 stage4 stageprofile stagefeedback 
+       rm -rf stage1-$(TARGET_SUBDIR) stage2-* stage3-* stage4-* stageprofile-* stagefeedback-* 
         $(MAKE) $(RECURSE_FLAGS_TO_PASS) all
+@endif gcc-bootstrap
  
  # --------------------------------------
  # Dependencies between different modules
@@ -40358,7 +40891,9 @@ all-stageprofile-libcpp: maybe-all-stageprofile-intl
  all-stagefeedback-libcpp: maybe-all-stagefeedback-intl
  all-fixincludes: maybe-all-libiberty
  all-gnattools: maybe-all-target-libada
+configure-gdb: maybe-configure-intl
  configure-gdb: maybe-configure-sim
+all-gdb: maybe-all-intl
  all-gdb: maybe-all-libiberty
  all-gdb: maybe-all-opcodes
  all-gdb: maybe-all-bfd
@@ -40379,6 +40914,14 @@ configure-stage3-bfd: configure-stage3-libiberty
  configure-stage4-bfd: configure-stage4-libiberty
  configure-stageprofile-bfd: configure-stageprofile-libiberty
  configure-stagefeedback-bfd: configure-stagefeedback-libiberty
+configure-bfd: maybe-configure-intl
+
+configure-stage1-bfd: maybe-configure-stage1-intl
+configure-stage2-bfd: maybe-configure-stage2-intl
+configure-stage3-bfd: maybe-configure-stage3-intl
+configure-stage4-bfd: maybe-configure-stage4-intl
+configure-stageprofile-bfd: maybe-configure-stageprofile-intl
+configure-stagefeedback-bfd: maybe-configure-stagefeedback-intl
  all-bfd: maybe-all-libiberty
  
  all-stage1-bfd: maybe-all-stage1-libiberty
@@ -40395,6 +40938,14 @@ all-stage3-bfd: maybe-all-stage3-intl
  all-stage4-bfd: maybe-all-stage4-intl
  all-stageprofile-bfd: maybe-all-stageprofile-intl
  all-stagefeedback-bfd: maybe-all-stagefeedback-intl
+configure-binutils: maybe-configure-intl
+
+configure-stage1-binutils: maybe-configure-stage1-intl
+configure-stage2-binutils: maybe-configure-stage2-intl
+configure-stage3-binutils: maybe-configure-stage3-intl
+configure-stage4-binutils: maybe-configure-stage4-intl
+configure-stageprofile-binutils: maybe-configure-stageprofile-intl
+configure-stagefeedback-binutils: maybe-configure-stagefeedback-intl
  all-binutils: maybe-all-libiberty
  
  all-stage1-binutils: maybe-all-stage1-libiberty
@@ -40456,6 +41007,14 @@ all-stageprofile-binutils: maybe-all-stageprofile-intl
  all-stagefeedback-binutils: maybe-all-stagefeedback-intl
  install-binutils: maybe-install-opcodes
  install-opcodes: maybe-install-bfd
+configure-gas: maybe-configure-intl
+
+configure-stage1-gas: maybe-configure-stage1-intl
+configure-stage2-gas: maybe-configure-stage2-intl
+configure-stage3-gas: maybe-configure-stage3-intl
+configure-stage4-gas: maybe-configure-stage4-intl
+configure-stageprofile-gas: maybe-configure-stageprofile-intl
+configure-stagefeedback-gas: maybe-configure-stagefeedback-intl
  all-gas: maybe-all-libiberty
  
  all-stage1-gas: maybe-all-stage1-libiberty
@@ -40488,10 +41047,19 @@ all-stage3-gas: maybe-all-stage3-intl
  all-stage4-gas: maybe-all-stage4-intl
  all-stageprofile-gas: maybe-all-stageprofile-intl
  all-stagefeedback-gas: maybe-all-stagefeedback-intl
+configure-gprof: maybe-configure-intl
  all-gprof: maybe-all-libiberty
  all-gprof: maybe-all-bfd
  all-gprof: maybe-all-opcodes
  all-gprof: maybe-all-intl
+configure-ld: maybe-configure-intl
+
+configure-stage1-ld: maybe-configure-stage1-intl
+configure-stage2-ld: maybe-configure-stage2-intl
+configure-stage3-ld: maybe-configure-stage3-intl
+configure-stage4-ld: maybe-configure-stage4-intl
+configure-stageprofile-ld: maybe-configure-stageprofile-intl
+configure-stagefeedback-ld: maybe-configure-stagefeedback-intl
  all-ld: maybe-all-libiberty
  
  all-stage1-ld: maybe-all-stage1-libiberty
@@ -40551,6 +41119,14 @@ all-stage3-ld: maybe-all-stage3-intl
  all-stage4-ld: maybe-all-stage4-intl
  all-stageprofile-ld: maybe-all-stageprofile-intl
  all-stagefeedback-ld: maybe-all-stagefeedback-intl
+configure-opcodes: maybe-configure-intl
+
+configure-stage1-opcodes: maybe-configure-stage1-intl
+configure-stage2-opcodes: maybe-configure-stage2-intl
+configure-stage3-opcodes: maybe-configure-stage3-intl
+configure-stage4-opcodes: maybe-configure-stage4-intl
+configure-stageprofile-opcodes: maybe-configure-stageprofile-intl
+configure-stagefeedback-opcodes: maybe-configure-stagefeedback-intl
  all-opcodes: maybe-all-bfd
  
  all-stage1-opcodes: maybe-all-stage1-bfd
@@ -40567,6 +41143,14 @@ all-stage3-opcodes: maybe-all-stage3-libiberty
  all-stage4-opcodes: maybe-all-stage4-libiberty
  all-stageprofile-opcodes: maybe-all-stageprofile-libiberty
  all-stagefeedback-opcodes: maybe-all-stagefeedback-libiberty
+all-opcodes: maybe-all-intl
+
+all-stage1-opcodes: maybe-all-stage1-intl
+all-stage2-opcodes: maybe-all-stage2-intl
+all-stage3-opcodes: maybe-all-stage3-intl
+all-stage4-opcodes: maybe-all-stage4-intl
+all-stageprofile-opcodes: maybe-all-stageprofile-intl
+all-stagefeedback-opcodes: maybe-all-stagefeedback-intl
  all-dejagnu: maybe-all-tcl
  all-dejagnu: maybe-all-expect
  all-dejagnu: maybe-all-tk
@@ -40588,6 +41172,8 @@ all-sid: maybe-all-tcl
  all-sid: maybe-all-tk
  install-sid: maybe-install-tcl
  install-sid: maybe-install-tk
+configure-sim: maybe-configure-intl
+all-sim: maybe-all-intl
  all-sim: maybe-all-libiberty
  all-sim: maybe-all-bfd
  all-sim: maybe-all-opcodes
@@ -40642,7 +41228,9 @@ all-target-libjava: maybe-all-target-zlib
  all-target-libjava: maybe-all-target-boehm-gc
  all-target-libjava: maybe-all-target-qthreads
  all-target-libjava: maybe-all-target-libffi
+configure-target-libobjc: maybe-configure-target-boehm-gc
  all-target-libobjc: maybe-all-target-libiberty
+all-target-libobjc: maybe-all-target-boehm-gc
  all-target-libstdc++-v3: maybe-all-target-libiberty
  all-target-libgloss: maybe-configure-target-newlib
  all-target-winsup: maybe-all-target-libiberty