fix libcc1 dependencies in toplevel Makefile

[Olivier Hainque <hainque@adacore.com>]

[-- Attachment #1: Type: text/plain, Size: 2050 bytes --]

Hello,

During highly parallel builds on fast hosts, we have experienced
sporadic bootstrap failures on libquadmath like

  In file included from ../../../src/libquadmath/printf/printf_fp.c:39:0:
  ../../../src/libquadmath/printf/quadmath-printf.h:24:20: fatal error: .../build/./gcc/include-fixed/limits.h: No such file or directory
  #include <limits.h>

A pretty clear sign of a race condition caused by some inaccuracy in the
dependency statements.

Investigation led us to suspect this piece in the toplevel Makefile.in:

  all-libcc1: maybe-all-gcc

which differs from all the other dependencies on maybe-all-gcc in that it's
unconditional whereas the other ones are conditioned on @if gcc-no-bootstrap.

(Thanks to Nico Roche, cc'ed for the worked involved in finding this out)

Our understanding is that it's incorrect to have dependencies on maybe-all-gcc
in the bootstrap case; that this should be a dependency on stage_current
instead.

This patch is a proposal to address this by first removing the following
statement in Makefile.def:

  dependencies = { module=all-libcc1; on=all-gcc; };

(which emits the dependency unconditionally), then refining the expansion
of "all" targets in Makefile.tpl so they include a possible dep conditioned by
gcc-no-bootstrap, on demand for "host_module"s that ask for it by way of a new
"depgcc" parameter.

We have been using this in-house for months now. The sporadic failures
have disappeared since then and we haven't observed any related fallout
so far.

Bootstrapped and regression tested on x86_64-linux.

OK to commit ?

Thanks in advance for your feedback,

With Kind Regards,

Olivier

2017-06-13  Olivier Hainque  <hainque@adacore.com>

	* Makefile.def (host_modules): Set depgcc to true for libcc1,
	meaning need of a dep on stage_current if gcc-bootstrap and on
	maybe-all-gcc otherwise.
	(dependencies) Remove unconditional dependency on all-gcc.
    
	* Makefile.tpl ("all" targets): Handle depgcc.
	* Makefile.in: Regenerate
 

[-- Attachment #2: libcc1-deps.diff --]
[-- Type: application/octet-stream, Size: 17138 bytes --]

diff --git a/Makefile.def b/Makefile.def
index abfa9ef..0bc3ccf 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -126,7 +126,7 @@ host_modules= { module= gnattools; };
 host_modules= { module= lto-plugin; bootstrap=true;
 		extra_configure_flags='--enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@';
 		extra_make_flags='@extra_linker_plugin_flags@'; };
-host_modules= { module= libcc1; extra_configure_flags=--enable-shared; };
+host_modules= { module= libcc1; extra_configure_flags=--enable-shared; depgcc=true; };
 host_modules= { module= gotools; };
 
 target_modules = { module= libstdc++-v3;
@@ -373,7 +373,6 @@ dependencies = { module=all-lto-plugin; on=all-libiberty; };
 dependencies = { module=all-lto-plugin; on=all-libiberty-linker-plugin; };
 
 dependencies = { module=configure-libcc1; on=configure-gcc; };
-dependencies = { module=all-libcc1; on=all-gcc; };
 
 dependencies = { module=all-gotools; on=all-target-libgo; };
 
diff --git a/Makefile.in b/Makefile.in
index b824e0a..5007f9d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2808,6 +2808,7 @@ 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
@@ -2865,6 +2866,7 @@ 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
@@ -2922,6 +2924,7 @@ 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
@@ -2979,6 +2982,7 @@ 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
@@ -3036,6 +3040,7 @@ 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
@@ -3093,6 +3098,7 @@ 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
@@ -3150,6 +3156,7 @@ maybe-all-build-libcpp:
 @if gcc-bootstrap
 all-build-libcpp: stage_current
 @endif gcc-bootstrap
+
 @if build-libcpp
 TARGET-build-libcpp=all
 maybe-all-build-libcpp: all-build-libcpp
@@ -3475,6 +3482,7 @@ maybe-all-bfd:
 @if gcc-bootstrap
 all-bfd: stage_current
 @endif gcc-bootstrap
+
 @if bfd
 TARGET-bfd=all
 maybe-all-bfd: all-bfd
@@ -4505,6 +4513,7 @@ maybe-all-opcodes:
 @if gcc-bootstrap
 all-opcodes: stage_current
 @endif gcc-bootstrap
+
 @if opcodes
 TARGET-opcodes=all
 maybe-all-opcodes: all-opcodes
@@ -5535,6 +5544,7 @@ maybe-all-binutils:
 @if gcc-bootstrap
 all-binutils: stage_current
 @endif gcc-bootstrap
+
 @if binutils
 TARGET-binutils=all
 maybe-all-binutils: all-binutils
@@ -6301,6 +6311,7 @@ maybe-all-bison:
 @if gcc-bootstrap
 all-bison: stage_current
 @endif gcc-bootstrap
+
 @if bison
 TARGET-bison=all
 maybe-all-bison: all-bison
@@ -6745,6 +6756,7 @@ maybe-all-cgen:
 @if gcc-bootstrap
 all-cgen: stage_current
 @endif gcc-bootstrap
+
 @if cgen
 TARGET-cgen=all
 maybe-all-cgen: all-cgen
@@ -7186,6 +7198,7 @@ maybe-all-dejagnu:
 @if gcc-bootstrap
 all-dejagnu: stage_current
 @endif gcc-bootstrap
+
 @if dejagnu
 TARGET-dejagnu=all
 maybe-all-dejagnu: all-dejagnu
@@ -7627,6 +7640,7 @@ maybe-all-etc:
 @if gcc-bootstrap
 all-etc: stage_current
 @endif gcc-bootstrap
+
 @if etc
 TARGET-etc=all
 maybe-all-etc: all-etc
@@ -8068,6 +8082,7 @@ maybe-all-fastjar:
 @if gcc-bootstrap
 all-fastjar: stage_current
 @endif gcc-bootstrap
+
 @if fastjar
 TARGET-fastjar=all
 maybe-all-fastjar: all-fastjar
@@ -8776,6 +8791,7 @@ maybe-all-fixincludes:
 @if gcc-bootstrap
 all-fixincludes: stage_current
 @endif gcc-bootstrap
+
 @if fixincludes
 TARGET-fixincludes=all
 maybe-all-fixincludes: all-fixincludes
@@ -9527,6 +9543,7 @@ maybe-all-flex:
 @if gcc-bootstrap
 all-flex: stage_current
 @endif gcc-bootstrap
+
 @if flex
 TARGET-flex=all
 maybe-all-flex: all-flex
@@ -10235,6 +10252,7 @@ maybe-all-gas:
 @if gcc-bootstrap
 all-gas: stage_current
 @endif gcc-bootstrap
+
 @if gas
 TARGET-gas=all
 maybe-all-gas: all-gas
@@ -11265,6 +11283,7 @@ maybe-all-gcc:
 @if gcc-bootstrap
 all-gcc: stage_current
 @endif gcc-bootstrap
+
 @if gcc
 TARGET-gcc=all
 maybe-all-gcc: all-gcc
@@ -12303,6 +12322,7 @@ maybe-all-gmp:
 @if gcc-bootstrap
 all-gmp: stage_current
 @endif gcc-bootstrap
+
 @if gmp
 TARGET-gmp=all
 maybe-all-gmp: all-gmp
@@ -13329,6 +13349,7 @@ maybe-all-mpfr:
 @if gcc-bootstrap
 all-mpfr: stage_current
 @endif gcc-bootstrap
+
 @if mpfr
 TARGET-mpfr=all
 maybe-all-mpfr: all-mpfr
@@ -14355,6 +14376,7 @@ maybe-all-mpc:
 @if gcc-bootstrap
 all-mpc: stage_current
 @endif gcc-bootstrap
+
 @if mpc
 TARGET-mpc=all
 maybe-all-mpc: all-mpc
@@ -15381,6 +15403,7 @@ maybe-all-isl:
 @if gcc-bootstrap
 all-isl: stage_current
 @endif gcc-bootstrap
+
 @if isl
 TARGET-isl=all
 maybe-all-isl: all-isl
@@ -16407,6 +16430,7 @@ maybe-all-libelf:
 @if gcc-bootstrap
 all-libelf: stage_current
 @endif gcc-bootstrap
+
 @if libelf
 TARGET-libelf=all
 maybe-all-libelf: all-libelf
@@ -17425,6 +17449,7 @@ maybe-all-gold:
 @if gcc-bootstrap
 all-gold: stage_current
 @endif gcc-bootstrap
+
 @if gold
 TARGET-gold=all
 maybe-all-gold: all-gold
@@ -18191,6 +18216,7 @@ maybe-all-gprof:
 @if gcc-bootstrap
 all-gprof: stage_current
 @endif gcc-bootstrap
+
 @if gprof
 TARGET-gprof=all
 maybe-all-gprof: all-gprof
@@ -18896,6 +18922,7 @@ maybe-all-intl:
 @if gcc-bootstrap
 all-intl: stage_current
 @endif gcc-bootstrap
+
 @if intl
 TARGET-intl=all
 maybe-all-intl: all-intl
@@ -19662,6 +19689,7 @@ maybe-all-tcl:
 @if gcc-bootstrap
 all-tcl: stage_current
 @endif gcc-bootstrap
+
 @if tcl
 TARGET-tcl=all
 maybe-all-tcl: all-tcl
@@ -20088,6 +20116,7 @@ maybe-all-itcl:
 @if gcc-bootstrap
 all-itcl: stage_current
 @endif gcc-bootstrap
+
 @if itcl
 TARGET-itcl=all
 maybe-all-itcl: all-itcl
@@ -20793,6 +20822,7 @@ maybe-all-ld:
 @if gcc-bootstrap
 all-ld: stage_current
 @endif gcc-bootstrap
+
 @if ld
 TARGET-ld=all
 maybe-all-ld: all-ld
@@ -21823,6 +21853,7 @@ maybe-all-libbacktrace:
 @if gcc-bootstrap
 all-libbacktrace: stage_current
 @endif gcc-bootstrap
+
 @if libbacktrace
 TARGET-libbacktrace=all
 maybe-all-libbacktrace: all-libbacktrace
@@ -22853,6 +22884,7 @@ maybe-all-libcpp:
 @if gcc-bootstrap
 all-libcpp: stage_current
 @endif gcc-bootstrap
+
 @if libcpp
 TARGET-libcpp=all
 maybe-all-libcpp: all-libcpp
@@ -23883,6 +23915,7 @@ maybe-all-libdecnumber:
 @if gcc-bootstrap
 all-libdecnumber: stage_current
 @endif gcc-bootstrap
+
 @if libdecnumber
 TARGET-libdecnumber=all
 maybe-all-libdecnumber: all-libdecnumber
@@ -24649,6 +24682,7 @@ maybe-all-libgui:
 @if gcc-bootstrap
 all-libgui: stage_current
 @endif gcc-bootstrap
+
 @if libgui
 TARGET-libgui=all
 maybe-all-libgui: all-libgui
@@ -25362,6 +25396,7 @@ maybe-all-libiberty:
 @if gcc-bootstrap
 all-libiberty: stage_current
 @endif gcc-bootstrap
+
 @if libiberty
 TARGET-libiberty=all
 maybe-all-libiberty: all-libiberty
@@ -26400,6 +26435,7 @@ maybe-all-libiberty-linker-plugin:
 @if gcc-bootstrap
 all-libiberty-linker-plugin: stage_current
 @endif gcc-bootstrap
+
 @if libiberty-linker-plugin
 TARGET-libiberty-linker-plugin=all
 maybe-all-libiberty-linker-plugin: all-libiberty-linker-plugin
@@ -27438,6 +27474,7 @@ maybe-all-libiconv:
 @if gcc-bootstrap
 all-libiconv: stage_current
 @endif gcc-bootstrap
+
 @if libiconv
 TARGET-libiconv=all
 maybe-all-libiconv: all-libiconv
@@ -28099,6 +28136,7 @@ maybe-all-m4:
 @if gcc-bootstrap
 all-m4: stage_current
 @endif gcc-bootstrap
+
 @if m4
 TARGET-m4=all
 maybe-all-m4: all-m4
@@ -28540,6 +28578,7 @@ maybe-all-readline:
 @if gcc-bootstrap
 all-readline: stage_current
 @endif gcc-bootstrap
+
 @if readline
 TARGET-readline=all
 maybe-all-readline: all-readline
@@ -28981,6 +29020,7 @@ maybe-all-sid:
 @if gcc-bootstrap
 all-sid: stage_current
 @endif gcc-bootstrap
+
 @if sid
 TARGET-sid=all
 maybe-all-sid: all-sid
@@ -29422,6 +29462,7 @@ maybe-all-sim:
 @if gcc-bootstrap
 all-sim: stage_current
 @endif gcc-bootstrap
+
 @if sim
 TARGET-sim=all
 maybe-all-sim: all-sim
@@ -29863,6 +29904,7 @@ maybe-all-texinfo:
 @if gcc-bootstrap
 all-texinfo: stage_current
 @endif gcc-bootstrap
+
 @if texinfo
 TARGET-texinfo=all
 maybe-all-texinfo: all-texinfo
@@ -30564,6 +30606,7 @@ maybe-all-zlib:
 @if gcc-bootstrap
 all-zlib: stage_current
 @endif gcc-bootstrap
+
 @if zlib
 TARGET-zlib=all
 maybe-all-zlib: all-zlib
@@ -31312,6 +31355,7 @@ maybe-all-gdb:
 @if gcc-bootstrap
 all-gdb: stage_current
 @endif gcc-bootstrap
+
 @if gdb
 TARGET-gdb=all
 maybe-all-gdb: all-gdb
@@ -31753,6 +31797,7 @@ maybe-all-expect:
 @if gcc-bootstrap
 all-expect: stage_current
 @endif gcc-bootstrap
+
 @if expect
 TARGET-expect=all
 maybe-all-expect: all-expect
@@ -32194,6 +32239,7 @@ maybe-all-guile:
 @if gcc-bootstrap
 all-guile: stage_current
 @endif gcc-bootstrap
+
 @if guile
 TARGET-guile=all
 maybe-all-guile: all-guile
@@ -32635,6 +32681,7 @@ maybe-all-tk:
 @if gcc-bootstrap
 all-tk: stage_current
 @endif gcc-bootstrap
+
 @if tk
 TARGET-tk=all
 maybe-all-tk: all-tk
@@ -33076,6 +33123,7 @@ maybe-all-libtermcap:
 @if gcc-bootstrap
 all-libtermcap: stage_current
 @endif gcc-bootstrap
+
 @if libtermcap
 TARGET-libtermcap=all
 maybe-all-libtermcap: all-libtermcap
@@ -33451,6 +33499,7 @@ maybe-all-utils:
 @if gcc-bootstrap
 all-utils: stage_current
 @endif gcc-bootstrap
+
 @if utils
 TARGET-utils=all
 maybe-all-utils: all-utils
@@ -33886,6 +33935,7 @@ maybe-all-gnattools:
 @if gcc-bootstrap
 all-gnattools: stage_current
 @endif gcc-bootstrap
+
 @if gnattools
 TARGET-gnattools=all
 maybe-all-gnattools: all-gnattools
@@ -34599,6 +34649,7 @@ maybe-all-lto-plugin:
 @if gcc-bootstrap
 all-lto-plugin: stage_current
 @endif gcc-bootstrap
+
 @if lto-plugin
 TARGET-lto-plugin=all
 maybe-all-lto-plugin: all-lto-plugin
@@ -35365,6 +35416,11 @@ maybe-all-libcc1:
 @if gcc-bootstrap
 all-libcc1: stage_current
 @endif gcc-bootstrap
+
+@if gcc-no-bootstrap
+all-libcc1: maybe-all-gcc
+@endif gcc-no-bootstrap
+
 @if libcc1
 TARGET-libcc1=all
 maybe-all-libcc1: all-libcc1
@@ -35806,6 +35862,7 @@ maybe-all-gotools:
 @if gcc-bootstrap
 all-gotools: stage_current
 @endif gcc-bootstrap
+
 @if gotools
 TARGET-gotools=all
 maybe-all-gotools: all-gotools
@@ -36628,6 +36685,7 @@ 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
@@ -37784,6 +37842,7 @@ maybe-all-target-libsanitizer:
 @if gcc-bootstrap
 all-target-libsanitizer: stage_current
 @endif gcc-bootstrap
+
 @if target-libsanitizer
 TARGET-target-libsanitizer=all
 maybe-all-target-libsanitizer: all-target-libsanitizer
@@ -38940,6 +38999,7 @@ maybe-all-target-libmpx:
 @if gcc-bootstrap
 all-target-libmpx: stage_current
 @endif gcc-bootstrap
+
 @if target-libmpx
 TARGET-target-libmpx=all
 maybe-all-target-libmpx: all-target-libmpx
@@ -40096,6 +40156,7 @@ maybe-all-target-libvtv:
 @if gcc-bootstrap
 all-target-libvtv: stage_current
 @endif gcc-bootstrap
+
 @if target-libvtv
 TARGET-target-libvtv=all
 maybe-all-target-libvtv: all-target-libvtv
@@ -40892,6 +40953,7 @@ maybe-all-target-libcilkrts:
 @if gcc-bootstrap
 all-target-libcilkrts: stage_current
 @endif gcc-bootstrap
+
 @if target-libcilkrts
 TARGET-target-libcilkrts=all
 maybe-all-target-libcilkrts: all-target-libcilkrts
@@ -41350,6 +41412,7 @@ maybe-all-target-liboffloadmic:
 @if gcc-bootstrap
 all-target-liboffloadmic: stage_current
 @endif gcc-bootstrap
+
 @if target-liboffloadmic
 TARGET-target-liboffloadmic=all
 maybe-all-target-liboffloadmic: all-target-liboffloadmic
@@ -41808,6 +41871,7 @@ 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
@@ -42266,6 +42330,7 @@ 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
@@ -43084,6 +43149,7 @@ maybe-all-target-libgcc:
 @if gcc-bootstrap
 all-target-libgcc: stage_current
 @endif gcc-bootstrap
+
 @if target-libgcc
 TARGET-target-libgcc=all
 maybe-all-target-libgcc: all-target-libgcc
@@ -43875,6 +43941,7 @@ maybe-all-target-libbacktrace:
 @if gcc-bootstrap
 all-target-libbacktrace: stage_current
 @endif gcc-bootstrap
+
 @if target-libbacktrace
 TARGET-target-libbacktrace=all
 maybe-all-target-libbacktrace: all-target-libbacktrace
@@ -44333,6 +44400,7 @@ maybe-all-target-libquadmath:
 @if gcc-bootstrap
 all-target-libquadmath: stage_current
 @endif gcc-bootstrap
+
 @if target-libquadmath
 TARGET-target-libquadmath=all
 maybe-all-target-libquadmath: all-target-libquadmath
@@ -44791,6 +44859,7 @@ 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
@@ -45249,6 +45318,7 @@ 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
@@ -45707,6 +45777,7 @@ maybe-all-target-libgo:
 @if gcc-bootstrap
 all-target-libgo: stage_current
 @endif gcc-bootstrap
+
 @if target-libgo
 TARGET-target-libgo=all
 maybe-all-target-libgo: all-target-libgo
@@ -46165,6 +46236,7 @@ maybe-all-target-libhsail-rt:
 @if gcc-bootstrap
 all-target-libhsail-rt: stage_current
 @endif gcc-bootstrap
+
 @if target-libhsail-rt
 TARGET-target-libhsail-rt=all
 maybe-all-target-libhsail-rt: all-target-libhsail-rt
@@ -46623,6 +46695,7 @@ 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
@@ -47016,6 +47089,7 @@ 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
@@ -47474,6 +47548,7 @@ 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
@@ -47927,6 +48002,7 @@ 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
@@ -48375,6 +48451,7 @@ 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
@@ -48833,6 +48910,7 @@ 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
@@ -49291,6 +49369,7 @@ 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
@@ -50109,6 +50188,7 @@ 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
@@ -50905,6 +50985,7 @@ maybe-all-target-libitm:
 @if gcc-bootstrap
 all-target-libitm: stage_current
 @endif gcc-bootstrap
+
 @if target-libitm
 TARGET-target-libitm=all
 maybe-all-target-libitm: all-target-libitm
@@ -51363,6 +51444,7 @@ maybe-all-target-libatomic:
 @if gcc-bootstrap
 all-target-libatomic: stage_current
 @endif gcc-bootstrap
+
 @if target-libatomic
 TARGET-target-libatomic=all
 maybe-all-target-libatomic: all-target-libatomic
@@ -55262,7 +55344,6 @@ all-stagefeedback-lto-plugin: maybe-all-stagefeedback-libiberty-linker-plugin
 all-stageautoprofile-lto-plugin: maybe-all-stageautoprofile-libiberty-linker-plugin
 all-stageautofeedback-lto-plugin: maybe-all-stageautofeedback-libiberty-linker-plugin
 configure-libcc1: maybe-configure-gcc
-all-libcc1: maybe-all-gcc
 all-gotools: maybe-all-target-libgo
 all-utils: maybe-all-libiberty
 configure-intl: maybe-all-libiconv
diff --git a/Makefile.tpl b/Makefile.tpl
index d0fa070..8ea0d69 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -1115,6 +1115,11 @@ maybe-all-[+prefix+][+module+]:
 @if gcc-bootstrap
 all-[+prefix+][+module+]: stage_current
 @endif gcc-bootstrap
+[+ IF depgcc +]
+@if gcc-no-bootstrap
+all-[+prefix+][+module+]: maybe-all-gcc
+@endif gcc-no-bootstrap
+[+ ENDIF depgcc +]
 @if [+prefix+][+module+]
 TARGET-[+prefix+][+module+]=[+
   IF all_target +][+all_target+][+ ELSE +]all[+ ENDIF all_target +]