X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=Makefile.in;h=8047c004da80363f182e7c05b5d10d8db950471a;hb=f3f795548f5860fdf265cda46045425567e66ea4;hp=468d8b0b483bc1c353062f786d11c3b01094e838;hpb=2b59cb0507a0cd617d4b6fda5d0ba9673daf1fb2;p=pf3gnuchains%2Fgcc-fork.git

diff --git a/Makefile.in b/Makefile.in
index 468d8b0b483..8047c004da8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -104,7 +104,7 @@ REALLY_SET_LIB_PATH = \
   $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH):$(TARGET_LIB_PATH):$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
 
 # This is the list of directories to be built for the build system.
-BUILD_CONFIGDIRS = libiberty libbanshee
+BUILD_CONFIGDIRS = libiberty
 # Build programs are put under this directory.
 BUILD_SUBDIR = @build_subdir@
 # This is set by the configure script to the arguments to use when configuring
@@ -245,6 +245,10 @@ CXX_FOR_BUILD = $(CXX)
 BUILD_PREFIX = @BUILD_PREFIX@
 BUILD_PREFIX_1 = @BUILD_PREFIX_1@
 
+# Flags to pass to stage2 and later makes.  They are defined
+# here so that they can be overridden by Makefile fragments.
+BOOT_CFLAGS= -g -O2
+
 CONFIGURED_BISON = @CONFIGURED_BISON@
 BISON = `if [ -f $$r/$(BUILD_SUBDIR)/bison/tests/bison ] ; then \
 	    echo $$r/$(BUILD_SUBDIR)/bison/tests/bison ; \
@@ -478,14 +482,6 @@ PICFLAG_FOR_TARGET =
 # Miscellaneous targets and flag lists
 # ------------------------------------
 
-@if gcc-bootstrap
-# Let's leave this as the first rule in the file until toplevel
-# bootstrap is fleshed out completely.
-sorry:
-	@echo Toplevel bootstrap temporarily out of commission.
-	@echo Please reconfigure without --enable-bootstrap
-@endif gcc-bootstrap
-
 # The first rule in the file had better be this one.  Don't put any above it.
 # This lives here to allow makefile fragments to contain dependencies.
 @default_target@:
@@ -682,7 +678,6 @@ configure-host:  \
     maybe-configure-ld \
     maybe-configure-libcpp \
     maybe-configure-libgui \
-    maybe-configure-libbanshee \
     maybe-configure-libiberty \
     maybe-configure-libtool \
     maybe-configure-m4 \
@@ -784,7 +779,6 @@ all-host:  \
     maybe-all-ld \
     maybe-all-libcpp \
     maybe-all-libgui \
-    maybe-all-libbanshee \
     maybe-all-libiberty \
     maybe-all-libtool \
     maybe-all-m4 \
@@ -881,7 +875,6 @@ info-host:  \
     maybe-info-ld \
     maybe-info-libcpp \
     maybe-info-libgui \
-    maybe-info-libbanshee \
     maybe-info-libiberty \
     maybe-info-libtool \
     maybe-info-m4 \
@@ -974,7 +967,6 @@ dvi-host:  \
     maybe-dvi-ld \
     maybe-dvi-libcpp \
     maybe-dvi-libgui \
-    maybe-dvi-libbanshee \
     maybe-dvi-libiberty \
     maybe-dvi-libtool \
     maybe-dvi-m4 \
@@ -1067,7 +1059,6 @@ TAGS-host:  \
     maybe-TAGS-ld \
     maybe-TAGS-libcpp \
     maybe-TAGS-libgui \
-    maybe-TAGS-libbanshee \
     maybe-TAGS-libiberty \
     maybe-TAGS-libtool \
     maybe-TAGS-m4 \
@@ -1160,7 +1151,6 @@ install-info-host:  \
     maybe-install-info-ld \
     maybe-install-info-libcpp \
     maybe-install-info-libgui \
-    maybe-install-info-libbanshee \
     maybe-install-info-libiberty \
     maybe-install-info-libtool \
     maybe-install-info-m4 \
@@ -1253,7 +1243,6 @@ installcheck-host:  \
     maybe-installcheck-ld \
     maybe-installcheck-libcpp \
     maybe-installcheck-libgui \
-    maybe-installcheck-libbanshee \
     maybe-installcheck-libiberty \
     maybe-installcheck-libtool \
     maybe-installcheck-m4 \
@@ -1346,7 +1335,6 @@ mostlyclean-host:  \
     maybe-mostlyclean-ld \
     maybe-mostlyclean-libcpp \
     maybe-mostlyclean-libgui \
-    maybe-mostlyclean-libbanshee \
     maybe-mostlyclean-libiberty \
     maybe-mostlyclean-libtool \
     maybe-mostlyclean-m4 \
@@ -1439,7 +1427,6 @@ clean-host:  \
     maybe-clean-ld \
     maybe-clean-libcpp \
     maybe-clean-libgui \
-    maybe-clean-libbanshee \
     maybe-clean-libiberty \
     maybe-clean-libtool \
     maybe-clean-m4 \
@@ -1532,7 +1519,6 @@ distclean-host:  \
     maybe-distclean-ld \
     maybe-distclean-libcpp \
     maybe-distclean-libgui \
-    maybe-distclean-libbanshee \
     maybe-distclean-libiberty \
     maybe-distclean-libtool \
     maybe-distclean-m4 \
@@ -1625,7 +1611,6 @@ maintainer-clean-host:  \
     maybe-maintainer-clean-ld \
     maybe-maintainer-clean-libcpp \
     maybe-maintainer-clean-libgui \
-    maybe-maintainer-clean-libbanshee \
     maybe-maintainer-clean-libiberty \
     maybe-maintainer-clean-libtool \
     maybe-maintainer-clean-m4 \
@@ -1775,7 +1760,6 @@ do-check: unstage  \
     maybe-check-ld \
     maybe-check-libcpp \
     maybe-check-libgui \
-    maybe-check-libbanshee \
     maybe-check-libiberty \
     maybe-check-libtool \
     maybe-check-m4 \
@@ -1887,7 +1871,6 @@ install-host-nogcc:  \
     maybe-install-ld \
     maybe-install-libcpp \
     maybe-install-libgui \
-    maybe-install-libbanshee \
     maybe-install-libiberty \
     maybe-install-libtool \
     maybe-install-m4 \
@@ -1956,7 +1939,6 @@ install-host:  \
     maybe-install-ld \
     maybe-install-libcpp \
     maybe-install-libgui \
-    maybe-install-libbanshee \
     maybe-install-libiberty \
     maybe-install-libtool \
     maybe-install-m4 \
@@ -12802,305 +12784,6 @@ maintainer-clean-libgui:
 @endif libgui
 
 
-.PHONY: configure-libbanshee maybe-configure-libbanshee
-maybe-configure-libbanshee:
-@if libbanshee
-maybe-configure-libbanshee: configure-libbanshee
-configure-libbanshee:
-	@test -f stage_last && exit 0; \
-	test ! -f libbanshee/Makefile || exit 0; \
-	[ -d libbanshee ] || mkdir libbanshee; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	echo Configuring in libbanshee; \
-	cd libbanshee || exit 1; \
-	case $(srcdir) in \
-	  \.) \
-	    srcdiroption="--srcdir=."; \
-	    libsrcdir=".";; \
-	  /* | [A-Za-z]:[\\/]*) \
-	    srcdiroption="--srcdir=$(srcdir)/libbanshee"; \
-	    libsrcdir="$$s/libbanshee";; \
-	  *) \
-	    srcdiroption="--srcdir=../$(srcdir)/libbanshee"; \
-	    libsrcdir="$$s/libbanshee";; \
-	esac; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
-	  || exit 1
-@endif libbanshee
-
-.PHONY: all-libbanshee maybe-all-libbanshee
-maybe-all-libbanshee:
-@if libbanshee
-maybe-all-libbanshee: all-libbanshee
-all-libbanshee: configure-libbanshee
-	@test -f stage_last && exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(SET_LIB_PATH) \
-	$(HOST_EXPORTS) \
-	(cd libbanshee && $(MAKE) $(FLAGS_TO_PASS)  all)
-@endif libbanshee
-
-.PHONY: check-libbanshee maybe-check-libbanshee
-maybe-check-libbanshee:
-@if libbanshee
-maybe-check-libbanshee: check-libbanshee
-
-check-libbanshee:
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(SET_LIB_PATH) \
-	$(HOST_EXPORTS) \
-	(cd libbanshee && $(MAKE) $(FLAGS_TO_PASS) check)
-
-@endif libbanshee
-
-.PHONY: install-libbanshee maybe-install-libbanshee
-maybe-install-libbanshee:
-@if libbanshee
-maybe-install-libbanshee: install-libbanshee
-
-install-libbanshee:
-
-@endif libbanshee
-
-# Other targets (info, dvi, etc.)
-
-.PHONY: maybe-info-libbanshee info-libbanshee
-maybe-info-libbanshee:
-@if libbanshee
-maybe-info-libbanshee: info-libbanshee
-
-info-libbanshee: \
-    configure-libbanshee 
-	@[ -f ./libbanshee/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(SET_LIB_PATH) \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing info in libbanshee" ; \
-	(cd libbanshee && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          info) \
-	  || exit 1
-
-@endif libbanshee
-
-.PHONY: maybe-dvi-libbanshee dvi-libbanshee
-maybe-dvi-libbanshee:
-@if libbanshee
-maybe-dvi-libbanshee: dvi-libbanshee
-
-dvi-libbanshee: \
-    configure-libbanshee 
-	@[ -f ./libbanshee/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(SET_LIB_PATH) \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing dvi in libbanshee" ; \
-	(cd libbanshee && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          dvi) \
-	  || exit 1
-
-@endif libbanshee
-
-.PHONY: maybe-TAGS-libbanshee TAGS-libbanshee
-maybe-TAGS-libbanshee:
-@if libbanshee
-maybe-TAGS-libbanshee: TAGS-libbanshee
-
-TAGS-libbanshee: \
-    configure-libbanshee 
-	@[ -f ./libbanshee/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(SET_LIB_PATH) \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing TAGS in libbanshee" ; \
-	(cd libbanshee && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          TAGS) \
-	  || exit 1
-
-@endif libbanshee
-
-.PHONY: maybe-install-info-libbanshee install-info-libbanshee
-maybe-install-info-libbanshee:
-@if libbanshee
-maybe-install-info-libbanshee: install-info-libbanshee
-
-install-info-libbanshee: \
-    configure-libbanshee \
-    info-libbanshee 
-	@[ -f ./libbanshee/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(SET_LIB_PATH) \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing install-info in libbanshee" ; \
-	(cd libbanshee && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          install-info) \
-	  || exit 1
-
-@endif libbanshee
-
-.PHONY: maybe-installcheck-libbanshee installcheck-libbanshee
-maybe-installcheck-libbanshee:
-@if libbanshee
-maybe-installcheck-libbanshee: installcheck-libbanshee
-
-installcheck-libbanshee: \
-    configure-libbanshee 
-	@[ -f ./libbanshee/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(SET_LIB_PATH) \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing installcheck in libbanshee" ; \
-	(cd libbanshee && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          installcheck) \
-	  || exit 1
-
-@endif libbanshee
-
-.PHONY: maybe-mostlyclean-libbanshee mostlyclean-libbanshee
-maybe-mostlyclean-libbanshee:
-@if libbanshee
-maybe-mostlyclean-libbanshee: mostlyclean-libbanshee
-
-mostlyclean-libbanshee: 
-	@[ -f ./libbanshee/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(SET_LIB_PATH) \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing mostlyclean in libbanshee" ; \
-	(cd libbanshee && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          mostlyclean) \
-	  || exit 1
-
-@endif libbanshee
-
-.PHONY: maybe-clean-libbanshee clean-libbanshee
-maybe-clean-libbanshee:
-@if libbanshee
-maybe-clean-libbanshee: clean-libbanshee
-
-clean-libbanshee: 
-	@[ -f ./libbanshee/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(SET_LIB_PATH) \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing clean in libbanshee" ; \
-	(cd libbanshee && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          clean) \
-	  || exit 1
-
-@endif libbanshee
-
-.PHONY: maybe-distclean-libbanshee distclean-libbanshee
-maybe-distclean-libbanshee:
-@if libbanshee
-maybe-distclean-libbanshee: distclean-libbanshee
-
-distclean-libbanshee: 
-	@[ -f ./libbanshee/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(SET_LIB_PATH) \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing distclean in libbanshee" ; \
-	(cd libbanshee && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          distclean) \
-	  || exit 1
-
-@endif libbanshee
-
-.PHONY: maybe-maintainer-clean-libbanshee maintainer-clean-libbanshee
-maybe-maintainer-clean-libbanshee:
-@if libbanshee
-maybe-maintainer-clean-libbanshee: maintainer-clean-libbanshee
-
-maintainer-clean-libbanshee: 
-	@[ -f ./libbanshee/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(SET_LIB_PATH) \
-	$(HOST_EXPORTS) \
-	for flag in $(EXTRA_HOST_FLAGS) ; do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	echo "Doing maintainer-clean in libbanshee" ; \
-	(cd libbanshee && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
-	          maintainer-clean) \
-	  || exit 1
-
-@endif libbanshee
-
-
 .PHONY: configure-libiberty maybe-configure-libiberty
 maybe-configure-libiberty:
 @if libiberty
@@ -28185,7 +27868,9 @@ stage:
 # (both in a combined tree, or separately).  This however requires some
 # change to the gcc driver, again in order to avoid comparison failures.
 
-# Bugs: This is almost certainly not parallel-make safe.
+# Bugs: This is crippled when doing parallel make, the `make all-host'
+# and `make all-target' phases can be parallelized.
+
 
 # 'touch' doesn't work right on some platforms.
 STAMP = echo timestamp > 
@@ -28203,7 +27888,6 @@ STAGE1_LANGUAGES=@stage1_languages@
 objext = .o
 
 # Flags to pass to stage2 and later makes.
-BOOT_CFLAGS= -g -O2
 POSTSTAGE1_FLAGS_TO_PASS = \
 	CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \
 	STAGE_PREFIX=$$r/stage-gcc/ \
@@ -28258,10 +27942,6 @@ stage1-start::
 	@[ -d stage1-libcpp ] || mkdir stage1-libcpp; \
 	set stage1-libcpp libcpp ; @CREATE_LINK_TO_DIR@ 
 @endif libcpp
-@if libbanshee
-	@[ -d stage1-libbanshee ] || mkdir stage1-libbanshee; \
-	set stage1-libbanshee libbanshee ; @CREATE_LINK_TO_DIR@ 
-@endif libbanshee
 @if libiberty
 	@[ -d stage1-libiberty ] || mkdir stage1-libiberty; \
 	set stage1-libiberty libiberty ; @CREATE_LINK_TO_DIR@ 
@@ -28297,9 +27977,6 @@ stage1-end::
 @if libcpp
 	@set libcpp stage1-libcpp ; @UNDO_LINK_TO_DIR@ 
 @endif libcpp
-@if libbanshee
-	@set libbanshee stage1-libbanshee ; @UNDO_LINK_TO_DIR@ 
-@endif libbanshee
 @if libiberty
 	@set libiberty stage1-libiberty ; @UNDO_LINK_TO_DIR@ 
 @endif libiberty
@@ -28315,10 +27992,10 @@ stage1-bubble::
 	@if test -f stage1-lean  ; then \
 	  echo Skipping rebuild of stage1 ; \
 	else \
-	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage1; \
+	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stage1; \
 	fi
 
-.PHONY: all-stage1
+.PHONY: all-stage1 clean-stage1
 all-stage1:     \
   maybe-all-stage1-bfd \
   maybe-all-stage1-opcodes \
@@ -28328,16 +28005,30 @@ all-stage1:     \
   maybe-all-stage1-intl   \
   maybe-all-stage1-ld \
   maybe-all-stage1-libcpp  \
-  maybe-all-stage1-libbanshee \
   maybe-all-stage1-libiberty                        \
   maybe-all-stage1-zlib       
 
+do-clean: clean-stage1
+clean-stage1:     \
+  maybe-clean-stage1-bfd \
+  maybe-clean-stage1-opcodes \
+  maybe-clean-stage1-binutils             \
+  maybe-clean-stage1-gas \
+  maybe-clean-stage1-gcc        \
+  maybe-clean-stage1-intl   \
+  maybe-clean-stage1-ld \
+  maybe-clean-stage1-libcpp  \
+  maybe-clean-stage1-libiberty                        \
+  maybe-clean-stage1-zlib       
+
 
 .PHONY: configure-stage1-bfd maybe-configure-stage1-bfd
 .PHONY: all-stage1-bfd maybe-all-stage1-bfd
+.PHONY: clean-stage1-bfd maybe-clean-stage1-bfd
 
 maybe-configure-stage1-bfd:
 maybe-all-stage1-bfd:
+maybe-clean-stage1-bfd:
 
 @if bfd-bootstrap
 maybe-configure-stage1-bfd: configure-stage1-bfd
@@ -28373,13 +28064,25 @@ all-stage1-bfd: configure-stage1-bfd
 	cd bfd && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-bfd: clean-stage1-bfd
+clean-stage1-bfd:
+	@[ -f bfd/Makefile ] || [ -f stage1-bfd/Makefile ] \
+	  || exit 0 ; \
+	[ -f bfd/Makefile ] || $(MAKE) stage1-start ; \
+	cd bfd && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		CFLAGS="$(STAGE1_CFLAGS)"  clean
 @endif bfd-bootstrap
 
+
 .PHONY: configure-stage1-opcodes maybe-configure-stage1-opcodes
 .PHONY: all-stage1-opcodes maybe-all-stage1-opcodes
+.PHONY: clean-stage1-opcodes maybe-clean-stage1-opcodes
 
 maybe-configure-stage1-opcodes:
 maybe-all-stage1-opcodes:
+maybe-clean-stage1-opcodes:
 
 @if opcodes-bootstrap
 maybe-configure-stage1-opcodes: configure-stage1-opcodes
@@ -28415,13 +28118,25 @@ all-stage1-opcodes: configure-stage1-opcodes
 	cd opcodes && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-opcodes: clean-stage1-opcodes
+clean-stage1-opcodes:
+	@[ -f opcodes/Makefile ] || [ -f stage1-opcodes/Makefile ] \
+	  || exit 0 ; \
+	[ -f opcodes/Makefile ] || $(MAKE) stage1-start ; \
+	cd opcodes && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		CFLAGS="$(STAGE1_CFLAGS)"  clean
 @endif opcodes-bootstrap
 
+
 .PHONY: configure-stage1-binutils maybe-configure-stage1-binutils
 .PHONY: all-stage1-binutils maybe-all-stage1-binutils
+.PHONY: clean-stage1-binutils maybe-clean-stage1-binutils
 
 maybe-configure-stage1-binutils:
 maybe-all-stage1-binutils:
+maybe-clean-stage1-binutils:
 
 @if binutils-bootstrap
 maybe-configure-stage1-binutils: configure-stage1-binutils
@@ -28457,13 +28172,25 @@ all-stage1-binutils: configure-stage1-binutils
 	cd binutils && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-binutils: clean-stage1-binutils
+clean-stage1-binutils:
+	@[ -f binutils/Makefile ] || [ -f stage1-binutils/Makefile ] \
+	  || exit 0 ; \
+	[ -f binutils/Makefile ] || $(MAKE) stage1-start ; \
+	cd binutils && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		CFLAGS="$(STAGE1_CFLAGS)"  clean
 @endif binutils-bootstrap
 
+
 .PHONY: configure-stage1-gas maybe-configure-stage1-gas
 .PHONY: all-stage1-gas maybe-all-stage1-gas
+.PHONY: clean-stage1-gas maybe-clean-stage1-gas
 
 maybe-configure-stage1-gas:
 maybe-all-stage1-gas:
+maybe-clean-stage1-gas:
 
 @if gas-bootstrap
 maybe-configure-stage1-gas: configure-stage1-gas
@@ -28499,13 +28226,25 @@ all-stage1-gas: configure-stage1-gas
 	cd gas && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-gas: clean-stage1-gas
+clean-stage1-gas:
+	@[ -f gas/Makefile ] || [ -f stage1-gas/Makefile ] \
+	  || exit 0 ; \
+	[ -f gas/Makefile ] || $(MAKE) stage1-start ; \
+	cd gas && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		CFLAGS="$(STAGE1_CFLAGS)"  clean
 @endif gas-bootstrap
 
+
 .PHONY: configure-stage1-gcc maybe-configure-stage1-gcc
 .PHONY: all-stage1-gcc maybe-all-stage1-gcc
+.PHONY: clean-stage1-gcc maybe-clean-stage1-gcc
 
 maybe-configure-stage1-gcc:
 maybe-all-stage1-gcc:
+maybe-clean-stage1-gcc:
 
 @if gcc-bootstrap
 maybe-configure-stage1-gcc: configure-stage1-gcc
@@ -28541,13 +28280,25 @@ all-stage1-gcc: configure-stage1-gcc
 	cd gcc && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		CFLAGS="$(STAGE1_CFLAGS)" $(EXTRA_GCC_FLAGS)
+
+maybe-clean-stage1-gcc: clean-stage1-gcc
+clean-stage1-gcc:
+	@[ -f gcc/Makefile ] || [ -f stage1-gcc/Makefile ] \
+	  || exit 0 ; \
+	[ -f gcc/Makefile ] || $(MAKE) stage1-start ; \
+	cd gcc && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		CFLAGS="$(STAGE1_CFLAGS)" $(EXTRA_GCC_FLAGS) clean
 @endif gcc-bootstrap
 
+
 .PHONY: configure-stage1-intl maybe-configure-stage1-intl
 .PHONY: all-stage1-intl maybe-all-stage1-intl
+.PHONY: clean-stage1-intl maybe-clean-stage1-intl
 
 maybe-configure-stage1-intl:
 maybe-all-stage1-intl:
+maybe-clean-stage1-intl:
 
 @if intl-bootstrap
 maybe-configure-stage1-intl: configure-stage1-intl
@@ -28583,13 +28334,25 @@ all-stage1-intl: configure-stage1-intl
 	cd intl && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-intl: clean-stage1-intl
+clean-stage1-intl:
+	@[ -f intl/Makefile ] || [ -f stage1-intl/Makefile ] \
+	  || exit 0 ; \
+	[ -f intl/Makefile ] || $(MAKE) stage1-start ; \
+	cd intl && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		CFLAGS="$(STAGE1_CFLAGS)"  clean
 @endif intl-bootstrap
 
+
 .PHONY: configure-stage1-ld maybe-configure-stage1-ld
 .PHONY: all-stage1-ld maybe-all-stage1-ld
+.PHONY: clean-stage1-ld maybe-clean-stage1-ld
 
 maybe-configure-stage1-ld:
 maybe-all-stage1-ld:
+maybe-clean-stage1-ld:
 
 @if ld-bootstrap
 maybe-configure-stage1-ld: configure-stage1-ld
@@ -28625,13 +28388,25 @@ all-stage1-ld: configure-stage1-ld
 	cd ld && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-ld: clean-stage1-ld
+clean-stage1-ld:
+	@[ -f ld/Makefile ] || [ -f stage1-ld/Makefile ] \
+	  || exit 0 ; \
+	[ -f ld/Makefile ] || $(MAKE) stage1-start ; \
+	cd ld && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		CFLAGS="$(STAGE1_CFLAGS)"  clean
 @endif ld-bootstrap
 
+
 .PHONY: configure-stage1-libcpp maybe-configure-stage1-libcpp
 .PHONY: all-stage1-libcpp maybe-all-stage1-libcpp
+.PHONY: clean-stage1-libcpp maybe-clean-stage1-libcpp
 
 maybe-configure-stage1-libcpp:
 maybe-all-stage1-libcpp:
+maybe-clean-stage1-libcpp:
 
 @if libcpp-bootstrap
 maybe-configure-stage1-libcpp: configure-stage1-libcpp
@@ -28667,55 +28442,25 @@ all-stage1-libcpp: configure-stage1-libcpp
 	cd libcpp && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		CFLAGS="$(STAGE1_CFLAGS)" 
-@endif libcpp-bootstrap
-
-.PHONY: configure-stage1-libbanshee maybe-configure-stage1-libbanshee
-.PHONY: all-stage1-libbanshee maybe-all-stage1-libbanshee
-
-maybe-configure-stage1-libbanshee:
-maybe-all-stage1-libbanshee:
-
-@if libbanshee-bootstrap
-maybe-configure-stage1-libbanshee: configure-stage1-libbanshee
-configure-stage1-libbanshee:
-	@$(MAKE) stage1-start
-	@[ -f libbanshee/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-	$(HOST_EXPORTS)  \
-	echo Configuring stage 1 in libbanshee ; \
-	cd libbanshee || exit 1; \
-	case $(srcdir) in \
-	  \.) \
-	    srcdiroption="--srcdir=."; \
-	    libsrcdir=".";; \
-	  /* | [A-Za-z]:[\\/]*) \
-	    srcdiroption="--srcdir=$(srcdir)/libbanshee"; \
-	    libsrcdir="$$s/libbanshee";; \
-	  *) \
-	    srcdiroption="--srcdir=../$(srcdir)/libbanshee"; \
-	    libsrcdir="$$s/libbanshee";; \
-	esac; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  --disable-intermodule 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" 
 
-maybe-all-stage1-libbanshee: all-stage1-libbanshee
-all-stage1-libbanshee: configure-stage1-libbanshee
-	@$(MAKE) stage1-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-	$(HOST_EXPORTS)  \
-	cd libbanshee && \
+maybe-clean-stage1-libcpp: clean-stage1-libcpp
+clean-stage1-libcpp:
+	@[ -f libcpp/Makefile ] || [ -f stage1-libcpp/Makefile ] \
+	  || exit 0 ; \
+	[ -f libcpp/Makefile ] || $(MAKE) stage1-start ; \
+	cd libcpp && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
-		CFLAGS="$(STAGE1_CFLAGS)" 
-@endif libbanshee-bootstrap
+		CFLAGS="$(STAGE1_CFLAGS)"  clean
+@endif libcpp-bootstrap
+
 
 .PHONY: configure-stage1-libiberty maybe-configure-stage1-libiberty
 .PHONY: all-stage1-libiberty maybe-all-stage1-libiberty
+.PHONY: clean-stage1-libiberty maybe-clean-stage1-libiberty
 
 maybe-configure-stage1-libiberty:
 maybe-all-stage1-libiberty:
+maybe-clean-stage1-libiberty:
 
 @if libiberty-bootstrap
 maybe-configure-stage1-libiberty: configure-stage1-libiberty
@@ -28751,13 +28496,25 @@ all-stage1-libiberty: configure-stage1-libiberty
 	cd libiberty && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-libiberty: clean-stage1-libiberty
+clean-stage1-libiberty:
+	@[ -f libiberty/Makefile ] || [ -f stage1-libiberty/Makefile ] \
+	  || exit 0 ; \
+	[ -f libiberty/Makefile ] || $(MAKE) stage1-start ; \
+	cd libiberty && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		CFLAGS="$(STAGE1_CFLAGS)"  clean
 @endif libiberty-bootstrap
 
+
 .PHONY: configure-stage1-zlib maybe-configure-stage1-zlib
 .PHONY: all-stage1-zlib maybe-all-stage1-zlib
+.PHONY: clean-stage1-zlib maybe-clean-stage1-zlib
 
 maybe-configure-stage1-zlib:
 maybe-all-stage1-zlib:
+maybe-clean-stage1-zlib:
 
 @if zlib-bootstrap
 maybe-configure-stage1-zlib: configure-stage1-zlib
@@ -28793,9 +28550,19 @@ all-stage1-zlib: configure-stage1-zlib
 	cd zlib && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		CFLAGS="$(STAGE1_CFLAGS)" 
+
+maybe-clean-stage1-zlib: clean-stage1-zlib
+clean-stage1-zlib:
+	@[ -f zlib/Makefile ] || [ -f stage1-zlib/Makefile ] \
+	  || exit 0 ; \
+	[ -f zlib/Makefile ] || $(MAKE) stage1-start ; \
+	cd zlib && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		CFLAGS="$(STAGE1_CFLAGS)"  clean
 @endif zlib-bootstrap
 
 
+
 # FIXME: Will not need to be conditional when toplevel bootstrap is the
 # only possibility, but now it conflicts with no-bootstrap rules
 @if gcc-bootstrap
@@ -28803,10 +28570,9 @@ all-stage1-zlib: configure-stage1-zlib
 
 
 
-.PHONY: distclean-stage1
-
-# Rules to wipe a stage and all the following ones, used for cleanstrap
+# Rules to wipe a stage and all the following ones, also used for cleanstrap
 
+.PHONY: distclean-stage1
 distclean-stage1::
 	[ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
 	rm -rf stage1-* 
@@ -28861,11 +28627,6 @@ stage2-start::
 	set stage2-libcpp libcpp ; @CREATE_LINK_TO_DIR@  ; \
 	set stage1-libcpp prev-libcpp ; @CREATE_LINK_TO_DIR@ 
 @endif libcpp
-@if libbanshee
-	@[ -d stage2-libbanshee ] || mkdir stage2-libbanshee; \
-	set stage2-libbanshee libbanshee ; @CREATE_LINK_TO_DIR@  ; \
-	set stage1-libbanshee prev-libbanshee ; @CREATE_LINK_TO_DIR@ 
-@endif libbanshee
 @if libiberty
 	@[ -d stage2-libiberty ] || mkdir stage2-libiberty; \
 	set stage2-libiberty libiberty ; @CREATE_LINK_TO_DIR@  ; \
@@ -28911,10 +28672,6 @@ stage2-end::
 	@set libcpp stage2-libcpp ; @UNDO_LINK_TO_DIR@  ; \
 	set prev-libcpp stage1-libcpp ; @UNDO_LINK_TO_DIR@ 
 @endif libcpp
-@if libbanshee
-	@set libbanshee stage2-libbanshee ; @UNDO_LINK_TO_DIR@  ; \
-	set prev-libbanshee stage1-libbanshee ; @UNDO_LINK_TO_DIR@ 
-@endif libbanshee
 @if libiberty
 	@set libiberty stage2-libiberty ; @UNDO_LINK_TO_DIR@  ; \
 	set prev-libiberty stage1-libiberty ; @UNDO_LINK_TO_DIR@ 
@@ -28932,10 +28689,10 @@ stage2-bubble:: stage1-bubble
 	@if test -f stage2-lean || test -f stage1-lean  ; then \
 	  echo Skipping rebuild of stage2 ; \
 	else \
-	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage2; \
+	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stage2; \
 	fi
 
-.PHONY: all-stage2
+.PHONY: all-stage2 clean-stage2
 all-stage2:     \
   maybe-all-stage2-bfd \
   maybe-all-stage2-opcodes \
@@ -28945,16 +28702,30 @@ all-stage2:     \
   maybe-all-stage2-intl   \
   maybe-all-stage2-ld \
   maybe-all-stage2-libcpp  \
-  maybe-all-stage2-libbanshee \
   maybe-all-stage2-libiberty                        \
   maybe-all-stage2-zlib       
 
+do-clean: clean-stage2
+clean-stage2:     \
+  maybe-clean-stage2-bfd \
+  maybe-clean-stage2-opcodes \
+  maybe-clean-stage2-binutils             \
+  maybe-clean-stage2-gas \
+  maybe-clean-stage2-gcc        \
+  maybe-clean-stage2-intl   \
+  maybe-clean-stage2-ld \
+  maybe-clean-stage2-libcpp  \
+  maybe-clean-stage2-libiberty                        \
+  maybe-clean-stage2-zlib       
+
 
 .PHONY: configure-stage2-bfd maybe-configure-stage2-bfd
 .PHONY: all-stage2-bfd maybe-all-stage2-bfd
+.PHONY: clean-stage2-bfd maybe-clean-stage2-bfd
 
 maybe-configure-stage2-bfd:
 maybe-all-stage2-bfd:
+maybe-clean-stage2-bfd:
 
 @if bfd-bootstrap
 maybe-configure-stage2-bfd: configure-stage2-bfd
@@ -28991,13 +28762,26 @@ all-stage2-bfd: configure-stage2-bfd
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		 
-@endif bfd-bootstrap
 
-.PHONY: configure-stage2-opcodes maybe-configure-stage2-opcodes
-.PHONY: all-stage2-opcodes maybe-all-stage2-opcodes
+maybe-clean-stage2-bfd: clean-stage2-bfd
+clean-stage2-bfd:
+	@[ -f bfd/Makefile ] || [ -f stage2-bfd/Makefile ] \
+	  || exit 0 ; \
+	[ -f bfd/Makefile ] || $(MAKE) stage2-start ; \
+	cd bfd && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
+@endif bfd-bootstrap
+
+
+.PHONY: configure-stage2-opcodes maybe-configure-stage2-opcodes
+.PHONY: all-stage2-opcodes maybe-all-stage2-opcodes
+.PHONY: clean-stage2-opcodes maybe-clean-stage2-opcodes
 
 maybe-configure-stage2-opcodes:
 maybe-all-stage2-opcodes:
+maybe-clean-stage2-opcodes:
 
 @if opcodes-bootstrap
 maybe-configure-stage2-opcodes: configure-stage2-opcodes
@@ -29034,13 +28818,26 @@ all-stage2-opcodes: configure-stage2-opcodes
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		 
+
+maybe-clean-stage2-opcodes: clean-stage2-opcodes
+clean-stage2-opcodes:
+	@[ -f opcodes/Makefile ] || [ -f stage2-opcodes/Makefile ] \
+	  || exit 0 ; \
+	[ -f opcodes/Makefile ] || $(MAKE) stage2-start ; \
+	cd opcodes && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
 @endif opcodes-bootstrap
 
+
 .PHONY: configure-stage2-binutils maybe-configure-stage2-binutils
 .PHONY: all-stage2-binutils maybe-all-stage2-binutils
+.PHONY: clean-stage2-binutils maybe-clean-stage2-binutils
 
 maybe-configure-stage2-binutils:
 maybe-all-stage2-binutils:
+maybe-clean-stage2-binutils:
 
 @if binutils-bootstrap
 maybe-configure-stage2-binutils: configure-stage2-binutils
@@ -29077,13 +28874,26 @@ all-stage2-binutils: configure-stage2-binutils
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		 
+
+maybe-clean-stage2-binutils: clean-stage2-binutils
+clean-stage2-binutils:
+	@[ -f binutils/Makefile ] || [ -f stage2-binutils/Makefile ] \
+	  || exit 0 ; \
+	[ -f binutils/Makefile ] || $(MAKE) stage2-start ; \
+	cd binutils && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
 @endif binutils-bootstrap
 
+
 .PHONY: configure-stage2-gas maybe-configure-stage2-gas
 .PHONY: all-stage2-gas maybe-all-stage2-gas
+.PHONY: clean-stage2-gas maybe-clean-stage2-gas
 
 maybe-configure-stage2-gas:
 maybe-all-stage2-gas:
+maybe-clean-stage2-gas:
 
 @if gas-bootstrap
 maybe-configure-stage2-gas: configure-stage2-gas
@@ -29120,13 +28930,26 @@ all-stage2-gas: configure-stage2-gas
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		 
+
+maybe-clean-stage2-gas: clean-stage2-gas
+clean-stage2-gas:
+	@[ -f gas/Makefile ] || [ -f stage2-gas/Makefile ] \
+	  || exit 0 ; \
+	[ -f gas/Makefile ] || $(MAKE) stage2-start ; \
+	cd gas && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
 @endif gas-bootstrap
 
+
 .PHONY: configure-stage2-gcc maybe-configure-stage2-gcc
 .PHONY: all-stage2-gcc maybe-all-stage2-gcc
+.PHONY: clean-stage2-gcc maybe-clean-stage2-gcc
 
 maybe-configure-stage2-gcc:
 maybe-all-stage2-gcc:
+maybe-clean-stage2-gcc:
 
 @if gcc-bootstrap
 maybe-configure-stage2-gcc: configure-stage2-gcc
@@ -29163,13 +28986,26 @@ all-stage2-gcc: configure-stage2-gcc
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		 $(EXTRA_GCC_FLAGS)
+
+maybe-clean-stage2-gcc: clean-stage2-gcc
+clean-stage2-gcc:
+	@[ -f gcc/Makefile ] || [ -f stage2-gcc/Makefile ] \
+	  || exit 0 ; \
+	[ -f gcc/Makefile ] || $(MAKE) stage2-start ; \
+	cd gcc && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 $(EXTRA_GCC_FLAGS) clean
 @endif gcc-bootstrap
 
+
 .PHONY: configure-stage2-intl maybe-configure-stage2-intl
 .PHONY: all-stage2-intl maybe-all-stage2-intl
+.PHONY: clean-stage2-intl maybe-clean-stage2-intl
 
 maybe-configure-stage2-intl:
 maybe-all-stage2-intl:
+maybe-clean-stage2-intl:
 
 @if intl-bootstrap
 maybe-configure-stage2-intl: configure-stage2-intl
@@ -29206,13 +29042,26 @@ all-stage2-intl: configure-stage2-intl
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		 
+
+maybe-clean-stage2-intl: clean-stage2-intl
+clean-stage2-intl:
+	@[ -f intl/Makefile ] || [ -f stage2-intl/Makefile ] \
+	  || exit 0 ; \
+	[ -f intl/Makefile ] || $(MAKE) stage2-start ; \
+	cd intl && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
 @endif intl-bootstrap
 
+
 .PHONY: configure-stage2-ld maybe-configure-stage2-ld
 .PHONY: all-stage2-ld maybe-all-stage2-ld
+.PHONY: clean-stage2-ld maybe-clean-stage2-ld
 
 maybe-configure-stage2-ld:
 maybe-all-stage2-ld:
+maybe-clean-stage2-ld:
 
 @if ld-bootstrap
 maybe-configure-stage2-ld: configure-stage2-ld
@@ -29249,13 +29098,26 @@ all-stage2-ld: configure-stage2-ld
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		 
+
+maybe-clean-stage2-ld: clean-stage2-ld
+clean-stage2-ld:
+	@[ -f ld/Makefile ] || [ -f stage2-ld/Makefile ] \
+	  || exit 0 ; \
+	[ -f ld/Makefile ] || $(MAKE) stage2-start ; \
+	cd ld && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
 @endif ld-bootstrap
 
+
 .PHONY: configure-stage2-libcpp maybe-configure-stage2-libcpp
 .PHONY: all-stage2-libcpp maybe-all-stage2-libcpp
+.PHONY: clean-stage2-libcpp maybe-clean-stage2-libcpp
 
 maybe-configure-stage2-libcpp:
 maybe-all-stage2-libcpp:
+maybe-clean-stage2-libcpp:
 
 @if libcpp-bootstrap
 maybe-configure-stage2-libcpp: configure-stage2-libcpp
@@ -29292,56 +29154,26 @@ all-stage2-libcpp: configure-stage2-libcpp
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		 
-@endif libcpp-bootstrap
 
-.PHONY: configure-stage2-libbanshee maybe-configure-stage2-libbanshee
-.PHONY: all-stage2-libbanshee maybe-all-stage2-libbanshee
-
-maybe-configure-stage2-libbanshee:
-maybe-all-stage2-libbanshee:
-
-@if libbanshee-bootstrap
-maybe-configure-stage2-libbanshee: configure-stage2-libbanshee
-configure-stage2-libbanshee:
-	@$(MAKE) stage2-start
-	@[ -f libbanshee/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-	$(STAGE_HOST_EXPORTS)  \
-	echo Configuring stage 2 in libbanshee ; \
-	cd libbanshee || exit 1; \
-	case $(srcdir) in \
-	  \.) \
-	    srcdiroption="--srcdir=."; \
-	    libsrcdir=".";; \
-	  /* | [A-Za-z]:[\\/]*) \
-	    srcdiroption="--srcdir=$(srcdir)/libbanshee"; \
-	    libsrcdir="$$s/libbanshee";; \
-	  *) \
-	    srcdiroption="--srcdir=../$(srcdir)/libbanshee"; \
-	    libsrcdir="$$s/libbanshee";; \
-	esac; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-
-maybe-all-stage2-libbanshee: all-stage2-libbanshee
-all-stage2-libbanshee: configure-stage2-libbanshee
-	@$(MAKE) stage2-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-	$(STAGE_HOST_EXPORTS)  \
-	cd libbanshee && \
+maybe-clean-stage2-libcpp: clean-stage2-libcpp
+clean-stage2-libcpp:
+	@[ -f libcpp/Makefile ] || [ -f stage2-libcpp/Makefile ] \
+	  || exit 0 ; \
+	[ -f libcpp/Makefile ] || $(MAKE) stage2-start ; \
+	cd libcpp && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		 
-@endif libbanshee-bootstrap
+		  clean
+@endif libcpp-bootstrap
+
 
 .PHONY: configure-stage2-libiberty maybe-configure-stage2-libiberty
 .PHONY: all-stage2-libiberty maybe-all-stage2-libiberty
+.PHONY: clean-stage2-libiberty maybe-clean-stage2-libiberty
 
 maybe-configure-stage2-libiberty:
 maybe-all-stage2-libiberty:
+maybe-clean-stage2-libiberty:
 
 @if libiberty-bootstrap
 maybe-configure-stage2-libiberty: configure-stage2-libiberty
@@ -29378,13 +29210,26 @@ all-stage2-libiberty: configure-stage2-libiberty
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		 
+
+maybe-clean-stage2-libiberty: clean-stage2-libiberty
+clean-stage2-libiberty:
+	@[ -f libiberty/Makefile ] || [ -f stage2-libiberty/Makefile ] \
+	  || exit 0 ; \
+	[ -f libiberty/Makefile ] || $(MAKE) stage2-start ; \
+	cd libiberty && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
 @endif libiberty-bootstrap
 
+
 .PHONY: configure-stage2-zlib maybe-configure-stage2-zlib
 .PHONY: all-stage2-zlib maybe-all-stage2-zlib
+.PHONY: clean-stage2-zlib maybe-clean-stage2-zlib
 
 maybe-configure-stage2-zlib:
 maybe-all-stage2-zlib:
+maybe-clean-stage2-zlib:
 
 @if zlib-bootstrap
 maybe-configure-stage2-zlib: configure-stage2-zlib
@@ -29421,9 +29266,20 @@ all-stage2-zlib: configure-stage2-zlib
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		 
+
+maybe-clean-stage2-zlib: clean-stage2-zlib
+clean-stage2-zlib:
+	@[ -f zlib/Makefile ] || [ -f stage2-zlib/Makefile ] \
+	  || exit 0 ; \
+	[ -f zlib/Makefile ] || $(MAKE) stage2-start ; \
+	cd zlib && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
 @endif zlib-bootstrap
 
 
+
 # FIXME: Will not need to be conditional when toplevel bootstrap is the
 # only possibility, but now it conflicts with no-bootstrap rules
 @if gcc-bootstrap
@@ -29434,10 +29290,9 @@ all-stage2-zlib: configure-stage2-zlib
 bootstrap2: stage2-bubble  all
 
 
-.PHONY: distclean-stage2
-
-# Rules to wipe a stage and all the following ones, used for cleanstrap
+# Rules to wipe a stage and all the following ones, also used for cleanstrap
 distclean-stage1:: distclean-stage2 
+.PHONY: distclean-stage2
 distclean-stage2::
 	[ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
 	rm -rf stage2-* 
@@ -29492,11 +29347,6 @@ stage3-start::
 	set stage3-libcpp libcpp ; @CREATE_LINK_TO_DIR@  ; \
 	set stage2-libcpp prev-libcpp ; @CREATE_LINK_TO_DIR@ 
 @endif libcpp
-@if libbanshee
-	@[ -d stage3-libbanshee ] || mkdir stage3-libbanshee; \
-	set stage3-libbanshee libbanshee ; @CREATE_LINK_TO_DIR@  ; \
-	set stage2-libbanshee prev-libbanshee ; @CREATE_LINK_TO_DIR@ 
-@endif libbanshee
 @if libiberty
 	@[ -d stage3-libiberty ] || mkdir stage3-libiberty; \
 	set stage3-libiberty libiberty ; @CREATE_LINK_TO_DIR@  ; \
@@ -29542,10 +29392,6 @@ stage3-end::
 	@set libcpp stage3-libcpp ; @UNDO_LINK_TO_DIR@  ; \
 	set prev-libcpp stage2-libcpp ; @UNDO_LINK_TO_DIR@ 
 @endif libcpp
-@if libbanshee
-	@set libbanshee stage3-libbanshee ; @UNDO_LINK_TO_DIR@  ; \
-	set prev-libbanshee stage2-libbanshee ; @UNDO_LINK_TO_DIR@ 
-@endif libbanshee
 @if libiberty
 	@set libiberty stage3-libiberty ; @UNDO_LINK_TO_DIR@  ; \
 	set prev-libiberty stage2-libiberty ; @UNDO_LINK_TO_DIR@ 
@@ -29564,10 +29410,10 @@ stage3-bubble:: stage2-bubble
 	@if test -f stage3-lean || test -f stage2-lean  ; then \
 	  echo Skipping rebuild of stage3 ; \
 	else \
-	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage3; \
+	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stage3; \
 	fi
 
-.PHONY: all-stage3
+.PHONY: all-stage3 clean-stage3
 all-stage3:     \
   maybe-all-stage3-bfd \
   maybe-all-stage3-opcodes \
@@ -29577,16 +29423,30 @@ all-stage3:     \
   maybe-all-stage3-intl   \
   maybe-all-stage3-ld \
   maybe-all-stage3-libcpp  \
-  maybe-all-stage3-libbanshee \
   maybe-all-stage3-libiberty                        \
   maybe-all-stage3-zlib       
 
+do-clean: clean-stage3
+clean-stage3:     \
+  maybe-clean-stage3-bfd \
+  maybe-clean-stage3-opcodes \
+  maybe-clean-stage3-binutils             \
+  maybe-clean-stage3-gas \
+  maybe-clean-stage3-gcc        \
+  maybe-clean-stage3-intl   \
+  maybe-clean-stage3-ld \
+  maybe-clean-stage3-libcpp  \
+  maybe-clean-stage3-libiberty                        \
+  maybe-clean-stage3-zlib       
+
 
 .PHONY: configure-stage3-bfd maybe-configure-stage3-bfd
 .PHONY: all-stage3-bfd maybe-all-stage3-bfd
+.PHONY: clean-stage3-bfd maybe-clean-stage3-bfd
 
 maybe-configure-stage3-bfd:
 maybe-all-stage3-bfd:
+maybe-clean-stage3-bfd:
 
 @if bfd-bootstrap
 maybe-configure-stage3-bfd: configure-stage3-bfd
@@ -29623,13 +29483,26 @@ all-stage3-bfd: configure-stage3-bfd
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		 
+
+maybe-clean-stage3-bfd: clean-stage3-bfd
+clean-stage3-bfd:
+	@[ -f bfd/Makefile ] || [ -f stage3-bfd/Makefile ] \
+	  || exit 0 ; \
+	[ -f bfd/Makefile ] || $(MAKE) stage3-start ; \
+	cd bfd && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
 @endif bfd-bootstrap
 
+
 .PHONY: configure-stage3-opcodes maybe-configure-stage3-opcodes
 .PHONY: all-stage3-opcodes maybe-all-stage3-opcodes
+.PHONY: clean-stage3-opcodes maybe-clean-stage3-opcodes
 
 maybe-configure-stage3-opcodes:
 maybe-all-stage3-opcodes:
+maybe-clean-stage3-opcodes:
 
 @if opcodes-bootstrap
 maybe-configure-stage3-opcodes: configure-stage3-opcodes
@@ -29666,13 +29539,26 @@ all-stage3-opcodes: configure-stage3-opcodes
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		 
+
+maybe-clean-stage3-opcodes: clean-stage3-opcodes
+clean-stage3-opcodes:
+	@[ -f opcodes/Makefile ] || [ -f stage3-opcodes/Makefile ] \
+	  || exit 0 ; \
+	[ -f opcodes/Makefile ] || $(MAKE) stage3-start ; \
+	cd opcodes && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
 @endif opcodes-bootstrap
 
+
 .PHONY: configure-stage3-binutils maybe-configure-stage3-binutils
 .PHONY: all-stage3-binutils maybe-all-stage3-binutils
+.PHONY: clean-stage3-binutils maybe-clean-stage3-binutils
 
 maybe-configure-stage3-binutils:
 maybe-all-stage3-binutils:
+maybe-clean-stage3-binutils:
 
 @if binutils-bootstrap
 maybe-configure-stage3-binutils: configure-stage3-binutils
@@ -29709,13 +29595,26 @@ all-stage3-binutils: configure-stage3-binutils
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		 
+
+maybe-clean-stage3-binutils: clean-stage3-binutils
+clean-stage3-binutils:
+	@[ -f binutils/Makefile ] || [ -f stage3-binutils/Makefile ] \
+	  || exit 0 ; \
+	[ -f binutils/Makefile ] || $(MAKE) stage3-start ; \
+	cd binutils && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
 @endif binutils-bootstrap
 
+
 .PHONY: configure-stage3-gas maybe-configure-stage3-gas
 .PHONY: all-stage3-gas maybe-all-stage3-gas
+.PHONY: clean-stage3-gas maybe-clean-stage3-gas
 
 maybe-configure-stage3-gas:
 maybe-all-stage3-gas:
+maybe-clean-stage3-gas:
 
 @if gas-bootstrap
 maybe-configure-stage3-gas: configure-stage3-gas
@@ -29752,13 +29651,26 @@ all-stage3-gas: configure-stage3-gas
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		 
+
+maybe-clean-stage3-gas: clean-stage3-gas
+clean-stage3-gas:
+	@[ -f gas/Makefile ] || [ -f stage3-gas/Makefile ] \
+	  || exit 0 ; \
+	[ -f gas/Makefile ] || $(MAKE) stage3-start ; \
+	cd gas && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
 @endif gas-bootstrap
 
+
 .PHONY: configure-stage3-gcc maybe-configure-stage3-gcc
 .PHONY: all-stage3-gcc maybe-all-stage3-gcc
+.PHONY: clean-stage3-gcc maybe-clean-stage3-gcc
 
 maybe-configure-stage3-gcc:
 maybe-all-stage3-gcc:
+maybe-clean-stage3-gcc:
 
 @if gcc-bootstrap
 maybe-configure-stage3-gcc: configure-stage3-gcc
@@ -29795,13 +29707,26 @@ all-stage3-gcc: configure-stage3-gcc
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		 $(EXTRA_GCC_FLAGS)
+
+maybe-clean-stage3-gcc: clean-stage3-gcc
+clean-stage3-gcc:
+	@[ -f gcc/Makefile ] || [ -f stage3-gcc/Makefile ] \
+	  || exit 0 ; \
+	[ -f gcc/Makefile ] || $(MAKE) stage3-start ; \
+	cd gcc && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 $(EXTRA_GCC_FLAGS) clean
 @endif gcc-bootstrap
 
+
 .PHONY: configure-stage3-intl maybe-configure-stage3-intl
 .PHONY: all-stage3-intl maybe-all-stage3-intl
+.PHONY: clean-stage3-intl maybe-clean-stage3-intl
 
 maybe-configure-stage3-intl:
 maybe-all-stage3-intl:
+maybe-clean-stage3-intl:
 
 @if intl-bootstrap
 maybe-configure-stage3-intl: configure-stage3-intl
@@ -29838,13 +29763,26 @@ all-stage3-intl: configure-stage3-intl
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		 
+
+maybe-clean-stage3-intl: clean-stage3-intl
+clean-stage3-intl:
+	@[ -f intl/Makefile ] || [ -f stage3-intl/Makefile ] \
+	  || exit 0 ; \
+	[ -f intl/Makefile ] || $(MAKE) stage3-start ; \
+	cd intl && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
 @endif intl-bootstrap
 
+
 .PHONY: configure-stage3-ld maybe-configure-stage3-ld
 .PHONY: all-stage3-ld maybe-all-stage3-ld
+.PHONY: clean-stage3-ld maybe-clean-stage3-ld
 
 maybe-configure-stage3-ld:
 maybe-all-stage3-ld:
+maybe-clean-stage3-ld:
 
 @if ld-bootstrap
 maybe-configure-stage3-ld: configure-stage3-ld
@@ -29881,13 +29819,26 @@ all-stage3-ld: configure-stage3-ld
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		 
+
+maybe-clean-stage3-ld: clean-stage3-ld
+clean-stage3-ld:
+	@[ -f ld/Makefile ] || [ -f stage3-ld/Makefile ] \
+	  || exit 0 ; \
+	[ -f ld/Makefile ] || $(MAKE) stage3-start ; \
+	cd ld && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
 @endif ld-bootstrap
 
+
 .PHONY: configure-stage3-libcpp maybe-configure-stage3-libcpp
 .PHONY: all-stage3-libcpp maybe-all-stage3-libcpp
+.PHONY: clean-stage3-libcpp maybe-clean-stage3-libcpp
 
 maybe-configure-stage3-libcpp:
 maybe-all-stage3-libcpp:
+maybe-clean-stage3-libcpp:
 
 @if libcpp-bootstrap
 maybe-configure-stage3-libcpp: configure-stage3-libcpp
@@ -29924,56 +29875,26 @@ all-stage3-libcpp: configure-stage3-libcpp
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		 
-@endif libcpp-bootstrap
-
-.PHONY: configure-stage3-libbanshee maybe-configure-stage3-libbanshee
-.PHONY: all-stage3-libbanshee maybe-all-stage3-libbanshee
-
-maybe-configure-stage3-libbanshee:
-maybe-all-stage3-libbanshee:
-
-@if libbanshee-bootstrap
-maybe-configure-stage3-libbanshee: configure-stage3-libbanshee
-configure-stage3-libbanshee:
-	@$(MAKE) stage3-start
-	@[ -f libbanshee/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-	$(STAGE_HOST_EXPORTS)  \
-	echo Configuring stage 3 in libbanshee ; \
-	cd libbanshee || exit 1; \
-	case $(srcdir) in \
-	  \.) \
-	    srcdiroption="--srcdir=."; \
-	    libsrcdir=".";; \
-	  /* | [A-Za-z]:[\\/]*) \
-	    srcdiroption="--srcdir=$(srcdir)/libbanshee"; \
-	    libsrcdir="$$s/libbanshee";; \
-	  *) \
-	    srcdiroption="--srcdir=../$(srcdir)/libbanshee"; \
-	    libsrcdir="$$s/libbanshee";; \
-	esac; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
 
-maybe-all-stage3-libbanshee: all-stage3-libbanshee
-all-stage3-libbanshee: configure-stage3-libbanshee
-	@$(MAKE) stage3-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-	$(STAGE_HOST_EXPORTS)  \
-	cd libbanshee && \
+maybe-clean-stage3-libcpp: clean-stage3-libcpp
+clean-stage3-libcpp:
+	@[ -f libcpp/Makefile ] || [ -f stage3-libcpp/Makefile ] \
+	  || exit 0 ; \
+	[ -f libcpp/Makefile ] || $(MAKE) stage3-start ; \
+	cd libcpp && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		 
-@endif libbanshee-bootstrap
+		  clean
+@endif libcpp-bootstrap
+
 
 .PHONY: configure-stage3-libiberty maybe-configure-stage3-libiberty
 .PHONY: all-stage3-libiberty maybe-all-stage3-libiberty
+.PHONY: clean-stage3-libiberty maybe-clean-stage3-libiberty
 
 maybe-configure-stage3-libiberty:
 maybe-all-stage3-libiberty:
+maybe-clean-stage3-libiberty:
 
 @if libiberty-bootstrap
 maybe-configure-stage3-libiberty: configure-stage3-libiberty
@@ -30010,13 +29931,26 @@ all-stage3-libiberty: configure-stage3-libiberty
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		 
+
+maybe-clean-stage3-libiberty: clean-stage3-libiberty
+clean-stage3-libiberty:
+	@[ -f libiberty/Makefile ] || [ -f stage3-libiberty/Makefile ] \
+	  || exit 0 ; \
+	[ -f libiberty/Makefile ] || $(MAKE) stage3-start ; \
+	cd libiberty && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
 @endif libiberty-bootstrap
 
+
 .PHONY: configure-stage3-zlib maybe-configure-stage3-zlib
 .PHONY: all-stage3-zlib maybe-all-stage3-zlib
+.PHONY: clean-stage3-zlib maybe-clean-stage3-zlib
 
 maybe-configure-stage3-zlib:
 maybe-all-stage3-zlib:
+maybe-clean-stage3-zlib:
 
 @if zlib-bootstrap
 maybe-configure-stage3-zlib: configure-stage3-zlib
@@ -30053,9 +29987,20 @@ all-stage3-zlib: configure-stage3-zlib
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		 
+
+maybe-clean-stage3-zlib: clean-stage3-zlib
+clean-stage3-zlib:
+	@[ -f zlib/Makefile ] || [ -f stage3-zlib/Makefile ] \
+	  || exit 0 ; \
+	[ -f zlib/Makefile ] || $(MAKE) stage3-start ; \
+	cd zlib && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
 @endif zlib-bootstrap
 
 
+
 # FIXME: Will not need to be conditional when toplevel bootstrap is the
 # only possibility, but now it conflicts with no-bootstrap rules
 @if gcc-bootstrap
@@ -30093,17 +30038,16 @@ compare:
 bootstrap: stage3-bubble compare all
 
 
-.PHONY: distclean-stage3
-
-# Rules to wipe a stage and all the following ones, used for cleanstrap
+# Rules to wipe a stage and all the following ones, also used for cleanstrap
 distclean-stage2:: distclean-stage3 
+.PHONY: distclean-stage3
 distclean-stage3::
 	[ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
 	rm -rf stage3-* compare 
 
 
 .PHONY: cleanstrap
-cleanstrap: distclean-stage1 bootstrap
+cleanstrap: distclean bootstrap
 
 @endif gcc-bootstrap
 
@@ -30154,11 +30098,6 @@ stage4-start::
 	set stage4-libcpp libcpp ; @CREATE_LINK_TO_DIR@  ; \
 	set stage3-libcpp prev-libcpp ; @CREATE_LINK_TO_DIR@ 
 @endif libcpp
-@if libbanshee
-	@[ -d stage4-libbanshee ] || mkdir stage4-libbanshee; \
-	set stage4-libbanshee libbanshee ; @CREATE_LINK_TO_DIR@  ; \
-	set stage3-libbanshee prev-libbanshee ; @CREATE_LINK_TO_DIR@ 
-@endif libbanshee
 @if libiberty
 	@[ -d stage4-libiberty ] || mkdir stage4-libiberty; \
 	set stage4-libiberty libiberty ; @CREATE_LINK_TO_DIR@  ; \
@@ -30204,10 +30143,6 @@ stage4-end::
 	@set libcpp stage4-libcpp ; @UNDO_LINK_TO_DIR@  ; \
 	set prev-libcpp stage3-libcpp ; @UNDO_LINK_TO_DIR@ 
 @endif libcpp
-@if libbanshee
-	@set libbanshee stage4-libbanshee ; @UNDO_LINK_TO_DIR@  ; \
-	set prev-libbanshee stage3-libbanshee ; @UNDO_LINK_TO_DIR@ 
-@endif libbanshee
 @if libiberty
 	@set libiberty stage4-libiberty ; @UNDO_LINK_TO_DIR@  ; \
 	set prev-libiberty stage3-libiberty ; @UNDO_LINK_TO_DIR@ 
@@ -30226,10 +30161,10 @@ stage4-bubble:: stage3-bubble
 	@if test -f stage4-lean || test -f stage3-lean  ; then \
 	  echo Skipping rebuild of stage4 ; \
 	else \
-	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage4; \
+	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stage4; \
 	fi
 
-.PHONY: all-stage4
+.PHONY: all-stage4 clean-stage4
 all-stage4:     \
   maybe-all-stage4-bfd \
   maybe-all-stage4-opcodes \
@@ -30239,16 +30174,30 @@ all-stage4:     \
   maybe-all-stage4-intl   \
   maybe-all-stage4-ld \
   maybe-all-stage4-libcpp  \
-  maybe-all-stage4-libbanshee \
   maybe-all-stage4-libiberty                        \
   maybe-all-stage4-zlib       
 
+do-clean: clean-stage4
+clean-stage4:     \
+  maybe-clean-stage4-bfd \
+  maybe-clean-stage4-opcodes \
+  maybe-clean-stage4-binutils             \
+  maybe-clean-stage4-gas \
+  maybe-clean-stage4-gcc        \
+  maybe-clean-stage4-intl   \
+  maybe-clean-stage4-ld \
+  maybe-clean-stage4-libcpp  \
+  maybe-clean-stage4-libiberty                        \
+  maybe-clean-stage4-zlib       
+
 
 .PHONY: configure-stage4-bfd maybe-configure-stage4-bfd
 .PHONY: all-stage4-bfd maybe-all-stage4-bfd
+.PHONY: clean-stage4-bfd maybe-clean-stage4-bfd
 
 maybe-configure-stage4-bfd:
 maybe-all-stage4-bfd:
+maybe-clean-stage4-bfd:
 
 @if bfd-bootstrap
 maybe-configure-stage4-bfd: configure-stage4-bfd
@@ -30285,13 +30234,26 @@ all-stage4-bfd: configure-stage4-bfd
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		 
+
+maybe-clean-stage4-bfd: clean-stage4-bfd
+clean-stage4-bfd:
+	@[ -f bfd/Makefile ] || [ -f stage4-bfd/Makefile ] \
+	  || exit 0 ; \
+	[ -f bfd/Makefile ] || $(MAKE) stage4-start ; \
+	cd bfd && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
 @endif bfd-bootstrap
 
+
 .PHONY: configure-stage4-opcodes maybe-configure-stage4-opcodes
 .PHONY: all-stage4-opcodes maybe-all-stage4-opcodes
+.PHONY: clean-stage4-opcodes maybe-clean-stage4-opcodes
 
 maybe-configure-stage4-opcodes:
 maybe-all-stage4-opcodes:
+maybe-clean-stage4-opcodes:
 
 @if opcodes-bootstrap
 maybe-configure-stage4-opcodes: configure-stage4-opcodes
@@ -30328,13 +30290,26 @@ all-stage4-opcodes: configure-stage4-opcodes
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		 
+
+maybe-clean-stage4-opcodes: clean-stage4-opcodes
+clean-stage4-opcodes:
+	@[ -f opcodes/Makefile ] || [ -f stage4-opcodes/Makefile ] \
+	  || exit 0 ; \
+	[ -f opcodes/Makefile ] || $(MAKE) stage4-start ; \
+	cd opcodes && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
 @endif opcodes-bootstrap
 
+
 .PHONY: configure-stage4-binutils maybe-configure-stage4-binutils
 .PHONY: all-stage4-binutils maybe-all-stage4-binutils
+.PHONY: clean-stage4-binutils maybe-clean-stage4-binutils
 
 maybe-configure-stage4-binutils:
 maybe-all-stage4-binutils:
+maybe-clean-stage4-binutils:
 
 @if binutils-bootstrap
 maybe-configure-stage4-binutils: configure-stage4-binutils
@@ -30371,13 +30346,26 @@ all-stage4-binutils: configure-stage4-binutils
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		 
+
+maybe-clean-stage4-binutils: clean-stage4-binutils
+clean-stage4-binutils:
+	@[ -f binutils/Makefile ] || [ -f stage4-binutils/Makefile ] \
+	  || exit 0 ; \
+	[ -f binutils/Makefile ] || $(MAKE) stage4-start ; \
+	cd binutils && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
 @endif binutils-bootstrap
 
+
 .PHONY: configure-stage4-gas maybe-configure-stage4-gas
 .PHONY: all-stage4-gas maybe-all-stage4-gas
+.PHONY: clean-stage4-gas maybe-clean-stage4-gas
 
 maybe-configure-stage4-gas:
 maybe-all-stage4-gas:
+maybe-clean-stage4-gas:
 
 @if gas-bootstrap
 maybe-configure-stage4-gas: configure-stage4-gas
@@ -30414,13 +30402,26 @@ all-stage4-gas: configure-stage4-gas
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		 
+
+maybe-clean-stage4-gas: clean-stage4-gas
+clean-stage4-gas:
+	@[ -f gas/Makefile ] || [ -f stage4-gas/Makefile ] \
+	  || exit 0 ; \
+	[ -f gas/Makefile ] || $(MAKE) stage4-start ; \
+	cd gas && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
 @endif gas-bootstrap
 
+
 .PHONY: configure-stage4-gcc maybe-configure-stage4-gcc
 .PHONY: all-stage4-gcc maybe-all-stage4-gcc
+.PHONY: clean-stage4-gcc maybe-clean-stage4-gcc
 
 maybe-configure-stage4-gcc:
 maybe-all-stage4-gcc:
+maybe-clean-stage4-gcc:
 
 @if gcc-bootstrap
 maybe-configure-stage4-gcc: configure-stage4-gcc
@@ -30457,13 +30458,26 @@ all-stage4-gcc: configure-stage4-gcc
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		 $(EXTRA_GCC_FLAGS)
+
+maybe-clean-stage4-gcc: clean-stage4-gcc
+clean-stage4-gcc:
+	@[ -f gcc/Makefile ] || [ -f stage4-gcc/Makefile ] \
+	  || exit 0 ; \
+	[ -f gcc/Makefile ] || $(MAKE) stage4-start ; \
+	cd gcc && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		 $(EXTRA_GCC_FLAGS) clean
 @endif gcc-bootstrap
 
+
 .PHONY: configure-stage4-intl maybe-configure-stage4-intl
 .PHONY: all-stage4-intl maybe-all-stage4-intl
+.PHONY: clean-stage4-intl maybe-clean-stage4-intl
 
 maybe-configure-stage4-intl:
 maybe-all-stage4-intl:
+maybe-clean-stage4-intl:
 
 @if intl-bootstrap
 maybe-configure-stage4-intl: configure-stage4-intl
@@ -30500,13 +30514,26 @@ all-stage4-intl: configure-stage4-intl
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		 
+
+maybe-clean-stage4-intl: clean-stage4-intl
+clean-stage4-intl:
+	@[ -f intl/Makefile ] || [ -f stage4-intl/Makefile ] \
+	  || exit 0 ; \
+	[ -f intl/Makefile ] || $(MAKE) stage4-start ; \
+	cd intl && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
 @endif intl-bootstrap
 
+
 .PHONY: configure-stage4-ld maybe-configure-stage4-ld
 .PHONY: all-stage4-ld maybe-all-stage4-ld
+.PHONY: clean-stage4-ld maybe-clean-stage4-ld
 
 maybe-configure-stage4-ld:
 maybe-all-stage4-ld:
+maybe-clean-stage4-ld:
 
 @if ld-bootstrap
 maybe-configure-stage4-ld: configure-stage4-ld
@@ -30543,13 +30570,26 @@ all-stage4-ld: configure-stage4-ld
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		 
+
+maybe-clean-stage4-ld: clean-stage4-ld
+clean-stage4-ld:
+	@[ -f ld/Makefile ] || [ -f stage4-ld/Makefile ] \
+	  || exit 0 ; \
+	[ -f ld/Makefile ] || $(MAKE) stage4-start ; \
+	cd ld && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
 @endif ld-bootstrap
 
+
 .PHONY: configure-stage4-libcpp maybe-configure-stage4-libcpp
 .PHONY: all-stage4-libcpp maybe-all-stage4-libcpp
+.PHONY: clean-stage4-libcpp maybe-clean-stage4-libcpp
 
 maybe-configure-stage4-libcpp:
 maybe-all-stage4-libcpp:
+maybe-clean-stage4-libcpp:
 
 @if libcpp-bootstrap
 maybe-configure-stage4-libcpp: configure-stage4-libcpp
@@ -30586,56 +30626,26 @@ all-stage4-libcpp: configure-stage4-libcpp
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		 
-@endif libcpp-bootstrap
-
-.PHONY: configure-stage4-libbanshee maybe-configure-stage4-libbanshee
-.PHONY: all-stage4-libbanshee maybe-all-stage4-libbanshee
 
-maybe-configure-stage4-libbanshee:
-maybe-all-stage4-libbanshee:
-
-@if libbanshee-bootstrap
-maybe-configure-stage4-libbanshee: configure-stage4-libbanshee
-configure-stage4-libbanshee:
-	@$(MAKE) stage4-start
-	@[ -f libbanshee/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-	$(STAGE_HOST_EXPORTS)  \
-	echo Configuring stage 4 in libbanshee ; \
-	cd libbanshee || exit 1; \
-	case $(srcdir) in \
-	  \.) \
-	    srcdiroption="--srcdir=."; \
-	    libsrcdir=".";; \
-	  /* | [A-Za-z]:[\\/]*) \
-	    srcdiroption="--srcdir=$(srcdir)/libbanshee"; \
-	    libsrcdir="$$s/libbanshee";; \
-	  *) \
-	    srcdiroption="--srcdir=../$(srcdir)/libbanshee"; \
-	    libsrcdir="$$s/libbanshee";; \
-	esac; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-
-maybe-all-stage4-libbanshee: all-stage4-libbanshee
-all-stage4-libbanshee: configure-stage4-libbanshee
-	@$(MAKE) stage4-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-	$(STAGE_HOST_EXPORTS)  \
-	cd libbanshee && \
+maybe-clean-stage4-libcpp: clean-stage4-libcpp
+clean-stage4-libcpp:
+	@[ -f libcpp/Makefile ] || [ -f stage4-libcpp/Makefile ] \
+	  || exit 0 ; \
+	[ -f libcpp/Makefile ] || $(MAKE) stage4-start ; \
+	cd libcpp && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		 
-@endif libbanshee-bootstrap
+		  clean
+@endif libcpp-bootstrap
+
 
 .PHONY: configure-stage4-libiberty maybe-configure-stage4-libiberty
 .PHONY: all-stage4-libiberty maybe-all-stage4-libiberty
+.PHONY: clean-stage4-libiberty maybe-clean-stage4-libiberty
 
 maybe-configure-stage4-libiberty:
 maybe-all-stage4-libiberty:
+maybe-clean-stage4-libiberty:
 
 @if libiberty-bootstrap
 maybe-configure-stage4-libiberty: configure-stage4-libiberty
@@ -30672,13 +30682,26 @@ all-stage4-libiberty: configure-stage4-libiberty
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		 
+
+maybe-clean-stage4-libiberty: clean-stage4-libiberty
+clean-stage4-libiberty:
+	@[ -f libiberty/Makefile ] || [ -f stage4-libiberty/Makefile ] \
+	  || exit 0 ; \
+	[ -f libiberty/Makefile ] || $(MAKE) stage4-start ; \
+	cd libiberty && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
 @endif libiberty-bootstrap
 
+
 .PHONY: configure-stage4-zlib maybe-configure-stage4-zlib
 .PHONY: all-stage4-zlib maybe-all-stage4-zlib
+.PHONY: clean-stage4-zlib maybe-clean-stage4-zlib
 
 maybe-configure-stage4-zlib:
 maybe-all-stage4-zlib:
+maybe-clean-stage4-zlib:
 
 @if zlib-bootstrap
 maybe-configure-stage4-zlib: configure-stage4-zlib
@@ -30715,9 +30738,20 @@ all-stage4-zlib: configure-stage4-zlib
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		 
+
+maybe-clean-stage4-zlib: clean-stage4-zlib
+clean-stage4-zlib:
+	@[ -f zlib/Makefile ] || [ -f stage4-zlib/Makefile ] \
+	  || exit 0 ; \
+	[ -f zlib/Makefile ] || $(MAKE) stage4-start ; \
+	cd zlib && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		  clean
 @endif zlib-bootstrap
 
 
+
 # FIXME: Will not need to be conditional when toplevel bootstrap is the
 # only possibility, but now it conflicts with no-bootstrap rules
 @if gcc-bootstrap
@@ -30755,10 +30789,9 @@ compare3:
 bootstrap4: stage4-bubble compare3 all
 
 
-.PHONY: distclean-stage4
-
-# Rules to wipe a stage and all the following ones, used for cleanstrap
+# Rules to wipe a stage and all the following ones, also used for cleanstrap
 distclean-stage3:: distclean-stage4 
+.PHONY: distclean-stage4
 distclean-stage4::
 	[ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
 	rm -rf stage4-* compare3 
@@ -30813,11 +30846,6 @@ stageprofile-start::
 	set stageprofile-libcpp libcpp ; @CREATE_LINK_TO_DIR@  ; \
 	set stage1-libcpp prev-libcpp ; @CREATE_LINK_TO_DIR@ 
 @endif libcpp
-@if libbanshee
-	@[ -d stageprofile-libbanshee ] || mkdir stageprofile-libbanshee; \
-	set stageprofile-libbanshee libbanshee ; @CREATE_LINK_TO_DIR@  ; \
-	set stage1-libbanshee prev-libbanshee ; @CREATE_LINK_TO_DIR@ 
-@endif libbanshee
 @if libiberty
 	@[ -d stageprofile-libiberty ] || mkdir stageprofile-libiberty; \
 	set stageprofile-libiberty libiberty ; @CREATE_LINK_TO_DIR@  ; \
@@ -30863,10 +30891,6 @@ stageprofile-end::
 	@set libcpp stageprofile-libcpp ; @UNDO_LINK_TO_DIR@  ; \
 	set prev-libcpp stage1-libcpp ; @UNDO_LINK_TO_DIR@ 
 @endif libcpp
-@if libbanshee
-	@set libbanshee stageprofile-libbanshee ; @UNDO_LINK_TO_DIR@  ; \
-	set prev-libbanshee stage1-libbanshee ; @UNDO_LINK_TO_DIR@ 
-@endif libbanshee
 @if libiberty
 	@set libiberty stageprofile-libiberty ; @UNDO_LINK_TO_DIR@  ; \
 	set prev-libiberty stage1-libiberty ; @UNDO_LINK_TO_DIR@ 
@@ -30884,10 +30908,10 @@ stageprofile-bubble:: stage1-bubble
 	@if test -f stageprofile-lean || test -f stage1-lean  ; then \
 	  echo Skipping rebuild of stageprofile ; \
 	else \
-	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stageprofile; \
+	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stageprofile; \
 	fi
 
-.PHONY: all-stageprofile
+.PHONY: all-stageprofile clean-stageprofile
 all-stageprofile:     \
   maybe-all-stageprofile-bfd \
   maybe-all-stageprofile-opcodes \
@@ -30897,16 +30921,30 @@ all-stageprofile:     \
   maybe-all-stageprofile-intl   \
   maybe-all-stageprofile-ld \
   maybe-all-stageprofile-libcpp  \
-  maybe-all-stageprofile-libbanshee \
   maybe-all-stageprofile-libiberty                        \
   maybe-all-stageprofile-zlib       
 
+do-clean: clean-stageprofile
+clean-stageprofile:     \
+  maybe-clean-stageprofile-bfd \
+  maybe-clean-stageprofile-opcodes \
+  maybe-clean-stageprofile-binutils             \
+  maybe-clean-stageprofile-gas \
+  maybe-clean-stageprofile-gcc        \
+  maybe-clean-stageprofile-intl   \
+  maybe-clean-stageprofile-ld \
+  maybe-clean-stageprofile-libcpp  \
+  maybe-clean-stageprofile-libiberty                        \
+  maybe-clean-stageprofile-zlib       
+
 
 .PHONY: configure-stageprofile-bfd maybe-configure-stageprofile-bfd
 .PHONY: all-stageprofile-bfd maybe-all-stageprofile-bfd
+.PHONY: clean-stageprofile-bfd maybe-clean-stageprofile-bfd
 
 maybe-configure-stageprofile-bfd:
 maybe-all-stageprofile-bfd:
+maybe-clean-stageprofile-bfd:
 
 @if bfd-bootstrap
 maybe-configure-stageprofile-bfd: configure-stageprofile-bfd
@@ -30943,13 +30981,26 @@ all-stageprofile-bfd: configure-stageprofile-bfd
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-bfd: clean-stageprofile-bfd
+clean-stageprofile-bfd:
+	@[ -f bfd/Makefile ] || [ -f stageprofile-bfd/Makefile ] \
+	  || exit 0 ; \
+	[ -f bfd/Makefile ] || $(MAKE) stageprofile-start ; \
+	cd bfd && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
 @endif bfd-bootstrap
 
+
 .PHONY: configure-stageprofile-opcodes maybe-configure-stageprofile-opcodes
 .PHONY: all-stageprofile-opcodes maybe-all-stageprofile-opcodes
+.PHONY: clean-stageprofile-opcodes maybe-clean-stageprofile-opcodes
 
 maybe-configure-stageprofile-opcodes:
 maybe-all-stageprofile-opcodes:
+maybe-clean-stageprofile-opcodes:
 
 @if opcodes-bootstrap
 maybe-configure-stageprofile-opcodes: configure-stageprofile-opcodes
@@ -30986,13 +31037,26 @@ all-stageprofile-opcodes: configure-stageprofile-opcodes
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-opcodes: clean-stageprofile-opcodes
+clean-stageprofile-opcodes:
+	@[ -f opcodes/Makefile ] || [ -f stageprofile-opcodes/Makefile ] \
+	  || exit 0 ; \
+	[ -f opcodes/Makefile ] || $(MAKE) stageprofile-start ; \
+	cd opcodes && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
 @endif opcodes-bootstrap
 
+
 .PHONY: configure-stageprofile-binutils maybe-configure-stageprofile-binutils
 .PHONY: all-stageprofile-binutils maybe-all-stageprofile-binutils
+.PHONY: clean-stageprofile-binutils maybe-clean-stageprofile-binutils
 
 maybe-configure-stageprofile-binutils:
 maybe-all-stageprofile-binutils:
+maybe-clean-stageprofile-binutils:
 
 @if binutils-bootstrap
 maybe-configure-stageprofile-binutils: configure-stageprofile-binutils
@@ -31029,13 +31093,26 @@ all-stageprofile-binutils: configure-stageprofile-binutils
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-binutils: clean-stageprofile-binutils
+clean-stageprofile-binutils:
+	@[ -f binutils/Makefile ] || [ -f stageprofile-binutils/Makefile ] \
+	  || exit 0 ; \
+	[ -f binutils/Makefile ] || $(MAKE) stageprofile-start ; \
+	cd binutils && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
 @endif binutils-bootstrap
 
+
 .PHONY: configure-stageprofile-gas maybe-configure-stageprofile-gas
 .PHONY: all-stageprofile-gas maybe-all-stageprofile-gas
+.PHONY: clean-stageprofile-gas maybe-clean-stageprofile-gas
 
 maybe-configure-stageprofile-gas:
 maybe-all-stageprofile-gas:
+maybe-clean-stageprofile-gas:
 
 @if gas-bootstrap
 maybe-configure-stageprofile-gas: configure-stageprofile-gas
@@ -31072,13 +31149,26 @@ all-stageprofile-gas: configure-stageprofile-gas
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-gas: clean-stageprofile-gas
+clean-stageprofile-gas:
+	@[ -f gas/Makefile ] || [ -f stageprofile-gas/Makefile ] \
+	  || exit 0 ; \
+	[ -f gas/Makefile ] || $(MAKE) stageprofile-start ; \
+	cd gas && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
 @endif gas-bootstrap
 
+
 .PHONY: configure-stageprofile-gcc maybe-configure-stageprofile-gcc
 .PHONY: all-stageprofile-gcc maybe-all-stageprofile-gcc
+.PHONY: clean-stageprofile-gcc maybe-clean-stageprofile-gcc
 
 maybe-configure-stageprofile-gcc:
 maybe-all-stageprofile-gcc:
+maybe-clean-stageprofile-gcc:
 
 @if gcc-bootstrap
 maybe-configure-stageprofile-gcc: configure-stageprofile-gcc
@@ -31115,13 +31205,26 @@ all-stageprofile-gcc: configure-stageprofile-gcc
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" $(EXTRA_GCC_FLAGS)
+
+maybe-clean-stageprofile-gcc: clean-stageprofile-gcc
+clean-stageprofile-gcc:
+	@[ -f gcc/Makefile ] || [ -f stageprofile-gcc/Makefile ] \
+	  || exit 0 ; \
+	[ -f gcc/Makefile ] || $(MAKE) stageprofile-start ; \
+	cd gcc && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" $(EXTRA_GCC_FLAGS) clean
 @endif gcc-bootstrap
 
+
 .PHONY: configure-stageprofile-intl maybe-configure-stageprofile-intl
 .PHONY: all-stageprofile-intl maybe-all-stageprofile-intl
+.PHONY: clean-stageprofile-intl maybe-clean-stageprofile-intl
 
 maybe-configure-stageprofile-intl:
 maybe-all-stageprofile-intl:
+maybe-clean-stageprofile-intl:
 
 @if intl-bootstrap
 maybe-configure-stageprofile-intl: configure-stageprofile-intl
@@ -31158,13 +31261,26 @@ all-stageprofile-intl: configure-stageprofile-intl
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-intl: clean-stageprofile-intl
+clean-stageprofile-intl:
+	@[ -f intl/Makefile ] || [ -f stageprofile-intl/Makefile ] \
+	  || exit 0 ; \
+	[ -f intl/Makefile ] || $(MAKE) stageprofile-start ; \
+	cd intl && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
 @endif intl-bootstrap
 
+
 .PHONY: configure-stageprofile-ld maybe-configure-stageprofile-ld
 .PHONY: all-stageprofile-ld maybe-all-stageprofile-ld
+.PHONY: clean-stageprofile-ld maybe-clean-stageprofile-ld
 
 maybe-configure-stageprofile-ld:
 maybe-all-stageprofile-ld:
+maybe-clean-stageprofile-ld:
 
 @if ld-bootstrap
 maybe-configure-stageprofile-ld: configure-stageprofile-ld
@@ -31201,13 +31317,26 @@ all-stageprofile-ld: configure-stageprofile-ld
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-ld: clean-stageprofile-ld
+clean-stageprofile-ld:
+	@[ -f ld/Makefile ] || [ -f stageprofile-ld/Makefile ] \
+	  || exit 0 ; \
+	[ -f ld/Makefile ] || $(MAKE) stageprofile-start ; \
+	cd ld && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
 @endif ld-bootstrap
 
+
 .PHONY: configure-stageprofile-libcpp maybe-configure-stageprofile-libcpp
 .PHONY: all-stageprofile-libcpp maybe-all-stageprofile-libcpp
+.PHONY: clean-stageprofile-libcpp maybe-clean-stageprofile-libcpp
 
 maybe-configure-stageprofile-libcpp:
 maybe-all-stageprofile-libcpp:
+maybe-clean-stageprofile-libcpp:
 
 @if libcpp-bootstrap
 maybe-configure-stageprofile-libcpp: configure-stageprofile-libcpp
@@ -31244,56 +31373,26 @@ all-stageprofile-libcpp: configure-stageprofile-libcpp
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
-@endif libcpp-bootstrap
-
-.PHONY: configure-stageprofile-libbanshee maybe-configure-stageprofile-libbanshee
-.PHONY: all-stageprofile-libbanshee maybe-all-stageprofile-libbanshee
 
-maybe-configure-stageprofile-libbanshee:
-maybe-all-stageprofile-libbanshee:
-
-@if libbanshee-bootstrap
-maybe-configure-stageprofile-libbanshee: configure-stageprofile-libbanshee
-configure-stageprofile-libbanshee:
-	@$(MAKE) stageprofile-start
-	@[ -f libbanshee/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-	$(STAGE_HOST_EXPORTS)  \
-	echo Configuring stage profile in libbanshee ; \
-	cd libbanshee || exit 1; \
-	case $(srcdir) in \
-	  \.) \
-	    srcdiroption="--srcdir=."; \
-	    libsrcdir=".";; \
-	  /* | [A-Za-z]:[\\/]*) \
-	    srcdiroption="--srcdir=$(srcdir)/libbanshee"; \
-	    libsrcdir="$$s/libbanshee";; \
-	  *) \
-	    srcdiroption="--srcdir=../$(srcdir)/libbanshee"; \
-	    libsrcdir="$$s/libbanshee";; \
-	esac; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
-
-maybe-all-stageprofile-libbanshee: all-stageprofile-libbanshee
-all-stageprofile-libbanshee: configure-stageprofile-libbanshee
-	@$(MAKE) stageprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-	$(STAGE_HOST_EXPORTS)  \
-	cd libbanshee && \
+maybe-clean-stageprofile-libcpp: clean-stageprofile-libcpp
+clean-stageprofile-libcpp:
+	@[ -f libcpp/Makefile ] || [ -f stageprofile-libcpp/Makefile ] \
+	  || exit 0 ; \
+	[ -f libcpp/Makefile ] || $(MAKE) stageprofile-start ; \
+	cd libcpp && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
-@endif libbanshee-bootstrap
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
+@endif libcpp-bootstrap
+
 
 .PHONY: configure-stageprofile-libiberty maybe-configure-stageprofile-libiberty
 .PHONY: all-stageprofile-libiberty maybe-all-stageprofile-libiberty
+.PHONY: clean-stageprofile-libiberty maybe-clean-stageprofile-libiberty
 
 maybe-configure-stageprofile-libiberty:
 maybe-all-stageprofile-libiberty:
+maybe-clean-stageprofile-libiberty:
 
 @if libiberty-bootstrap
 maybe-configure-stageprofile-libiberty: configure-stageprofile-libiberty
@@ -31330,13 +31429,26 @@ all-stageprofile-libiberty: configure-stageprofile-libiberty
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-libiberty: clean-stageprofile-libiberty
+clean-stageprofile-libiberty:
+	@[ -f libiberty/Makefile ] || [ -f stageprofile-libiberty/Makefile ] \
+	  || exit 0 ; \
+	[ -f libiberty/Makefile ] || $(MAKE) stageprofile-start ; \
+	cd libiberty && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
 @endif libiberty-bootstrap
 
+
 .PHONY: configure-stageprofile-zlib maybe-configure-stageprofile-zlib
 .PHONY: all-stageprofile-zlib maybe-all-stageprofile-zlib
+.PHONY: clean-stageprofile-zlib maybe-clean-stageprofile-zlib
 
 maybe-configure-stageprofile-zlib:
 maybe-all-stageprofile-zlib:
+maybe-clean-stageprofile-zlib:
 
 @if zlib-bootstrap
 maybe-configure-stageprofile-zlib: configure-stageprofile-zlib
@@ -31373,9 +31485,20 @@ all-stageprofile-zlib: configure-stageprofile-zlib
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" 
+
+maybe-clean-stageprofile-zlib: clean-stageprofile-zlib
+clean-stageprofile-zlib:
+	@[ -f zlib/Makefile ] || [ -f stageprofile-zlib/Makefile ] \
+	  || exit 0 ; \
+	[ -f zlib/Makefile ] || $(MAKE) stageprofile-start ; \
+	cd zlib && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"  clean
 @endif zlib-bootstrap
 
 
+
 # FIXME: Will not need to be conditional when toplevel bootstrap is the
 # only possibility, but now it conflicts with no-bootstrap rules
 @if gcc-bootstrap
@@ -31383,10 +31506,9 @@ all-stageprofile-zlib: configure-stageprofile-zlib
 
 
 
-.PHONY: distclean-stageprofile
-
-# Rules to wipe a stage and all the following ones, used for cleanstrap
+# Rules to wipe a stage and all the following ones, also used for cleanstrap
 distclean-stage1:: distclean-stageprofile 
+.PHONY: distclean-stageprofile
 distclean-stageprofile::
 	[ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
 	rm -rf stageprofile-* 
@@ -31441,11 +31563,6 @@ stagefeedback-start::
 	set stagefeedback-libcpp libcpp ; @CREATE_LINK_TO_DIR@  ; \
 	set stage1-libcpp prev-libcpp ; @CREATE_LINK_TO_DIR@ 
 @endif libcpp
-@if libbanshee
-	@[ -d stagefeedback-libbanshee ] || mkdir stagefeedback-libbanshee; \
-	set stagefeedback-libbanshee libbanshee ; @CREATE_LINK_TO_DIR@  ; \
-	set stage1-libbanshee prev-libbanshee ; @CREATE_LINK_TO_DIR@ 
-@endif libbanshee
 @if libiberty
 	@[ -d stagefeedback-libiberty ] || mkdir stagefeedback-libiberty; \
 	set stagefeedback-libiberty libiberty ; @CREATE_LINK_TO_DIR@  ; \
@@ -31491,10 +31608,6 @@ stagefeedback-end::
 	@set libcpp stagefeedback-libcpp ; @UNDO_LINK_TO_DIR@  ; \
 	set prev-libcpp stage1-libcpp ; @UNDO_LINK_TO_DIR@ 
 @endif libcpp
-@if libbanshee
-	@set libbanshee stagefeedback-libbanshee ; @UNDO_LINK_TO_DIR@  ; \
-	set prev-libbanshee stage1-libbanshee ; @UNDO_LINK_TO_DIR@ 
-@endif libbanshee
 @if libiberty
 	@set libiberty stagefeedback-libiberty ; @UNDO_LINK_TO_DIR@  ; \
 	set prev-libiberty stage1-libiberty ; @UNDO_LINK_TO_DIR@ 
@@ -31512,10 +31625,10 @@ stagefeedback-bubble:: stage1-bubble
 	@if test -f stagefeedback-lean || test -f stage1-lean  ; then \
 	  echo Skipping rebuild of stagefeedback ; \
 	else \
-	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stagefeedback; \
+	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stagefeedback; \
 	fi
 
-.PHONY: all-stagefeedback
+.PHONY: all-stagefeedback clean-stagefeedback
 all-stagefeedback:     \
   maybe-all-stagefeedback-bfd \
   maybe-all-stagefeedback-opcodes \
@@ -31525,16 +31638,30 @@ all-stagefeedback:     \
   maybe-all-stagefeedback-intl   \
   maybe-all-stagefeedback-ld \
   maybe-all-stagefeedback-libcpp  \
-  maybe-all-stagefeedback-libbanshee \
   maybe-all-stagefeedback-libiberty                        \
   maybe-all-stagefeedback-zlib       
 
+do-clean: clean-stagefeedback
+clean-stagefeedback:     \
+  maybe-clean-stagefeedback-bfd \
+  maybe-clean-stagefeedback-opcodes \
+  maybe-clean-stagefeedback-binutils             \
+  maybe-clean-stagefeedback-gas \
+  maybe-clean-stagefeedback-gcc        \
+  maybe-clean-stagefeedback-intl   \
+  maybe-clean-stagefeedback-ld \
+  maybe-clean-stagefeedback-libcpp  \
+  maybe-clean-stagefeedback-libiberty                        \
+  maybe-clean-stagefeedback-zlib       
+
 
 .PHONY: configure-stagefeedback-bfd maybe-configure-stagefeedback-bfd
 .PHONY: all-stagefeedback-bfd maybe-all-stagefeedback-bfd
+.PHONY: clean-stagefeedback-bfd maybe-clean-stagefeedback-bfd
 
 maybe-configure-stagefeedback-bfd:
 maybe-all-stagefeedback-bfd:
+maybe-clean-stagefeedback-bfd:
 
 @if bfd-bootstrap
 maybe-configure-stagefeedback-bfd: configure-stagefeedback-bfd
@@ -31571,13 +31698,26 @@ all-stagefeedback-bfd: configure-stagefeedback-bfd
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-bfd: clean-stagefeedback-bfd
+clean-stagefeedback-bfd:
+	@[ -f bfd/Makefile ] || [ -f stagefeedback-bfd/Makefile ] \
+	  || exit 0 ; \
+	[ -f bfd/Makefile ] || $(MAKE) stagefeedback-start ; \
+	cd bfd && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
 @endif bfd-bootstrap
 
+
 .PHONY: configure-stagefeedback-opcodes maybe-configure-stagefeedback-opcodes
 .PHONY: all-stagefeedback-opcodes maybe-all-stagefeedback-opcodes
+.PHONY: clean-stagefeedback-opcodes maybe-clean-stagefeedback-opcodes
 
 maybe-configure-stagefeedback-opcodes:
 maybe-all-stagefeedback-opcodes:
+maybe-clean-stagefeedback-opcodes:
 
 @if opcodes-bootstrap
 maybe-configure-stagefeedback-opcodes: configure-stagefeedback-opcodes
@@ -31614,13 +31754,26 @@ all-stagefeedback-opcodes: configure-stagefeedback-opcodes
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-opcodes: clean-stagefeedback-opcodes
+clean-stagefeedback-opcodes:
+	@[ -f opcodes/Makefile ] || [ -f stagefeedback-opcodes/Makefile ] \
+	  || exit 0 ; \
+	[ -f opcodes/Makefile ] || $(MAKE) stagefeedback-start ; \
+	cd opcodes && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
 @endif opcodes-bootstrap
 
+
 .PHONY: configure-stagefeedback-binutils maybe-configure-stagefeedback-binutils
 .PHONY: all-stagefeedback-binutils maybe-all-stagefeedback-binutils
+.PHONY: clean-stagefeedback-binutils maybe-clean-stagefeedback-binutils
 
 maybe-configure-stagefeedback-binutils:
 maybe-all-stagefeedback-binutils:
+maybe-clean-stagefeedback-binutils:
 
 @if binutils-bootstrap
 maybe-configure-stagefeedback-binutils: configure-stagefeedback-binutils
@@ -31657,13 +31810,26 @@ all-stagefeedback-binutils: configure-stagefeedback-binutils
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-binutils: clean-stagefeedback-binutils
+clean-stagefeedback-binutils:
+	@[ -f binutils/Makefile ] || [ -f stagefeedback-binutils/Makefile ] \
+	  || exit 0 ; \
+	[ -f binutils/Makefile ] || $(MAKE) stagefeedback-start ; \
+	cd binutils && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
 @endif binutils-bootstrap
 
+
 .PHONY: configure-stagefeedback-gas maybe-configure-stagefeedback-gas
 .PHONY: all-stagefeedback-gas maybe-all-stagefeedback-gas
+.PHONY: clean-stagefeedback-gas maybe-clean-stagefeedback-gas
 
 maybe-configure-stagefeedback-gas:
 maybe-all-stagefeedback-gas:
+maybe-clean-stagefeedback-gas:
 
 @if gas-bootstrap
 maybe-configure-stagefeedback-gas: configure-stagefeedback-gas
@@ -31700,13 +31866,26 @@ all-stagefeedback-gas: configure-stagefeedback-gas
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-gas: clean-stagefeedback-gas
+clean-stagefeedback-gas:
+	@[ -f gas/Makefile ] || [ -f stagefeedback-gas/Makefile ] \
+	  || exit 0 ; \
+	[ -f gas/Makefile ] || $(MAKE) stagefeedback-start ; \
+	cd gas && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
 @endif gas-bootstrap
 
+
 .PHONY: configure-stagefeedback-gcc maybe-configure-stagefeedback-gcc
 .PHONY: all-stagefeedback-gcc maybe-all-stagefeedback-gcc
+.PHONY: clean-stagefeedback-gcc maybe-clean-stagefeedback-gcc
 
 maybe-configure-stagefeedback-gcc:
 maybe-all-stagefeedback-gcc:
+maybe-clean-stagefeedback-gcc:
 
 @if gcc-bootstrap
 maybe-configure-stagefeedback-gcc: configure-stagefeedback-gcc
@@ -31743,13 +31922,26 @@ all-stagefeedback-gcc: configure-stagefeedback-gcc
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		CFLAGS="$(BOOT_CFLAGS) -fprofile-use" $(EXTRA_GCC_FLAGS)
+
+maybe-clean-stagefeedback-gcc: clean-stagefeedback-gcc
+clean-stagefeedback-gcc:
+	@[ -f gcc/Makefile ] || [ -f stagefeedback-gcc/Makefile ] \
+	  || exit 0 ; \
+	[ -f gcc/Makefile ] || $(MAKE) stagefeedback-start ; \
+	cd gcc && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-use" $(EXTRA_GCC_FLAGS) clean
 @endif gcc-bootstrap
 
+
 .PHONY: configure-stagefeedback-intl maybe-configure-stagefeedback-intl
 .PHONY: all-stagefeedback-intl maybe-all-stagefeedback-intl
+.PHONY: clean-stagefeedback-intl maybe-clean-stagefeedback-intl
 
 maybe-configure-stagefeedback-intl:
 maybe-all-stagefeedback-intl:
+maybe-clean-stagefeedback-intl:
 
 @if intl-bootstrap
 maybe-configure-stagefeedback-intl: configure-stagefeedback-intl
@@ -31786,13 +31978,26 @@ all-stagefeedback-intl: configure-stagefeedback-intl
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-intl: clean-stagefeedback-intl
+clean-stagefeedback-intl:
+	@[ -f intl/Makefile ] || [ -f stagefeedback-intl/Makefile ] \
+	  || exit 0 ; \
+	[ -f intl/Makefile ] || $(MAKE) stagefeedback-start ; \
+	cd intl && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
 @endif intl-bootstrap
 
+
 .PHONY: configure-stagefeedback-ld maybe-configure-stagefeedback-ld
 .PHONY: all-stagefeedback-ld maybe-all-stagefeedback-ld
+.PHONY: clean-stagefeedback-ld maybe-clean-stagefeedback-ld
 
 maybe-configure-stagefeedback-ld:
 maybe-all-stagefeedback-ld:
+maybe-clean-stagefeedback-ld:
 
 @if ld-bootstrap
 maybe-configure-stagefeedback-ld: configure-stagefeedback-ld
@@ -31829,13 +32034,26 @@ all-stagefeedback-ld: configure-stagefeedback-ld
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-ld: clean-stagefeedback-ld
+clean-stagefeedback-ld:
+	@[ -f ld/Makefile ] || [ -f stagefeedback-ld/Makefile ] \
+	  || exit 0 ; \
+	[ -f ld/Makefile ] || $(MAKE) stagefeedback-start ; \
+	cd ld && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
 @endif ld-bootstrap
 
+
 .PHONY: configure-stagefeedback-libcpp maybe-configure-stagefeedback-libcpp
 .PHONY: all-stagefeedback-libcpp maybe-all-stagefeedback-libcpp
+.PHONY: clean-stagefeedback-libcpp maybe-clean-stagefeedback-libcpp
 
 maybe-configure-stagefeedback-libcpp:
 maybe-all-stagefeedback-libcpp:
+maybe-clean-stagefeedback-libcpp:
 
 @if libcpp-bootstrap
 maybe-configure-stagefeedback-libcpp: configure-stagefeedback-libcpp
@@ -31872,56 +32090,26 @@ all-stagefeedback-libcpp: configure-stagefeedback-libcpp
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
-@endif libcpp-bootstrap
-
-.PHONY: configure-stagefeedback-libbanshee maybe-configure-stagefeedback-libbanshee
-.PHONY: all-stagefeedback-libbanshee maybe-all-stagefeedback-libbanshee
-
-maybe-configure-stagefeedback-libbanshee:
-maybe-all-stagefeedback-libbanshee:
-
-@if libbanshee-bootstrap
-maybe-configure-stagefeedback-libbanshee: configure-stagefeedback-libbanshee
-configure-stagefeedback-libbanshee:
-	@$(MAKE) stagefeedback-start
-	@[ -f libbanshee/Makefile ] && exit 0 || : ; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-	$(STAGE_HOST_EXPORTS)  \
-	echo Configuring stage feedback in libbanshee ; \
-	cd libbanshee || exit 1; \
-	case $(srcdir) in \
-	  \.) \
-	    srcdiroption="--srcdir=."; \
-	    libsrcdir=".";; \
-	  /* | [A-Za-z]:[\\/]*) \
-	    srcdiroption="--srcdir=$(srcdir)/libbanshee"; \
-	    libsrcdir="$$s/libbanshee";; \
-	  *) \
-	    srcdiroption="--srcdir=../$(srcdir)/libbanshee"; \
-	    libsrcdir="$$s/libbanshee";; \
-	esac; \
-	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} \
-	  @stage2_werror_flag@ 
 
-maybe-all-stagefeedback-libbanshee: all-stagefeedback-libbanshee
-all-stagefeedback-libbanshee: configure-stagefeedback-libbanshee
-	@$(MAKE) stagefeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s;  \
-	$(STAGE_HOST_EXPORTS)  \
-	cd libbanshee && \
+maybe-clean-stagefeedback-libcpp: clean-stagefeedback-libcpp
+clean-stagefeedback-libcpp:
+	@[ -f libcpp/Makefile ] || [ -f stagefeedback-libcpp/Makefile ] \
+	  || exit 0 ; \
+	[ -f libcpp/Makefile ] || $(MAKE) stagefeedback-start ; \
+	cd libcpp && \
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
-		CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
-@endif libbanshee-bootstrap
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
+@endif libcpp-bootstrap
+
 
 .PHONY: configure-stagefeedback-libiberty maybe-configure-stagefeedback-libiberty
 .PHONY: all-stagefeedback-libiberty maybe-all-stagefeedback-libiberty
+.PHONY: clean-stagefeedback-libiberty maybe-clean-stagefeedback-libiberty
 
 maybe-configure-stagefeedback-libiberty:
 maybe-all-stagefeedback-libiberty:
+maybe-clean-stagefeedback-libiberty:
 
 @if libiberty-bootstrap
 maybe-configure-stagefeedback-libiberty: configure-stagefeedback-libiberty
@@ -31958,13 +32146,26 @@ all-stagefeedback-libiberty: configure-stagefeedback-libiberty
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-libiberty: clean-stagefeedback-libiberty
+clean-stagefeedback-libiberty:
+	@[ -f libiberty/Makefile ] || [ -f stagefeedback-libiberty/Makefile ] \
+	  || exit 0 ; \
+	[ -f libiberty/Makefile ] || $(MAKE) stagefeedback-start ; \
+	cd libiberty && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
 @endif libiberty-bootstrap
 
+
 .PHONY: configure-stagefeedback-zlib maybe-configure-stagefeedback-zlib
 .PHONY: all-stagefeedback-zlib maybe-all-stagefeedback-zlib
+.PHONY: clean-stagefeedback-zlib maybe-clean-stagefeedback-zlib
 
 maybe-configure-stagefeedback-zlib:
 maybe-all-stagefeedback-zlib:
+maybe-clean-stagefeedback-zlib:
 
 @if zlib-bootstrap
 maybe-configure-stagefeedback-zlib: configure-stagefeedback-zlib
@@ -32001,9 +32202,20 @@ all-stagefeedback-zlib: configure-stagefeedback-zlib
 	$(MAKE) $(FLAGS_TO_PASS)  \
 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
 		CFLAGS="$(BOOT_CFLAGS) -fprofile-use" 
+
+maybe-clean-stagefeedback-zlib: clean-stagefeedback-zlib
+clean-stagefeedback-zlib:
+	@[ -f zlib/Makefile ] || [ -f stagefeedback-zlib/Makefile ] \
+	  || exit 0 ; \
+	[ -f zlib/Makefile ] || $(MAKE) stagefeedback-start ; \
+	cd zlib && \
+	$(MAKE) $(FLAGS_TO_PASS)  \
+		$(POSTSTAGE1_FLAGS_TO_PASS)  \
+		CFLAGS="$(BOOT_CFLAGS) -fprofile-use"  clean
 @endif zlib-bootstrap
 
 
+
 # FIXME: Will not need to be conditional when toplevel bootstrap is the
 # only possibility, but now it conflicts with no-bootstrap rules
 @if gcc-bootstrap
@@ -32011,10 +32223,9 @@ all-stagefeedback-zlib: configure-stagefeedback-zlib
 
 
 
-.PHONY: distclean-stagefeedback
-
-# Rules to wipe a stage and all the following ones, used for cleanstrap
+# Rules to wipe a stage and all the following ones, also used for cleanstrap
 distclean-stage1:: distclean-stagefeedback 
+.PHONY: distclean-stagefeedback
 distclean-stagefeedback::
 	[ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
 	rm -rf stagefeedback-* 
@@ -32054,6 +32265,12 @@ profiledbootstrap:
 	$(MAKE) stagefeedback-bubble stagefeedback-end
 @endif gcc-bootstrap
 
+@if gcc-bootstrap
+NOTPARALLEL = .NOTPARALLEL
+$(NOTPARALLEL):
+do-distclean: distclean-stage1
+@endif gcc-bootstrap
+
 # --------------------------------------
 # Dependencies between different modules
 # --------------------------------------
@@ -32288,14 +32505,6 @@ all-stage3-gcc: maybe-all-stage3-zlib
 all-stage4-gcc: maybe-all-stage4-zlib
 all-stageprofile-gcc: maybe-all-stageprofile-zlib
 all-stagefeedback-gcc: maybe-all-stagefeedback-zlib
-all-gcc: maybe-all-libbanshee
-
-all-stage1-gcc: maybe-all-stage1-libbanshee
-all-stage2-gcc: maybe-all-stage2-libbanshee
-all-stage3-gcc: maybe-all-stage3-libbanshee
-all-stage4-gcc: maybe-all-stage4-libbanshee
-all-stageprofile-gcc: maybe-all-stageprofile-libbanshee
-all-stagefeedback-gcc: maybe-all-stagefeedback-libbanshee
 all-gcc: all-libcpp
 
 all-stage1-gcc: all-stage1-libcpp
@@ -32654,7 +32863,6 @@ all-prebootstrap: maybe-all-gas
 all-prebootstrap: maybe-all-intl
 all-prebootstrap: maybe-all-ld
 all-prebootstrap: maybe-all-libcpp
-all-prebootstrap: maybe-all-libbanshee
 all-prebootstrap: maybe-all-libiberty
 all-prebootstrap: maybe-all-zlib
 @endif gcc-no-bootstrap