Revert "Sync top level files with versions from gcc."

This reverts commit f948b2de97884bfb4e5fc11d40a6bea9e0b096ae.

6 files changed, 575 insertions, 10293 deletions

diff --git a/ChangeLog b/ChangeLog
index 7a55fccde1b..04dae341786 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,33 +5,6 @@
 
 2019-05-29  Nick Clifton  <nickc@redhat.com>
 
-	Import this patch from gcc mainline:
-	2018-10-28  Iain Buclaw  <ibuclaw@gdcproject.org>
-
-	* Makefile.def (target_modules): Add libphobos.
-	(flags_to_pass): Add GDC, GDCFLAGS, GDC_FOR_TARGET and
-	GDCFLAGS_FOR_TARGET.
-	(dependencies): Make libphobos depend on libatomic, libbacktrace
-	configure, and zlib configure.
-	(language): Add language d.
-	* Makefile.in: Rebuild.
-	* Makefile.tpl (BUILD_EXPORTS): Add GDC and GDCFLAGS.
-	(HOST_EXPORTS): Add GDC.
-	(POSTSTAGE1_HOST_EXPORTS): Add GDC and GDC_FOR_BUILD.
-	(BASE_TARGET_EXPORTS): Add GDC.
-	(GDC_FOR_BUILD, GDC, GDCFLAGS): New variables.
-	(GDC_FOR_TARGET, GDC_FLAGS_FOR_TARGET): New variables.
-	(EXTRA_HOST_FLAGS): Add GDC.
-	(STAGE1_FLAGS_TO_PASS): Add GDC.
-	(EXTRA_TARGET_FLAGS): Add GDC and GDCFLAGS.
-	* config-ml.in: Treat GDC and GDCFLAGS like other compiler/flag
-	environment variables.
-	* configure: Rebuild.
-	* configure.ac: Add target-libphobos to target_libraries.  Set and
-	substitute GDC_FOR_BUILD and GDC_FOR_TARGET.
-
-2019-05-29  Nick Clifton  <nickc@redhat.com>
-
 	* configure.ac (noconfigdirs): Add libctf if the target does not use
 	the ELF file format.
 	* configure: Regenerate.
diff --git a/Makefile.def b/Makefile.def
index 893299b963c..e3a94f2c7de 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -4,7 +4,7 @@ AutoGen definitions Makefile.tpl;
 // Makefile.in is generated from Makefile.tpl by 'autogen Makefile.def'.
 // This file was originally written by Nathanael Nerode.
 //
-//   Copyright 2002-2019 Free Software Foundation
+//   Copyright 2002-2017 Free Software Foundation
 //
 // This file is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -63,7 +63,7 @@ host_modules= { module= mpfr; lib_path=src/.libs; bootstrap=true;
 		extra_make_flags='AM_CFLAGS="-DNO_ASM"';
 		no_install= true; };
 host_modules= { module= mpc; lib_path=src/.libs; bootstrap=true;
-		extra_configure_flags='--disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@ --disable-maintainer-mode';
+		extra_configure_flags='--disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@';
 		no_install= true; };
 host_modules= { module= isl; lib_path=.libs; bootstrap=true;
 		extra_configure_flags='--disable-shared @extra_isl_gmp_configure_flags@';
@@ -146,6 +146,8 @@ target_modules = { module= libvtv;
 		   bootstrap=true;
 		   lib_path=.libs;
 		   raw_cxx=true; };
+target_modules = { module= libcilkrts;
+		   lib_path=.libs; };
 target_modules = { module= liboffloadmic;
 		   lib_path=.libs;
 		   extra_configure_flags='@extra_liboffloadmic_configure_flags@'; };
@@ -157,9 +159,6 @@ target_modules = { module= libquadmath; };
 target_modules = { module= libgfortran; };
 target_modules = { module= libobjc; };
 target_modules = { module= libgo; };
-target_modules = { module= libhsail-rt; };
-target_modules = { module= libphobos;
-		   lib_path=src/.libs; };
 target_modules = { module= libtermcap; no_check=true;
                    missing=mostlyclean;
                    missing=clean;
@@ -272,8 +271,6 @@ flags_to_pass = { flag= STAGE1_CHECKING ; };
 flags_to_pass = { flag= STAGE1_LANGUAGES ; };
 flags_to_pass = { flag= GNATBIND ; };
 flags_to_pass = { flag= GNATMAKE ; };
-flags_to_pass = { flag= GDC ; };
-flags_to_pass = { flag= GDCFLAGS ; };
 
 // Target tools
 flags_to_pass = { flag= AR_FOR_TARGET ; };
@@ -287,8 +284,6 @@ flags_to_pass = { flag= FLAGS_FOR_TARGET ; };
 flags_to_pass = { flag= GFORTRAN_FOR_TARGET ; };
 flags_to_pass = { flag= GOC_FOR_TARGET ; };
 flags_to_pass = { flag= GOCFLAGS_FOR_TARGET ; };
-flags_to_pass = { flag= GDC_FOR_TARGET ; };
-flags_to_pass = { flag= GDCFLAGS_FOR_TARGET ; };
 flags_to_pass = { flag= LD_FOR_TARGET ; };
 flags_to_pass = { flag= LIPO_FOR_TARGET ; };
 flags_to_pass = { flag= LDFLAGS_FOR_TARGET ; };
@@ -548,6 +543,7 @@ dependencies = { module=all-m4; on=all-build-texinfo; };
 // on libgcc and newlib/libgloss.
 lang_env_dependencies = { module=libitm; cxx=true; };
 lang_env_dependencies = { module=libffi; cxx=true; };
+lang_env_dependencies = { module=libcilkrts; cxx=true; };
 lang_env_dependencies = { module=liboffloadmic; cxx=true; };
 lang_env_dependencies = { module=newlib; no_c=true; };
 lang_env_dependencies = { module=libgloss; no_c=true; };
@@ -564,11 +560,6 @@ dependencies = { module=configure-target-libgo; on=all-target-libstdc++-v3; };
 dependencies = { module=all-target-libgo; on=all-target-libbacktrace; };
 dependencies = { module=all-target-libgo; on=all-target-libffi; };
 dependencies = { module=all-target-libgo; on=all-target-libatomic; };
-dependencies = { module=configure-target-libphobos; on=configure-target-libbacktrace; };
-dependencies = { module=configure-target-libphobos; on=configure-target-zlib; };
-dependencies = { module=all-target-libphobos; on=all-target-libbacktrace; };
-dependencies = { module=all-target-libphobos; on=all-target-zlib; };
-dependencies = { module=all-target-libphobos; on=all-target-libatomic; };
 dependencies = { module=configure-target-libstdc++-v3; on=configure-target-libgomp; };
 dependencies = { module=configure-target-liboffloadmic; on=configure-target-libgomp; };
 dependencies = { module=configure-target-libsanitizer; on=all-target-libstdc++-v3; };
@@ -582,11 +573,12 @@ dependencies = { module=all-target-liboffloadmic; on=all-target-libgomp; };
 dependencies = { module=install-target-libgo; on=install-target-libatomic; };
 dependencies = { module=install-target-libgfortran; on=install-target-libquadmath; };
 dependencies = { module=install-target-libgfortran; on=install-target-libgcc; };
-dependencies = { module=install-target-libphobos; on=install-target-libatomic; };
 dependencies = { module=install-target-libsanitizer; on=install-target-libstdc++-v3; };
 dependencies = { module=install-target-libsanitizer; on=install-target-libgcc; };
 dependencies = { module=install-target-libvtv; on=install-target-libstdc++-v3; };
 dependencies = { module=install-target-libvtv; on=install-target-libgcc; };
+dependencies = { module=install-target-libcilkrts; on=install-target-libstdc++-v3; };
+dependencies = { module=install-target-libcilkrts; on=install-target-libgcc; };
 dependencies = { module=install-target-liboffloadmic; on=install-target-libstdc++-v3; };
 dependencies = { module=install-target-liboffloadmic; on=install-target-libgcc; };
 dependencies = { module=install-target-libitm; on=install-target-libgcc; };
@@ -620,12 +612,7 @@ languages = { language=objc;	gcc-check-target=check-objc;
 				lib-check-target=check-target-libobjc; };
 languages = { language=obj-c++;	gcc-check-target=check-obj-c++; };
 languages = { language=go;	gcc-check-target=check-go;
-				lib-check-target=check-target-libgo;
-				lib-check-target=check-gotools; };
-languages = { language=brig;	gcc-check-target=check-brig;
-				lib-check-target=check-target-libhsail-rt; };
-languages = { language=d;	gcc-check-target=check-d;
-				lib-check-target=check-target-libphobos; };
+				lib-check-target=check-target-libgo; };
 
 // Toplevel bootstrap
 bootstrap_stage = { id=1 ; };
@@ -644,15 +631,5 @@ bootstrap_stage = {
 bootstrap_stage = {
 	id=profile ; prev=1 ; };
 bootstrap_stage = {
-	id=train; prev=profile ; } ;
-bootstrap_stage = {
-	id=feedback ; prev=train;
+	id=feedback ; prev=profile ;
 	bootstrap_target=profiledbootstrap ; };
-bootstrap_stage = {
-	id=autoprofile ; prev=1 ;
-        autoprofile="$$s/gcc/config/i386/$(AUTO_PROFILE)" ; };
-bootstrap_stage = {
-	id=autofeedback ; prev=autoprofile ;
-	bootstrap_target=autoprofiledbootstrap ;
-	profile_data="PERF_DATA=perf.data" ; };
-
diff --git a/Makefile.in b/Makefile.in
index 3df9d8a6b13..e4b6051b1a7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,7 +4,7 @@
 # Makefile for directory with subdirs to build.
 #   Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
 #   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019
+#   2011, 2012, 2013, 2014, 2015, 2016, 2017
 #   Free Software Foundation
 #
 # This file is free software; you can redistribute it and/or modify
@@ -157,8 +157,6 @@ BUILD_EXPORTS = \
 	GFORTRAN="$(GFORTRAN_FOR_BUILD)"; export GFORTRAN; \
 	GOC="$(GOC_FOR_BUILD)"; export GOC; \
 	GOCFLAGS="$(GOCFLAGS_FOR_BUILD)"; export GOCFLAGS; \
-	GDC="$(GDC_FOR_BUILD)"; export GDC; \
-	GDCFLAGS="$(GDCFLAGS_FOR_BUILD)"; export GDCFLAGS; \
 	DLLTOOL="$(DLLTOOL_FOR_BUILD)"; export DLLTOOL; \
 	LD="$(LD_FOR_BUILD)"; export LD; \
 	LDFLAGS="$(LDFLAGS_FOR_BUILD)"; export LDFLAGS; \
@@ -195,7 +193,6 @@ HOST_EXPORTS = \
 	CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
 	GFORTRAN="$(GFORTRAN)"; export GFORTRAN; \
 	GOC="$(GOC)"; export GOC; \
-	GDC="$(GDC)"; export GDC; \
 	AR="$(AR)"; export AR; \
 	AS="$(AS)"; export AS; \
 	CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
@@ -208,7 +205,6 @@ HOST_EXPORTS = \
 	WINDMC="$(WINDMC)"; export WINDMC; \
 	OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
 	OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-	OTOOL="$(OTOOL)"; export OTOOL; \
 	READELF="$(READELF)"; export READELF; \
 	AR_FOR_TARGET="$(AR_FOR_TARGET)"; export AR_FOR_TARGET; \
 	AS_FOR_TARGET="$(AS_FOR_TARGET)"; export AS_FOR_TARGET; \
@@ -217,7 +213,6 @@ HOST_EXPORTS = \
 	NM_FOR_TARGET="$(NM_FOR_TARGET)"; export NM_FOR_TARGET; \
 	OBJDUMP_FOR_TARGET="$(OBJDUMP_FOR_TARGET)"; export OBJDUMP_FOR_TARGET; \
 	OBJCOPY_FOR_TARGET="$(OBJCOPY_FOR_TARGET)"; export OBJCOPY_FOR_TARGET; \
-	OTOOL_FOR_TARGET="$(OTOOL_FOR_TARGET)"; export OTOOL_FOR_TARGET; \
 	RANLIB_FOR_TARGET="$(RANLIB_FOR_TARGET)"; export RANLIB_FOR_TARGET; \
 	READELF_FOR_TARGET="$(READELF_FOR_TARGET)"; export READELF_FOR_TARGET; \
 	TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
@@ -226,6 +221,7 @@ HOST_EXPORTS = \
 	GMPINC="$(HOST_GMPINC)"; export GMPINC; \
 	ISLLIBS="$(HOST_ISLLIBS)"; export ISLLIBS; \
 	ISLINC="$(HOST_ISLINC)"; export ISLINC; \
+	ISLVER="$(HOST_ISLVER)"; export ISLVER; \
 	LIBELFLIBS="$(HOST_LIBELFLIBS)"; export LIBELFLIBS; \
 	LIBELFINC="$(HOST_LIBELFINC)"; export LIBELFINC; \
 	XGCC_FLAGS_FOR_TARGET="$(XGCC_FLAGS_FOR_TARGET)"; export XGCC_FLAGS_FOR_TARGET; \
@@ -262,14 +258,6 @@ POSTSTAGE1_HOST_EXPORTS = \
 	CC_FOR_BUILD="$$CC"; export CC_FOR_BUILD; \
 	$(POSTSTAGE1_CXX_EXPORT) \
 	$(LTO_EXPORTS) \
-	GDC="$$r/$(HOST_SUBDIR)/prev-gcc/gdc$(exeext) -B$$r/$(HOST_SUBDIR)/prev-gcc/ \
-	  -B$(build_tooldir)/bin/ $(GDC_FLAGS_FOR_TARGET) \
-	  -B$$r/prev-$(TARGET_SUBDIR)/libphobos/src \
-	  -I$$r/prev-$(TARGET_SUBDIR)/libphobos/libdruntime -I$$s/libphobos/libdruntime \
-	  -L$$r/prev-$(TARGET_SUBDIR)/libphobos/src/.libs \
-	  -L$$r/prev-$(TARGET_SUBDIR)/libphobos/libdruntime/.libs"; \
-	export GDC; \
-	GDC_FOR_BUILD="$$GDC"; export GDC_FOR_BUILD; \
 	GNATBIND="$$r/$(HOST_SUBDIR)/prev-gcc/gnatbind"; export GNATBIND; \
 	LDFLAGS="$(POSTSTAGE1_LDFLAGS) $(BOOT_LDFLAGS)"; export LDFLAGS; \
 	HOST_LIBS="$(POSTSTAGE1_LIBS)"; export HOST_LIBS;
@@ -292,7 +280,6 @@ BASE_TARGET_EXPORTS = \
 	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
 	GFORTRAN="$(GFORTRAN_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GFORTRAN; \
 	GOC="$(GOC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GOC; \
-	GDC="$(GDC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GDC; \
 	DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
 	LD="$(COMPILER_LD_FOR_TARGET)"; export LD; \
 	LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
@@ -300,7 +287,6 @@ BASE_TARGET_EXPORTS = \
 	NM="$(COMPILER_NM_FOR_TARGET)"; export NM; \
 	OBJDUMP="$(OBJDUMP_FOR_TARGET)"; export OBJDUMP; \
 	OBJCOPY="$(OBJCOPY_FOR_TARGET)"; export OBJCOPY; \
-	OTOOL="$(OTOOL_FOR_TARGET)"; export OTOOL; \
 	RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
 	READELF="$(READELF_FOR_TARGET)"; export READELF; \
 	STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
@@ -328,6 +314,7 @@ HOST_GMPINC = @gmpinc@
 # Where to find isl
 HOST_ISLLIBS = @isllibs@
 HOST_ISLINC = @islinc@
+HOST_ISLVER = @islver@
 
 # Where to find libelf
 HOST_LIBELFLIBS = @libelflibs@
@@ -358,7 +345,6 @@ CXX_FOR_BUILD = @CXX_FOR_BUILD@
 DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@
 GFORTRAN_FOR_BUILD = @GFORTRAN_FOR_BUILD@
 GOC_FOR_BUILD = @GOC_FOR_BUILD@
-GDC_FOR_BUILD = @GDC_FOR_BUILD@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
 LD_FOR_BUILD = @LD_FOR_BUILD@
 NM_FOR_BUILD = @NM_FOR_BUILD@
@@ -388,7 +374,7 @@ MAKEINFO = @MAKEINFO@
 EXPECT = @EXPECT@
 RUNTEST = @RUNTEST@
 
-AUTO_PROFILE = gcc-auto-profile -c 10000000
+AUTO_PROFILE = gcc-auto-profile -c 1000000
 
 # This just becomes part of the MAKEINFO definition passed down to
 # sub-makes.  It lets flags be given on the command line while still
@@ -410,14 +396,12 @@ LD = @LD@
 LIPO = @LIPO@
 NM = @NM@
 OBJDUMP = @OBJDUMP@
-OTOOL = @OTOOL@
 RANLIB = @RANLIB@
 READELF = @READELF@
 STRIP = @STRIP@
 WINDRES = @WINDRES@
 WINDMC = @WINDMC@
 
-GDC = @GDC@
 GNATBIND = @GNATBIND@
 GNATMAKE = @GNATMAKE@
 
@@ -427,7 +411,6 @@ LIBCFLAGS = $(CFLAGS)
 CXXFLAGS = @CXXFLAGS@
 LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
 GOCFLAGS = $(CFLAGS)
-GDCFLAGS = $(CFLAGS)
 
 CREATE_GCOV = create_gcov
 
@@ -490,16 +473,6 @@ STAGEprofile_CXXFLAGS = $(STAGEprofile_CFLAGS)
 STAGEprofile_TFLAGS = $(STAGE_TFLAGS)
 STAGEprofile_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS)
 
-# Defaults for stage train; some are overridden below.
-STAGEtrain_CFLAGS = $(STAGE_CFLAGS)
-STAGEtrain_CXXFLAGS = $(CXXFLAGS)
-@if target-libstdc++-v3-bootstrap
-# Override the above if we're bootstrapping C++.
-STAGEtrain_CXXFLAGS = $(STAGEtrain_CFLAGS)
-@endif target-libstdc++-v3-bootstrap
-STAGEtrain_TFLAGS = $(STAGE_TFLAGS)
-STAGEtrain_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS)
-
 # Defaults for stage feedback; some are overridden below.
 STAGEfeedback_CFLAGS = $(STAGE_CFLAGS)
 STAGEfeedback_CXXFLAGS = $(CXXFLAGS)
@@ -510,26 +483,6 @@ STAGEfeedback_CXXFLAGS = $(STAGEfeedback_CFLAGS)
 STAGEfeedback_TFLAGS = $(STAGE_TFLAGS)
 STAGEfeedback_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS)
 
-# Defaults for stage autoprofile; some are overridden below.
-STAGEautoprofile_CFLAGS = $(STAGE_CFLAGS)
-STAGEautoprofile_CXXFLAGS = $(CXXFLAGS)
-@if target-libstdc++-v3-bootstrap
-# Override the above if we're bootstrapping C++.
-STAGEautoprofile_CXXFLAGS = $(STAGEautoprofile_CFLAGS)
-@endif target-libstdc++-v3-bootstrap
-STAGEautoprofile_TFLAGS = $(STAGE_TFLAGS)
-STAGEautoprofile_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS)
-
-# Defaults for stage autofeedback; some are overridden below.
-STAGEautofeedback_CFLAGS = $(STAGE_CFLAGS)
-STAGEautofeedback_CXXFLAGS = $(CXXFLAGS)
-@if target-libstdc++-v3-bootstrap
-# Override the above if we're bootstrapping C++.
-STAGEautofeedback_CXXFLAGS = $(STAGEautofeedback_CFLAGS)
-@endif target-libstdc++-v3-bootstrap
-STAGEautofeedback_TFLAGS = $(STAGE_TFLAGS)
-STAGEautofeedback_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS)
-
 
 # By default, C and C++ are the only stage1 languages, because they are the
 # only ones we require to build with the bootstrap compiler, and also the
@@ -549,24 +502,11 @@ STAGE1_CONFIGURE_FLAGS = --disable-intermodule $(STAGE1_CHECKING) \
 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" \
 	  --disable-build-format-warnings
 
-# When using the slow stage1 compiler disable IL verification and forcefully
-# enable it when using the stage2 compiler instead.  As we later compare
-# stage2 and stage3 we are merely avoid doing redundant work, plus we apply
-# checking when building all target libraries for release builds.
-STAGE1_TFLAGS += -fno-checking
-STAGE2_CFLAGS += -fno-checking
-STAGE2_TFLAGS += -fno-checking
-STAGE3_CFLAGS += -fchecking=1
-STAGE3_TFLAGS += -fchecking=1
-
 STAGEprofile_CFLAGS = $(STAGE2_CFLAGS) -fprofile-generate
 STAGEprofile_TFLAGS = $(STAGE2_TFLAGS)
 
-STAGEtrain_CFLAGS = $(filter-out -fchecking=1,$(STAGE3_CFLAGS))
-STAGEtrain_TFLAGS = $(filter-out -fchecking=1,$(STAGE3_TFLAGS))
-
-STAGEfeedback_CFLAGS = $(STAGE4_CFLAGS) -fprofile-use
-STAGEfeedback_TFLAGS = $(STAGE4_TFLAGS)
+STAGEfeedback_CFLAGS = $(STAGE3_CFLAGS) -fprofile-use
+STAGEfeedback_TFLAGS = $(STAGE3_TFLAGS)
 
 STAGEautoprofile_CFLAGS = $(STAGE2_CFLAGS) -g
 STAGEautoprofile_TFLAGS = $(STAGE2_TFLAGS)
@@ -594,7 +534,6 @@ CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @CXX_FOR_TARGET@
 RAW_CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @RAW_CXX_FOR_TARGET@
 GFORTRAN_FOR_TARGET=$(STAGE_CC_WRAPPER) @GFORTRAN_FOR_TARGET@
 GOC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GOC_FOR_TARGET@
-GDC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GDC_FOR_TARGET@
 DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@
 LD_FOR_TARGET=@LD_FOR_TARGET@
 
@@ -602,7 +541,6 @@ LIPO_FOR_TARGET=@LIPO_FOR_TARGET@
 NM_FOR_TARGET=@NM_FOR_TARGET@
 OBJDUMP_FOR_TARGET=@OBJDUMP_FOR_TARGET@
 OBJCOPY_FOR_TARGET=@OBJCOPY_FOR_TARGET@
-OTOOL_FOR_TARGET=@OTOOL_FOR_TARGET@
 RANLIB_FOR_TARGET=@RANLIB_FOR_TARGET@
 READELF_FOR_TARGET=@READELF_FOR_TARGET@
 STRIP_FOR_TARGET=@STRIP_FOR_TARGET@
@@ -620,7 +558,6 @@ LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
 LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
 LDFLAGS_FOR_TARGET = @LDFLAGS_FOR_TARGET@
 GOCFLAGS_FOR_TARGET = -O2 -g
-GDCFLAGS_FOR_TARGET = -O2 -g
 
 FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@
 SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
@@ -645,7 +582,7 @@ all:
 
 # This is the list of directories that may be needed in RPATH_ENVVAR
 # so that programs built for the target machine work.
-TARGET_LIB_PATH = $(TARGET_LIB_PATH_libstdc++-v3)$(TARGET_LIB_PATH_libsanitizer)$(TARGET_LIB_PATH_libmpx)$(TARGET_LIB_PATH_libvtv)$(TARGET_LIB_PATH_liboffloadmic)$(TARGET_LIB_PATH_libssp)$(TARGET_LIB_PATH_libphobos)$(TARGET_LIB_PATH_libgomp)$(TARGET_LIB_PATH_libitm)$(TARGET_LIB_PATH_libatomic)$(HOST_LIB_PATH_gcc)
+TARGET_LIB_PATH = $(TARGET_LIB_PATH_libstdc++-v3)$(TARGET_LIB_PATH_libsanitizer)$(TARGET_LIB_PATH_libmpx)$(TARGET_LIB_PATH_libvtv)$(TARGET_LIB_PATH_libcilkrts)$(TARGET_LIB_PATH_liboffloadmic)$(TARGET_LIB_PATH_libssp)$(TARGET_LIB_PATH_libgomp)$(TARGET_LIB_PATH_libitm)$(TARGET_LIB_PATH_libatomic)$(HOST_LIB_PATH_gcc)
 
 @if target-libstdc++-v3
 TARGET_LIB_PATH_libstdc++-v3 = $$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs:
@@ -663,6 +600,10 @@ TARGET_LIB_PATH_libmpx = $$r/$(TARGET_SUBDIR)/libmpx/.libs:
 TARGET_LIB_PATH_libvtv = $$r/$(TARGET_SUBDIR)/libvtv/.libs:
 @endif target-libvtv
 
+@if target-libcilkrts
+TARGET_LIB_PATH_libcilkrts = $$r/$(TARGET_SUBDIR)/libcilkrts/.libs:
+@endif target-libcilkrts
+
 @if target-liboffloadmic
 TARGET_LIB_PATH_liboffloadmic = $$r/$(TARGET_SUBDIR)/liboffloadmic/.libs:
 @endif target-liboffloadmic
@@ -671,10 +612,6 @@ TARGET_LIB_PATH_liboffloadmic = $$r/$(TARGET_SUBDIR)/liboffloadmic/.libs:
 TARGET_LIB_PATH_libssp = $$r/$(TARGET_SUBDIR)/libssp/.libs:
 @endif target-libssp
 
-@if target-libphobos
-TARGET_LIB_PATH_libphobos = $$r/$(TARGET_SUBDIR)/libphobos/src/.libs:
-@endif target-libphobos
-
 @if target-libgomp
 TARGET_LIB_PATH_libgomp = $$r/$(TARGET_SUBDIR)/libgomp/.libs:
 @endif target-libgomp
@@ -809,8 +746,6 @@ BASE_FLAGS_TO_PASS = \
 	"STAGE1_LANGUAGES=$(STAGE1_LANGUAGES)" \
 	"GNATBIND=$(GNATBIND)" \
 	"GNATMAKE=$(GNATMAKE)" \
-	"GDC=$(GDC)" \
-	"GDCFLAGS=$(GDCFLAGS)" \
 	"AR_FOR_TARGET=$(AR_FOR_TARGET)" \
 	"AS_FOR_TARGET=$(AS_FOR_TARGET)" \
 	"CC_FOR_TARGET=$(CC_FOR_TARGET)" \
@@ -822,8 +757,6 @@ BASE_FLAGS_TO_PASS = \
 	"GFORTRAN_FOR_TARGET=$(GFORTRAN_FOR_TARGET)" \
 	"GOC_FOR_TARGET=$(GOC_FOR_TARGET)" \
 	"GOCFLAGS_FOR_TARGET=$(GOCFLAGS_FOR_TARGET)" \
-	"GDC_FOR_TARGET=$(GDC_FOR_TARGET)" \
-	"GDCFLAGS_FOR_TARGET=$(GDCFLAGS_FOR_TARGET)" \
 	"LD_FOR_TARGET=$(LD_FOR_TARGET)" \
 	"LIPO_FOR_TARGET=$(LIPO_FOR_TARGET)" \
 	"LDFLAGS_FOR_TARGET=$(LDFLAGS_FOR_TARGET)" \
@@ -842,40 +775,22 @@ BASE_FLAGS_TO_PASS = \
 	"LEAN=$(LEAN)" \
 	"STAGE1_CFLAGS=$(STAGE1_CFLAGS)" \
 	"STAGE1_CXXFLAGS=$(STAGE1_CXXFLAGS)" \
-	"STAGE1_GENERATOR_CFLAGS=$(STAGE1_GENERATOR_CFLAGS)" \
 	"STAGE1_TFLAGS=$(STAGE1_TFLAGS)" \
 	"STAGE2_CFLAGS=$(STAGE2_CFLAGS)" \
 	"STAGE2_CXXFLAGS=$(STAGE2_CXXFLAGS)" \
-	"STAGE2_GENERATOR_CFLAGS=$(STAGE2_GENERATOR_CFLAGS)" \
 	"STAGE2_TFLAGS=$(STAGE2_TFLAGS)" \
 	"STAGE3_CFLAGS=$(STAGE3_CFLAGS)" \
 	"STAGE3_CXXFLAGS=$(STAGE3_CXXFLAGS)" \
-	"STAGE3_GENERATOR_CFLAGS=$(STAGE3_GENERATOR_CFLAGS)" \
 	"STAGE3_TFLAGS=$(STAGE3_TFLAGS)" \
 	"STAGE4_CFLAGS=$(STAGE4_CFLAGS)" \
 	"STAGE4_CXXFLAGS=$(STAGE4_CXXFLAGS)" \
-	"STAGE4_GENERATOR_CFLAGS=$(STAGE4_GENERATOR_CFLAGS)" \
 	"STAGE4_TFLAGS=$(STAGE4_TFLAGS)" \
 	"STAGEprofile_CFLAGS=$(STAGEprofile_CFLAGS)" \
 	"STAGEprofile_CXXFLAGS=$(STAGEprofile_CXXFLAGS)" \
-	"STAGEprofile_GENERATOR_CFLAGS=$(STAGEprofile_GENERATOR_CFLAGS)" \
 	"STAGEprofile_TFLAGS=$(STAGEprofile_TFLAGS)" \
-	"STAGEtrain_CFLAGS=$(STAGEtrain_CFLAGS)" \
-	"STAGEtrain_CXXFLAGS=$(STAGEtrain_CXXFLAGS)" \
-	"STAGEtrain_GENERATOR_CFLAGS=$(STAGEtrain_GENERATOR_CFLAGS)" \
-	"STAGEtrain_TFLAGS=$(STAGEtrain_TFLAGS)" \
 	"STAGEfeedback_CFLAGS=$(STAGEfeedback_CFLAGS)" \
 	"STAGEfeedback_CXXFLAGS=$(STAGEfeedback_CXXFLAGS)" \
-	"STAGEfeedback_GENERATOR_CFLAGS=$(STAGEfeedback_GENERATOR_CFLAGS)" \
 	"STAGEfeedback_TFLAGS=$(STAGEfeedback_TFLAGS)" \
-	"STAGEautoprofile_CFLAGS=$(STAGEautoprofile_CFLAGS)" \
-	"STAGEautoprofile_CXXFLAGS=$(STAGEautoprofile_CXXFLAGS)" \
-	"STAGEautoprofile_GENERATOR_CFLAGS=$(STAGEautoprofile_GENERATOR_CFLAGS)" \
-	"STAGEautoprofile_TFLAGS=$(STAGEautoprofile_TFLAGS)" \
-	"STAGEautofeedback_CFLAGS=$(STAGEautofeedback_CFLAGS)" \
-	"STAGEautofeedback_CXXFLAGS=$(STAGEautofeedback_CXXFLAGS)" \
-	"STAGEautofeedback_GENERATOR_CFLAGS=$(STAGEautofeedback_GENERATOR_CFLAGS)" \
-	"STAGEautofeedback_TFLAGS=$(STAGEautofeedback_TFLAGS)" \
 	$(CXX_FOR_TARGET_FLAG_TO_PASS) \
 	"TFLAGS=$(TFLAGS)" \
 	"CONFIG_SHELL=$(SHELL)" \
@@ -895,12 +810,10 @@ EXTRA_HOST_FLAGS = \
 	'DLLTOOL=$(DLLTOOL)' \
 	'GFORTRAN=$(GFORTRAN)' \
 	'GOC=$(GOC)' \
-	'GDC=$(GDC)' \
 	'LD=$(LD)' \
 	'LIPO=$(LIPO)' \
 	'NM=$(NM)' \
 	'OBJDUMP=$(OBJDUMP)' \
-	'OTOOL=$(OTOOL)' \
 	'RANLIB=$(RANLIB)' \
 	'READELF=$(READELF)' \
 	'STRIP=$(STRIP)' \
@@ -921,7 +834,6 @@ STAGE1_FLAGS_TO_PASS = \
 POSTSTAGE1_FLAGS_TO_PASS = \
 	CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \
 	CXX="$${CXX}" CXX_FOR_BUILD="$${CXX_FOR_BUILD}" \
-	GDC="$${GDC}" GDC_FOR_BUILD="$${GDC_FOR_BUILD}" \
 	GNATBIND="$${GNATBIND}" \
 	LDFLAGS="$${LDFLAGS}" \
 	HOST_LIBS="$${HOST_LIBS}" \
@@ -954,8 +866,6 @@ EXTRA_TARGET_FLAGS = \
 	'GFORTRAN=$$(GFORTRAN_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
 	'GOC=$$(GOC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
 	'GOCFLAGS=$$(GOCFLAGS_FOR_TARGET)' \
-	'GDC=$$(GDC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
-	'GDCFLAGS=$$(GDCFLAGS_FOR_TARGET)' \
 	'LD=$(COMPILER_LD_FOR_TARGET)' \
 	'LDFLAGS=$$(LDFLAGS_FOR_TARGET)' \
 	'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \
@@ -1049,6 +959,7 @@ configure-target:  \
     maybe-configure-target-libsanitizer \
     maybe-configure-target-libmpx \
     maybe-configure-target-libvtv \
+    maybe-configure-target-libcilkrts \
     maybe-configure-target-liboffloadmic \
     maybe-configure-target-libssp \
     maybe-configure-target-newlib \
@@ -1058,8 +969,6 @@ configure-target:  \
     maybe-configure-target-libgfortran \
     maybe-configure-target-libobjc \
     maybe-configure-target-libgo \
-    maybe-configure-target-libhsail-rt \
-    maybe-configure-target-libphobos \
     maybe-configure-target-libtermcap \
     maybe-configure-target-winsup \
     maybe-configure-target-libgloss \
@@ -1216,6 +1125,7 @@ all-target: maybe-all-target-libmpx
 @if target-libvtv-no-bootstrap
 all-target: maybe-all-target-libvtv
 @endif target-libvtv-no-bootstrap
+all-target: maybe-all-target-libcilkrts
 all-target: maybe-all-target-liboffloadmic
 all-target: maybe-all-target-libssp
 all-target: maybe-all-target-newlib
@@ -1227,8 +1137,6 @@ all-target: maybe-all-target-libquadmath
 all-target: maybe-all-target-libgfortran
 all-target: maybe-all-target-libobjc
 all-target: maybe-all-target-libgo
-all-target: maybe-all-target-libhsail-rt
-all-target: maybe-all-target-libphobos
 all-target: maybe-all-target-libtermcap
 all-target: maybe-all-target-winsup
 all-target: maybe-all-target-libgloss
@@ -1312,6 +1220,7 @@ info-target: maybe-info-target-libstdc++-v3
 info-target: maybe-info-target-libsanitizer
 info-target: maybe-info-target-libmpx
 info-target: maybe-info-target-libvtv
+info-target: maybe-info-target-libcilkrts
 info-target: maybe-info-target-liboffloadmic
 info-target: maybe-info-target-libssp
 info-target: maybe-info-target-newlib
@@ -1321,8 +1230,6 @@ info-target: maybe-info-target-libquadmath
 info-target: maybe-info-target-libgfortran
 info-target: maybe-info-target-libobjc
 info-target: maybe-info-target-libgo
-info-target: maybe-info-target-libhsail-rt
-info-target: maybe-info-target-libphobos
 info-target: maybe-info-target-libtermcap
 info-target: maybe-info-target-winsup
 info-target: maybe-info-target-libgloss
@@ -1399,6 +1306,7 @@ dvi-target: maybe-dvi-target-libstdc++-v3
 dvi-target: maybe-dvi-target-libsanitizer
 dvi-target: maybe-dvi-target-libmpx
 dvi-target: maybe-dvi-target-libvtv
+dvi-target: maybe-dvi-target-libcilkrts
 dvi-target: maybe-dvi-target-liboffloadmic
 dvi-target: maybe-dvi-target-libssp
 dvi-target: maybe-dvi-target-newlib
@@ -1408,8 +1316,6 @@ dvi-target: maybe-dvi-target-libquadmath
 dvi-target: maybe-dvi-target-libgfortran
 dvi-target: maybe-dvi-target-libobjc
 dvi-target: maybe-dvi-target-libgo
-dvi-target: maybe-dvi-target-libhsail-rt
-dvi-target: maybe-dvi-target-libphobos
 dvi-target: maybe-dvi-target-libtermcap
 dvi-target: maybe-dvi-target-winsup
 dvi-target: maybe-dvi-target-libgloss
@@ -1486,6 +1392,7 @@ pdf-target: maybe-pdf-target-libstdc++-v3
 pdf-target: maybe-pdf-target-libsanitizer
 pdf-target: maybe-pdf-target-libmpx
 pdf-target: maybe-pdf-target-libvtv
+pdf-target: maybe-pdf-target-libcilkrts
 pdf-target: maybe-pdf-target-liboffloadmic
 pdf-target: maybe-pdf-target-libssp
 pdf-target: maybe-pdf-target-newlib
@@ -1495,8 +1402,6 @@ pdf-target: maybe-pdf-target-libquadmath
 pdf-target: maybe-pdf-target-libgfortran
 pdf-target: maybe-pdf-target-libobjc
 pdf-target: maybe-pdf-target-libgo
-pdf-target: maybe-pdf-target-libhsail-rt
-pdf-target: maybe-pdf-target-libphobos
 pdf-target: maybe-pdf-target-libtermcap
 pdf-target: maybe-pdf-target-winsup
 pdf-target: maybe-pdf-target-libgloss
@@ -1573,6 +1478,7 @@ html-target: maybe-html-target-libstdc++-v3
 html-target: maybe-html-target-libsanitizer
 html-target: maybe-html-target-libmpx
 html-target: maybe-html-target-libvtv
+html-target: maybe-html-target-libcilkrts
 html-target: maybe-html-target-liboffloadmic
 html-target: maybe-html-target-libssp
 html-target: maybe-html-target-newlib
@@ -1582,8 +1488,6 @@ html-target: maybe-html-target-libquadmath
 html-target: maybe-html-target-libgfortran
 html-target: maybe-html-target-libobjc
 html-target: maybe-html-target-libgo
-html-target: maybe-html-target-libhsail-rt
-html-target: maybe-html-target-libphobos
 html-target: maybe-html-target-libtermcap
 html-target: maybe-html-target-winsup
 html-target: maybe-html-target-libgloss
@@ -1660,6 +1564,7 @@ TAGS-target: maybe-TAGS-target-libstdc++-v3
 TAGS-target: maybe-TAGS-target-libsanitizer
 TAGS-target: maybe-TAGS-target-libmpx
 TAGS-target: maybe-TAGS-target-libvtv
+TAGS-target: maybe-TAGS-target-libcilkrts
 TAGS-target: maybe-TAGS-target-liboffloadmic
 TAGS-target: maybe-TAGS-target-libssp
 TAGS-target: maybe-TAGS-target-newlib
@@ -1669,8 +1574,6 @@ TAGS-target: maybe-TAGS-target-libquadmath
 TAGS-target: maybe-TAGS-target-libgfortran
 TAGS-target: maybe-TAGS-target-libobjc
 TAGS-target: maybe-TAGS-target-libgo
-TAGS-target: maybe-TAGS-target-libhsail-rt
-TAGS-target: maybe-TAGS-target-libphobos
 TAGS-target: maybe-TAGS-target-libtermcap
 TAGS-target: maybe-TAGS-target-winsup
 TAGS-target: maybe-TAGS-target-libgloss
@@ -1747,6 +1650,7 @@ install-info-target: maybe-install-info-target-libstdc++-v3
 install-info-target: maybe-install-info-target-libsanitizer
 install-info-target: maybe-install-info-target-libmpx
 install-info-target: maybe-install-info-target-libvtv
+install-info-target: maybe-install-info-target-libcilkrts
 install-info-target: maybe-install-info-target-liboffloadmic
 install-info-target: maybe-install-info-target-libssp
 install-info-target: maybe-install-info-target-newlib
@@ -1756,8 +1660,6 @@ install-info-target: maybe-install-info-target-libquadmath
 install-info-target: maybe-install-info-target-libgfortran
 install-info-target: maybe-install-info-target-libobjc
 install-info-target: maybe-install-info-target-libgo
-install-info-target: maybe-install-info-target-libhsail-rt
-install-info-target: maybe-install-info-target-libphobos
 install-info-target: maybe-install-info-target-libtermcap
 install-info-target: maybe-install-info-target-winsup
 install-info-target: maybe-install-info-target-libgloss
@@ -1834,6 +1736,7 @@ install-pdf-target: maybe-install-pdf-target-libstdc++-v3
 install-pdf-target: maybe-install-pdf-target-libsanitizer
 install-pdf-target: maybe-install-pdf-target-libmpx
 install-pdf-target: maybe-install-pdf-target-libvtv
+install-pdf-target: maybe-install-pdf-target-libcilkrts
 install-pdf-target: maybe-install-pdf-target-liboffloadmic
 install-pdf-target: maybe-install-pdf-target-libssp
 install-pdf-target: maybe-install-pdf-target-newlib
@@ -1843,8 +1746,6 @@ install-pdf-target: maybe-install-pdf-target-libquadmath
 install-pdf-target: maybe-install-pdf-target-libgfortran
 install-pdf-target: maybe-install-pdf-target-libobjc
 install-pdf-target: maybe-install-pdf-target-libgo
-install-pdf-target: maybe-install-pdf-target-libhsail-rt
-install-pdf-target: maybe-install-pdf-target-libphobos
 install-pdf-target: maybe-install-pdf-target-libtermcap
 install-pdf-target: maybe-install-pdf-target-winsup
 install-pdf-target: maybe-install-pdf-target-libgloss
@@ -1921,6 +1822,7 @@ install-html-target: maybe-install-html-target-libstdc++-v3
 install-html-target: maybe-install-html-target-libsanitizer
 install-html-target: maybe-install-html-target-libmpx
 install-html-target: maybe-install-html-target-libvtv
+install-html-target: maybe-install-html-target-libcilkrts
 install-html-target: maybe-install-html-target-liboffloadmic
 install-html-target: maybe-install-html-target-libssp
 install-html-target: maybe-install-html-target-newlib
@@ -1930,8 +1832,6 @@ install-html-target: maybe-install-html-target-libquadmath
 install-html-target: maybe-install-html-target-libgfortran
 install-html-target: maybe-install-html-target-libobjc
 install-html-target: maybe-install-html-target-libgo
-install-html-target: maybe-install-html-target-libhsail-rt
-install-html-target: maybe-install-html-target-libphobos
 install-html-target: maybe-install-html-target-libtermcap
 install-html-target: maybe-install-html-target-winsup
 install-html-target: maybe-install-html-target-libgloss
@@ -2008,6 +1908,7 @@ installcheck-target: maybe-installcheck-target-libstdc++-v3
 installcheck-target: maybe-installcheck-target-libsanitizer
 installcheck-target: maybe-installcheck-target-libmpx
 installcheck-target: maybe-installcheck-target-libvtv
+installcheck-target: maybe-installcheck-target-libcilkrts
 installcheck-target: maybe-installcheck-target-liboffloadmic
 installcheck-target: maybe-installcheck-target-libssp
 installcheck-target: maybe-installcheck-target-newlib
@@ -2017,8 +1918,6 @@ installcheck-target: maybe-installcheck-target-libquadmath
 installcheck-target: maybe-installcheck-target-libgfortran
 installcheck-target: maybe-installcheck-target-libobjc
 installcheck-target: maybe-installcheck-target-libgo
-installcheck-target: maybe-installcheck-target-libhsail-rt
-installcheck-target: maybe-installcheck-target-libphobos
 installcheck-target: maybe-installcheck-target-libtermcap
 installcheck-target: maybe-installcheck-target-winsup
 installcheck-target: maybe-installcheck-target-libgloss
@@ -2095,6 +1994,7 @@ mostlyclean-target: maybe-mostlyclean-target-libstdc++-v3
 mostlyclean-target: maybe-mostlyclean-target-libsanitizer
 mostlyclean-target: maybe-mostlyclean-target-libmpx
 mostlyclean-target: maybe-mostlyclean-target-libvtv
+mostlyclean-target: maybe-mostlyclean-target-libcilkrts
 mostlyclean-target: maybe-mostlyclean-target-liboffloadmic
 mostlyclean-target: maybe-mostlyclean-target-libssp
 mostlyclean-target: maybe-mostlyclean-target-newlib
@@ -2104,8 +2004,6 @@ mostlyclean-target: maybe-mostlyclean-target-libquadmath
 mostlyclean-target: maybe-mostlyclean-target-libgfortran
 mostlyclean-target: maybe-mostlyclean-target-libobjc
 mostlyclean-target: maybe-mostlyclean-target-libgo
-mostlyclean-target: maybe-mostlyclean-target-libhsail-rt
-mostlyclean-target: maybe-mostlyclean-target-libphobos
 mostlyclean-target: maybe-mostlyclean-target-libtermcap
 mostlyclean-target: maybe-mostlyclean-target-winsup
 mostlyclean-target: maybe-mostlyclean-target-libgloss
@@ -2182,6 +2080,7 @@ clean-target: maybe-clean-target-libstdc++-v3
 clean-target: maybe-clean-target-libsanitizer
 clean-target: maybe-clean-target-libmpx
 clean-target: maybe-clean-target-libvtv
+clean-target: maybe-clean-target-libcilkrts
 clean-target: maybe-clean-target-liboffloadmic
 clean-target: maybe-clean-target-libssp
 clean-target: maybe-clean-target-newlib
@@ -2191,8 +2090,6 @@ clean-target: maybe-clean-target-libquadmath
 clean-target: maybe-clean-target-libgfortran
 clean-target: maybe-clean-target-libobjc
 clean-target: maybe-clean-target-libgo
-clean-target: maybe-clean-target-libhsail-rt
-clean-target: maybe-clean-target-libphobos
 clean-target: maybe-clean-target-libtermcap
 clean-target: maybe-clean-target-winsup
 clean-target: maybe-clean-target-libgloss
@@ -2269,6 +2166,7 @@ distclean-target: maybe-distclean-target-libstdc++-v3
 distclean-target: maybe-distclean-target-libsanitizer
 distclean-target: maybe-distclean-target-libmpx
 distclean-target: maybe-distclean-target-libvtv
+distclean-target: maybe-distclean-target-libcilkrts
 distclean-target: maybe-distclean-target-liboffloadmic
 distclean-target: maybe-distclean-target-libssp
 distclean-target: maybe-distclean-target-newlib
@@ -2278,8 +2176,6 @@ distclean-target: maybe-distclean-target-libquadmath
 distclean-target: maybe-distclean-target-libgfortran
 distclean-target: maybe-distclean-target-libobjc
 distclean-target: maybe-distclean-target-libgo
-distclean-target: maybe-distclean-target-libhsail-rt
-distclean-target: maybe-distclean-target-libphobos
 distclean-target: maybe-distclean-target-libtermcap
 distclean-target: maybe-distclean-target-winsup
 distclean-target: maybe-distclean-target-libgloss
@@ -2356,6 +2252,7 @@ maintainer-clean-target: maybe-maintainer-clean-target-libstdc++-v3
 maintainer-clean-target: maybe-maintainer-clean-target-libsanitizer
 maintainer-clean-target: maybe-maintainer-clean-target-libmpx
 maintainer-clean-target: maybe-maintainer-clean-target-libvtv
+maintainer-clean-target: maybe-maintainer-clean-target-libcilkrts
 maintainer-clean-target: maybe-maintainer-clean-target-liboffloadmic
 maintainer-clean-target: maybe-maintainer-clean-target-libssp
 maintainer-clean-target: maybe-maintainer-clean-target-newlib
@@ -2365,8 +2262,6 @@ maintainer-clean-target: maybe-maintainer-clean-target-libquadmath
 maintainer-clean-target: maybe-maintainer-clean-target-libgfortran
 maintainer-clean-target: maybe-maintainer-clean-target-libobjc
 maintainer-clean-target: maybe-maintainer-clean-target-libgo
-maintainer-clean-target: maybe-maintainer-clean-target-libhsail-rt
-maintainer-clean-target: maybe-maintainer-clean-target-libphobos
 maintainer-clean-target: maybe-maintainer-clean-target-libtermcap
 maintainer-clean-target: maybe-maintainer-clean-target-winsup
 maintainer-clean-target: maybe-maintainer-clean-target-libgloss
@@ -2499,6 +2394,7 @@ check-target:  \
     maybe-check-target-libsanitizer \
     maybe-check-target-libmpx \
     maybe-check-target-libvtv \
+    maybe-check-target-libcilkrts \
     maybe-check-target-liboffloadmic \
     maybe-check-target-libssp \
     maybe-check-target-newlib \
@@ -2508,8 +2404,6 @@ check-target:  \
     maybe-check-target-libgfortran \
     maybe-check-target-libobjc \
     maybe-check-target-libgo \
-    maybe-check-target-libhsail-rt \
-    maybe-check-target-libphobos \
     maybe-check-target-libtermcap \
     maybe-check-target-winsup \
     maybe-check-target-libgloss \
@@ -2683,6 +2577,7 @@ install-target:  \
     maybe-install-target-libsanitizer \
     maybe-install-target-libmpx \
     maybe-install-target-libvtv \
+    maybe-install-target-libcilkrts \
     maybe-install-target-liboffloadmic \
     maybe-install-target-libssp \
     maybe-install-target-newlib \
@@ -2692,8 +2587,6 @@ install-target:  \
     maybe-install-target-libgfortran \
     maybe-install-target-libobjc \
     maybe-install-target-libgo \
-    maybe-install-target-libhsail-rt \
-    maybe-install-target-libphobos \
     maybe-install-target-libtermcap \
     maybe-install-target-winsup \
     maybe-install-target-libgloss \
@@ -2790,6 +2683,7 @@ install-strip-target:  \
     maybe-install-strip-target-libsanitizer \
     maybe-install-strip-target-libmpx \
     maybe-install-strip-target-libvtv \
+    maybe-install-strip-target-libcilkrts \
     maybe-install-strip-target-liboffloadmic \
     maybe-install-strip-target-libssp \
     maybe-install-strip-target-newlib \
@@ -2799,8 +2693,6 @@ install-strip-target:  \
     maybe-install-strip-target-libgfortran \
     maybe-install-strip-target-libobjc \
     maybe-install-strip-target-libgo \
-    maybe-install-strip-target-libhsail-rt \
-    maybe-install-strip-target-libphobos \
     maybe-install-strip-target-libtermcap \
     maybe-install-strip-target-winsup \
     maybe-install-strip-target-libgloss \
@@ -3455,39 +3347,6 @@ configure-stageprofile-bfd:
 	  $(STAGEprofile_CONFIGURE_FLAGS)
 @endif bfd-bootstrap
 
-.PHONY: configure-stagetrain-bfd maybe-configure-stagetrain-bfd
-maybe-configure-stagetrain-bfd:
-@if bfd-bootstrap
-maybe-configure-stagetrain-bfd: configure-stagetrain-bfd
-configure-stagetrain-bfd:
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEtrain_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEtrain_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEtrain_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage train in $(HOST_SUBDIR)/bfd; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd; \
-	cd $(HOST_SUBDIR)/bfd || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=bfd; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEtrain_CONFIGURE_FLAGS)
-@endif bfd-bootstrap
-
 .PHONY: configure-stagefeedback-bfd maybe-configure-stagefeedback-bfd
 maybe-configure-stagefeedback-bfd:
 @if bfd-bootstrap
@@ -3521,72 +3380,6 @@ configure-stagefeedback-bfd:
 	  $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif bfd-bootstrap
 
-.PHONY: configure-stageautoprofile-bfd maybe-configure-stageautoprofile-bfd
-maybe-configure-stageautoprofile-bfd:
-@if bfd-bootstrap
-maybe-configure-stageautoprofile-bfd: configure-stageautoprofile-bfd
-configure-stageautoprofile-bfd:
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautoprofile_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautoprofile_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage autoprofile in $(HOST_SUBDIR)/bfd; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd; \
-	cd $(HOST_SUBDIR)/bfd || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=bfd; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautoprofile_CONFIGURE_FLAGS)
-@endif bfd-bootstrap
-
-.PHONY: configure-stageautofeedback-bfd maybe-configure-stageautofeedback-bfd
-maybe-configure-stageautofeedback-bfd:
-@if bfd-bootstrap
-maybe-configure-stageautofeedback-bfd: configure-stageautofeedback-bfd
-configure-stageautofeedback-bfd:
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautofeedback_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautofeedback_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage autofeedback in $(HOST_SUBDIR)/bfd; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd; \
-	cd $(HOST_SUBDIR)/bfd || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=bfd; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautofeedback_CONFIGURE_FLAGS)
-@endif bfd-bootstrap
-
 
 
 
@@ -3628,7 +3421,6 @@ all-stage1-bfd: configure-stage1-bfd
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE1_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
 		LIBCFLAGS="$(LIBCFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -3673,7 +3465,6 @@ all-stage2-bfd: configure-stage2-bfd
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE2_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE2_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -3716,7 +3507,6 @@ all-stage3-bfd: configure-stage3-bfd
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE3_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE3_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -3759,7 +3549,6 @@ all-stage4-bfd: configure-stage4-bfd
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE4_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE4_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -3802,7 +3591,6 @@ all-stageprofile-bfd: configure-stageprofile-bfd
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGEprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -3826,49 +3614,6 @@ clean-stageprofile-bfd:
 @endif bfd-bootstrap
 
 
-.PHONY: all-stagetrain-bfd maybe-all-stagetrain-bfd
-.PHONY: clean-stagetrain-bfd maybe-clean-stagetrain-bfd
-maybe-all-stagetrain-bfd:
-maybe-clean-stagetrain-bfd:
-@if bfd-bootstrap
-maybe-all-stagetrain-bfd: all-stagetrain-bfd
-all-stagetrain: all-stagetrain-bfd
-TARGET-stagetrain-bfd = $(TARGET-bfd)
-all-stagetrain-bfd: configure-stagetrain-bfd
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/bfd && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEtrain_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEtrain_TFLAGS)"  \
-		$(TARGET-stagetrain-bfd)
-
-maybe-clean-stagetrain-bfd: clean-stagetrain-bfd
-clean-stagetrain: clean-stagetrain-bfd
-clean-stagetrain-bfd:
-	@if [ $(current_stage) = stagetrain ]; then \
-	  [ -f $(HOST_SUBDIR)/bfd/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stagetrain-bfd/Makefile ] || exit 0; \
-	  $(MAKE) stagetrain-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/bfd && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif bfd-bootstrap
-
-
 .PHONY: all-stagefeedback-bfd maybe-all-stagefeedback-bfd
 .PHONY: clean-stagefeedback-bfd maybe-clean-stagefeedback-bfd
 maybe-all-stagefeedback-bfd:
@@ -3888,7 +3633,6 @@ all-stagefeedback-bfd: configure-stagefeedback-bfd
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGEfeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -3912,92 +3656,6 @@ clean-stagefeedback-bfd:
 @endif bfd-bootstrap
 
 
-.PHONY: all-stageautoprofile-bfd maybe-all-stageautoprofile-bfd
-.PHONY: clean-stageautoprofile-bfd maybe-clean-stageautoprofile-bfd
-maybe-all-stageautoprofile-bfd:
-maybe-clean-stageautoprofile-bfd:
-@if bfd-bootstrap
-maybe-all-stageautoprofile-bfd: all-stageautoprofile-bfd
-all-stageautoprofile: all-stageautoprofile-bfd
-TARGET-stageautoprofile-bfd = $(TARGET-bfd)
-all-stageautoprofile-bfd: configure-stageautoprofile-bfd
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/bfd && \
-	$$s/gcc/config/i386/$(AUTO_PROFILE) \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEautoprofile_TFLAGS)"  \
-		$(TARGET-stageautoprofile-bfd)
-
-maybe-clean-stageautoprofile-bfd: clean-stageautoprofile-bfd
-clean-stageautoprofile: clean-stageautoprofile-bfd
-clean-stageautoprofile-bfd:
-	@if [ $(current_stage) = stageautoprofile ]; then \
-	  [ -f $(HOST_SUBDIR)/bfd/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageautoprofile-bfd/Makefile ] || exit 0; \
-	  $(MAKE) stageautoprofile-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/bfd && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif bfd-bootstrap
-
-
-.PHONY: all-stageautofeedback-bfd maybe-all-stageautofeedback-bfd
-.PHONY: clean-stageautofeedback-bfd maybe-clean-stageautofeedback-bfd
-maybe-all-stageautofeedback-bfd:
-maybe-clean-stageautofeedback-bfd:
-@if bfd-bootstrap
-maybe-all-stageautofeedback-bfd: all-stageautofeedback-bfd
-all-stageautofeedback: all-stageautofeedback-bfd
-TARGET-stageautofeedback-bfd = $(TARGET-bfd)
-all-stageautofeedback-bfd: configure-stageautofeedback-bfd
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/bfd && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEautofeedback_TFLAGS)" PERF_DATA=perf.data \
-		$(TARGET-stageautofeedback-bfd)
-
-maybe-clean-stageautofeedback-bfd: clean-stageautofeedback-bfd
-clean-stageautofeedback: clean-stageautofeedback-bfd
-clean-stageautofeedback-bfd:
-	@if [ $(current_stage) = stageautofeedback ]; then \
-	  [ -f $(HOST_SUBDIR)/bfd/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageautofeedback-bfd/Makefile ] || exit 0; \
-	  $(MAKE) stageautofeedback-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/bfd && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif bfd-bootstrap
-
-
 
 
 
@@ -4569,39 +4227,6 @@ configure-stageprofile-opcodes:
 	  $(STAGEprofile_CONFIGURE_FLAGS)
 @endif opcodes-bootstrap
 
-.PHONY: configure-stagetrain-opcodes maybe-configure-stagetrain-opcodes
-maybe-configure-stagetrain-opcodes:
-@if opcodes-bootstrap
-maybe-configure-stagetrain-opcodes: configure-stagetrain-opcodes
-configure-stagetrain-opcodes:
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEtrain_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEtrain_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEtrain_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage train in $(HOST_SUBDIR)/opcodes; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes; \
-	cd $(HOST_SUBDIR)/opcodes || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=opcodes; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEtrain_CONFIGURE_FLAGS)
-@endif opcodes-bootstrap
-
 .PHONY: configure-stagefeedback-opcodes maybe-configure-stagefeedback-opcodes
 maybe-configure-stagefeedback-opcodes:
 @if opcodes-bootstrap
@@ -4635,72 +4260,6 @@ configure-stagefeedback-opcodes:
 	  $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif opcodes-bootstrap
 
-.PHONY: configure-stageautoprofile-opcodes maybe-configure-stageautoprofile-opcodes
-maybe-configure-stageautoprofile-opcodes:
-@if opcodes-bootstrap
-maybe-configure-stageautoprofile-opcodes: configure-stageautoprofile-opcodes
-configure-stageautoprofile-opcodes:
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautoprofile_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautoprofile_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage autoprofile in $(HOST_SUBDIR)/opcodes; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes; \
-	cd $(HOST_SUBDIR)/opcodes || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=opcodes; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautoprofile_CONFIGURE_FLAGS)
-@endif opcodes-bootstrap
-
-.PHONY: configure-stageautofeedback-opcodes maybe-configure-stageautofeedback-opcodes
-maybe-configure-stageautofeedback-opcodes:
-@if opcodes-bootstrap
-maybe-configure-stageautofeedback-opcodes: configure-stageautofeedback-opcodes
-configure-stageautofeedback-opcodes:
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautofeedback_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautofeedback_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage autofeedback in $(HOST_SUBDIR)/opcodes; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes; \
-	cd $(HOST_SUBDIR)/opcodes || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=opcodes; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautofeedback_CONFIGURE_FLAGS)
-@endif opcodes-bootstrap
-
 
 
 
@@ -4742,7 +4301,6 @@ all-stage1-opcodes: configure-stage1-opcodes
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE1_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
 		LIBCFLAGS="$(LIBCFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -4787,7 +4345,6 @@ all-stage2-opcodes: configure-stage2-opcodes
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE2_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE2_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -4830,7 +4387,6 @@ all-stage3-opcodes: configure-stage3-opcodes
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE3_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE3_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -4873,7 +4429,6 @@ all-stage4-opcodes: configure-stage4-opcodes
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE4_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE4_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -4916,7 +4471,6 @@ all-stageprofile-opcodes: configure-stageprofile-opcodes
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGEprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -4940,49 +4494,6 @@ clean-stageprofile-opcodes:
 @endif opcodes-bootstrap
 
 
-.PHONY: all-stagetrain-opcodes maybe-all-stagetrain-opcodes
-.PHONY: clean-stagetrain-opcodes maybe-clean-stagetrain-opcodes
-maybe-all-stagetrain-opcodes:
-maybe-clean-stagetrain-opcodes:
-@if opcodes-bootstrap
-maybe-all-stagetrain-opcodes: all-stagetrain-opcodes
-all-stagetrain: all-stagetrain-opcodes
-TARGET-stagetrain-opcodes = $(TARGET-opcodes)
-all-stagetrain-opcodes: configure-stagetrain-opcodes
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/opcodes && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEtrain_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEtrain_TFLAGS)"  \
-		$(TARGET-stagetrain-opcodes)
-
-maybe-clean-stagetrain-opcodes: clean-stagetrain-opcodes
-clean-stagetrain: clean-stagetrain-opcodes
-clean-stagetrain-opcodes:
-	@if [ $(current_stage) = stagetrain ]; then \
-	  [ -f $(HOST_SUBDIR)/opcodes/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stagetrain-opcodes/Makefile ] || exit 0; \
-	  $(MAKE) stagetrain-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/opcodes && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif opcodes-bootstrap
-
-
 .PHONY: all-stagefeedback-opcodes maybe-all-stagefeedback-opcodes
 .PHONY: clean-stagefeedback-opcodes maybe-clean-stagefeedback-opcodes
 maybe-all-stagefeedback-opcodes:
@@ -5002,7 +4513,6 @@ all-stagefeedback-opcodes: configure-stagefeedback-opcodes
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGEfeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -5026,92 +4536,6 @@ clean-stagefeedback-opcodes:
 @endif opcodes-bootstrap
 
 
-.PHONY: all-stageautoprofile-opcodes maybe-all-stageautoprofile-opcodes
-.PHONY: clean-stageautoprofile-opcodes maybe-clean-stageautoprofile-opcodes
-maybe-all-stageautoprofile-opcodes:
-maybe-clean-stageautoprofile-opcodes:
-@if opcodes-bootstrap
-maybe-all-stageautoprofile-opcodes: all-stageautoprofile-opcodes
-all-stageautoprofile: all-stageautoprofile-opcodes
-TARGET-stageautoprofile-opcodes = $(TARGET-opcodes)
-all-stageautoprofile-opcodes: configure-stageautoprofile-opcodes
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/opcodes && \
-	$$s/gcc/config/i386/$(AUTO_PROFILE) \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEautoprofile_TFLAGS)"  \
-		$(TARGET-stageautoprofile-opcodes)
-
-maybe-clean-stageautoprofile-opcodes: clean-stageautoprofile-opcodes
-clean-stageautoprofile: clean-stageautoprofile-opcodes
-clean-stageautoprofile-opcodes:
-	@if [ $(current_stage) = stageautoprofile ]; then \
-	  [ -f $(HOST_SUBDIR)/opcodes/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageautoprofile-opcodes/Makefile ] || exit 0; \
-	  $(MAKE) stageautoprofile-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/opcodes && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif opcodes-bootstrap
-
-
-.PHONY: all-stageautofeedback-opcodes maybe-all-stageautofeedback-opcodes
-.PHONY: clean-stageautofeedback-opcodes maybe-clean-stageautofeedback-opcodes
-maybe-all-stageautofeedback-opcodes:
-maybe-clean-stageautofeedback-opcodes:
-@if opcodes-bootstrap
-maybe-all-stageautofeedback-opcodes: all-stageautofeedback-opcodes
-all-stageautofeedback: all-stageautofeedback-opcodes
-TARGET-stageautofeedback-opcodes = $(TARGET-opcodes)
-all-stageautofeedback-opcodes: configure-stageautofeedback-opcodes
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/opcodes && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEautofeedback_TFLAGS)" PERF_DATA=perf.data \
-		$(TARGET-stageautofeedback-opcodes)
-
-maybe-clean-stageautofeedback-opcodes: clean-stageautofeedback-opcodes
-clean-stageautofeedback: clean-stageautofeedback-opcodes
-clean-stageautofeedback-opcodes:
-	@if [ $(current_stage) = stageautofeedback ]; then \
-	  [ -f $(HOST_SUBDIR)/opcodes/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageautofeedback-opcodes/Makefile ] || exit 0; \
-	  $(MAKE) stageautofeedback-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/opcodes && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif opcodes-bootstrap
-
-
 
 
 
@@ -5683,39 +5107,6 @@ configure-stageprofile-binutils:
 	  $(STAGEprofile_CONFIGURE_FLAGS)
 @endif binutils-bootstrap
 
-.PHONY: configure-stagetrain-binutils maybe-configure-stagetrain-binutils
-maybe-configure-stagetrain-binutils:
-@if binutils-bootstrap
-maybe-configure-stagetrain-binutils: configure-stagetrain-binutils
-configure-stagetrain-binutils:
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEtrain_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEtrain_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEtrain_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage train in $(HOST_SUBDIR)/binutils; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils; \
-	cd $(HOST_SUBDIR)/binutils || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=binutils; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEtrain_CONFIGURE_FLAGS)
-@endif binutils-bootstrap
-
 .PHONY: configure-stagefeedback-binutils maybe-configure-stagefeedback-binutils
 maybe-configure-stagefeedback-binutils:
 @if binutils-bootstrap
@@ -5749,72 +5140,6 @@ configure-stagefeedback-binutils:
 	  $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif binutils-bootstrap
 
-.PHONY: configure-stageautoprofile-binutils maybe-configure-stageautoprofile-binutils
-maybe-configure-stageautoprofile-binutils:
-@if binutils-bootstrap
-maybe-configure-stageautoprofile-binutils: configure-stageautoprofile-binutils
-configure-stageautoprofile-binutils:
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautoprofile_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautoprofile_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage autoprofile in $(HOST_SUBDIR)/binutils; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils; \
-	cd $(HOST_SUBDIR)/binutils || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=binutils; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautoprofile_CONFIGURE_FLAGS)
-@endif binutils-bootstrap
-
-.PHONY: configure-stageautofeedback-binutils maybe-configure-stageautofeedback-binutils
-maybe-configure-stageautofeedback-binutils:
-@if binutils-bootstrap
-maybe-configure-stageautofeedback-binutils: configure-stageautofeedback-binutils
-configure-stageautofeedback-binutils:
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautofeedback_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautofeedback_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage autofeedback in $(HOST_SUBDIR)/binutils; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils; \
-	cd $(HOST_SUBDIR)/binutils || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=binutils; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautofeedback_CONFIGURE_FLAGS)
-@endif binutils-bootstrap
-
 
 
 
@@ -5856,7 +5181,6 @@ all-stage1-binutils: configure-stage1-binutils
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE1_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
 		LIBCFLAGS="$(LIBCFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -5901,7 +5225,6 @@ all-stage2-binutils: configure-stage2-binutils
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE2_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE2_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -5944,7 +5267,6 @@ all-stage3-binutils: configure-stage3-binutils
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE3_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE3_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -5987,7 +5309,6 @@ all-stage4-binutils: configure-stage4-binutils
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE4_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE4_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -6030,7 +5351,6 @@ all-stageprofile-binutils: configure-stageprofile-binutils
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGEprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -6054,49 +5374,6 @@ clean-stageprofile-binutils:
 @endif binutils-bootstrap
 
 
-.PHONY: all-stagetrain-binutils maybe-all-stagetrain-binutils
-.PHONY: clean-stagetrain-binutils maybe-clean-stagetrain-binutils
-maybe-all-stagetrain-binutils:
-maybe-clean-stagetrain-binutils:
-@if binutils-bootstrap
-maybe-all-stagetrain-binutils: all-stagetrain-binutils
-all-stagetrain: all-stagetrain-binutils
-TARGET-stagetrain-binutils = $(TARGET-binutils)
-all-stagetrain-binutils: configure-stagetrain-binutils
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/binutils && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEtrain_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEtrain_TFLAGS)"  \
-		$(TARGET-stagetrain-binutils)
-
-maybe-clean-stagetrain-binutils: clean-stagetrain-binutils
-clean-stagetrain: clean-stagetrain-binutils
-clean-stagetrain-binutils:
-	@if [ $(current_stage) = stagetrain ]; then \
-	  [ -f $(HOST_SUBDIR)/binutils/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stagetrain-binutils/Makefile ] || exit 0; \
-	  $(MAKE) stagetrain-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/binutils && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif binutils-bootstrap
-
-
 .PHONY: all-stagefeedback-binutils maybe-all-stagefeedback-binutils
 .PHONY: clean-stagefeedback-binutils maybe-clean-stagefeedback-binutils
 maybe-all-stagefeedback-binutils:
@@ -6116,7 +5393,6 @@ all-stagefeedback-binutils: configure-stagefeedback-binutils
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGEfeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -6140,92 +5416,6 @@ clean-stagefeedback-binutils:
 @endif binutils-bootstrap
 
 
-.PHONY: all-stageautoprofile-binutils maybe-all-stageautoprofile-binutils
-.PHONY: clean-stageautoprofile-binutils maybe-clean-stageautoprofile-binutils
-maybe-all-stageautoprofile-binutils:
-maybe-clean-stageautoprofile-binutils:
-@if binutils-bootstrap
-maybe-all-stageautoprofile-binutils: all-stageautoprofile-binutils
-all-stageautoprofile: all-stageautoprofile-binutils
-TARGET-stageautoprofile-binutils = $(TARGET-binutils)
-all-stageautoprofile-binutils: configure-stageautoprofile-binutils
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/binutils && \
-	$$s/gcc/config/i386/$(AUTO_PROFILE) \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEautoprofile_TFLAGS)"  \
-		$(TARGET-stageautoprofile-binutils)
-
-maybe-clean-stageautoprofile-binutils: clean-stageautoprofile-binutils
-clean-stageautoprofile: clean-stageautoprofile-binutils
-clean-stageautoprofile-binutils:
-	@if [ $(current_stage) = stageautoprofile ]; then \
-	  [ -f $(HOST_SUBDIR)/binutils/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageautoprofile-binutils/Makefile ] || exit 0; \
-	  $(MAKE) stageautoprofile-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/binutils && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif binutils-bootstrap
-
-
-.PHONY: all-stageautofeedback-binutils maybe-all-stageautofeedback-binutils
-.PHONY: clean-stageautofeedback-binutils maybe-clean-stageautofeedback-binutils
-maybe-all-stageautofeedback-binutils:
-maybe-clean-stageautofeedback-binutils:
-@if binutils-bootstrap
-maybe-all-stageautofeedback-binutils: all-stageautofeedback-binutils
-all-stageautofeedback: all-stageautofeedback-binutils
-TARGET-stageautofeedback-binutils = $(TARGET-binutils)
-all-stageautofeedback-binutils: configure-stageautofeedback-binutils
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/binutils && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEautofeedback_TFLAGS)" PERF_DATA=perf.data \
-		$(TARGET-stageautofeedback-binutils)
-
-maybe-clean-stageautofeedback-binutils: clean-stageautofeedback-binutils
-clean-stageautofeedback: clean-stageautofeedback-binutils
-clean-stageautofeedback-binutils:
-	@if [ $(current_stage) = stageautofeedback ]; then \
-	  [ -f $(HOST_SUBDIR)/binutils/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageautofeedback-binutils/Makefile ] || exit 0; \
-	  $(MAKE) stageautofeedback-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/binutils && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif binutils-bootstrap
-
-
 
 
 
@@ -9008,39 +8198,6 @@ configure-stageprofile-fixincludes:
 	  $(STAGEprofile_CONFIGURE_FLAGS)
 @endif fixincludes-bootstrap
 
-.PHONY: configure-stagetrain-fixincludes maybe-configure-stagetrain-fixincludes
-maybe-configure-stagetrain-fixincludes:
-@if fixincludes-bootstrap
-maybe-configure-stagetrain-fixincludes: configure-stagetrain-fixincludes
-configure-stagetrain-fixincludes:
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/fixincludes/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEtrain_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEtrain_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEtrain_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage train in $(HOST_SUBDIR)/fixincludes; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes; \
-	cd $(HOST_SUBDIR)/fixincludes || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/fixincludes/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=fixincludes; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEtrain_CONFIGURE_FLAGS)
-@endif fixincludes-bootstrap
-
 .PHONY: configure-stagefeedback-fixincludes maybe-configure-stagefeedback-fixincludes
 maybe-configure-stagefeedback-fixincludes:
 @if fixincludes-bootstrap
@@ -9074,72 +8231,6 @@ configure-stagefeedback-fixincludes:
 	  $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif fixincludes-bootstrap
 
-.PHONY: configure-stageautoprofile-fixincludes maybe-configure-stageautoprofile-fixincludes
-maybe-configure-stageautoprofile-fixincludes:
-@if fixincludes-bootstrap
-maybe-configure-stageautoprofile-fixincludes: configure-stageautoprofile-fixincludes
-configure-stageautoprofile-fixincludes:
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/fixincludes/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautoprofile_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautoprofile_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage autoprofile in $(HOST_SUBDIR)/fixincludes; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes; \
-	cd $(HOST_SUBDIR)/fixincludes || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/fixincludes/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=fixincludes; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautoprofile_CONFIGURE_FLAGS)
-@endif fixincludes-bootstrap
-
-.PHONY: configure-stageautofeedback-fixincludes maybe-configure-stageautofeedback-fixincludes
-maybe-configure-stageautofeedback-fixincludes:
-@if fixincludes-bootstrap
-maybe-configure-stageautofeedback-fixincludes: configure-stageautofeedback-fixincludes
-configure-stageautofeedback-fixincludes:
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/fixincludes/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautofeedback_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautofeedback_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage autofeedback in $(HOST_SUBDIR)/fixincludes; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes; \
-	cd $(HOST_SUBDIR)/fixincludes || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/fixincludes/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=fixincludes; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautofeedback_CONFIGURE_FLAGS)
-@endif fixincludes-bootstrap
-
 
 
 
@@ -9181,7 +8272,6 @@ all-stage1-fixincludes: configure-stage1-fixincludes
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE1_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
 		LIBCFLAGS="$(LIBCFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -9226,7 +8316,6 @@ all-stage2-fixincludes: configure-stage2-fixincludes
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE2_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE2_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -9269,7 +8358,6 @@ all-stage3-fixincludes: configure-stage3-fixincludes
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE3_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE3_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -9312,7 +8400,6 @@ all-stage4-fixincludes: configure-stage4-fixincludes
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE4_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE4_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -9355,7 +8442,6 @@ all-stageprofile-fixincludes: configure-stageprofile-fixincludes
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGEprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -9379,49 +8465,6 @@ clean-stageprofile-fixincludes:
 @endif fixincludes-bootstrap
 
 
-.PHONY: all-stagetrain-fixincludes maybe-all-stagetrain-fixincludes
-.PHONY: clean-stagetrain-fixincludes maybe-clean-stagetrain-fixincludes
-maybe-all-stagetrain-fixincludes:
-maybe-clean-stagetrain-fixincludes:
-@if fixincludes-bootstrap
-maybe-all-stagetrain-fixincludes: all-stagetrain-fixincludes
-all-stagetrain: all-stagetrain-fixincludes
-TARGET-stagetrain-fixincludes = $(TARGET-fixincludes)
-all-stagetrain-fixincludes: configure-stagetrain-fixincludes
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/fixincludes && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEtrain_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEtrain_TFLAGS)"  \
-		$(TARGET-stagetrain-fixincludes)
-
-maybe-clean-stagetrain-fixincludes: clean-stagetrain-fixincludes
-clean-stagetrain: clean-stagetrain-fixincludes
-clean-stagetrain-fixincludes:
-	@if [ $(current_stage) = stagetrain ]; then \
-	  [ -f $(HOST_SUBDIR)/fixincludes/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stagetrain-fixincludes/Makefile ] || exit 0; \
-	  $(MAKE) stagetrain-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/fixincludes && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif fixincludes-bootstrap
-
-
 .PHONY: all-stagefeedback-fixincludes maybe-all-stagefeedback-fixincludes
 .PHONY: clean-stagefeedback-fixincludes maybe-clean-stagefeedback-fixincludes
 maybe-all-stagefeedback-fixincludes:
@@ -9441,7 +8484,6 @@ all-stagefeedback-fixincludes: configure-stagefeedback-fixincludes
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGEfeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -9465,92 +8507,6 @@ clean-stagefeedback-fixincludes:
 @endif fixincludes-bootstrap
 
 
-.PHONY: all-stageautoprofile-fixincludes maybe-all-stageautoprofile-fixincludes
-.PHONY: clean-stageautoprofile-fixincludes maybe-clean-stageautoprofile-fixincludes
-maybe-all-stageautoprofile-fixincludes:
-maybe-clean-stageautoprofile-fixincludes:
-@if fixincludes-bootstrap
-maybe-all-stageautoprofile-fixincludes: all-stageautoprofile-fixincludes
-all-stageautoprofile: all-stageautoprofile-fixincludes
-TARGET-stageautoprofile-fixincludes = $(TARGET-fixincludes)
-all-stageautoprofile-fixincludes: configure-stageautoprofile-fixincludes
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/fixincludes && \
-	$$s/gcc/config/i386/$(AUTO_PROFILE) \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEautoprofile_TFLAGS)"  \
-		$(TARGET-stageautoprofile-fixincludes)
-
-maybe-clean-stageautoprofile-fixincludes: clean-stageautoprofile-fixincludes
-clean-stageautoprofile: clean-stageautoprofile-fixincludes
-clean-stageautoprofile-fixincludes:
-	@if [ $(current_stage) = stageautoprofile ]; then \
-	  [ -f $(HOST_SUBDIR)/fixincludes/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageautoprofile-fixincludes/Makefile ] || exit 0; \
-	  $(MAKE) stageautoprofile-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/fixincludes && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif fixincludes-bootstrap
-
-
-.PHONY: all-stageautofeedback-fixincludes maybe-all-stageautofeedback-fixincludes
-.PHONY: clean-stageautofeedback-fixincludes maybe-clean-stageautofeedback-fixincludes
-maybe-all-stageautofeedback-fixincludes:
-maybe-clean-stageautofeedback-fixincludes:
-@if fixincludes-bootstrap
-maybe-all-stageautofeedback-fixincludes: all-stageautofeedback-fixincludes
-all-stageautofeedback: all-stageautofeedback-fixincludes
-TARGET-stageautofeedback-fixincludes = $(TARGET-fixincludes)
-all-stageautofeedback-fixincludes: configure-stageautofeedback-fixincludes
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/fixincludes && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEautofeedback_TFLAGS)" PERF_DATA=perf.data \
-		$(TARGET-stageautofeedback-fixincludes)
-
-maybe-clean-stageautofeedback-fixincludes: clean-stageautofeedback-fixincludes
-clean-stageautofeedback: clean-stageautofeedback-fixincludes
-clean-stageautofeedback-fixincludes:
-	@if [ $(current_stage) = stageautofeedback ]; then \
-	  [ -f $(HOST_SUBDIR)/fixincludes/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageautofeedback-fixincludes/Makefile ] || exit 0; \
-	  $(MAKE) stageautofeedback-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/fixincludes && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif fixincludes-bootstrap
-
-
 
 
 
@@ -10551,39 +9507,6 @@ configure-stageprofile-gas:
 	  $(STAGEprofile_CONFIGURE_FLAGS)
 @endif gas-bootstrap
 
-.PHONY: configure-stagetrain-gas maybe-configure-stagetrain-gas
-maybe-configure-stagetrain-gas:
-@if gas-bootstrap
-maybe-configure-stagetrain-gas: configure-stagetrain-gas
-configure-stagetrain-gas:
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEtrain_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEtrain_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEtrain_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage train in $(HOST_SUBDIR)/gas; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas; \
-	cd $(HOST_SUBDIR)/gas || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=gas; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEtrain_CONFIGURE_FLAGS)
-@endif gas-bootstrap
-
 .PHONY: configure-stagefeedback-gas maybe-configure-stagefeedback-gas
 maybe-configure-stagefeedback-gas:
 @if gas-bootstrap
@@ -10617,72 +9540,6 @@ configure-stagefeedback-gas:
 	  $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif gas-bootstrap
 
-.PHONY: configure-stageautoprofile-gas maybe-configure-stageautoprofile-gas
-maybe-configure-stageautoprofile-gas:
-@if gas-bootstrap
-maybe-configure-stageautoprofile-gas: configure-stageautoprofile-gas
-configure-stageautoprofile-gas:
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautoprofile_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautoprofile_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage autoprofile in $(HOST_SUBDIR)/gas; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas; \
-	cd $(HOST_SUBDIR)/gas || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=gas; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautoprofile_CONFIGURE_FLAGS)
-@endif gas-bootstrap
-
-.PHONY: configure-stageautofeedback-gas maybe-configure-stageautofeedback-gas
-maybe-configure-stageautofeedback-gas:
-@if gas-bootstrap
-maybe-configure-stageautofeedback-gas: configure-stageautofeedback-gas
-configure-stageautofeedback-gas:
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautofeedback_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautofeedback_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage autofeedback in $(HOST_SUBDIR)/gas; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas; \
-	cd $(HOST_SUBDIR)/gas || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gas/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=gas; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautofeedback_CONFIGURE_FLAGS)
-@endif gas-bootstrap
-
 
 
 
@@ -10724,7 +9581,6 @@ all-stage1-gas: configure-stage1-gas
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE1_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
 		LIBCFLAGS="$(LIBCFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -10769,7 +9625,6 @@ all-stage2-gas: configure-stage2-gas
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE2_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE2_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -10812,7 +9667,6 @@ all-stage3-gas: configure-stage3-gas
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE3_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE3_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -10855,7 +9709,6 @@ all-stage4-gas: configure-stage4-gas
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE4_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE4_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -10898,7 +9751,6 @@ all-stageprofile-gas: configure-stageprofile-gas
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGEprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -10922,49 +9774,6 @@ clean-stageprofile-gas:
 @endif gas-bootstrap
 
 
-.PHONY: all-stagetrain-gas maybe-all-stagetrain-gas
-.PHONY: clean-stagetrain-gas maybe-clean-stagetrain-gas
-maybe-all-stagetrain-gas:
-maybe-clean-stagetrain-gas:
-@if gas-bootstrap
-maybe-all-stagetrain-gas: all-stagetrain-gas
-all-stagetrain: all-stagetrain-gas
-TARGET-stagetrain-gas = $(TARGET-gas)
-all-stagetrain-gas: configure-stagetrain-gas
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/gas && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEtrain_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEtrain_TFLAGS)"  \
-		$(TARGET-stagetrain-gas)
-
-maybe-clean-stagetrain-gas: clean-stagetrain-gas
-clean-stagetrain: clean-stagetrain-gas
-clean-stagetrain-gas:
-	@if [ $(current_stage) = stagetrain ]; then \
-	  [ -f $(HOST_SUBDIR)/gas/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stagetrain-gas/Makefile ] || exit 0; \
-	  $(MAKE) stagetrain-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/gas && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif gas-bootstrap
-
-
 .PHONY: all-stagefeedback-gas maybe-all-stagefeedback-gas
 .PHONY: clean-stagefeedback-gas maybe-clean-stagefeedback-gas
 maybe-all-stagefeedback-gas:
@@ -10984,7 +9793,6 @@ all-stagefeedback-gas: configure-stagefeedback-gas
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGEfeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -11008,92 +9816,6 @@ clean-stagefeedback-gas:
 @endif gas-bootstrap
 
 
-.PHONY: all-stageautoprofile-gas maybe-all-stageautoprofile-gas
-.PHONY: clean-stageautoprofile-gas maybe-clean-stageautoprofile-gas
-maybe-all-stageautoprofile-gas:
-maybe-clean-stageautoprofile-gas:
-@if gas-bootstrap
-maybe-all-stageautoprofile-gas: all-stageautoprofile-gas
-all-stageautoprofile: all-stageautoprofile-gas
-TARGET-stageautoprofile-gas = $(TARGET-gas)
-all-stageautoprofile-gas: configure-stageautoprofile-gas
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/gas && \
-	$$s/gcc/config/i386/$(AUTO_PROFILE) \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEautoprofile_TFLAGS)"  \
-		$(TARGET-stageautoprofile-gas)
-
-maybe-clean-stageautoprofile-gas: clean-stageautoprofile-gas
-clean-stageautoprofile: clean-stageautoprofile-gas
-clean-stageautoprofile-gas:
-	@if [ $(current_stage) = stageautoprofile ]; then \
-	  [ -f $(HOST_SUBDIR)/gas/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageautoprofile-gas/Makefile ] || exit 0; \
-	  $(MAKE) stageautoprofile-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/gas && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif gas-bootstrap
-
-
-.PHONY: all-stageautofeedback-gas maybe-all-stageautofeedback-gas
-.PHONY: clean-stageautofeedback-gas maybe-clean-stageautofeedback-gas
-maybe-all-stageautofeedback-gas:
-maybe-clean-stageautofeedback-gas:
-@if gas-bootstrap
-maybe-all-stageautofeedback-gas: all-stageautofeedback-gas
-all-stageautofeedback: all-stageautofeedback-gas
-TARGET-stageautofeedback-gas = $(TARGET-gas)
-all-stageautofeedback-gas: configure-stageautofeedback-gas
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/gas && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEautofeedback_TFLAGS)" PERF_DATA=perf.data \
-		$(TARGET-stageautofeedback-gas)
-
-maybe-clean-stageautofeedback-gas: clean-stageautofeedback-gas
-clean-stageautofeedback: clean-stageautofeedback-gas
-clean-stageautofeedback-gas:
-	@if [ $(current_stage) = stageautofeedback ]; then \
-	  [ -f $(HOST_SUBDIR)/gas/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageautofeedback-gas/Makefile ] || exit 0; \
-	  $(MAKE) stageautofeedback-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/gas && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif gas-bootstrap
-
-
 
 
 
@@ -11665,39 +10387,6 @@ configure-stageprofile-gcc:
 	  $(STAGEprofile_CONFIGURE_FLAGS)
 @endif gcc-bootstrap
 
-.PHONY: configure-stagetrain-gcc maybe-configure-stagetrain-gcc
-maybe-configure-stagetrain-gcc:
-@if gcc-bootstrap
-maybe-configure-stagetrain-gcc: configure-stagetrain-gcc
-configure-stagetrain-gcc:
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEtrain_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEtrain_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEtrain_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage train in $(HOST_SUBDIR)/gcc; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc; \
-	cd $(HOST_SUBDIR)/gcc || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=gcc; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEtrain_CONFIGURE_FLAGS)
-@endif gcc-bootstrap
-
 .PHONY: configure-stagefeedback-gcc maybe-configure-stagefeedback-gcc
 maybe-configure-stagefeedback-gcc:
 @if gcc-bootstrap
@@ -11731,72 +10420,6 @@ configure-stagefeedback-gcc:
 	  $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif gcc-bootstrap
 
-.PHONY: configure-stageautoprofile-gcc maybe-configure-stageautoprofile-gcc
-maybe-configure-stageautoprofile-gcc:
-@if gcc-bootstrap
-maybe-configure-stageautoprofile-gcc: configure-stageautoprofile-gcc
-configure-stageautoprofile-gcc:
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautoprofile_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautoprofile_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage autoprofile in $(HOST_SUBDIR)/gcc; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc; \
-	cd $(HOST_SUBDIR)/gcc || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=gcc; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautoprofile_CONFIGURE_FLAGS)
-@endif gcc-bootstrap
-
-.PHONY: configure-stageautofeedback-gcc maybe-configure-stageautofeedback-gcc
-maybe-configure-stageautofeedback-gcc:
-@if gcc-bootstrap
-maybe-configure-stageautofeedback-gcc: configure-stageautofeedback-gcc
-configure-stageautofeedback-gcc:
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautofeedback_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautofeedback_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage autofeedback in $(HOST_SUBDIR)/gcc; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc; \
-	cd $(HOST_SUBDIR)/gcc || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=gcc; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautofeedback_CONFIGURE_FLAGS)
-@endif gcc-bootstrap
-
 
 
 
@@ -11838,7 +10461,6 @@ all-stage1-gcc: configure-stage1-gcc
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE1_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
 		LIBCFLAGS="$(LIBCFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -11883,7 +10505,6 @@ all-stage2-gcc: configure-stage2-gcc
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE2_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE2_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -11926,7 +10547,6 @@ all-stage3-gcc: configure-stage3-gcc
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE3_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE3_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -11969,7 +10589,6 @@ all-stage4-gcc: configure-stage4-gcc
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE4_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE4_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -12012,7 +10631,6 @@ all-stageprofile-gcc: configure-stageprofile-gcc
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGEprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -12036,49 +10654,6 @@ clean-stageprofile-gcc:
 @endif gcc-bootstrap
 
 
-.PHONY: all-stagetrain-gcc maybe-all-stagetrain-gcc
-.PHONY: clean-stagetrain-gcc maybe-clean-stagetrain-gcc
-maybe-all-stagetrain-gcc:
-maybe-clean-stagetrain-gcc:
-@if gcc-bootstrap
-maybe-all-stagetrain-gcc: all-stagetrain-gcc
-all-stagetrain: all-stagetrain-gcc
-TARGET-stagetrain-gcc = $(TARGET-gcc)
-all-stagetrain-gcc: configure-stagetrain-gcc
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/gcc && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEtrain_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
-		TFLAGS="$(STAGEtrain_TFLAGS)"  \
-		$(TARGET-stagetrain-gcc)
-
-maybe-clean-stagetrain-gcc: clean-stagetrain-gcc
-clean-stagetrain: clean-stagetrain-gcc
-clean-stagetrain-gcc:
-	@if [ $(current_stage) = stagetrain ]; then \
-	  [ -f $(HOST_SUBDIR)/gcc/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stagetrain-gcc/Makefile ] || exit 0; \
-	  $(MAKE) stagetrain-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/gcc && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) clean
-@endif gcc-bootstrap
-
-
 .PHONY: all-stagefeedback-gcc maybe-all-stagefeedback-gcc
 .PHONY: clean-stagefeedback-gcc maybe-clean-stagefeedback-gcc
 maybe-all-stagefeedback-gcc:
@@ -12098,7 +10673,6 @@ all-stagefeedback-gcc: configure-stagefeedback-gcc
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGEfeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -12122,92 +10696,6 @@ clean-stagefeedback-gcc:
 @endif gcc-bootstrap
 
 
-.PHONY: all-stageautoprofile-gcc maybe-all-stageautoprofile-gcc
-.PHONY: clean-stageautoprofile-gcc maybe-clean-stageautoprofile-gcc
-maybe-all-stageautoprofile-gcc:
-maybe-clean-stageautoprofile-gcc:
-@if gcc-bootstrap
-maybe-all-stageautoprofile-gcc: all-stageautoprofile-gcc
-all-stageautoprofile: all-stageautoprofile-gcc
-TARGET-stageautoprofile-gcc = $(TARGET-gcc)
-all-stageautoprofile-gcc: configure-stageautoprofile-gcc
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/gcc && \
-	$$s/gcc/config/i386/$(AUTO_PROFILE) \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
-		TFLAGS="$(STAGEautoprofile_TFLAGS)"  \
-		$(TARGET-stageautoprofile-gcc)
-
-maybe-clean-stageautoprofile-gcc: clean-stageautoprofile-gcc
-clean-stageautoprofile: clean-stageautoprofile-gcc
-clean-stageautoprofile-gcc:
-	@if [ $(current_stage) = stageautoprofile ]; then \
-	  [ -f $(HOST_SUBDIR)/gcc/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageautoprofile-gcc/Makefile ] || exit 0; \
-	  $(MAKE) stageautoprofile-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/gcc && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) clean
-@endif gcc-bootstrap
-
-
-.PHONY: all-stageautofeedback-gcc maybe-all-stageautofeedback-gcc
-.PHONY: clean-stageautofeedback-gcc maybe-clean-stageautofeedback-gcc
-maybe-all-stageautofeedback-gcc:
-maybe-clean-stageautofeedback-gcc:
-@if gcc-bootstrap
-maybe-all-stageautofeedback-gcc: all-stageautofeedback-gcc
-all-stageautofeedback: all-stageautofeedback-gcc
-TARGET-stageautofeedback-gcc = $(TARGET-gcc)
-all-stageautofeedback-gcc: configure-stageautofeedback-gcc
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/gcc && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
-		TFLAGS="$(STAGEautofeedback_TFLAGS)" PERF_DATA=perf.data \
-		$(TARGET-stageautofeedback-gcc)
-
-maybe-clean-stageautofeedback-gcc: clean-stageautofeedback-gcc
-clean-stageautofeedback: clean-stageautofeedback-gcc
-clean-stageautofeedback-gcc:
-	@if [ $(current_stage) = stageautofeedback ]; then \
-	  [ -f $(HOST_SUBDIR)/gcc/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageautofeedback-gcc/Makefile ] || exit 0; \
-	  $(MAKE) stageautofeedback-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/gcc && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) clean
-@endif gcc-bootstrap
-
-
 
 
 
@@ -12784,40 +11272,6 @@ configure-stageprofile-gmp:
 	  --disable-shared LEX="touch lex.yy.c"
 @endif gmp-bootstrap
 
-.PHONY: configure-stagetrain-gmp maybe-configure-stagetrain-gmp
-maybe-configure-stagetrain-gmp:
-@if gmp-bootstrap
-maybe-configure-stagetrain-gmp: configure-stagetrain-gmp
-configure-stagetrain-gmp:
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEtrain_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEtrain_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEtrain_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage train in $(HOST_SUBDIR)/gmp; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp; \
-	cd $(HOST_SUBDIR)/gmp || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gmp/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=gmp; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-	  --target=none-${host_vendor}-${host_os} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEtrain_CONFIGURE_FLAGS) \
-	  --disable-shared LEX="touch lex.yy.c"
-@endif gmp-bootstrap
-
 .PHONY: configure-stagefeedback-gmp maybe-configure-stagefeedback-gmp
 maybe-configure-stagefeedback-gmp:
 @if gmp-bootstrap
@@ -12852,74 +11306,6 @@ configure-stagefeedback-gmp:
 	  --disable-shared LEX="touch lex.yy.c"
 @endif gmp-bootstrap
 
-.PHONY: configure-stageautoprofile-gmp maybe-configure-stageautoprofile-gmp
-maybe-configure-stageautoprofile-gmp:
-@if gmp-bootstrap
-maybe-configure-stageautoprofile-gmp: configure-stageautoprofile-gmp
-configure-stageautoprofile-gmp:
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautoprofile_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautoprofile_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage autoprofile in $(HOST_SUBDIR)/gmp; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp; \
-	cd $(HOST_SUBDIR)/gmp || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gmp/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=gmp; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-	  --target=none-${host_vendor}-${host_os} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautoprofile_CONFIGURE_FLAGS) \
-	  --disable-shared LEX="touch lex.yy.c"
-@endif gmp-bootstrap
-
-.PHONY: configure-stageautofeedback-gmp maybe-configure-stageautofeedback-gmp
-maybe-configure-stageautofeedback-gmp:
-@if gmp-bootstrap
-maybe-configure-stageautofeedback-gmp: configure-stageautofeedback-gmp
-configure-stageautofeedback-gmp:
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautofeedback_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautofeedback_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage autofeedback in $(HOST_SUBDIR)/gmp; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp; \
-	cd $(HOST_SUBDIR)/gmp || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gmp/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=gmp; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
-	  --target=none-${host_vendor}-${host_os} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautofeedback_CONFIGURE_FLAGS) \
-	  --disable-shared LEX="touch lex.yy.c"
-@endif gmp-bootstrap
-
 
 
 
@@ -12961,7 +11347,6 @@ all-stage1-gmp: configure-stage1-gmp
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE1_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
 		LIBCFLAGS="$(LIBCFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -13006,7 +11391,6 @@ all-stage2-gmp: configure-stage2-gmp
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE2_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE2_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -13049,7 +11433,6 @@ all-stage3-gmp: configure-stage3-gmp
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE3_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE3_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -13092,7 +11475,6 @@ all-stage4-gmp: configure-stage4-gmp
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE4_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE4_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -13135,7 +11517,6 @@ all-stageprofile-gmp: configure-stageprofile-gmp
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGEprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -13159,49 +11540,6 @@ clean-stageprofile-gmp:
 @endif gmp-bootstrap
 
 
-.PHONY: all-stagetrain-gmp maybe-all-stagetrain-gmp
-.PHONY: clean-stagetrain-gmp maybe-clean-stagetrain-gmp
-maybe-all-stagetrain-gmp:
-maybe-clean-stagetrain-gmp:
-@if gmp-bootstrap
-maybe-all-stagetrain-gmp: all-stagetrain-gmp
-all-stagetrain: all-stagetrain-gmp
-TARGET-stagetrain-gmp = $(TARGET-gmp)
-all-stagetrain-gmp: configure-stagetrain-gmp
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/gmp && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEtrain_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
-		TFLAGS="$(STAGEtrain_TFLAGS)"  \
-		$(TARGET-stagetrain-gmp)
-
-maybe-clean-stagetrain-gmp: clean-stagetrain-gmp
-clean-stagetrain: clean-stagetrain-gmp
-clean-stagetrain-gmp:
-	@if [ $(current_stage) = stagetrain ]; then \
-	  [ -f $(HOST_SUBDIR)/gmp/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stagetrain-gmp/Makefile ] || exit 0; \
-	  $(MAKE) stagetrain-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/gmp && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
-@endif gmp-bootstrap
-
-
 .PHONY: all-stagefeedback-gmp maybe-all-stagefeedback-gmp
 .PHONY: clean-stagefeedback-gmp maybe-clean-stagefeedback-gmp
 maybe-all-stagefeedback-gmp:
@@ -13221,7 +11559,6 @@ all-stagefeedback-gmp: configure-stagefeedback-gmp
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGEfeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -13245,92 +11582,6 @@ clean-stagefeedback-gmp:
 @endif gmp-bootstrap
 
 
-.PHONY: all-stageautoprofile-gmp maybe-all-stageautoprofile-gmp
-.PHONY: clean-stageautoprofile-gmp maybe-clean-stageautoprofile-gmp
-maybe-all-stageautoprofile-gmp:
-maybe-clean-stageautoprofile-gmp:
-@if gmp-bootstrap
-maybe-all-stageautoprofile-gmp: all-stageautoprofile-gmp
-all-stageautoprofile: all-stageautoprofile-gmp
-TARGET-stageautoprofile-gmp = $(TARGET-gmp)
-all-stageautoprofile-gmp: configure-stageautoprofile-gmp
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/gmp && \
-	$$s/gcc/config/i386/$(AUTO_PROFILE) \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
-		TFLAGS="$(STAGEautoprofile_TFLAGS)"  \
-		$(TARGET-stageautoprofile-gmp)
-
-maybe-clean-stageautoprofile-gmp: clean-stageautoprofile-gmp
-clean-stageautoprofile: clean-stageautoprofile-gmp
-clean-stageautoprofile-gmp:
-	@if [ $(current_stage) = stageautoprofile ]; then \
-	  [ -f $(HOST_SUBDIR)/gmp/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageautoprofile-gmp/Makefile ] || exit 0; \
-	  $(MAKE) stageautoprofile-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/gmp && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
-@endif gmp-bootstrap
-
-
-.PHONY: all-stageautofeedback-gmp maybe-all-stageautofeedback-gmp
-.PHONY: clean-stageautofeedback-gmp maybe-clean-stageautofeedback-gmp
-maybe-all-stageautofeedback-gmp:
-maybe-clean-stageautofeedback-gmp:
-@if gmp-bootstrap
-maybe-all-stageautofeedback-gmp: all-stageautofeedback-gmp
-all-stageautofeedback: all-stageautofeedback-gmp
-TARGET-stageautofeedback-gmp = $(TARGET-gmp)
-all-stageautofeedback-gmp: configure-stageautofeedback-gmp
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/gmp && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
-		TFLAGS="$(STAGEautofeedback_TFLAGS)" PERF_DATA=perf.data \
-		$(TARGET-stageautofeedback-gmp)
-
-maybe-clean-stageautofeedback-gmp: clean-stageautofeedback-gmp
-clean-stageautofeedback: clean-stageautofeedback-gmp
-clean-stageautofeedback-gmp:
-	@if [ $(current_stage) = stageautofeedback ]; then \
-	  [ -f $(HOST_SUBDIR)/gmp/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageautofeedback-gmp/Makefile ] || exit 0; \
-	  $(MAKE) stageautofeedback-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/gmp && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
-@endif gmp-bootstrap
-
-
 
 
 
@@ -13895,40 +12146,6 @@ configure-stageprofile-mpfr:
 	  --disable-shared @extra_mpfr_configure_flags@
 @endif mpfr-bootstrap
 
-.PHONY: configure-stagetrain-mpfr maybe-configure-stagetrain-mpfr
-maybe-configure-stagetrain-mpfr:
-@if mpfr-bootstrap
-maybe-configure-stagetrain-mpfr: configure-stagetrain-mpfr
-configure-stagetrain-mpfr:
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEtrain_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEtrain_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEtrain_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage train in $(HOST_SUBDIR)/mpfr; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr; \
-	cd $(HOST_SUBDIR)/mpfr || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/mpfr/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=mpfr; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEtrain_CONFIGURE_FLAGS) \
-	  --disable-shared @extra_mpfr_configure_flags@
-@endif mpfr-bootstrap
-
 .PHONY: configure-stagefeedback-mpfr maybe-configure-stagefeedback-mpfr
 maybe-configure-stagefeedback-mpfr:
 @if mpfr-bootstrap
@@ -13963,74 +12180,6 @@ configure-stagefeedback-mpfr:
 	  --disable-shared @extra_mpfr_configure_flags@
 @endif mpfr-bootstrap
 
-.PHONY: configure-stageautoprofile-mpfr maybe-configure-stageautoprofile-mpfr
-maybe-configure-stageautoprofile-mpfr:
-@if mpfr-bootstrap
-maybe-configure-stageautoprofile-mpfr: configure-stageautoprofile-mpfr
-configure-stageautoprofile-mpfr:
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautoprofile_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautoprofile_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage autoprofile in $(HOST_SUBDIR)/mpfr; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr; \
-	cd $(HOST_SUBDIR)/mpfr || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/mpfr/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=mpfr; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautoprofile_CONFIGURE_FLAGS) \
-	  --disable-shared @extra_mpfr_configure_flags@
-@endif mpfr-bootstrap
-
-.PHONY: configure-stageautofeedback-mpfr maybe-configure-stageautofeedback-mpfr
-maybe-configure-stageautofeedback-mpfr:
-@if mpfr-bootstrap
-maybe-configure-stageautofeedback-mpfr: configure-stageautofeedback-mpfr
-configure-stageautofeedback-mpfr:
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautofeedback_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautofeedback_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage autofeedback in $(HOST_SUBDIR)/mpfr; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr; \
-	cd $(HOST_SUBDIR)/mpfr || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/mpfr/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=mpfr; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautofeedback_CONFIGURE_FLAGS) \
-	  --disable-shared @extra_mpfr_configure_flags@
-@endif mpfr-bootstrap
-
 
 
 
@@ -14072,7 +12221,6 @@ all-stage1-mpfr: configure-stage1-mpfr
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE1_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
 		LIBCFLAGS="$(LIBCFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -14117,7 +12265,6 @@ all-stage2-mpfr: configure-stage2-mpfr
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE2_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE2_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -14160,7 +12307,6 @@ all-stage3-mpfr: configure-stage3-mpfr
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE3_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE3_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -14203,7 +12349,6 @@ all-stage4-mpfr: configure-stage4-mpfr
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE4_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE4_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -14246,7 +12391,6 @@ all-stageprofile-mpfr: configure-stageprofile-mpfr
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGEprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -14270,49 +12414,6 @@ clean-stageprofile-mpfr:
 @endif mpfr-bootstrap
 
 
-.PHONY: all-stagetrain-mpfr maybe-all-stagetrain-mpfr
-.PHONY: clean-stagetrain-mpfr maybe-clean-stagetrain-mpfr
-maybe-all-stagetrain-mpfr:
-maybe-clean-stagetrain-mpfr:
-@if mpfr-bootstrap
-maybe-all-stagetrain-mpfr: all-stagetrain-mpfr
-all-stagetrain: all-stagetrain-mpfr
-TARGET-stagetrain-mpfr = $(TARGET-mpfr)
-all-stagetrain-mpfr: configure-stagetrain-mpfr
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/mpfr && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEtrain_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
-		TFLAGS="$(STAGEtrain_TFLAGS)"  \
-		$(TARGET-stagetrain-mpfr)
-
-maybe-clean-stagetrain-mpfr: clean-stagetrain-mpfr
-clean-stagetrain: clean-stagetrain-mpfr
-clean-stagetrain-mpfr:
-	@if [ $(current_stage) = stagetrain ]; then \
-	  [ -f $(HOST_SUBDIR)/mpfr/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stagetrain-mpfr/Makefile ] || exit 0; \
-	  $(MAKE) stagetrain-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/mpfr && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
-@endif mpfr-bootstrap
-
-
 .PHONY: all-stagefeedback-mpfr maybe-all-stagefeedback-mpfr
 .PHONY: clean-stagefeedback-mpfr maybe-clean-stagefeedback-mpfr
 maybe-all-stagefeedback-mpfr:
@@ -14332,7 +12433,6 @@ all-stagefeedback-mpfr: configure-stagefeedback-mpfr
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGEfeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -14356,92 +12456,6 @@ clean-stagefeedback-mpfr:
 @endif mpfr-bootstrap
 
 
-.PHONY: all-stageautoprofile-mpfr maybe-all-stageautoprofile-mpfr
-.PHONY: clean-stageautoprofile-mpfr maybe-clean-stageautoprofile-mpfr
-maybe-all-stageautoprofile-mpfr:
-maybe-clean-stageautoprofile-mpfr:
-@if mpfr-bootstrap
-maybe-all-stageautoprofile-mpfr: all-stageautoprofile-mpfr
-all-stageautoprofile: all-stageautoprofile-mpfr
-TARGET-stageautoprofile-mpfr = $(TARGET-mpfr)
-all-stageautoprofile-mpfr: configure-stageautoprofile-mpfr
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/mpfr && \
-	$$s/gcc/config/i386/$(AUTO_PROFILE) \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
-		TFLAGS="$(STAGEautoprofile_TFLAGS)"  \
-		$(TARGET-stageautoprofile-mpfr)
-
-maybe-clean-stageautoprofile-mpfr: clean-stageautoprofile-mpfr
-clean-stageautoprofile: clean-stageautoprofile-mpfr
-clean-stageautoprofile-mpfr:
-	@if [ $(current_stage) = stageautoprofile ]; then \
-	  [ -f $(HOST_SUBDIR)/mpfr/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageautoprofile-mpfr/Makefile ] || exit 0; \
-	  $(MAKE) stageautoprofile-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/mpfr && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
-@endif mpfr-bootstrap
-
-
-.PHONY: all-stageautofeedback-mpfr maybe-all-stageautofeedback-mpfr
-.PHONY: clean-stageautofeedback-mpfr maybe-clean-stageautofeedback-mpfr
-maybe-all-stageautofeedback-mpfr:
-maybe-clean-stageautofeedback-mpfr:
-@if mpfr-bootstrap
-maybe-all-stageautofeedback-mpfr: all-stageautofeedback-mpfr
-all-stageautofeedback: all-stageautofeedback-mpfr
-TARGET-stageautofeedback-mpfr = $(TARGET-mpfr)
-all-stageautofeedback-mpfr: configure-stageautofeedback-mpfr
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/mpfr && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
-		TFLAGS="$(STAGEautofeedback_TFLAGS)" PERF_DATA=perf.data \
-		$(TARGET-stageautofeedback-mpfr)
-
-maybe-clean-stageautofeedback-mpfr: clean-stageautofeedback-mpfr
-clean-stageautofeedback: clean-stageautofeedback-mpfr
-clean-stageautofeedback-mpfr:
-	@if [ $(current_stage) = stageautofeedback ]; then \
-	  [ -f $(HOST_SUBDIR)/mpfr/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageautofeedback-mpfr/Makefile ] || exit 0; \
-	  $(MAKE) stageautofeedback-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/mpfr && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
-@endif mpfr-bootstrap
-
-
 
 
 
@@ -14831,7 +12845,7 @@ configure-mpc:
 	  $$s/$$module_srcdir/configure \
 	  --srcdir=$${topdir}/$$module_srcdir \
 	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@ --disable-maintainer-mode \
+	  --target=${target_alias} --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@ \
 	  || exit 1
 @endif mpc
 
@@ -14867,7 +12881,7 @@ configure-stage1-mpc:
 	  --target=${target_alias} \
 	   \
 	  $(STAGE1_CONFIGURE_FLAGS) \
-	  --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@ --disable-maintainer-mode
+	  --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
 @endif mpc-bootstrap
 
 .PHONY: configure-stage2-mpc maybe-configure-stage2-mpc
@@ -14901,7 +12915,7 @@ configure-stage2-mpc:
 	  --target=${target_alias} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
 	  $(STAGE2_CONFIGURE_FLAGS) \
-	  --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@ --disable-maintainer-mode
+	  --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
 @endif mpc-bootstrap
 
 .PHONY: configure-stage3-mpc maybe-configure-stage3-mpc
@@ -14935,7 +12949,7 @@ configure-stage3-mpc:
 	  --target=${target_alias} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
 	  $(STAGE3_CONFIGURE_FLAGS) \
-	  --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@ --disable-maintainer-mode
+	  --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
 @endif mpc-bootstrap
 
 .PHONY: configure-stage4-mpc maybe-configure-stage4-mpc
@@ -14969,7 +12983,7 @@ configure-stage4-mpc:
 	  --target=${target_alias} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
 	  $(STAGE4_CONFIGURE_FLAGS) \
-	  --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@ --disable-maintainer-mode
+	  --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
 @endif mpc-bootstrap
 
 .PHONY: configure-stageprofile-mpc maybe-configure-stageprofile-mpc
@@ -15003,41 +13017,7 @@ configure-stageprofile-mpc:
 	  --target=${target_alias} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
 	  $(STAGEprofile_CONFIGURE_FLAGS) \
-	  --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@ --disable-maintainer-mode
-@endif mpc-bootstrap
-
-.PHONY: configure-stagetrain-mpc maybe-configure-stagetrain-mpc
-maybe-configure-stagetrain-mpc:
-@if mpc-bootstrap
-maybe-configure-stagetrain-mpc: configure-stagetrain-mpc
-configure-stagetrain-mpc:
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/mpc/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEtrain_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEtrain_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEtrain_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage train in $(HOST_SUBDIR)/mpc; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc; \
-	cd $(HOST_SUBDIR)/mpc || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=mpc; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEtrain_CONFIGURE_FLAGS) \
-	  --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@ --disable-maintainer-mode
+	  --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
 @endif mpc-bootstrap
 
 .PHONY: configure-stagefeedback-mpc maybe-configure-stagefeedback-mpc
@@ -15071,75 +13051,7 @@ configure-stagefeedback-mpc:
 	  --target=${target_alias} \
 	  --with-build-libsubdir=$(HOST_SUBDIR) \
 	  $(STAGEfeedback_CONFIGURE_FLAGS) \
-	  --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@ --disable-maintainer-mode
-@endif mpc-bootstrap
-
-.PHONY: configure-stageautoprofile-mpc maybe-configure-stageautoprofile-mpc
-maybe-configure-stageautoprofile-mpc:
-@if mpc-bootstrap
-maybe-configure-stageautoprofile-mpc: configure-stageautoprofile-mpc
-configure-stageautoprofile-mpc:
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/mpc/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautoprofile_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautoprofile_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage autoprofile in $(HOST_SUBDIR)/mpc; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc; \
-	cd $(HOST_SUBDIR)/mpc || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=mpc; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautoprofile_CONFIGURE_FLAGS) \
-	  --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@ --disable-maintainer-mode
-@endif mpc-bootstrap
-
-.PHONY: configure-stageautofeedback-mpc maybe-configure-stageautofeedback-mpc
-maybe-configure-stageautofeedback-mpc:
-@if mpc-bootstrap
-maybe-configure-stageautofeedback-mpc: configure-stageautofeedback-mpc
-configure-stageautofeedback-mpc:
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/mpc/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautofeedback_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautofeedback_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage autofeedback in $(HOST_SUBDIR)/mpc; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc; \
-	cd $(HOST_SUBDIR)/mpc || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=mpc; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautofeedback_CONFIGURE_FLAGS) \
-	  --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@ --disable-maintainer-mode
+	  --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
 @endif mpc-bootstrap
 
 
@@ -15183,7 +13095,6 @@ all-stage1-mpc: configure-stage1-mpc
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE1_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
 		LIBCFLAGS="$(LIBCFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -15228,7 +13139,6 @@ all-stage2-mpc: configure-stage2-mpc
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE2_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE2_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -15271,7 +13181,6 @@ all-stage3-mpc: configure-stage3-mpc
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE3_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE3_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -15314,7 +13223,6 @@ all-stage4-mpc: configure-stage4-mpc
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE4_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE4_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -15357,7 +13265,6 @@ all-stageprofile-mpc: configure-stageprofile-mpc
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGEprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -15381,49 +13288,6 @@ clean-stageprofile-mpc:
 @endif mpc-bootstrap
 
 
-.PHONY: all-stagetrain-mpc maybe-all-stagetrain-mpc
-.PHONY: clean-stagetrain-mpc maybe-clean-stagetrain-mpc
-maybe-all-stagetrain-mpc:
-maybe-clean-stagetrain-mpc:
-@if mpc-bootstrap
-maybe-all-stagetrain-mpc: all-stagetrain-mpc
-all-stagetrain: all-stagetrain-mpc
-TARGET-stagetrain-mpc = $(TARGET-mpc)
-all-stagetrain-mpc: configure-stagetrain-mpc
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/mpc && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEtrain_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEtrain_TFLAGS)"  \
-		$(TARGET-stagetrain-mpc)
-
-maybe-clean-stagetrain-mpc: clean-stagetrain-mpc
-clean-stagetrain: clean-stagetrain-mpc
-clean-stagetrain-mpc:
-	@if [ $(current_stage) = stagetrain ]; then \
-	  [ -f $(HOST_SUBDIR)/mpc/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stagetrain-mpc/Makefile ] || exit 0; \
-	  $(MAKE) stagetrain-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/mpc && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif mpc-bootstrap
-
-
 .PHONY: all-stagefeedback-mpc maybe-all-stagefeedback-mpc
 .PHONY: clean-stagefeedback-mpc maybe-clean-stagefeedback-mpc
 maybe-all-stagefeedback-mpc:
@@ -15443,7 +13307,6 @@ all-stagefeedback-mpc: configure-stagefeedback-mpc
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGEfeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -15467,92 +13330,6 @@ clean-stagefeedback-mpc:
 @endif mpc-bootstrap
 
 
-.PHONY: all-stageautoprofile-mpc maybe-all-stageautoprofile-mpc
-.PHONY: clean-stageautoprofile-mpc maybe-clean-stageautoprofile-mpc
-maybe-all-stageautoprofile-mpc:
-maybe-clean-stageautoprofile-mpc:
-@if mpc-bootstrap
-maybe-all-stageautoprofile-mpc: all-stageautoprofile-mpc
-all-stageautoprofile: all-stageautoprofile-mpc
-TARGET-stageautoprofile-mpc = $(TARGET-mpc)
-all-stageautoprofile-mpc: configure-stageautoprofile-mpc
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/mpc && \
-	$$s/gcc/config/i386/$(AUTO_PROFILE) \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEautoprofile_TFLAGS)"  \
-		$(TARGET-stageautoprofile-mpc)
-
-maybe-clean-stageautoprofile-mpc: clean-stageautoprofile-mpc
-clean-stageautoprofile: clean-stageautoprofile-mpc
-clean-stageautoprofile-mpc:
-	@if [ $(current_stage) = stageautoprofile ]; then \
-	  [ -f $(HOST_SUBDIR)/mpc/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageautoprofile-mpc/Makefile ] || exit 0; \
-	  $(MAKE) stageautoprofile-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/mpc && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif mpc-bootstrap
-
-
-.PHONY: all-stageautofeedback-mpc maybe-all-stageautofeedback-mpc
-.PHONY: clean-stageautofeedback-mpc maybe-clean-stageautofeedback-mpc
-maybe-all-stageautofeedback-mpc:
-maybe-clean-stageautofeedback-mpc:
-@if mpc-bootstrap
-maybe-all-stageautofeedback-mpc: all-stageautofeedback-mpc
-all-stageautofeedback: all-stageautofeedback-mpc
-TARGET-stageautofeedback-mpc = $(TARGET-mpc)
-all-stageautofeedback-mpc: configure-stageautofeedback-mpc
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/mpc && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEautofeedback_TFLAGS)" PERF_DATA=perf.data \
-		$(TARGET-stageautofeedback-mpc)
-
-maybe-clean-stageautofeedback-mpc: clean-stageautofeedback-mpc
-clean-stageautofeedback: clean-stageautofeedback-mpc
-clean-stageautofeedback-mpc:
-	@if [ $(current_stage) = stageautofeedback ]; then \
-	  [ -f $(HOST_SUBDIR)/mpc/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageautofeedback-mpc/Makefile ] || exit 0; \
-	  $(MAKE) stageautofeedback-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/mpc && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif mpc-bootstrap
-
-
 
 
 
@@ -16117,40 +13894,6 @@ configure-stageprofile-isl:
 	  --disable-shared @extra_isl_gmp_configure_flags@
 @endif isl-bootstrap
 
-.PHONY: configure-stagetrain-isl maybe-configure-stagetrain-isl
-maybe-configure-stagetrain-isl:
-@if isl-bootstrap
-maybe-configure-stagetrain-isl: configure-stagetrain-isl
-configure-stagetrain-isl:
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/isl
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/isl/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEtrain_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEtrain_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEtrain_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage train in $(HOST_SUBDIR)/isl; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/isl; \
-	cd $(HOST_SUBDIR)/isl || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/isl/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=isl; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEtrain_CONFIGURE_FLAGS) \
-	  --disable-shared @extra_isl_gmp_configure_flags@
-@endif isl-bootstrap
-
 .PHONY: configure-stagefeedback-isl maybe-configure-stagefeedback-isl
 maybe-configure-stagefeedback-isl:
 @if isl-bootstrap
@@ -16185,74 +13928,6 @@ configure-stagefeedback-isl:
 	  --disable-shared @extra_isl_gmp_configure_flags@
 @endif isl-bootstrap
 
-.PHONY: configure-stageautoprofile-isl maybe-configure-stageautoprofile-isl
-maybe-configure-stageautoprofile-isl:
-@if isl-bootstrap
-maybe-configure-stageautoprofile-isl: configure-stageautoprofile-isl
-configure-stageautoprofile-isl:
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/isl
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/isl/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautoprofile_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautoprofile_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage autoprofile in $(HOST_SUBDIR)/isl; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/isl; \
-	cd $(HOST_SUBDIR)/isl || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/isl/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=isl; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautoprofile_CONFIGURE_FLAGS) \
-	  --disable-shared @extra_isl_gmp_configure_flags@
-@endif isl-bootstrap
-
-.PHONY: configure-stageautofeedback-isl maybe-configure-stageautofeedback-isl
-maybe-configure-stageautofeedback-isl:
-@if isl-bootstrap
-maybe-configure-stageautofeedback-isl: configure-stageautofeedback-isl
-configure-stageautofeedback-isl:
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/isl
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/isl/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautofeedback_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautofeedback_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage autofeedback in $(HOST_SUBDIR)/isl; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/isl; \
-	cd $(HOST_SUBDIR)/isl || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/isl/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=isl; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautofeedback_CONFIGURE_FLAGS) \
-	  --disable-shared @extra_isl_gmp_configure_flags@
-@endif isl-bootstrap
-
 
 
 
@@ -16294,7 +13969,6 @@ all-stage1-isl: configure-stage1-isl
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE1_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
 		LIBCFLAGS="$(LIBCFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -16339,7 +14013,6 @@ all-stage2-isl: configure-stage2-isl
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE2_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE2_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -16382,7 +14055,6 @@ all-stage3-isl: configure-stage3-isl
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE3_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE3_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -16425,7 +14097,6 @@ all-stage4-isl: configure-stage4-isl
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE4_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE4_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -16468,7 +14139,6 @@ all-stageprofile-isl: configure-stageprofile-isl
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGEprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -16492,49 +14162,6 @@ clean-stageprofile-isl:
 @endif isl-bootstrap
 
 
-.PHONY: all-stagetrain-isl maybe-all-stagetrain-isl
-.PHONY: clean-stagetrain-isl maybe-clean-stagetrain-isl
-maybe-all-stagetrain-isl:
-maybe-clean-stagetrain-isl:
-@if isl-bootstrap
-maybe-all-stagetrain-isl: all-stagetrain-isl
-all-stagetrain: all-stagetrain-isl
-TARGET-stagetrain-isl = $(TARGET-isl)
-all-stagetrain-isl: configure-stagetrain-isl
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/isl && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEtrain_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) V=1 \
-		TFLAGS="$(STAGEtrain_TFLAGS)"  \
-		$(TARGET-stagetrain-isl)
-
-maybe-clean-stagetrain-isl: clean-stagetrain-isl
-clean-stagetrain: clean-stagetrain-isl
-clean-stagetrain-isl:
-	@if [ $(current_stage) = stagetrain ]; then \
-	  [ -f $(HOST_SUBDIR)/isl/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stagetrain-isl/Makefile ] || exit 0; \
-	  $(MAKE) stagetrain-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/isl && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) V=1 clean
-@endif isl-bootstrap
-
-
 .PHONY: all-stagefeedback-isl maybe-all-stagefeedback-isl
 .PHONY: clean-stagefeedback-isl maybe-clean-stagefeedback-isl
 maybe-all-stagefeedback-isl:
@@ -16554,7 +14181,6 @@ all-stagefeedback-isl: configure-stagefeedback-isl
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGEfeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -16578,92 +14204,6 @@ clean-stagefeedback-isl:
 @endif isl-bootstrap
 
 
-.PHONY: all-stageautoprofile-isl maybe-all-stageautoprofile-isl
-.PHONY: clean-stageautoprofile-isl maybe-clean-stageautoprofile-isl
-maybe-all-stageautoprofile-isl:
-maybe-clean-stageautoprofile-isl:
-@if isl-bootstrap
-maybe-all-stageautoprofile-isl: all-stageautoprofile-isl
-all-stageautoprofile: all-stageautoprofile-isl
-TARGET-stageautoprofile-isl = $(TARGET-isl)
-all-stageautoprofile-isl: configure-stageautoprofile-isl
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/isl && \
-	$$s/gcc/config/i386/$(AUTO_PROFILE) \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) V=1 \
-		TFLAGS="$(STAGEautoprofile_TFLAGS)"  \
-		$(TARGET-stageautoprofile-isl)
-
-maybe-clean-stageautoprofile-isl: clean-stageautoprofile-isl
-clean-stageautoprofile: clean-stageautoprofile-isl
-clean-stageautoprofile-isl:
-	@if [ $(current_stage) = stageautoprofile ]; then \
-	  [ -f $(HOST_SUBDIR)/isl/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageautoprofile-isl/Makefile ] || exit 0; \
-	  $(MAKE) stageautoprofile-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/isl && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) V=1 clean
-@endif isl-bootstrap
-
-
-.PHONY: all-stageautofeedback-isl maybe-all-stageautofeedback-isl
-.PHONY: clean-stageautofeedback-isl maybe-clean-stageautofeedback-isl
-maybe-all-stageautofeedback-isl:
-maybe-clean-stageautofeedback-isl:
-@if isl-bootstrap
-maybe-all-stageautofeedback-isl: all-stageautofeedback-isl
-all-stageautofeedback: all-stageautofeedback-isl
-TARGET-stageautofeedback-isl = $(TARGET-isl)
-all-stageautofeedback-isl: configure-stageautofeedback-isl
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/isl && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) V=1 \
-		TFLAGS="$(STAGEautofeedback_TFLAGS)" PERF_DATA=perf.data \
-		$(TARGET-stageautofeedback-isl)
-
-maybe-clean-stageautofeedback-isl: clean-stageautofeedback-isl
-clean-stageautofeedback: clean-stageautofeedback-isl
-clean-stageautofeedback-isl:
-	@if [ $(current_stage) = stageautofeedback ]; then \
-	  [ -f $(HOST_SUBDIR)/isl/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageautofeedback-isl/Makefile ] || exit 0; \
-	  $(MAKE) stageautofeedback-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/isl && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) V=1 clean
-@endif isl-bootstrap
-
-
 
 
 
@@ -17228,40 +14768,6 @@ configure-stageprofile-libelf:
 	  --disable-shared
 @endif libelf-bootstrap
 
-.PHONY: configure-stagetrain-libelf maybe-configure-stagetrain-libelf
-maybe-configure-stagetrain-libelf:
-@if libelf-bootstrap
-maybe-configure-stagetrain-libelf: configure-stagetrain-libelf
-configure-stagetrain-libelf:
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEtrain_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEtrain_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEtrain_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage train in $(HOST_SUBDIR)/libelf; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf; \
-	cd $(HOST_SUBDIR)/libelf || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libelf; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEtrain_CONFIGURE_FLAGS) \
-	  --disable-shared
-@endif libelf-bootstrap
-
 .PHONY: configure-stagefeedback-libelf maybe-configure-stagefeedback-libelf
 maybe-configure-stagefeedback-libelf:
 @if libelf-bootstrap
@@ -17296,74 +14802,6 @@ configure-stagefeedback-libelf:
 	  --disable-shared
 @endif libelf-bootstrap
 
-.PHONY: configure-stageautoprofile-libelf maybe-configure-stageautoprofile-libelf
-maybe-configure-stageautoprofile-libelf:
-@if libelf-bootstrap
-maybe-configure-stageautoprofile-libelf: configure-stageautoprofile-libelf
-configure-stageautoprofile-libelf:
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautoprofile_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautoprofile_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage autoprofile in $(HOST_SUBDIR)/libelf; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf; \
-	cd $(HOST_SUBDIR)/libelf || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libelf; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautoprofile_CONFIGURE_FLAGS) \
-	  --disable-shared
-@endif libelf-bootstrap
-
-.PHONY: configure-stageautofeedback-libelf maybe-configure-stageautofeedback-libelf
-maybe-configure-stageautofeedback-libelf:
-@if libelf-bootstrap
-maybe-configure-stageautofeedback-libelf: configure-stageautofeedback-libelf
-configure-stageautofeedback-libelf:
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautofeedback_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautofeedback_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage autofeedback in $(HOST_SUBDIR)/libelf; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf; \
-	cd $(HOST_SUBDIR)/libelf || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libelf; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautofeedback_CONFIGURE_FLAGS) \
-	  --disable-shared
-@endif libelf-bootstrap
-
 
 
 
@@ -17405,7 +14843,6 @@ all-stage1-libelf: configure-stage1-libelf
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE1_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
 		LIBCFLAGS="$(LIBCFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -17450,7 +14887,6 @@ all-stage2-libelf: configure-stage2-libelf
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE2_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE2_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -17493,7 +14929,6 @@ all-stage3-libelf: configure-stage3-libelf
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE3_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE3_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -17536,7 +14971,6 @@ all-stage4-libelf: configure-stage4-libelf
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE4_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE4_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -17579,7 +15013,6 @@ all-stageprofile-libelf: configure-stageprofile-libelf
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGEprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -17603,49 +15036,6 @@ clean-stageprofile-libelf:
 @endif libelf-bootstrap
 
 
-.PHONY: all-stagetrain-libelf maybe-all-stagetrain-libelf
-.PHONY: clean-stagetrain-libelf maybe-clean-stagetrain-libelf
-maybe-all-stagetrain-libelf:
-maybe-clean-stagetrain-libelf:
-@if libelf-bootstrap
-maybe-all-stagetrain-libelf: all-stagetrain-libelf
-all-stagetrain: all-stagetrain-libelf
-TARGET-stagetrain-libelf = $(TARGET-libelf)
-all-stagetrain-libelf: configure-stagetrain-libelf
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/libelf && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEtrain_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEtrain_TFLAGS)"  \
-		$(TARGET-stagetrain-libelf)
-
-maybe-clean-stagetrain-libelf: clean-stagetrain-libelf
-clean-stagetrain: clean-stagetrain-libelf
-clean-stagetrain-libelf:
-	@if [ $(current_stage) = stagetrain ]; then \
-	  [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stagetrain-libelf/Makefile ] || exit 0; \
-	  $(MAKE) stagetrain-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/libelf && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif libelf-bootstrap
-
-
 .PHONY: all-stagefeedback-libelf maybe-all-stagefeedback-libelf
 .PHONY: clean-stagefeedback-libelf maybe-clean-stagefeedback-libelf
 maybe-all-stagefeedback-libelf:
@@ -17665,7 +15055,6 @@ all-stagefeedback-libelf: configure-stagefeedback-libelf
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGEfeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -17689,92 +15078,6 @@ clean-stagefeedback-libelf:
 @endif libelf-bootstrap
 
 
-.PHONY: all-stageautoprofile-libelf maybe-all-stageautoprofile-libelf
-.PHONY: clean-stageautoprofile-libelf maybe-clean-stageautoprofile-libelf
-maybe-all-stageautoprofile-libelf:
-maybe-clean-stageautoprofile-libelf:
-@if libelf-bootstrap
-maybe-all-stageautoprofile-libelf: all-stageautoprofile-libelf
-all-stageautoprofile: all-stageautoprofile-libelf
-TARGET-stageautoprofile-libelf = $(TARGET-libelf)
-all-stageautoprofile-libelf: configure-stageautoprofile-libelf
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/libelf && \
-	$$s/gcc/config/i386/$(AUTO_PROFILE) \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEautoprofile_TFLAGS)"  \
-		$(TARGET-stageautoprofile-libelf)
-
-maybe-clean-stageautoprofile-libelf: clean-stageautoprofile-libelf
-clean-stageautoprofile: clean-stageautoprofile-libelf
-clean-stageautoprofile-libelf:
-	@if [ $(current_stage) = stageautoprofile ]; then \
-	  [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageautoprofile-libelf/Makefile ] || exit 0; \
-	  $(MAKE) stageautoprofile-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/libelf && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif libelf-bootstrap
-
-
-.PHONY: all-stageautofeedback-libelf maybe-all-stageautofeedback-libelf
-.PHONY: clean-stageautofeedback-libelf maybe-clean-stageautofeedback-libelf
-maybe-all-stageautofeedback-libelf:
-maybe-clean-stageautofeedback-libelf:
-@if libelf-bootstrap
-maybe-all-stageautofeedback-libelf: all-stageautofeedback-libelf
-all-stageautofeedback: all-stageautofeedback-libelf
-TARGET-stageautofeedback-libelf = $(TARGET-libelf)
-all-stageautofeedback-libelf: configure-stageautofeedback-libelf
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/libelf && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEautofeedback_TFLAGS)" PERF_DATA=perf.data \
-		$(TARGET-stageautofeedback-libelf)
-
-maybe-clean-stageautofeedback-libelf: clean-stageautofeedback-libelf
-clean-stageautofeedback: clean-stageautofeedback-libelf
-clean-stageautofeedback-libelf:
-	@if [ $(current_stage) = stageautofeedback ]; then \
-	  [ -f $(HOST_SUBDIR)/libelf/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageautofeedback-libelf/Makefile ] || exit 0; \
-	  $(MAKE) stageautofeedback-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/libelf && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif libelf-bootstrap
-
-
 
 
 
@@ -18334,39 +15637,6 @@ configure-stageprofile-gold:
 	  $(STAGEprofile_CONFIGURE_FLAGS)
 @endif gold-bootstrap
 
-.PHONY: configure-stagetrain-gold maybe-configure-stagetrain-gold
-maybe-configure-stagetrain-gold:
-@if gold-bootstrap
-maybe-configure-stagetrain-gold: configure-stagetrain-gold
-configure-stagetrain-gold:
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEtrain_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEtrain_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEtrain_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage train in $(HOST_SUBDIR)/gold; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold; \
-	cd $(HOST_SUBDIR)/gold || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=gold; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEtrain_CONFIGURE_FLAGS)
-@endif gold-bootstrap
-
 .PHONY: configure-stagefeedback-gold maybe-configure-stagefeedback-gold
 maybe-configure-stagefeedback-gold:
 @if gold-bootstrap
@@ -18400,72 +15670,6 @@ configure-stagefeedback-gold:
 	  $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif gold-bootstrap
 
-.PHONY: configure-stageautoprofile-gold maybe-configure-stageautoprofile-gold
-maybe-configure-stageautoprofile-gold:
-@if gold-bootstrap
-maybe-configure-stageautoprofile-gold: configure-stageautoprofile-gold
-configure-stageautoprofile-gold:
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautoprofile_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautoprofile_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage autoprofile in $(HOST_SUBDIR)/gold; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold; \
-	cd $(HOST_SUBDIR)/gold || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=gold; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautoprofile_CONFIGURE_FLAGS)
-@endif gold-bootstrap
-
-.PHONY: configure-stageautofeedback-gold maybe-configure-stageautofeedback-gold
-maybe-configure-stageautofeedback-gold:
-@if gold-bootstrap
-maybe-configure-stageautofeedback-gold: configure-stageautofeedback-gold
-configure-stageautofeedback-gold:
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautofeedback_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautofeedback_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage autofeedback in $(HOST_SUBDIR)/gold; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold; \
-	cd $(HOST_SUBDIR)/gold || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/gold/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=gold; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautofeedback_CONFIGURE_FLAGS)
-@endif gold-bootstrap
-
 
 
 
@@ -18507,7 +15711,6 @@ all-stage1-gold: configure-stage1-gold
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE1_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
 		LIBCFLAGS="$(LIBCFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -18552,7 +15755,6 @@ all-stage2-gold: configure-stage2-gold
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE2_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE2_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -18595,7 +15797,6 @@ all-stage3-gold: configure-stage3-gold
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE3_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE3_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -18638,7 +15839,6 @@ all-stage4-gold: configure-stage4-gold
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE4_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE4_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -18681,7 +15881,6 @@ all-stageprofile-gold: configure-stageprofile-gold
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGEprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -18705,49 +15904,6 @@ clean-stageprofile-gold:
 @endif gold-bootstrap
 
 
-.PHONY: all-stagetrain-gold maybe-all-stagetrain-gold
-.PHONY: clean-stagetrain-gold maybe-clean-stagetrain-gold
-maybe-all-stagetrain-gold:
-maybe-clean-stagetrain-gold:
-@if gold-bootstrap
-maybe-all-stagetrain-gold: all-stagetrain-gold
-all-stagetrain: all-stagetrain-gold
-TARGET-stagetrain-gold = $(TARGET-gold)
-all-stagetrain-gold: configure-stagetrain-gold
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/gold && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEtrain_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEtrain_TFLAGS)"  \
-		$(TARGET-stagetrain-gold)
-
-maybe-clean-stagetrain-gold: clean-stagetrain-gold
-clean-stagetrain: clean-stagetrain-gold
-clean-stagetrain-gold:
-	@if [ $(current_stage) = stagetrain ]; then \
-	  [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stagetrain-gold/Makefile ] || exit 0; \
-	  $(MAKE) stagetrain-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/gold && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif gold-bootstrap
-
-
 .PHONY: all-stagefeedback-gold maybe-all-stagefeedback-gold
 .PHONY: clean-stagefeedback-gold maybe-clean-stagefeedback-gold
 maybe-all-stagefeedback-gold:
@@ -18767,7 +15923,6 @@ all-stagefeedback-gold: configure-stagefeedback-gold
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGEfeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -18791,92 +15946,6 @@ clean-stagefeedback-gold:
 @endif gold-bootstrap
 
 
-.PHONY: all-stageautoprofile-gold maybe-all-stageautoprofile-gold
-.PHONY: clean-stageautoprofile-gold maybe-clean-stageautoprofile-gold
-maybe-all-stageautoprofile-gold:
-maybe-clean-stageautoprofile-gold:
-@if gold-bootstrap
-maybe-all-stageautoprofile-gold: all-stageautoprofile-gold
-all-stageautoprofile: all-stageautoprofile-gold
-TARGET-stageautoprofile-gold = $(TARGET-gold)
-all-stageautoprofile-gold: configure-stageautoprofile-gold
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/gold && \
-	$$s/gcc/config/i386/$(AUTO_PROFILE) \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEautoprofile_TFLAGS)"  \
-		$(TARGET-stageautoprofile-gold)
-
-maybe-clean-stageautoprofile-gold: clean-stageautoprofile-gold
-clean-stageautoprofile: clean-stageautoprofile-gold
-clean-stageautoprofile-gold:
-	@if [ $(current_stage) = stageautoprofile ]; then \
-	  [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageautoprofile-gold/Makefile ] || exit 0; \
-	  $(MAKE) stageautoprofile-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/gold && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif gold-bootstrap
-
-
-.PHONY: all-stageautofeedback-gold maybe-all-stageautofeedback-gold
-.PHONY: clean-stageautofeedback-gold maybe-clean-stageautofeedback-gold
-maybe-all-stageautofeedback-gold:
-maybe-clean-stageautofeedback-gold:
-@if gold-bootstrap
-maybe-all-stageautofeedback-gold: all-stageautofeedback-gold
-all-stageautofeedback: all-stageautofeedback-gold
-TARGET-stageautofeedback-gold = $(TARGET-gold)
-all-stageautofeedback-gold: configure-stageautofeedback-gold
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/gold && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEautofeedback_TFLAGS)" PERF_DATA=perf.data \
-		$(TARGET-stageautofeedback-gold)
-
-maybe-clean-stageautofeedback-gold: clean-stageautofeedback-gold
-clean-stageautofeedback: clean-stageautofeedback-gold
-clean-stageautofeedback-gold:
-	@if [ $(current_stage) = stageautofeedback ]; then \
-	  [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageautofeedback-gold/Makefile ] || exit 0; \
-	  $(MAKE) stageautofeedback-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/gold && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif gold-bootstrap
-
-
 
 
 
@@ -19889,39 +16958,6 @@ configure-stageprofile-intl:
 	  $(STAGEprofile_CONFIGURE_FLAGS)
 @endif intl-bootstrap
 
-.PHONY: configure-stagetrain-intl maybe-configure-stagetrain-intl
-maybe-configure-stagetrain-intl:
-@if intl-bootstrap
-maybe-configure-stagetrain-intl: configure-stagetrain-intl
-configure-stagetrain-intl:
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEtrain_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEtrain_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEtrain_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage train in $(HOST_SUBDIR)/intl; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl; \
-	cd $(HOST_SUBDIR)/intl || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=intl; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEtrain_CONFIGURE_FLAGS)
-@endif intl-bootstrap
-
 .PHONY: configure-stagefeedback-intl maybe-configure-stagefeedback-intl
 maybe-configure-stagefeedback-intl:
 @if intl-bootstrap
@@ -19955,72 +16991,6 @@ configure-stagefeedback-intl:
 	  $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif intl-bootstrap
 
-.PHONY: configure-stageautoprofile-intl maybe-configure-stageautoprofile-intl
-maybe-configure-stageautoprofile-intl:
-@if intl-bootstrap
-maybe-configure-stageautoprofile-intl: configure-stageautoprofile-intl
-configure-stageautoprofile-intl:
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautoprofile_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautoprofile_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage autoprofile in $(HOST_SUBDIR)/intl; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl; \
-	cd $(HOST_SUBDIR)/intl || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=intl; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautoprofile_CONFIGURE_FLAGS)
-@endif intl-bootstrap
-
-.PHONY: configure-stageautofeedback-intl maybe-configure-stageautofeedback-intl
-maybe-configure-stageautofeedback-intl:
-@if intl-bootstrap
-maybe-configure-stageautofeedback-intl: configure-stageautofeedback-intl
-configure-stageautofeedback-intl:
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautofeedback_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautofeedback_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage autofeedback in $(HOST_SUBDIR)/intl; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl; \
-	cd $(HOST_SUBDIR)/intl || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/intl/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=intl; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautofeedback_CONFIGURE_FLAGS)
-@endif intl-bootstrap
-
 
 
 
@@ -20062,7 +17032,6 @@ all-stage1-intl: configure-stage1-intl
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE1_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
 		LIBCFLAGS="$(LIBCFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -20107,7 +17076,6 @@ all-stage2-intl: configure-stage2-intl
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE2_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE2_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -20150,7 +17118,6 @@ all-stage3-intl: configure-stage3-intl
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE3_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE3_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -20193,7 +17160,6 @@ all-stage4-intl: configure-stage4-intl
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE4_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE4_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -20236,7 +17202,6 @@ all-stageprofile-intl: configure-stageprofile-intl
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGEprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -20260,49 +17225,6 @@ clean-stageprofile-intl:
 @endif intl-bootstrap
 
 
-.PHONY: all-stagetrain-intl maybe-all-stagetrain-intl
-.PHONY: clean-stagetrain-intl maybe-clean-stagetrain-intl
-maybe-all-stagetrain-intl:
-maybe-clean-stagetrain-intl:
-@if intl-bootstrap
-maybe-all-stagetrain-intl: all-stagetrain-intl
-all-stagetrain: all-stagetrain-intl
-TARGET-stagetrain-intl = $(TARGET-intl)
-all-stagetrain-intl: configure-stagetrain-intl
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/intl && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEtrain_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEtrain_TFLAGS)"  \
-		$(TARGET-stagetrain-intl)
-
-maybe-clean-stagetrain-intl: clean-stagetrain-intl
-clean-stagetrain: clean-stagetrain-intl
-clean-stagetrain-intl:
-	@if [ $(current_stage) = stagetrain ]; then \
-	  [ -f $(HOST_SUBDIR)/intl/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stagetrain-intl/Makefile ] || exit 0; \
-	  $(MAKE) stagetrain-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/intl && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif intl-bootstrap
-
-
 .PHONY: all-stagefeedback-intl maybe-all-stagefeedback-intl
 .PHONY: clean-stagefeedback-intl maybe-clean-stagefeedback-intl
 maybe-all-stagefeedback-intl:
@@ -20322,7 +17244,6 @@ all-stagefeedback-intl: configure-stagefeedback-intl
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGEfeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -20346,92 +17267,6 @@ clean-stagefeedback-intl:
 @endif intl-bootstrap
 
 
-.PHONY: all-stageautoprofile-intl maybe-all-stageautoprofile-intl
-.PHONY: clean-stageautoprofile-intl maybe-clean-stageautoprofile-intl
-maybe-all-stageautoprofile-intl:
-maybe-clean-stageautoprofile-intl:
-@if intl-bootstrap
-maybe-all-stageautoprofile-intl: all-stageautoprofile-intl
-all-stageautoprofile: all-stageautoprofile-intl
-TARGET-stageautoprofile-intl = $(TARGET-intl)
-all-stageautoprofile-intl: configure-stageautoprofile-intl
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/intl && \
-	$$s/gcc/config/i386/$(AUTO_PROFILE) \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEautoprofile_TFLAGS)"  \
-		$(TARGET-stageautoprofile-intl)
-
-maybe-clean-stageautoprofile-intl: clean-stageautoprofile-intl
-clean-stageautoprofile: clean-stageautoprofile-intl
-clean-stageautoprofile-intl:
-	@if [ $(current_stage) = stageautoprofile ]; then \
-	  [ -f $(HOST_SUBDIR)/intl/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageautoprofile-intl/Makefile ] || exit 0; \
-	  $(MAKE) stageautoprofile-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/intl && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif intl-bootstrap
-
-
-.PHONY: all-stageautofeedback-intl maybe-all-stageautofeedback-intl
-.PHONY: clean-stageautofeedback-intl maybe-clean-stageautofeedback-intl
-maybe-all-stageautofeedback-intl:
-maybe-clean-stageautofeedback-intl:
-@if intl-bootstrap
-maybe-all-stageautofeedback-intl: all-stageautofeedback-intl
-all-stageautofeedback: all-stageautofeedback-intl
-TARGET-stageautofeedback-intl = $(TARGET-intl)
-all-stageautofeedback-intl: configure-stageautofeedback-intl
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/intl && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEautofeedback_TFLAGS)" PERF_DATA=perf.data \
-		$(TARGET-stageautofeedback-intl)
-
-maybe-clean-stageautofeedback-intl: clean-stageautofeedback-intl
-clean-stageautofeedback: clean-stageautofeedback-intl
-clean-stageautofeedback-intl:
-	@if [ $(current_stage) = stageautofeedback ]; then \
-	  [ -f $(HOST_SUBDIR)/intl/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageautofeedback-intl/Makefile ] || exit 0; \
-	  $(MAKE) stageautofeedback-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/intl && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif intl-bootstrap
-
-
 
 
 
@@ -21870,39 +18705,6 @@ configure-stageprofile-ld:
 	  $(STAGEprofile_CONFIGURE_FLAGS)
 @endif ld-bootstrap
 
-.PHONY: configure-stagetrain-ld maybe-configure-stagetrain-ld
-maybe-configure-stagetrain-ld:
-@if ld-bootstrap
-maybe-configure-stagetrain-ld: configure-stagetrain-ld
-configure-stagetrain-ld:
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEtrain_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEtrain_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEtrain_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage train in $(HOST_SUBDIR)/ld; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld; \
-	cd $(HOST_SUBDIR)/ld || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=ld; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEtrain_CONFIGURE_FLAGS)
-@endif ld-bootstrap
-
 .PHONY: configure-stagefeedback-ld maybe-configure-stagefeedback-ld
 maybe-configure-stagefeedback-ld:
 @if ld-bootstrap
@@ -21936,72 +18738,6 @@ configure-stagefeedback-ld:
 	  $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif ld-bootstrap
 
-.PHONY: configure-stageautoprofile-ld maybe-configure-stageautoprofile-ld
-maybe-configure-stageautoprofile-ld:
-@if ld-bootstrap
-maybe-configure-stageautoprofile-ld: configure-stageautoprofile-ld
-configure-stageautoprofile-ld:
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautoprofile_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautoprofile_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage autoprofile in $(HOST_SUBDIR)/ld; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld; \
-	cd $(HOST_SUBDIR)/ld || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=ld; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautoprofile_CONFIGURE_FLAGS)
-@endif ld-bootstrap
-
-.PHONY: configure-stageautofeedback-ld maybe-configure-stageautofeedback-ld
-maybe-configure-stageautofeedback-ld:
-@if ld-bootstrap
-maybe-configure-stageautofeedback-ld: configure-stageautofeedback-ld
-configure-stageautofeedback-ld:
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautofeedback_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautofeedback_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage autofeedback in $(HOST_SUBDIR)/ld; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld; \
-	cd $(HOST_SUBDIR)/ld || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/ld/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=ld; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautofeedback_CONFIGURE_FLAGS)
-@endif ld-bootstrap
-
 
 
 
@@ -22043,7 +18779,6 @@ all-stage1-ld: configure-stage1-ld
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE1_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
 		LIBCFLAGS="$(LIBCFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -22088,7 +18823,6 @@ all-stage2-ld: configure-stage2-ld
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE2_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE2_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -22131,7 +18865,6 @@ all-stage3-ld: configure-stage3-ld
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE3_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE3_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -22174,7 +18907,6 @@ all-stage4-ld: configure-stage4-ld
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE4_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE4_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -22217,7 +18949,6 @@ all-stageprofile-ld: configure-stageprofile-ld
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGEprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -22241,49 +18972,6 @@ clean-stageprofile-ld:
 @endif ld-bootstrap
 
 
-.PHONY: all-stagetrain-ld maybe-all-stagetrain-ld
-.PHONY: clean-stagetrain-ld maybe-clean-stagetrain-ld
-maybe-all-stagetrain-ld:
-maybe-clean-stagetrain-ld:
-@if ld-bootstrap
-maybe-all-stagetrain-ld: all-stagetrain-ld
-all-stagetrain: all-stagetrain-ld
-TARGET-stagetrain-ld = $(TARGET-ld)
-all-stagetrain-ld: configure-stagetrain-ld
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/ld && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEtrain_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEtrain_TFLAGS)"  \
-		$(TARGET-stagetrain-ld)
-
-maybe-clean-stagetrain-ld: clean-stagetrain-ld
-clean-stagetrain: clean-stagetrain-ld
-clean-stagetrain-ld:
-	@if [ $(current_stage) = stagetrain ]; then \
-	  [ -f $(HOST_SUBDIR)/ld/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stagetrain-ld/Makefile ] || exit 0; \
-	  $(MAKE) stagetrain-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/ld && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif ld-bootstrap
-
-
 .PHONY: all-stagefeedback-ld maybe-all-stagefeedback-ld
 .PHONY: clean-stagefeedback-ld maybe-clean-stagefeedback-ld
 maybe-all-stagefeedback-ld:
@@ -22303,7 +18991,6 @@ all-stagefeedback-ld: configure-stagefeedback-ld
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGEfeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -22327,92 +19014,6 @@ clean-stagefeedback-ld:
 @endif ld-bootstrap
 
 
-.PHONY: all-stageautoprofile-ld maybe-all-stageautoprofile-ld
-.PHONY: clean-stageautoprofile-ld maybe-clean-stageautoprofile-ld
-maybe-all-stageautoprofile-ld:
-maybe-clean-stageautoprofile-ld:
-@if ld-bootstrap
-maybe-all-stageautoprofile-ld: all-stageautoprofile-ld
-all-stageautoprofile: all-stageautoprofile-ld
-TARGET-stageautoprofile-ld = $(TARGET-ld)
-all-stageautoprofile-ld: configure-stageautoprofile-ld
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/ld && \
-	$$s/gcc/config/i386/$(AUTO_PROFILE) \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEautoprofile_TFLAGS)"  \
-		$(TARGET-stageautoprofile-ld)
-
-maybe-clean-stageautoprofile-ld: clean-stageautoprofile-ld
-clean-stageautoprofile: clean-stageautoprofile-ld
-clean-stageautoprofile-ld:
-	@if [ $(current_stage) = stageautoprofile ]; then \
-	  [ -f $(HOST_SUBDIR)/ld/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageautoprofile-ld/Makefile ] || exit 0; \
-	  $(MAKE) stageautoprofile-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/ld && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif ld-bootstrap
-
-
-.PHONY: all-stageautofeedback-ld maybe-all-stageautofeedback-ld
-.PHONY: clean-stageautofeedback-ld maybe-clean-stageautofeedback-ld
-maybe-all-stageautofeedback-ld:
-maybe-clean-stageautofeedback-ld:
-@if ld-bootstrap
-maybe-all-stageautofeedback-ld: all-stageautofeedback-ld
-all-stageautofeedback: all-stageautofeedback-ld
-TARGET-stageautofeedback-ld = $(TARGET-ld)
-all-stageautofeedback-ld: configure-stageautofeedback-ld
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/ld && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEautofeedback_TFLAGS)" PERF_DATA=perf.data \
-		$(TARGET-stageautofeedback-ld)
-
-maybe-clean-stageautofeedback-ld: clean-stageautofeedback-ld
-clean-stageautofeedback: clean-stageautofeedback-ld
-clean-stageautofeedback-ld:
-	@if [ $(current_stage) = stageautofeedback ]; then \
-	  [ -f $(HOST_SUBDIR)/ld/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageautofeedback-ld/Makefile ] || exit 0; \
-	  $(MAKE) stageautofeedback-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/ld && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif ld-bootstrap
-
-
 
 
 
@@ -22984,39 +19585,6 @@ configure-stageprofile-libbacktrace:
 	  $(STAGEprofile_CONFIGURE_FLAGS)
 @endif libbacktrace-bootstrap
 
-.PHONY: configure-stagetrain-libbacktrace maybe-configure-stagetrain-libbacktrace
-maybe-configure-stagetrain-libbacktrace:
-@if libbacktrace-bootstrap
-maybe-configure-stagetrain-libbacktrace: configure-stagetrain-libbacktrace
-configure-stagetrain-libbacktrace:
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/libbacktrace/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEtrain_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEtrain_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEtrain_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage train in $(HOST_SUBDIR)/libbacktrace; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace; \
-	cd $(HOST_SUBDIR)/libbacktrace || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libbacktrace/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libbacktrace; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEtrain_CONFIGURE_FLAGS)
-@endif libbacktrace-bootstrap
-
 .PHONY: configure-stagefeedback-libbacktrace maybe-configure-stagefeedback-libbacktrace
 maybe-configure-stagefeedback-libbacktrace:
 @if libbacktrace-bootstrap
@@ -23050,72 +19618,6 @@ configure-stagefeedback-libbacktrace:
 	  $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif libbacktrace-bootstrap
 
-.PHONY: configure-stageautoprofile-libbacktrace maybe-configure-stageautoprofile-libbacktrace
-maybe-configure-stageautoprofile-libbacktrace:
-@if libbacktrace-bootstrap
-maybe-configure-stageautoprofile-libbacktrace: configure-stageautoprofile-libbacktrace
-configure-stageautoprofile-libbacktrace:
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/libbacktrace/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautoprofile_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautoprofile_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage autoprofile in $(HOST_SUBDIR)/libbacktrace; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace; \
-	cd $(HOST_SUBDIR)/libbacktrace || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libbacktrace/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libbacktrace; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautoprofile_CONFIGURE_FLAGS)
-@endif libbacktrace-bootstrap
-
-.PHONY: configure-stageautofeedback-libbacktrace maybe-configure-stageautofeedback-libbacktrace
-maybe-configure-stageautofeedback-libbacktrace:
-@if libbacktrace-bootstrap
-maybe-configure-stageautofeedback-libbacktrace: configure-stageautofeedback-libbacktrace
-configure-stageautofeedback-libbacktrace:
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/libbacktrace/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautofeedback_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautofeedback_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage autofeedback in $(HOST_SUBDIR)/libbacktrace; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace; \
-	cd $(HOST_SUBDIR)/libbacktrace || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libbacktrace/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libbacktrace; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautofeedback_CONFIGURE_FLAGS)
-@endif libbacktrace-bootstrap
-
 
 
 
@@ -23157,7 +19659,6 @@ all-stage1-libbacktrace: configure-stage1-libbacktrace
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE1_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
 		LIBCFLAGS="$(LIBCFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -23202,7 +19703,6 @@ all-stage2-libbacktrace: configure-stage2-libbacktrace
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE2_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE2_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -23245,7 +19745,6 @@ all-stage3-libbacktrace: configure-stage3-libbacktrace
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE3_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE3_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -23288,7 +19787,6 @@ all-stage4-libbacktrace: configure-stage4-libbacktrace
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE4_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE4_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -23331,7 +19829,6 @@ all-stageprofile-libbacktrace: configure-stageprofile-libbacktrace
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGEprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -23355,49 +19852,6 @@ clean-stageprofile-libbacktrace:
 @endif libbacktrace-bootstrap
 
 
-.PHONY: all-stagetrain-libbacktrace maybe-all-stagetrain-libbacktrace
-.PHONY: clean-stagetrain-libbacktrace maybe-clean-stagetrain-libbacktrace
-maybe-all-stagetrain-libbacktrace:
-maybe-clean-stagetrain-libbacktrace:
-@if libbacktrace-bootstrap
-maybe-all-stagetrain-libbacktrace: all-stagetrain-libbacktrace
-all-stagetrain: all-stagetrain-libbacktrace
-TARGET-stagetrain-libbacktrace = $(TARGET-libbacktrace)
-all-stagetrain-libbacktrace: configure-stagetrain-libbacktrace
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/libbacktrace && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEtrain_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEtrain_TFLAGS)"  \
-		$(TARGET-stagetrain-libbacktrace)
-
-maybe-clean-stagetrain-libbacktrace: clean-stagetrain-libbacktrace
-clean-stagetrain: clean-stagetrain-libbacktrace
-clean-stagetrain-libbacktrace:
-	@if [ $(current_stage) = stagetrain ]; then \
-	  [ -f $(HOST_SUBDIR)/libbacktrace/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stagetrain-libbacktrace/Makefile ] || exit 0; \
-	  $(MAKE) stagetrain-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/libbacktrace && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif libbacktrace-bootstrap
-
-
 .PHONY: all-stagefeedback-libbacktrace maybe-all-stagefeedback-libbacktrace
 .PHONY: clean-stagefeedback-libbacktrace maybe-clean-stagefeedback-libbacktrace
 maybe-all-stagefeedback-libbacktrace:
@@ -23417,7 +19871,6 @@ all-stagefeedback-libbacktrace: configure-stagefeedback-libbacktrace
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGEfeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -23441,92 +19894,6 @@ clean-stagefeedback-libbacktrace:
 @endif libbacktrace-bootstrap
 
 
-.PHONY: all-stageautoprofile-libbacktrace maybe-all-stageautoprofile-libbacktrace
-.PHONY: clean-stageautoprofile-libbacktrace maybe-clean-stageautoprofile-libbacktrace
-maybe-all-stageautoprofile-libbacktrace:
-maybe-clean-stageautoprofile-libbacktrace:
-@if libbacktrace-bootstrap
-maybe-all-stageautoprofile-libbacktrace: all-stageautoprofile-libbacktrace
-all-stageautoprofile: all-stageautoprofile-libbacktrace
-TARGET-stageautoprofile-libbacktrace = $(TARGET-libbacktrace)
-all-stageautoprofile-libbacktrace: configure-stageautoprofile-libbacktrace
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/libbacktrace && \
-	$$s/gcc/config/i386/$(AUTO_PROFILE) \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEautoprofile_TFLAGS)"  \
-		$(TARGET-stageautoprofile-libbacktrace)
-
-maybe-clean-stageautoprofile-libbacktrace: clean-stageautoprofile-libbacktrace
-clean-stageautoprofile: clean-stageautoprofile-libbacktrace
-clean-stageautoprofile-libbacktrace:
-	@if [ $(current_stage) = stageautoprofile ]; then \
-	  [ -f $(HOST_SUBDIR)/libbacktrace/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageautoprofile-libbacktrace/Makefile ] || exit 0; \
-	  $(MAKE) stageautoprofile-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/libbacktrace && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif libbacktrace-bootstrap
-
-
-.PHONY: all-stageautofeedback-libbacktrace maybe-all-stageautofeedback-libbacktrace
-.PHONY: clean-stageautofeedback-libbacktrace maybe-clean-stageautofeedback-libbacktrace
-maybe-all-stageautofeedback-libbacktrace:
-maybe-clean-stageautofeedback-libbacktrace:
-@if libbacktrace-bootstrap
-maybe-all-stageautofeedback-libbacktrace: all-stageautofeedback-libbacktrace
-all-stageautofeedback: all-stageautofeedback-libbacktrace
-TARGET-stageautofeedback-libbacktrace = $(TARGET-libbacktrace)
-all-stageautofeedback-libbacktrace: configure-stageautofeedback-libbacktrace
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/libbacktrace && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEautofeedback_TFLAGS)" PERF_DATA=perf.data \
-		$(TARGET-stageautofeedback-libbacktrace)
-
-maybe-clean-stageautofeedback-libbacktrace: clean-stageautofeedback-libbacktrace
-clean-stageautofeedback: clean-stageautofeedback-libbacktrace
-clean-stageautofeedback-libbacktrace:
-	@if [ $(current_stage) = stageautofeedback ]; then \
-	  [ -f $(HOST_SUBDIR)/libbacktrace/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageautofeedback-libbacktrace/Makefile ] || exit 0; \
-	  $(MAKE) stageautofeedback-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/libbacktrace && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif libbacktrace-bootstrap
-
-
 
 
 
@@ -24098,39 +20465,6 @@ configure-stageprofile-libcpp:
 	  $(STAGEprofile_CONFIGURE_FLAGS)
 @endif libcpp-bootstrap
 
-.PHONY: configure-stagetrain-libcpp maybe-configure-stagetrain-libcpp
-maybe-configure-stagetrain-libcpp:
-@if libcpp-bootstrap
-maybe-configure-stagetrain-libcpp: configure-stagetrain-libcpp
-configure-stagetrain-libcpp:
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEtrain_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEtrain_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEtrain_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage train in $(HOST_SUBDIR)/libcpp; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp; \
-	cd $(HOST_SUBDIR)/libcpp || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libcpp; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEtrain_CONFIGURE_FLAGS)
-@endif libcpp-bootstrap
-
 .PHONY: configure-stagefeedback-libcpp maybe-configure-stagefeedback-libcpp
 maybe-configure-stagefeedback-libcpp:
 @if libcpp-bootstrap
@@ -24164,72 +20498,6 @@ configure-stagefeedback-libcpp:
 	  $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif libcpp-bootstrap
 
-.PHONY: configure-stageautoprofile-libcpp maybe-configure-stageautoprofile-libcpp
-maybe-configure-stageautoprofile-libcpp:
-@if libcpp-bootstrap
-maybe-configure-stageautoprofile-libcpp: configure-stageautoprofile-libcpp
-configure-stageautoprofile-libcpp:
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautoprofile_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautoprofile_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage autoprofile in $(HOST_SUBDIR)/libcpp; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp; \
-	cd $(HOST_SUBDIR)/libcpp || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libcpp; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautoprofile_CONFIGURE_FLAGS)
-@endif libcpp-bootstrap
-
-.PHONY: configure-stageautofeedback-libcpp maybe-configure-stageautofeedback-libcpp
-maybe-configure-stageautofeedback-libcpp:
-@if libcpp-bootstrap
-maybe-configure-stageautofeedback-libcpp: configure-stageautofeedback-libcpp
-configure-stageautofeedback-libcpp:
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautofeedback_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautofeedback_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage autofeedback in $(HOST_SUBDIR)/libcpp; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp; \
-	cd $(HOST_SUBDIR)/libcpp || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libcpp; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautofeedback_CONFIGURE_FLAGS)
-@endif libcpp-bootstrap
-
 
 
 
@@ -24271,7 +20539,6 @@ all-stage1-libcpp: configure-stage1-libcpp
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE1_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
 		LIBCFLAGS="$(LIBCFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -24316,7 +20583,6 @@ all-stage2-libcpp: configure-stage2-libcpp
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE2_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE2_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -24359,7 +20625,6 @@ all-stage3-libcpp: configure-stage3-libcpp
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE3_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE3_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -24402,7 +20667,6 @@ all-stage4-libcpp: configure-stage4-libcpp
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE4_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE4_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -24445,7 +20709,6 @@ all-stageprofile-libcpp: configure-stageprofile-libcpp
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGEprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -24469,49 +20732,6 @@ clean-stageprofile-libcpp:
 @endif libcpp-bootstrap
 
 
-.PHONY: all-stagetrain-libcpp maybe-all-stagetrain-libcpp
-.PHONY: clean-stagetrain-libcpp maybe-clean-stagetrain-libcpp
-maybe-all-stagetrain-libcpp:
-maybe-clean-stagetrain-libcpp:
-@if libcpp-bootstrap
-maybe-all-stagetrain-libcpp: all-stagetrain-libcpp
-all-stagetrain: all-stagetrain-libcpp
-TARGET-stagetrain-libcpp = $(TARGET-libcpp)
-all-stagetrain-libcpp: configure-stagetrain-libcpp
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/libcpp && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEtrain_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEtrain_TFLAGS)"  \
-		$(TARGET-stagetrain-libcpp)
-
-maybe-clean-stagetrain-libcpp: clean-stagetrain-libcpp
-clean-stagetrain: clean-stagetrain-libcpp
-clean-stagetrain-libcpp:
-	@if [ $(current_stage) = stagetrain ]; then \
-	  [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stagetrain-libcpp/Makefile ] || exit 0; \
-	  $(MAKE) stagetrain-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/libcpp && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif libcpp-bootstrap
-
-
 .PHONY: all-stagefeedback-libcpp maybe-all-stagefeedback-libcpp
 .PHONY: clean-stagefeedback-libcpp maybe-clean-stagefeedback-libcpp
 maybe-all-stagefeedback-libcpp:
@@ -24531,7 +20751,6 @@ all-stagefeedback-libcpp: configure-stagefeedback-libcpp
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGEfeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -24555,92 +20774,6 @@ clean-stagefeedback-libcpp:
 @endif libcpp-bootstrap
 
 
-.PHONY: all-stageautoprofile-libcpp maybe-all-stageautoprofile-libcpp
-.PHONY: clean-stageautoprofile-libcpp maybe-clean-stageautoprofile-libcpp
-maybe-all-stageautoprofile-libcpp:
-maybe-clean-stageautoprofile-libcpp:
-@if libcpp-bootstrap
-maybe-all-stageautoprofile-libcpp: all-stageautoprofile-libcpp
-all-stageautoprofile: all-stageautoprofile-libcpp
-TARGET-stageautoprofile-libcpp = $(TARGET-libcpp)
-all-stageautoprofile-libcpp: configure-stageautoprofile-libcpp
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/libcpp && \
-	$$s/gcc/config/i386/$(AUTO_PROFILE) \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEautoprofile_TFLAGS)"  \
-		$(TARGET-stageautoprofile-libcpp)
-
-maybe-clean-stageautoprofile-libcpp: clean-stageautoprofile-libcpp
-clean-stageautoprofile: clean-stageautoprofile-libcpp
-clean-stageautoprofile-libcpp:
-	@if [ $(current_stage) = stageautoprofile ]; then \
-	  [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageautoprofile-libcpp/Makefile ] || exit 0; \
-	  $(MAKE) stageautoprofile-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/libcpp && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif libcpp-bootstrap
-
-
-.PHONY: all-stageautofeedback-libcpp maybe-all-stageautofeedback-libcpp
-.PHONY: clean-stageautofeedback-libcpp maybe-clean-stageautofeedback-libcpp
-maybe-all-stageautofeedback-libcpp:
-maybe-clean-stageautofeedback-libcpp:
-@if libcpp-bootstrap
-maybe-all-stageautofeedback-libcpp: all-stageautofeedback-libcpp
-all-stageautofeedback: all-stageautofeedback-libcpp
-TARGET-stageautofeedback-libcpp = $(TARGET-libcpp)
-all-stageautofeedback-libcpp: configure-stageautofeedback-libcpp
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/libcpp && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEautofeedback_TFLAGS)" PERF_DATA=perf.data \
-		$(TARGET-stageautofeedback-libcpp)
-
-maybe-clean-stageautofeedback-libcpp: clean-stageautofeedback-libcpp
-clean-stageautofeedback: clean-stageautofeedback-libcpp
-clean-stageautofeedback-libcpp:
-	@if [ $(current_stage) = stageautofeedback ]; then \
-	  [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageautofeedback-libcpp/Makefile ] || exit 0; \
-	  $(MAKE) stageautofeedback-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/libcpp && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif libcpp-bootstrap
-
-
 
 
 
@@ -25212,39 +21345,6 @@ configure-stageprofile-libdecnumber:
 	  $(STAGEprofile_CONFIGURE_FLAGS)
 @endif libdecnumber-bootstrap
 
-.PHONY: configure-stagetrain-libdecnumber maybe-configure-stagetrain-libdecnumber
-maybe-configure-stagetrain-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-configure-stagetrain-libdecnumber: configure-stagetrain-libdecnumber
-configure-stagetrain-libdecnumber:
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEtrain_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEtrain_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEtrain_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage train in $(HOST_SUBDIR)/libdecnumber; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber; \
-	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libdecnumber; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEtrain_CONFIGURE_FLAGS)
-@endif libdecnumber-bootstrap
-
 .PHONY: configure-stagefeedback-libdecnumber maybe-configure-stagefeedback-libdecnumber
 maybe-configure-stagefeedback-libdecnumber:
 @if libdecnumber-bootstrap
@@ -25278,72 +21378,6 @@ configure-stagefeedback-libdecnumber:
 	  $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif libdecnumber-bootstrap
 
-.PHONY: configure-stageautoprofile-libdecnumber maybe-configure-stageautoprofile-libdecnumber
-maybe-configure-stageautoprofile-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-configure-stageautoprofile-libdecnumber: configure-stageautoprofile-libdecnumber
-configure-stageautoprofile-libdecnumber:
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautoprofile_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautoprofile_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage autoprofile in $(HOST_SUBDIR)/libdecnumber; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber; \
-	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libdecnumber; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautoprofile_CONFIGURE_FLAGS)
-@endif libdecnumber-bootstrap
-
-.PHONY: configure-stageautofeedback-libdecnumber maybe-configure-stageautofeedback-libdecnumber
-maybe-configure-stageautofeedback-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-configure-stageautofeedback-libdecnumber: configure-stageautofeedback-libdecnumber
-configure-stageautofeedback-libdecnumber:
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautofeedback_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautofeedback_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage autofeedback in $(HOST_SUBDIR)/libdecnumber; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber; \
-	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libdecnumber; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautofeedback_CONFIGURE_FLAGS)
-@endif libdecnumber-bootstrap
-
 
 
 
@@ -25385,7 +21419,6 @@ all-stage1-libdecnumber: configure-stage1-libdecnumber
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE1_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
 		LIBCFLAGS="$(LIBCFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -25430,7 +21463,6 @@ all-stage2-libdecnumber: configure-stage2-libdecnumber
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE2_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE2_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -25473,7 +21505,6 @@ all-stage3-libdecnumber: configure-stage3-libdecnumber
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE3_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE3_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -25516,7 +21547,6 @@ all-stage4-libdecnumber: configure-stage4-libdecnumber
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE4_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE4_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -25559,7 +21589,6 @@ all-stageprofile-libdecnumber: configure-stageprofile-libdecnumber
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGEprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -25583,49 +21612,6 @@ clean-stageprofile-libdecnumber:
 @endif libdecnumber-bootstrap
 
 
-.PHONY: all-stagetrain-libdecnumber maybe-all-stagetrain-libdecnumber
-.PHONY: clean-stagetrain-libdecnumber maybe-clean-stagetrain-libdecnumber
-maybe-all-stagetrain-libdecnumber:
-maybe-clean-stagetrain-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-all-stagetrain-libdecnumber: all-stagetrain-libdecnumber
-all-stagetrain: all-stagetrain-libdecnumber
-TARGET-stagetrain-libdecnumber = $(TARGET-libdecnumber)
-all-stagetrain-libdecnumber: configure-stagetrain-libdecnumber
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/libdecnumber && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEtrain_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEtrain_TFLAGS)"  \
-		$(TARGET-stagetrain-libdecnumber)
-
-maybe-clean-stagetrain-libdecnumber: clean-stagetrain-libdecnumber
-clean-stagetrain: clean-stagetrain-libdecnumber
-clean-stagetrain-libdecnumber:
-	@if [ $(current_stage) = stagetrain ]; then \
-	  [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stagetrain-libdecnumber/Makefile ] || exit 0; \
-	  $(MAKE) stagetrain-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/libdecnumber && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif libdecnumber-bootstrap
-
-
 .PHONY: all-stagefeedback-libdecnumber maybe-all-stagefeedback-libdecnumber
 .PHONY: clean-stagefeedback-libdecnumber maybe-clean-stagefeedback-libdecnumber
 maybe-all-stagefeedback-libdecnumber:
@@ -25645,7 +21631,6 @@ all-stagefeedback-libdecnumber: configure-stagefeedback-libdecnumber
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGEfeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -25669,92 +21654,6 @@ clean-stagefeedback-libdecnumber:
 @endif libdecnumber-bootstrap
 
 
-.PHONY: all-stageautoprofile-libdecnumber maybe-all-stageautoprofile-libdecnumber
-.PHONY: clean-stageautoprofile-libdecnumber maybe-clean-stageautoprofile-libdecnumber
-maybe-all-stageautoprofile-libdecnumber:
-maybe-clean-stageautoprofile-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-all-stageautoprofile-libdecnumber: all-stageautoprofile-libdecnumber
-all-stageautoprofile: all-stageautoprofile-libdecnumber
-TARGET-stageautoprofile-libdecnumber = $(TARGET-libdecnumber)
-all-stageautoprofile-libdecnumber: configure-stageautoprofile-libdecnumber
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/libdecnumber && \
-	$$s/gcc/config/i386/$(AUTO_PROFILE) \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEautoprofile_TFLAGS)"  \
-		$(TARGET-stageautoprofile-libdecnumber)
-
-maybe-clean-stageautoprofile-libdecnumber: clean-stageautoprofile-libdecnumber
-clean-stageautoprofile: clean-stageautoprofile-libdecnumber
-clean-stageautoprofile-libdecnumber:
-	@if [ $(current_stage) = stageautoprofile ]; then \
-	  [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageautoprofile-libdecnumber/Makefile ] || exit 0; \
-	  $(MAKE) stageautoprofile-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/libdecnumber && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif libdecnumber-bootstrap
-
-
-.PHONY: all-stageautofeedback-libdecnumber maybe-all-stageautofeedback-libdecnumber
-.PHONY: clean-stageautofeedback-libdecnumber maybe-clean-stageautofeedback-libdecnumber
-maybe-all-stageautofeedback-libdecnumber:
-maybe-clean-stageautofeedback-libdecnumber:
-@if libdecnumber-bootstrap
-maybe-all-stageautofeedback-libdecnumber: all-stageautofeedback-libdecnumber
-all-stageautofeedback: all-stageautofeedback-libdecnumber
-TARGET-stageautofeedback-libdecnumber = $(TARGET-libdecnumber)
-all-stageautofeedback-libdecnumber: configure-stageautofeedback-libdecnumber
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/libdecnumber && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEautofeedback_TFLAGS)" PERF_DATA=perf.data \
-		$(TARGET-stageautofeedback-libdecnumber)
-
-maybe-clean-stageautofeedback-libdecnumber: clean-stageautofeedback-libdecnumber
-clean-stageautofeedback: clean-stageautofeedback-libdecnumber
-clean-stageautofeedback-libdecnumber:
-	@if [ $(current_stage) = stageautofeedback ]; then \
-	  [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageautofeedback-libdecnumber/Makefile ] || exit 0; \
-	  $(MAKE) stageautofeedback-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/libdecnumber && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif libdecnumber-bootstrap
-
-
 
 
 
@@ -26772,40 +22671,6 @@ configure-stageprofile-libiberty:
 	  @extra_host_libiberty_configure_flags@
 @endif libiberty-bootstrap
 
-.PHONY: configure-stagetrain-libiberty maybe-configure-stagetrain-libiberty
-maybe-configure-stagetrain-libiberty:
-@if libiberty-bootstrap
-maybe-configure-stagetrain-libiberty: configure-stagetrain-libiberty
-configure-stagetrain-libiberty:
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEtrain_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEtrain_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEtrain_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage train in $(HOST_SUBDIR)/libiberty; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty; \
-	cd $(HOST_SUBDIR)/libiberty || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libiberty; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEtrain_CONFIGURE_FLAGS) \
-	  @extra_host_libiberty_configure_flags@
-@endif libiberty-bootstrap
-
 .PHONY: configure-stagefeedback-libiberty maybe-configure-stagefeedback-libiberty
 maybe-configure-stagefeedback-libiberty:
 @if libiberty-bootstrap
@@ -26840,74 +22705,6 @@ configure-stagefeedback-libiberty:
 	  @extra_host_libiberty_configure_flags@
 @endif libiberty-bootstrap
 
-.PHONY: configure-stageautoprofile-libiberty maybe-configure-stageautoprofile-libiberty
-maybe-configure-stageautoprofile-libiberty:
-@if libiberty-bootstrap
-maybe-configure-stageautoprofile-libiberty: configure-stageautoprofile-libiberty
-configure-stageautoprofile-libiberty:
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautoprofile_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautoprofile_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage autoprofile in $(HOST_SUBDIR)/libiberty; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty; \
-	cd $(HOST_SUBDIR)/libiberty || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libiberty; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautoprofile_CONFIGURE_FLAGS) \
-	  @extra_host_libiberty_configure_flags@
-@endif libiberty-bootstrap
-
-.PHONY: configure-stageautofeedback-libiberty maybe-configure-stageautofeedback-libiberty
-maybe-configure-stageautofeedback-libiberty:
-@if libiberty-bootstrap
-maybe-configure-stageautofeedback-libiberty: configure-stageautofeedback-libiberty
-configure-stageautofeedback-libiberty:
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautofeedback_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautofeedback_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage autofeedback in $(HOST_SUBDIR)/libiberty; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty; \
-	cd $(HOST_SUBDIR)/libiberty || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libiberty; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautofeedback_CONFIGURE_FLAGS) \
-	  @extra_host_libiberty_configure_flags@
-@endif libiberty-bootstrap
-
 
 
 
@@ -26949,7 +22746,6 @@ all-stage1-libiberty: configure-stage1-libiberty
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE1_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
 		LIBCFLAGS="$(LIBCFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -26994,7 +22790,6 @@ all-stage2-libiberty: configure-stage2-libiberty
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE2_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE2_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -27037,7 +22832,6 @@ all-stage3-libiberty: configure-stage3-libiberty
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE3_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE3_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -27080,7 +22874,6 @@ all-stage4-libiberty: configure-stage4-libiberty
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE4_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE4_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -27123,7 +22916,6 @@ all-stageprofile-libiberty: configure-stageprofile-libiberty
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGEprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -27147,49 +22939,6 @@ clean-stageprofile-libiberty:
 @endif libiberty-bootstrap
 
 
-.PHONY: all-stagetrain-libiberty maybe-all-stagetrain-libiberty
-.PHONY: clean-stagetrain-libiberty maybe-clean-stagetrain-libiberty
-maybe-all-stagetrain-libiberty:
-maybe-clean-stagetrain-libiberty:
-@if libiberty-bootstrap
-maybe-all-stagetrain-libiberty: all-stagetrain-libiberty
-all-stagetrain: all-stagetrain-libiberty
-TARGET-stagetrain-libiberty = $(TARGET-libiberty)
-all-stagetrain-libiberty: configure-stagetrain-libiberty
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/libiberty && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEtrain_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEtrain_TFLAGS)"  \
-		$(TARGET-stagetrain-libiberty)
-
-maybe-clean-stagetrain-libiberty: clean-stagetrain-libiberty
-clean-stagetrain: clean-stagetrain-libiberty
-clean-stagetrain-libiberty:
-	@if [ $(current_stage) = stagetrain ]; then \
-	  [ -f $(HOST_SUBDIR)/libiberty/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stagetrain-libiberty/Makefile ] || exit 0; \
-	  $(MAKE) stagetrain-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/libiberty && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif libiberty-bootstrap
-
-
 .PHONY: all-stagefeedback-libiberty maybe-all-stagefeedback-libiberty
 .PHONY: clean-stagefeedback-libiberty maybe-clean-stagefeedback-libiberty
 maybe-all-stagefeedback-libiberty:
@@ -27209,7 +22958,6 @@ all-stagefeedback-libiberty: configure-stagefeedback-libiberty
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGEfeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -27233,92 +22981,6 @@ clean-stagefeedback-libiberty:
 @endif libiberty-bootstrap
 
 
-.PHONY: all-stageautoprofile-libiberty maybe-all-stageautoprofile-libiberty
-.PHONY: clean-stageautoprofile-libiberty maybe-clean-stageautoprofile-libiberty
-maybe-all-stageautoprofile-libiberty:
-maybe-clean-stageautoprofile-libiberty:
-@if libiberty-bootstrap
-maybe-all-stageautoprofile-libiberty: all-stageautoprofile-libiberty
-all-stageautoprofile: all-stageautoprofile-libiberty
-TARGET-stageautoprofile-libiberty = $(TARGET-libiberty)
-all-stageautoprofile-libiberty: configure-stageautoprofile-libiberty
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/libiberty && \
-	$$s/gcc/config/i386/$(AUTO_PROFILE) \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEautoprofile_TFLAGS)"  \
-		$(TARGET-stageautoprofile-libiberty)
-
-maybe-clean-stageautoprofile-libiberty: clean-stageautoprofile-libiberty
-clean-stageautoprofile: clean-stageautoprofile-libiberty
-clean-stageautoprofile-libiberty:
-	@if [ $(current_stage) = stageautoprofile ]; then \
-	  [ -f $(HOST_SUBDIR)/libiberty/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageautoprofile-libiberty/Makefile ] || exit 0; \
-	  $(MAKE) stageautoprofile-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/libiberty && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif libiberty-bootstrap
-
-
-.PHONY: all-stageautofeedback-libiberty maybe-all-stageautofeedback-libiberty
-.PHONY: clean-stageautofeedback-libiberty maybe-clean-stageautofeedback-libiberty
-maybe-all-stageautofeedback-libiberty:
-maybe-clean-stageautofeedback-libiberty:
-@if libiberty-bootstrap
-maybe-all-stageautofeedback-libiberty: all-stageautofeedback-libiberty
-all-stageautofeedback: all-stageautofeedback-libiberty
-TARGET-stageautofeedback-libiberty = $(TARGET-libiberty)
-all-stageautofeedback-libiberty: configure-stageautofeedback-libiberty
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/libiberty && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEautofeedback_TFLAGS)" PERF_DATA=perf.data \
-		$(TARGET-stageautofeedback-libiberty)
-
-maybe-clean-stageautofeedback-libiberty: clean-stageautofeedback-libiberty
-clean-stageautofeedback: clean-stageautofeedback-libiberty
-clean-stageautofeedback-libiberty:
-	@if [ $(current_stage) = stageautofeedback ]; then \
-	  [ -f $(HOST_SUBDIR)/libiberty/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageautofeedback-libiberty/Makefile ] || exit 0; \
-	  $(MAKE) stageautofeedback-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/libiberty && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif libiberty-bootstrap
-
-
 
 
 
@@ -27895,40 +23557,6 @@ configure-stageprofile-libiberty-linker-plugin:
 	  @extra_host_libiberty_configure_flags@ --disable-install-libiberty @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
 @endif libiberty-linker-plugin-bootstrap
 
-.PHONY: configure-stagetrain-libiberty-linker-plugin maybe-configure-stagetrain-libiberty-linker-plugin
-maybe-configure-stagetrain-libiberty-linker-plugin:
-@if libiberty-linker-plugin-bootstrap
-maybe-configure-stagetrain-libiberty-linker-plugin: configure-stagetrain-libiberty-linker-plugin
-configure-stagetrain-libiberty-linker-plugin:
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEtrain_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEtrain_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEtrain_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage train in $(HOST_SUBDIR)/libiberty-linker-plugin; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin; \
-	cd $(HOST_SUBDIR)/libiberty-linker-plugin || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libiberty-linker-plugin/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libiberty; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEtrain_CONFIGURE_FLAGS) \
-	  @extra_host_libiberty_configure_flags@ --disable-install-libiberty @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
-@endif libiberty-linker-plugin-bootstrap
-
 .PHONY: configure-stagefeedback-libiberty-linker-plugin maybe-configure-stagefeedback-libiberty-linker-plugin
 maybe-configure-stagefeedback-libiberty-linker-plugin:
 @if libiberty-linker-plugin-bootstrap
@@ -27963,74 +23591,6 @@ configure-stagefeedback-libiberty-linker-plugin:
 	  @extra_host_libiberty_configure_flags@ --disable-install-libiberty @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
 @endif libiberty-linker-plugin-bootstrap
 
-.PHONY: configure-stageautoprofile-libiberty-linker-plugin maybe-configure-stageautoprofile-libiberty-linker-plugin
-maybe-configure-stageautoprofile-libiberty-linker-plugin:
-@if libiberty-linker-plugin-bootstrap
-maybe-configure-stageautoprofile-libiberty-linker-plugin: configure-stageautoprofile-libiberty-linker-plugin
-configure-stageautoprofile-libiberty-linker-plugin:
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautoprofile_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautoprofile_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage autoprofile in $(HOST_SUBDIR)/libiberty-linker-plugin; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin; \
-	cd $(HOST_SUBDIR)/libiberty-linker-plugin || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libiberty-linker-plugin/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libiberty; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautoprofile_CONFIGURE_FLAGS) \
-	  @extra_host_libiberty_configure_flags@ --disable-install-libiberty @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
-@endif libiberty-linker-plugin-bootstrap
-
-.PHONY: configure-stageautofeedback-libiberty-linker-plugin maybe-configure-stageautofeedback-libiberty-linker-plugin
-maybe-configure-stageautofeedback-libiberty-linker-plugin:
-@if libiberty-linker-plugin-bootstrap
-maybe-configure-stageautofeedback-libiberty-linker-plugin: configure-stageautofeedback-libiberty-linker-plugin
-configure-stageautofeedback-libiberty-linker-plugin:
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautofeedback_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautofeedback_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage autofeedback in $(HOST_SUBDIR)/libiberty-linker-plugin; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin; \
-	cd $(HOST_SUBDIR)/libiberty-linker-plugin || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libiberty-linker-plugin/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libiberty; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautofeedback_CONFIGURE_FLAGS) \
-	  @extra_host_libiberty_configure_flags@ --disable-install-libiberty @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
-@endif libiberty-linker-plugin-bootstrap
-
 
 
 
@@ -28072,7 +23632,6 @@ all-stage1-libiberty-linker-plugin: configure-stage1-libiberty-linker-plugin
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE1_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
 		LIBCFLAGS="$(LIBCFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -28117,7 +23676,6 @@ all-stage2-libiberty-linker-plugin: configure-stage2-libiberty-linker-plugin
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE2_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE2_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -28160,7 +23718,6 @@ all-stage3-libiberty-linker-plugin: configure-stage3-libiberty-linker-plugin
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE3_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE3_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -28203,7 +23760,6 @@ all-stage4-libiberty-linker-plugin: configure-stage4-libiberty-linker-plugin
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE4_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE4_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -28246,7 +23802,6 @@ all-stageprofile-libiberty-linker-plugin: configure-stageprofile-libiberty-linke
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGEprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -28270,49 +23825,6 @@ clean-stageprofile-libiberty-linker-plugin:
 @endif libiberty-linker-plugin-bootstrap
 
 
-.PHONY: all-stagetrain-libiberty-linker-plugin maybe-all-stagetrain-libiberty-linker-plugin
-.PHONY: clean-stagetrain-libiberty-linker-plugin maybe-clean-stagetrain-libiberty-linker-plugin
-maybe-all-stagetrain-libiberty-linker-plugin:
-maybe-clean-stagetrain-libiberty-linker-plugin:
-@if libiberty-linker-plugin-bootstrap
-maybe-all-stagetrain-libiberty-linker-plugin: all-stagetrain-libiberty-linker-plugin
-all-stagetrain: all-stagetrain-libiberty-linker-plugin
-TARGET-stagetrain-libiberty-linker-plugin = $(TARGET-libiberty-linker-plugin)
-all-stagetrain-libiberty-linker-plugin: configure-stagetrain-libiberty-linker-plugin
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEtrain_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
-		TFLAGS="$(STAGEtrain_TFLAGS)"  \
-		$(TARGET-stagetrain-libiberty-linker-plugin)
-
-maybe-clean-stagetrain-libiberty-linker-plugin: clean-stagetrain-libiberty-linker-plugin
-clean-stagetrain: clean-stagetrain-libiberty-linker-plugin
-clean-stagetrain-libiberty-linker-plugin:
-	@if [ $(current_stage) = stagetrain ]; then \
-	  [ -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stagetrain-libiberty-linker-plugin/Makefile ] || exit 0; \
-	  $(MAKE) stagetrain-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean
-@endif libiberty-linker-plugin-bootstrap
-
-
 .PHONY: all-stagefeedback-libiberty-linker-plugin maybe-all-stagefeedback-libiberty-linker-plugin
 .PHONY: clean-stagefeedback-libiberty-linker-plugin maybe-clean-stagefeedback-libiberty-linker-plugin
 maybe-all-stagefeedback-libiberty-linker-plugin:
@@ -28332,7 +23844,6 @@ all-stagefeedback-libiberty-linker-plugin: configure-stagefeedback-libiberty-lin
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGEfeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -28356,92 +23867,6 @@ clean-stagefeedback-libiberty-linker-plugin:
 @endif libiberty-linker-plugin-bootstrap
 
 
-.PHONY: all-stageautoprofile-libiberty-linker-plugin maybe-all-stageautoprofile-libiberty-linker-plugin
-.PHONY: clean-stageautoprofile-libiberty-linker-plugin maybe-clean-stageautoprofile-libiberty-linker-plugin
-maybe-all-stageautoprofile-libiberty-linker-plugin:
-maybe-clean-stageautoprofile-libiberty-linker-plugin:
-@if libiberty-linker-plugin-bootstrap
-maybe-all-stageautoprofile-libiberty-linker-plugin: all-stageautoprofile-libiberty-linker-plugin
-all-stageautoprofile: all-stageautoprofile-libiberty-linker-plugin
-TARGET-stageautoprofile-libiberty-linker-plugin = $(TARGET-libiberty-linker-plugin)
-all-stageautoprofile-libiberty-linker-plugin: configure-stageautoprofile-libiberty-linker-plugin
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
-	$$s/gcc/config/i386/$(AUTO_PROFILE) \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
-		TFLAGS="$(STAGEautoprofile_TFLAGS)"  \
-		$(TARGET-stageautoprofile-libiberty-linker-plugin)
-
-maybe-clean-stageautoprofile-libiberty-linker-plugin: clean-stageautoprofile-libiberty-linker-plugin
-clean-stageautoprofile: clean-stageautoprofile-libiberty-linker-plugin
-clean-stageautoprofile-libiberty-linker-plugin:
-	@if [ $(current_stage) = stageautoprofile ]; then \
-	  [ -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageautoprofile-libiberty-linker-plugin/Makefile ] || exit 0; \
-	  $(MAKE) stageautoprofile-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean
-@endif libiberty-linker-plugin-bootstrap
-
-
-.PHONY: all-stageautofeedback-libiberty-linker-plugin maybe-all-stageautofeedback-libiberty-linker-plugin
-.PHONY: clean-stageautofeedback-libiberty-linker-plugin maybe-clean-stageautofeedback-libiberty-linker-plugin
-maybe-all-stageautofeedback-libiberty-linker-plugin:
-maybe-clean-stageautofeedback-libiberty-linker-plugin:
-@if libiberty-linker-plugin-bootstrap
-maybe-all-stageautofeedback-libiberty-linker-plugin: all-stageautofeedback-libiberty-linker-plugin
-all-stageautofeedback: all-stageautofeedback-libiberty-linker-plugin
-TARGET-stageautofeedback-libiberty-linker-plugin = $(TARGET-libiberty-linker-plugin)
-all-stageautofeedback-libiberty-linker-plugin: configure-stageautofeedback-libiberty-linker-plugin
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
-		TFLAGS="$(STAGEautofeedback_TFLAGS)" PERF_DATA=perf.data \
-		$(TARGET-stageautofeedback-libiberty-linker-plugin)
-
-maybe-clean-stageautofeedback-libiberty-linker-plugin: clean-stageautofeedback-libiberty-linker-plugin
-clean-stageautofeedback: clean-stageautofeedback-libiberty-linker-plugin
-clean-stageautofeedback-libiberty-linker-plugin:
-	@if [ $(current_stage) = stageautofeedback ]; then \
-	  [ -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageautofeedback-libiberty-linker-plugin/Makefile ] || exit 0; \
-	  $(MAKE) stageautofeedback-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean
-@endif libiberty-linker-plugin-bootstrap
-
-
 
 
 
@@ -29018,40 +24443,6 @@ configure-stageprofile-libiconv:
 	  --disable-shared
 @endif libiconv-bootstrap
 
-.PHONY: configure-stagetrain-libiconv maybe-configure-stagetrain-libiconv
-maybe-configure-stagetrain-libiconv:
-@if libiconv-bootstrap
-maybe-configure-stagetrain-libiconv: configure-stagetrain-libiconv
-configure-stagetrain-libiconv:
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiconv
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/libiconv/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEtrain_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEtrain_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEtrain_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage train in $(HOST_SUBDIR)/libiconv; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiconv; \
-	cd $(HOST_SUBDIR)/libiconv || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libiconv/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libiconv; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEtrain_CONFIGURE_FLAGS) \
-	  --disable-shared
-@endif libiconv-bootstrap
-
 .PHONY: configure-stagefeedback-libiconv maybe-configure-stagefeedback-libiconv
 maybe-configure-stagefeedback-libiconv:
 @if libiconv-bootstrap
@@ -29086,74 +24477,6 @@ configure-stagefeedback-libiconv:
 	  --disable-shared
 @endif libiconv-bootstrap
 
-.PHONY: configure-stageautoprofile-libiconv maybe-configure-stageautoprofile-libiconv
-maybe-configure-stageautoprofile-libiconv:
-@if libiconv-bootstrap
-maybe-configure-stageautoprofile-libiconv: configure-stageautoprofile-libiconv
-configure-stageautoprofile-libiconv:
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiconv
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/libiconv/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautoprofile_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautoprofile_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage autoprofile in $(HOST_SUBDIR)/libiconv; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiconv; \
-	cd $(HOST_SUBDIR)/libiconv || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libiconv/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libiconv; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautoprofile_CONFIGURE_FLAGS) \
-	  --disable-shared
-@endif libiconv-bootstrap
-
-.PHONY: configure-stageautofeedback-libiconv maybe-configure-stageautofeedback-libiconv
-maybe-configure-stageautofeedback-libiconv:
-@if libiconv-bootstrap
-maybe-configure-stageautofeedback-libiconv: configure-stageautofeedback-libiconv
-configure-stageautofeedback-libiconv:
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiconv
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/libiconv/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautofeedback_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautofeedback_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage autofeedback in $(HOST_SUBDIR)/libiconv; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiconv; \
-	cd $(HOST_SUBDIR)/libiconv || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libiconv/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libiconv; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautofeedback_CONFIGURE_FLAGS) \
-	  --disable-shared
-@endif libiconv-bootstrap
-
 
 
 
@@ -29195,7 +24518,6 @@ all-stage1-libiconv: configure-stage1-libiconv
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE1_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
 		LIBCFLAGS="$(LIBCFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -29240,7 +24562,6 @@ all-stage2-libiconv: configure-stage2-libiconv
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE2_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE2_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -29283,7 +24604,6 @@ all-stage3-libiconv: configure-stage3-libiconv
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE3_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE3_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -29326,7 +24646,6 @@ all-stage4-libiconv: configure-stage4-libiconv
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE4_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE4_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -29369,7 +24688,6 @@ all-stageprofile-libiconv: configure-stageprofile-libiconv
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGEprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -29393,49 +24711,6 @@ clean-stageprofile-libiconv:
 @endif libiconv-bootstrap
 
 
-.PHONY: all-stagetrain-libiconv maybe-all-stagetrain-libiconv
-.PHONY: clean-stagetrain-libiconv maybe-clean-stagetrain-libiconv
-maybe-all-stagetrain-libiconv:
-maybe-clean-stagetrain-libiconv:
-@if libiconv-bootstrap
-maybe-all-stagetrain-libiconv: all-stagetrain-libiconv
-all-stagetrain: all-stagetrain-libiconv
-TARGET-stagetrain-libiconv = $(TARGET-libiconv)
-all-stagetrain-libiconv: configure-stagetrain-libiconv
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/libiconv && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEtrain_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEtrain_TFLAGS)"  \
-		$(TARGET-stagetrain-libiconv)
-
-maybe-clean-stagetrain-libiconv: clean-stagetrain-libiconv
-clean-stagetrain: clean-stagetrain-libiconv
-clean-stagetrain-libiconv:
-	@if [ $(current_stage) = stagetrain ]; then \
-	  [ -f $(HOST_SUBDIR)/libiconv/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stagetrain-libiconv/Makefile ] || exit 0; \
-	  $(MAKE) stagetrain-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/libiconv && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif libiconv-bootstrap
-
-
 .PHONY: all-stagefeedback-libiconv maybe-all-stagefeedback-libiconv
 .PHONY: clean-stagefeedback-libiconv maybe-clean-stagefeedback-libiconv
 maybe-all-stagefeedback-libiconv:
@@ -29455,7 +24730,6 @@ all-stagefeedback-libiconv: configure-stagefeedback-libiconv
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGEfeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -29479,92 +24753,6 @@ clean-stagefeedback-libiconv:
 @endif libiconv-bootstrap
 
 
-.PHONY: all-stageautoprofile-libiconv maybe-all-stageautoprofile-libiconv
-.PHONY: clean-stageautoprofile-libiconv maybe-clean-stageautoprofile-libiconv
-maybe-all-stageautoprofile-libiconv:
-maybe-clean-stageautoprofile-libiconv:
-@if libiconv-bootstrap
-maybe-all-stageautoprofile-libiconv: all-stageautoprofile-libiconv
-all-stageautoprofile: all-stageautoprofile-libiconv
-TARGET-stageautoprofile-libiconv = $(TARGET-libiconv)
-all-stageautoprofile-libiconv: configure-stageautoprofile-libiconv
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/libiconv && \
-	$$s/gcc/config/i386/$(AUTO_PROFILE) \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEautoprofile_TFLAGS)"  \
-		$(TARGET-stageautoprofile-libiconv)
-
-maybe-clean-stageautoprofile-libiconv: clean-stageautoprofile-libiconv
-clean-stageautoprofile: clean-stageautoprofile-libiconv
-clean-stageautoprofile-libiconv:
-	@if [ $(current_stage) = stageautoprofile ]; then \
-	  [ -f $(HOST_SUBDIR)/libiconv/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageautoprofile-libiconv/Makefile ] || exit 0; \
-	  $(MAKE) stageautoprofile-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/libiconv && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif libiconv-bootstrap
-
-
-.PHONY: all-stageautofeedback-libiconv maybe-all-stageautofeedback-libiconv
-.PHONY: clean-stageautofeedback-libiconv maybe-clean-stageautofeedback-libiconv
-maybe-all-stageautofeedback-libiconv:
-maybe-clean-stageautofeedback-libiconv:
-@if libiconv-bootstrap
-maybe-all-stageautofeedback-libiconv: all-stageautofeedback-libiconv
-all-stageautofeedback: all-stageautofeedback-libiconv
-TARGET-stageautofeedback-libiconv = $(TARGET-libiconv)
-all-stageautofeedback-libiconv: configure-stageautofeedback-libiconv
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/libiconv && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEautofeedback_TFLAGS)" PERF_DATA=perf.data \
-		$(TARGET-stageautofeedback-libiconv)
-
-maybe-clean-stageautofeedback-libiconv: clean-stageautofeedback-libiconv
-clean-stageautofeedback: clean-stageautofeedback-libiconv
-clean-stageautofeedback-libiconv:
-	@if [ $(current_stage) = stageautofeedback ]; then \
-	  [ -f $(HOST_SUBDIR)/libiconv/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageautofeedback-libiconv/Makefile ] || exit 0; \
-	  $(MAKE) stageautofeedback-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/libiconv && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif libiconv-bootstrap
-
-
 
 
 
@@ -32229,40 +27417,6 @@ configure-stageprofile-zlib:
 	  @extra_host_zlib_configure_flags@
 @endif zlib-bootstrap
 
-.PHONY: configure-stagetrain-zlib maybe-configure-stagetrain-zlib
-maybe-configure-stagetrain-zlib:
-@if zlib-bootstrap
-maybe-configure-stagetrain-zlib: configure-stagetrain-zlib
-configure-stagetrain-zlib:
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEtrain_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEtrain_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEtrain_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage train in $(HOST_SUBDIR)/zlib; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib; \
-	cd $(HOST_SUBDIR)/zlib || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=zlib; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEtrain_CONFIGURE_FLAGS) \
-	  @extra_host_zlib_configure_flags@
-@endif zlib-bootstrap
-
 .PHONY: configure-stagefeedback-zlib maybe-configure-stagefeedback-zlib
 maybe-configure-stagefeedback-zlib:
 @if zlib-bootstrap
@@ -32297,74 +27451,6 @@ configure-stagefeedback-zlib:
 	  @extra_host_zlib_configure_flags@
 @endif zlib-bootstrap
 
-.PHONY: configure-stageautoprofile-zlib maybe-configure-stageautoprofile-zlib
-maybe-configure-stageautoprofile-zlib:
-@if zlib-bootstrap
-maybe-configure-stageautoprofile-zlib: configure-stageautoprofile-zlib
-configure-stageautoprofile-zlib:
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautoprofile_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautoprofile_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage autoprofile in $(HOST_SUBDIR)/zlib; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib; \
-	cd $(HOST_SUBDIR)/zlib || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=zlib; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautoprofile_CONFIGURE_FLAGS) \
-	  @extra_host_zlib_configure_flags@
-@endif zlib-bootstrap
-
-.PHONY: configure-stageautofeedback-zlib maybe-configure-stageautofeedback-zlib
-maybe-configure-stageautofeedback-zlib:
-@if zlib-bootstrap
-maybe-configure-stageautofeedback-zlib: configure-stageautofeedback-zlib
-configure-stageautofeedback-zlib:
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautofeedback_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautofeedback_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage autofeedback in $(HOST_SUBDIR)/zlib; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib; \
-	cd $(HOST_SUBDIR)/zlib || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=zlib; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautofeedback_CONFIGURE_FLAGS) \
-	  @extra_host_zlib_configure_flags@
-@endif zlib-bootstrap
-
 
 
 
@@ -32406,7 +27492,6 @@ all-stage1-zlib: configure-stage1-zlib
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE1_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
 		LIBCFLAGS="$(LIBCFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -32451,7 +27536,6 @@ all-stage2-zlib: configure-stage2-zlib
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE2_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE2_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -32494,7 +27578,6 @@ all-stage3-zlib: configure-stage3-zlib
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE3_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE3_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -32537,7 +27620,6 @@ all-stage4-zlib: configure-stage4-zlib
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE4_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE4_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -32580,7 +27662,6 @@ all-stageprofile-zlib: configure-stageprofile-zlib
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGEprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -32604,49 +27685,6 @@ clean-stageprofile-zlib:
 @endif zlib-bootstrap
 
 
-.PHONY: all-stagetrain-zlib maybe-all-stagetrain-zlib
-.PHONY: clean-stagetrain-zlib maybe-clean-stagetrain-zlib
-maybe-all-stagetrain-zlib:
-maybe-clean-stagetrain-zlib:
-@if zlib-bootstrap
-maybe-all-stagetrain-zlib: all-stagetrain-zlib
-all-stagetrain: all-stagetrain-zlib
-TARGET-stagetrain-zlib = $(TARGET-zlib)
-all-stagetrain-zlib: configure-stagetrain-zlib
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/zlib && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEtrain_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEtrain_TFLAGS)"  \
-		$(TARGET-stagetrain-zlib)
-
-maybe-clean-stagetrain-zlib: clean-stagetrain-zlib
-clean-stagetrain: clean-stagetrain-zlib
-clean-stagetrain-zlib:
-	@if [ $(current_stage) = stagetrain ]; then \
-	  [ -f $(HOST_SUBDIR)/zlib/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stagetrain-zlib/Makefile ] || exit 0; \
-	  $(MAKE) stagetrain-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/zlib && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif zlib-bootstrap
-
-
 .PHONY: all-stagefeedback-zlib maybe-all-stagefeedback-zlib
 .PHONY: clean-stagefeedback-zlib maybe-clean-stagefeedback-zlib
 maybe-all-stagefeedback-zlib:
@@ -32666,7 +27704,6 @@ all-stagefeedback-zlib: configure-stagefeedback-zlib
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGEfeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -32690,92 +27727,6 @@ clean-stagefeedback-zlib:
 @endif zlib-bootstrap
 
 
-.PHONY: all-stageautoprofile-zlib maybe-all-stageautoprofile-zlib
-.PHONY: clean-stageautoprofile-zlib maybe-clean-stageautoprofile-zlib
-maybe-all-stageautoprofile-zlib:
-maybe-clean-stageautoprofile-zlib:
-@if zlib-bootstrap
-maybe-all-stageautoprofile-zlib: all-stageautoprofile-zlib
-all-stageautoprofile: all-stageautoprofile-zlib
-TARGET-stageautoprofile-zlib = $(TARGET-zlib)
-all-stageautoprofile-zlib: configure-stageautoprofile-zlib
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/zlib && \
-	$$s/gcc/config/i386/$(AUTO_PROFILE) \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEautoprofile_TFLAGS)"  \
-		$(TARGET-stageautoprofile-zlib)
-
-maybe-clean-stageautoprofile-zlib: clean-stageautoprofile-zlib
-clean-stageautoprofile: clean-stageautoprofile-zlib
-clean-stageautoprofile-zlib:
-	@if [ $(current_stage) = stageautoprofile ]; then \
-	  [ -f $(HOST_SUBDIR)/zlib/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageautoprofile-zlib/Makefile ] || exit 0; \
-	  $(MAKE) stageautoprofile-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/zlib && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif zlib-bootstrap
-
-
-.PHONY: all-stageautofeedback-zlib maybe-all-stageautofeedback-zlib
-.PHONY: clean-stageautofeedback-zlib maybe-clean-stageautofeedback-zlib
-maybe-all-stageautofeedback-zlib:
-maybe-clean-stageautofeedback-zlib:
-@if zlib-bootstrap
-maybe-all-stageautofeedback-zlib: all-stageautofeedback-zlib
-all-stageautofeedback: all-stageautofeedback-zlib
-TARGET-stageautofeedback-zlib = $(TARGET-zlib)
-all-stageautofeedback-zlib: configure-stageautofeedback-zlib
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/zlib && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEautofeedback_TFLAGS)" PERF_DATA=perf.data \
-		$(TARGET-stageautofeedback-zlib)
-
-maybe-clean-stageautofeedback-zlib: clean-stageautofeedback-zlib
-clean-stageautofeedback: clean-stageautofeedback-zlib
-clean-stageautofeedback-zlib:
-	@if [ $(current_stage) = stageautofeedback ]; then \
-	  [ -f $(HOST_SUBDIR)/zlib/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageautofeedback-zlib/Makefile ] || exit 0; \
-	  $(MAKE) stageautofeedback-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/zlib && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif zlib-bootstrap
-
-
 
 
 
@@ -36349,40 +31300,6 @@ configure-stageprofile-lto-plugin:
 	  --enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
 @endif lto-plugin-bootstrap
 
-.PHONY: configure-stagetrain-lto-plugin maybe-configure-stagetrain-lto-plugin
-maybe-configure-stagetrain-lto-plugin:
-@if lto-plugin-bootstrap
-maybe-configure-stagetrain-lto-plugin: configure-stagetrain-lto-plugin
-configure-stagetrain-lto-plugin:
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/lto-plugin/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEtrain_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEtrain_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEtrain_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage train in $(HOST_SUBDIR)/lto-plugin; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin; \
-	cd $(HOST_SUBDIR)/lto-plugin || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/lto-plugin/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=lto-plugin; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEtrain_CONFIGURE_FLAGS) \
-	  --enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
-@endif lto-plugin-bootstrap
-
 .PHONY: configure-stagefeedback-lto-plugin maybe-configure-stagefeedback-lto-plugin
 maybe-configure-stagefeedback-lto-plugin:
 @if lto-plugin-bootstrap
@@ -36417,74 +31334,6 @@ configure-stagefeedback-lto-plugin:
 	  --enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
 @endif lto-plugin-bootstrap
 
-.PHONY: configure-stageautoprofile-lto-plugin maybe-configure-stageautoprofile-lto-plugin
-maybe-configure-stageautoprofile-lto-plugin:
-@if lto-plugin-bootstrap
-maybe-configure-stageautoprofile-lto-plugin: configure-stageautoprofile-lto-plugin
-configure-stageautoprofile-lto-plugin:
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/lto-plugin/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautoprofile_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautoprofile_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage autoprofile in $(HOST_SUBDIR)/lto-plugin; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin; \
-	cd $(HOST_SUBDIR)/lto-plugin || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/lto-plugin/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=lto-plugin; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautoprofile_CONFIGURE_FLAGS) \
-	  --enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
-@endif lto-plugin-bootstrap
-
-.PHONY: configure-stageautofeedback-lto-plugin maybe-configure-stageautofeedback-lto-plugin
-maybe-configure-stageautofeedback-lto-plugin:
-@if lto-plugin-bootstrap
-maybe-configure-stageautofeedback-lto-plugin: configure-stageautofeedback-lto-plugin
-configure-stageautofeedback-lto-plugin:
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/lto-plugin/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautofeedback_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautofeedback_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage autofeedback in $(HOST_SUBDIR)/lto-plugin; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin; \
-	cd $(HOST_SUBDIR)/lto-plugin || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/lto-plugin/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=lto-plugin; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautofeedback_CONFIGURE_FLAGS) \
-	  --enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@
-@endif lto-plugin-bootstrap
-
 
 
 
@@ -36526,7 +31375,6 @@ all-stage1-lto-plugin: configure-stage1-lto-plugin
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE1_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
 		LIBCFLAGS="$(LIBCFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -36571,7 +31419,6 @@ all-stage2-lto-plugin: configure-stage2-lto-plugin
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE2_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE2_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -36614,7 +31461,6 @@ all-stage3-lto-plugin: configure-stage3-lto-plugin
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE3_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE3_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -36657,7 +31503,6 @@ all-stage4-lto-plugin: configure-stage4-lto-plugin
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE4_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE4_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -36700,7 +31545,6 @@ all-stageprofile-lto-plugin: configure-stageprofile-lto-plugin
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGEprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -36724,49 +31568,6 @@ clean-stageprofile-lto-plugin:
 @endif lto-plugin-bootstrap
 
 
-.PHONY: all-stagetrain-lto-plugin maybe-all-stagetrain-lto-plugin
-.PHONY: clean-stagetrain-lto-plugin maybe-clean-stagetrain-lto-plugin
-maybe-all-stagetrain-lto-plugin:
-maybe-clean-stagetrain-lto-plugin:
-@if lto-plugin-bootstrap
-maybe-all-stagetrain-lto-plugin: all-stagetrain-lto-plugin
-all-stagetrain: all-stagetrain-lto-plugin
-TARGET-stagetrain-lto-plugin = $(TARGET-lto-plugin)
-all-stagetrain-lto-plugin: configure-stagetrain-lto-plugin
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/lto-plugin && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEtrain_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
-		TFLAGS="$(STAGEtrain_TFLAGS)"  \
-		$(TARGET-stagetrain-lto-plugin)
-
-maybe-clean-stagetrain-lto-plugin: clean-stagetrain-lto-plugin
-clean-stagetrain: clean-stagetrain-lto-plugin
-clean-stagetrain-lto-plugin:
-	@if [ $(current_stage) = stagetrain ]; then \
-	  [ -f $(HOST_SUBDIR)/lto-plugin/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stagetrain-lto-plugin/Makefile ] || exit 0; \
-	  $(MAKE) stagetrain-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/lto-plugin && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean
-@endif lto-plugin-bootstrap
-
-
 .PHONY: all-stagefeedback-lto-plugin maybe-all-stagefeedback-lto-plugin
 .PHONY: clean-stagefeedback-lto-plugin maybe-clean-stagefeedback-lto-plugin
 maybe-all-stagefeedback-lto-plugin:
@@ -36786,7 +31587,6 @@ all-stagefeedback-lto-plugin: configure-stagefeedback-lto-plugin
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGEfeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -36810,92 +31610,6 @@ clean-stagefeedback-lto-plugin:
 @endif lto-plugin-bootstrap
 
 
-.PHONY: all-stageautoprofile-lto-plugin maybe-all-stageautoprofile-lto-plugin
-.PHONY: clean-stageautoprofile-lto-plugin maybe-clean-stageautoprofile-lto-plugin
-maybe-all-stageautoprofile-lto-plugin:
-maybe-clean-stageautoprofile-lto-plugin:
-@if lto-plugin-bootstrap
-maybe-all-stageautoprofile-lto-plugin: all-stageautoprofile-lto-plugin
-all-stageautoprofile: all-stageautoprofile-lto-plugin
-TARGET-stageautoprofile-lto-plugin = $(TARGET-lto-plugin)
-all-stageautoprofile-lto-plugin: configure-stageautoprofile-lto-plugin
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/lto-plugin && \
-	$$s/gcc/config/i386/$(AUTO_PROFILE) \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
-		TFLAGS="$(STAGEautoprofile_TFLAGS)"  \
-		$(TARGET-stageautoprofile-lto-plugin)
-
-maybe-clean-stageautoprofile-lto-plugin: clean-stageautoprofile-lto-plugin
-clean-stageautoprofile: clean-stageautoprofile-lto-plugin
-clean-stageautoprofile-lto-plugin:
-	@if [ $(current_stage) = stageautoprofile ]; then \
-	  [ -f $(HOST_SUBDIR)/lto-plugin/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageautoprofile-lto-plugin/Makefile ] || exit 0; \
-	  $(MAKE) stageautoprofile-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/lto-plugin && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean
-@endif lto-plugin-bootstrap
-
-
-.PHONY: all-stageautofeedback-lto-plugin maybe-all-stageautofeedback-lto-plugin
-.PHONY: clean-stageautofeedback-lto-plugin maybe-clean-stageautofeedback-lto-plugin
-maybe-all-stageautofeedback-lto-plugin:
-maybe-clean-stageautofeedback-lto-plugin:
-@if lto-plugin-bootstrap
-maybe-all-stageautofeedback-lto-plugin: all-stageautofeedback-lto-plugin
-all-stageautofeedback: all-stageautofeedback-lto-plugin
-TARGET-stageautofeedback-lto-plugin = $(TARGET-lto-plugin)
-all-stageautofeedback-lto-plugin: configure-stageautofeedback-lto-plugin
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/lto-plugin && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
-		TFLAGS="$(STAGEautofeedback_TFLAGS)" PERF_DATA=perf.data \
-		$(TARGET-stageautofeedback-lto-plugin)
-
-maybe-clean-stageautofeedback-lto-plugin: clean-stageautofeedback-lto-plugin
-clean-stageautofeedback: clean-stageautofeedback-lto-plugin
-clean-stageautofeedback-lto-plugin:
-	@if [ $(current_stage) = stageautofeedback ]; then \
-	  [ -f $(HOST_SUBDIR)/lto-plugin/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageautofeedback-lto-plugin/Makefile ] || exit 0; \
-	  $(MAKE) stageautofeedback-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/lto-plugin && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean
-@endif lto-plugin-bootstrap
-
-
 
 
 
@@ -38349,39 +33063,6 @@ configure-stageprofile-libctf:
 	  $(STAGEprofile_CONFIGURE_FLAGS)
 @endif libctf-bootstrap
 
-.PHONY: configure-stagetrain-libctf maybe-configure-stagetrain-libctf
-maybe-configure-stagetrain-libctf:
-@if libctf-bootstrap
-maybe-configure-stagetrain-libctf: configure-stagetrain-libctf
-configure-stagetrain-libctf:
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libctf
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/libctf/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEtrain_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEtrain_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEtrain_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage train in $(HOST_SUBDIR)/libctf; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libctf; \
-	cd $(HOST_SUBDIR)/libctf || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libctf/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libctf; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEtrain_CONFIGURE_FLAGS)
-@endif libctf-bootstrap
-
 .PHONY: configure-stagefeedback-libctf maybe-configure-stagefeedback-libctf
 maybe-configure-stagefeedback-libctf:
 @if libctf-bootstrap
@@ -38415,72 +33096,6 @@ configure-stagefeedback-libctf:
 	  $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif libctf-bootstrap
 
-.PHONY: configure-stageautoprofile-libctf maybe-configure-stageautoprofile-libctf
-maybe-configure-stageautoprofile-libctf:
-@if libctf-bootstrap
-maybe-configure-stageautoprofile-libctf: configure-stageautoprofile-libctf
-configure-stageautoprofile-libctf:
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libctf
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/libctf/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautoprofile_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautoprofile_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage autoprofile in $(HOST_SUBDIR)/libctf; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libctf; \
-	cd $(HOST_SUBDIR)/libctf || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libctf/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libctf; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautoprofile_CONFIGURE_FLAGS)
-@endif libctf-bootstrap
-
-.PHONY: configure-stageautofeedback-libctf maybe-configure-stageautofeedback-libctf
-maybe-configure-stageautofeedback-libctf:
-@if libctf-bootstrap
-maybe-configure-stageautofeedback-libctf: configure-stageautofeedback-libctf
-configure-stageautofeedback-libctf:
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libctf
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	test ! -f $(HOST_SUBDIR)/libctf/Makefile || exit 0; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS) \
-	CFLAGS="$(STAGEautofeedback_CFLAGS)"; export CFLAGS; \
-	CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)"; export CXXFLAGS; \
-	LIBCFLAGS="$(STAGEautofeedback_CFLAGS)"; export LIBCFLAGS;  \
-	echo Configuring stage autofeedback in $(HOST_SUBDIR)/libctf; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libctf; \
-	cd $(HOST_SUBDIR)/libctf || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(HOST_SUBDIR)/libctf/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libctf; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautofeedback_CONFIGURE_FLAGS)
-@endif libctf-bootstrap
-
 
 
 
@@ -38522,7 +33137,6 @@ all-stage1-libctf: configure-stage1-libctf
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE1_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE1_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE1_CXXFLAGS)" \
 		LIBCFLAGS="$(LIBCFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -38567,7 +33181,6 @@ all-stage2-libctf: configure-stage2-libctf
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE2_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE2_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE2_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE2_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -38610,7 +33223,6 @@ all-stage3-libctf: configure-stage3-libctf
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE3_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE3_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE3_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE3_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -38653,7 +33265,6 @@ all-stage4-libctf: configure-stage4-libctf
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGE4_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE4_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE4_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGE4_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -38696,7 +33307,6 @@ all-stageprofile-libctf: configure-stageprofile-libctf
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGEprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEprofile_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGEprofile_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -38720,49 +33330,6 @@ clean-stageprofile-libctf:
 @endif libctf-bootstrap
 
 
-.PHONY: all-stagetrain-libctf maybe-all-stagetrain-libctf
-.PHONY: clean-stagetrain-libctf maybe-clean-stagetrain-libctf
-maybe-all-stagetrain-libctf:
-maybe-clean-stagetrain-libctf:
-@if libctf-bootstrap
-maybe-all-stagetrain-libctf: all-stagetrain-libctf
-all-stagetrain: all-stagetrain-libctf
-TARGET-stagetrain-libctf = $(TARGET-libctf)
-all-stagetrain-libctf: configure-stagetrain-libctf
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/libctf && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEtrain_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEtrain_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEtrain_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEtrain_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEtrain_TFLAGS)"  \
-		$(TARGET-stagetrain-libctf)
-
-maybe-clean-stagetrain-libctf: clean-stagetrain-libctf
-clean-stagetrain: clean-stagetrain-libctf
-clean-stagetrain-libctf:
-	@if [ $(current_stage) = stagetrain ]; then \
-	  [ -f $(HOST_SUBDIR)/libctf/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stagetrain-libctf/Makefile ] || exit 0; \
-	  $(MAKE) stagetrain-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/libctf && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif libctf-bootstrap
-
-
 .PHONY: all-stagefeedback-libctf maybe-all-stagefeedback-libctf
 .PHONY: clean-stagefeedback-libctf maybe-clean-stagefeedback-libctf
 maybe-all-stagefeedback-libctf:
@@ -38782,7 +33349,6 @@ all-stagefeedback-libctf: configure-stagefeedback-libctf
 	 \
 	$(MAKE) $(BASE_FLAGS_TO_PASS) \
 		CFLAGS="$(STAGEfeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEfeedback_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
 		LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \
 		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
@@ -38806,92 +33372,6 @@ clean-stagefeedback-libctf:
 @endif libctf-bootstrap
 
 
-.PHONY: all-stageautoprofile-libctf maybe-all-stageautoprofile-libctf
-.PHONY: clean-stageautoprofile-libctf maybe-clean-stageautoprofile-libctf
-maybe-all-stageautoprofile-libctf:
-maybe-clean-stageautoprofile-libctf:
-@if libctf-bootstrap
-maybe-all-stageautoprofile-libctf: all-stageautoprofile-libctf
-all-stageautoprofile: all-stageautoprofile-libctf
-TARGET-stageautoprofile-libctf = $(TARGET-libctf)
-all-stageautoprofile-libctf: configure-stageautoprofile-libctf
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/libctf && \
-	$$s/gcc/config/i386/$(AUTO_PROFILE) \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautoprofile_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautoprofile_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautoprofile_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEautoprofile_TFLAGS)"  \
-		$(TARGET-stageautoprofile-libctf)
-
-maybe-clean-stageautoprofile-libctf: clean-stageautoprofile-libctf
-clean-stageautoprofile: clean-stageautoprofile-libctf
-clean-stageautoprofile-libctf:
-	@if [ $(current_stage) = stageautoprofile ]; then \
-	  [ -f $(HOST_SUBDIR)/libctf/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageautoprofile-libctf/Makefile ] || exit 0; \
-	  $(MAKE) stageautoprofile-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/libctf && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif libctf-bootstrap
-
-
-.PHONY: all-stageautofeedback-libctf maybe-all-stageautofeedback-libctf
-.PHONY: clean-stageautofeedback-libctf maybe-clean-stageautofeedback-libctf
-maybe-all-stageautofeedback-libctf:
-maybe-clean-stageautofeedback-libctf:
-@if libctf-bootstrap
-maybe-all-stageautofeedback-libctf: all-stageautofeedback-libctf
-all-stageautofeedback: all-stageautofeedback-libctf
-TARGET-stageautofeedback-libctf = $(TARGET-libctf)
-all-stageautofeedback-libctf: configure-stageautofeedback-libctf
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	$(HOST_EXPORTS) \
-	$(POSTSTAGE1_HOST_EXPORTS)  \
-	cd $(HOST_SUBDIR)/libctf && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGEautofeedback_GENERATOR_CFLAGS)" \
-		CXXFLAGS="$(STAGEautofeedback_CXXFLAGS)" \
-		LIBCFLAGS="$(STAGEautofeedback_CFLAGS)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-		TFLAGS="$(STAGEautofeedback_TFLAGS)" PERF_DATA=perf.data \
-		$(TARGET-stageautofeedback-libctf)
-
-maybe-clean-stageautofeedback-libctf: clean-stageautofeedback-libctf
-clean-stageautofeedback: clean-stageautofeedback-libctf
-clean-stageautofeedback-libctf:
-	@if [ $(current_stage) = stageautofeedback ]; then \
-	  [ -f $(HOST_SUBDIR)/libctf/Makefile ] || exit 0; \
-	else \
-	  [ -f $(HOST_SUBDIR)/stageautofeedback-libctf/Makefile ] || exit 0; \
-	  $(MAKE) stageautofeedback-start; \
-	fi; \
-	cd $(HOST_SUBDIR)/libctf && \
-	$(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
-@endif libctf-bootstrap
-
-
 
 
 
@@ -39526,51 +34006,6 @@ configure-stageprofile-target-libstdc++-v3:
 	  $(STAGEprofile_CONFIGURE_FLAGS)
 @endif target-libstdc++-v3-bootstrap
 
-.PHONY: configure-stagetrain-target-libstdc++-v3 maybe-configure-stagetrain-target-libstdc++-v3
-maybe-configure-stagetrain-target-libstdc++-v3:
-@if target-libstdc++-v3-bootstrap
-maybe-configure-stagetrain-target-libstdc++-v3: configure-stagetrain-target-libstdc++-v3
-configure-stagetrain-target-libstdc++-v3:
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	echo "Checking multilib configuration for libstdc++-v3..."; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null; \
-	if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
-	    mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	 \
-	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-	echo Configuring stage train in $(TARGET_SUBDIR)/libstdc++-v3; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \
-	cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libstdc++-v3; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEtrain_CONFIGURE_FLAGS)
-@endif target-libstdc++-v3-bootstrap
-
 .PHONY: configure-stagefeedback-target-libstdc++-v3 maybe-configure-stagefeedback-target-libstdc++-v3
 maybe-configure-stagefeedback-target-libstdc++-v3:
 @if target-libstdc++-v3-bootstrap
@@ -39616,96 +34051,6 @@ configure-stagefeedback-target-libstdc++-v3:
 	  $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif target-libstdc++-v3-bootstrap
 
-.PHONY: configure-stageautoprofile-target-libstdc++-v3 maybe-configure-stageautoprofile-target-libstdc++-v3
-maybe-configure-stageautoprofile-target-libstdc++-v3:
-@if target-libstdc++-v3-bootstrap
-maybe-configure-stageautoprofile-target-libstdc++-v3: configure-stageautoprofile-target-libstdc++-v3
-configure-stageautoprofile-target-libstdc++-v3:
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	echo "Checking multilib configuration for libstdc++-v3..."; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null; \
-	if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
-	    mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	 \
-	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-	echo Configuring stage autoprofile in $(TARGET_SUBDIR)/libstdc++-v3; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \
-	cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libstdc++-v3; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautoprofile_CONFIGURE_FLAGS)
-@endif target-libstdc++-v3-bootstrap
-
-.PHONY: configure-stageautofeedback-target-libstdc++-v3 maybe-configure-stageautofeedback-target-libstdc++-v3
-maybe-configure-stageautofeedback-target-libstdc++-v3:
-@if target-libstdc++-v3-bootstrap
-maybe-configure-stageautofeedback-target-libstdc++-v3: configure-stageautofeedback-target-libstdc++-v3
-configure-stageautofeedback-target-libstdc++-v3:
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	echo "Checking multilib configuration for libstdc++-v3..."; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null; \
-	if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \
-	    mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	 \
-	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-	echo Configuring stage autofeedback in $(TARGET_SUBDIR)/libstdc++-v3; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \
-	cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libstdc++-v3; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautofeedback_CONFIGURE_FLAGS)
-@endif target-libstdc++-v3-bootstrap
-
 
 
 
@@ -39940,48 +34285,6 @@ clean-stageprofile-target-libstdc++-v3:
 @endif target-libstdc++-v3-bootstrap
 
 
-.PHONY: all-stagetrain-target-libstdc++-v3 maybe-all-stagetrain-target-libstdc++-v3
-.PHONY: clean-stagetrain-target-libstdc++-v3 maybe-clean-stagetrain-target-libstdc++-v3
-maybe-all-stagetrain-target-libstdc++-v3:
-maybe-clean-stagetrain-target-libstdc++-v3:
-@if target-libstdc++-v3-bootstrap
-maybe-all-stagetrain-target-libstdc++-v3: all-stagetrain-target-libstdc++-v3
-all-stagetrain: all-stagetrain-target-libstdc++-v3
-TARGET-stagetrain-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3)
-all-stagetrain-target-libstdc++-v3: configure-stagetrain-target-libstdc++-v3
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	  \
-	cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
-		TFLAGS="$(STAGEtrain_TFLAGS)"  \
-		$(TARGET-stagetrain-target-libstdc++-v3)
-
-maybe-clean-stagetrain-target-libstdc++-v3: clean-stagetrain-target-libstdc++-v3
-clean-stagetrain: clean-stagetrain-target-libstdc++-v3
-clean-stagetrain-target-libstdc++-v3:
-	@if [ $(current_stage) = stagetrain ]; then \
-	  [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
-	else \
-	  [ -f $(TARGET_SUBDIR)/stagetrain-libstdc++-v3/Makefile ] || exit 0; \
-	  $(MAKE) stagetrain-start; \
-	fi; \
-	cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-	$(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
-@endif target-libstdc++-v3-bootstrap
-
-
 .PHONY: all-stagefeedback-target-libstdc++-v3 maybe-all-stagefeedback-target-libstdc++-v3
 .PHONY: clean-stagefeedback-target-libstdc++-v3 maybe-clean-stagefeedback-target-libstdc++-v3
 maybe-all-stagefeedback-target-libstdc++-v3:
@@ -40024,90 +34327,6 @@ clean-stagefeedback-target-libstdc++-v3:
 @endif target-libstdc++-v3-bootstrap
 
 
-.PHONY: all-stageautoprofile-target-libstdc++-v3 maybe-all-stageautoprofile-target-libstdc++-v3
-.PHONY: clean-stageautoprofile-target-libstdc++-v3 maybe-clean-stageautoprofile-target-libstdc++-v3
-maybe-all-stageautoprofile-target-libstdc++-v3:
-maybe-clean-stageautoprofile-target-libstdc++-v3:
-@if target-libstdc++-v3-bootstrap
-maybe-all-stageautoprofile-target-libstdc++-v3: all-stageautoprofile-target-libstdc++-v3
-all-stageautoprofile: all-stageautoprofile-target-libstdc++-v3
-TARGET-stageautoprofile-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3)
-all-stageautoprofile-target-libstdc++-v3: configure-stageautoprofile-target-libstdc++-v3
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	  \
-	cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-	$$s/gcc/config/i386/$(AUTO_PROFILE) \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
-		TFLAGS="$(STAGEautoprofile_TFLAGS)"  \
-		$(TARGET-stageautoprofile-target-libstdc++-v3)
-
-maybe-clean-stageautoprofile-target-libstdc++-v3: clean-stageautoprofile-target-libstdc++-v3
-clean-stageautoprofile: clean-stageautoprofile-target-libstdc++-v3
-clean-stageautoprofile-target-libstdc++-v3:
-	@if [ $(current_stage) = stageautoprofile ]; then \
-	  [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
-	else \
-	  [ -f $(TARGET_SUBDIR)/stageautoprofile-libstdc++-v3/Makefile ] || exit 0; \
-	  $(MAKE) stageautoprofile-start; \
-	fi; \
-	cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-	$(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
-@endif target-libstdc++-v3-bootstrap
-
-
-.PHONY: all-stageautofeedback-target-libstdc++-v3 maybe-all-stageautofeedback-target-libstdc++-v3
-.PHONY: clean-stageautofeedback-target-libstdc++-v3 maybe-clean-stageautofeedback-target-libstdc++-v3
-maybe-all-stageautofeedback-target-libstdc++-v3:
-maybe-clean-stageautofeedback-target-libstdc++-v3:
-@if target-libstdc++-v3-bootstrap
-maybe-all-stageautofeedback-target-libstdc++-v3: all-stageautofeedback-target-libstdc++-v3
-all-stageautofeedback: all-stageautofeedback-target-libstdc++-v3
-TARGET-stageautofeedback-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3)
-all-stageautofeedback-target-libstdc++-v3: configure-stageautofeedback-target-libstdc++-v3
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	  \
-	cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
-		TFLAGS="$(STAGEautofeedback_TFLAGS)" PERF_DATA=perf.data \
-		$(TARGET-stageautofeedback-target-libstdc++-v3)
-
-maybe-clean-stageautofeedback-target-libstdc++-v3: clean-stageautofeedback-target-libstdc++-v3
-clean-stageautofeedback: clean-stageautofeedback-target-libstdc++-v3
-clean-stageautofeedback-target-libstdc++-v3:
-	@if [ $(current_stage) = stageautofeedback ]; then \
-	  [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \
-	else \
-	  [ -f $(TARGET_SUBDIR)/stageautofeedback-libstdc++-v3/Makefile ] || exit 0; \
-	  $(MAKE) stageautofeedback-start; \
-	fi; \
-	cd $(TARGET_SUBDIR)/libstdc++-v3 && \
-	$(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
-@endif target-libstdc++-v3-bootstrap
-
-
 
 
 
@@ -40769,51 +34988,6 @@ configure-stageprofile-target-libsanitizer:
 	  $(STAGEprofile_CONFIGURE_FLAGS)
 @endif target-libsanitizer-bootstrap
 
-.PHONY: configure-stagetrain-target-libsanitizer maybe-configure-stagetrain-target-libsanitizer
-maybe-configure-stagetrain-target-libsanitizer:
-@if target-libsanitizer-bootstrap
-maybe-configure-stagetrain-target-libsanitizer: configure-stagetrain-target-libsanitizer
-configure-stagetrain-target-libsanitizer:
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	echo "Checking multilib configuration for libsanitizer..."; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null; \
-	if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \
-	    mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	 \
-	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-	echo Configuring stage train in $(TARGET_SUBDIR)/libsanitizer; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \
-	cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libsanitizer; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEtrain_CONFIGURE_FLAGS)
-@endif target-libsanitizer-bootstrap
-
 .PHONY: configure-stagefeedback-target-libsanitizer maybe-configure-stagefeedback-target-libsanitizer
 maybe-configure-stagefeedback-target-libsanitizer:
 @if target-libsanitizer-bootstrap
@@ -40859,96 +35033,6 @@ configure-stagefeedback-target-libsanitizer:
 	  $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif target-libsanitizer-bootstrap
 
-.PHONY: configure-stageautoprofile-target-libsanitizer maybe-configure-stageautoprofile-target-libsanitizer
-maybe-configure-stageautoprofile-target-libsanitizer:
-@if target-libsanitizer-bootstrap
-maybe-configure-stageautoprofile-target-libsanitizer: configure-stageautoprofile-target-libsanitizer
-configure-stageautoprofile-target-libsanitizer:
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	echo "Checking multilib configuration for libsanitizer..."; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null; \
-	if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \
-	    mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	 \
-	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-	echo Configuring stage autoprofile in $(TARGET_SUBDIR)/libsanitizer; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \
-	cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libsanitizer; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautoprofile_CONFIGURE_FLAGS)
-@endif target-libsanitizer-bootstrap
-
-.PHONY: configure-stageautofeedback-target-libsanitizer maybe-configure-stageautofeedback-target-libsanitizer
-maybe-configure-stageautofeedback-target-libsanitizer:
-@if target-libsanitizer-bootstrap
-maybe-configure-stageautofeedback-target-libsanitizer: configure-stageautofeedback-target-libsanitizer
-configure-stageautofeedback-target-libsanitizer:
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	echo "Checking multilib configuration for libsanitizer..."; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null; \
-	if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \
-	    mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	 \
-	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-	echo Configuring stage autofeedback in $(TARGET_SUBDIR)/libsanitizer; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \
-	cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libsanitizer; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautofeedback_CONFIGURE_FLAGS)
-@endif target-libsanitizer-bootstrap
-
 
 
 
@@ -41183,48 +35267,6 @@ clean-stageprofile-target-libsanitizer:
 @endif target-libsanitizer-bootstrap
 
 
-.PHONY: all-stagetrain-target-libsanitizer maybe-all-stagetrain-target-libsanitizer
-.PHONY: clean-stagetrain-target-libsanitizer maybe-clean-stagetrain-target-libsanitizer
-maybe-all-stagetrain-target-libsanitizer:
-maybe-clean-stagetrain-target-libsanitizer:
-@if target-libsanitizer-bootstrap
-maybe-all-stagetrain-target-libsanitizer: all-stagetrain-target-libsanitizer
-all-stagetrain: all-stagetrain-target-libsanitizer
-TARGET-stagetrain-target-libsanitizer = $(TARGET-target-libsanitizer)
-all-stagetrain-target-libsanitizer: configure-stagetrain-target-libsanitizer
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	  \
-	cd $(TARGET_SUBDIR)/libsanitizer && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
-		TFLAGS="$(STAGEtrain_TFLAGS)"  \
-		$(TARGET-stagetrain-target-libsanitizer)
-
-maybe-clean-stagetrain-target-libsanitizer: clean-stagetrain-target-libsanitizer
-clean-stagetrain: clean-stagetrain-target-libsanitizer
-clean-stagetrain-target-libsanitizer:
-	@if [ $(current_stage) = stagetrain ]; then \
-	  [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
-	else \
-	  [ -f $(TARGET_SUBDIR)/stagetrain-libsanitizer/Makefile ] || exit 0; \
-	  $(MAKE) stagetrain-start; \
-	fi; \
-	cd $(TARGET_SUBDIR)/libsanitizer && \
-	$(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
-@endif target-libsanitizer-bootstrap
-
-
 .PHONY: all-stagefeedback-target-libsanitizer maybe-all-stagefeedback-target-libsanitizer
 .PHONY: clean-stagefeedback-target-libsanitizer maybe-clean-stagefeedback-target-libsanitizer
 maybe-all-stagefeedback-target-libsanitizer:
@@ -41267,90 +35309,6 @@ clean-stagefeedback-target-libsanitizer:
 @endif target-libsanitizer-bootstrap
 
 
-.PHONY: all-stageautoprofile-target-libsanitizer maybe-all-stageautoprofile-target-libsanitizer
-.PHONY: clean-stageautoprofile-target-libsanitizer maybe-clean-stageautoprofile-target-libsanitizer
-maybe-all-stageautoprofile-target-libsanitizer:
-maybe-clean-stageautoprofile-target-libsanitizer:
-@if target-libsanitizer-bootstrap
-maybe-all-stageautoprofile-target-libsanitizer: all-stageautoprofile-target-libsanitizer
-all-stageautoprofile: all-stageautoprofile-target-libsanitizer
-TARGET-stageautoprofile-target-libsanitizer = $(TARGET-target-libsanitizer)
-all-stageautoprofile-target-libsanitizer: configure-stageautoprofile-target-libsanitizer
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	  \
-	cd $(TARGET_SUBDIR)/libsanitizer && \
-	$$s/gcc/config/i386/$(AUTO_PROFILE) \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
-		TFLAGS="$(STAGEautoprofile_TFLAGS)"  \
-		$(TARGET-stageautoprofile-target-libsanitizer)
-
-maybe-clean-stageautoprofile-target-libsanitizer: clean-stageautoprofile-target-libsanitizer
-clean-stageautoprofile: clean-stageautoprofile-target-libsanitizer
-clean-stageautoprofile-target-libsanitizer:
-	@if [ $(current_stage) = stageautoprofile ]; then \
-	  [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
-	else \
-	  [ -f $(TARGET_SUBDIR)/stageautoprofile-libsanitizer/Makefile ] || exit 0; \
-	  $(MAKE) stageautoprofile-start; \
-	fi; \
-	cd $(TARGET_SUBDIR)/libsanitizer && \
-	$(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
-@endif target-libsanitizer-bootstrap
-
-
-.PHONY: all-stageautofeedback-target-libsanitizer maybe-all-stageautofeedback-target-libsanitizer
-.PHONY: clean-stageautofeedback-target-libsanitizer maybe-clean-stageautofeedback-target-libsanitizer
-maybe-all-stageautofeedback-target-libsanitizer:
-maybe-clean-stageautofeedback-target-libsanitizer:
-@if target-libsanitizer-bootstrap
-maybe-all-stageautofeedback-target-libsanitizer: all-stageautofeedback-target-libsanitizer
-all-stageautofeedback: all-stageautofeedback-target-libsanitizer
-TARGET-stageautofeedback-target-libsanitizer = $(TARGET-target-libsanitizer)
-all-stageautofeedback-target-libsanitizer: configure-stageautofeedback-target-libsanitizer
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	  \
-	cd $(TARGET_SUBDIR)/libsanitizer && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
-		TFLAGS="$(STAGEautofeedback_TFLAGS)" PERF_DATA=perf.data \
-		$(TARGET-stageautofeedback-target-libsanitizer)
-
-maybe-clean-stageautofeedback-target-libsanitizer: clean-stageautofeedback-target-libsanitizer
-clean-stageautofeedback: clean-stageautofeedback-target-libsanitizer
-clean-stageautofeedback-target-libsanitizer:
-	@if [ $(current_stage) = stageautofeedback ]; then \
-	  [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \
-	else \
-	  [ -f $(TARGET_SUBDIR)/stageautofeedback-libsanitizer/Makefile ] || exit 0; \
-	  $(MAKE) stageautofeedback-start; \
-	fi; \
-	cd $(TARGET_SUBDIR)/libsanitizer && \
-	$(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
-@endif target-libsanitizer-bootstrap
-
-
 
 
 
@@ -42012,51 +35970,6 @@ configure-stageprofile-target-libmpx:
 	  $(STAGEprofile_CONFIGURE_FLAGS)
 @endif target-libmpx-bootstrap
 
-.PHONY: configure-stagetrain-target-libmpx maybe-configure-stagetrain-target-libmpx
-maybe-configure-stagetrain-target-libmpx:
-@if target-libmpx-bootstrap
-maybe-configure-stagetrain-target-libmpx: configure-stagetrain-target-libmpx
-configure-stagetrain-target-libmpx:
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	echo "Checking multilib configuration for libmpx..."; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libmpx/multilib.tmp 2> /dev/null; \
-	if test -r $(TARGET_SUBDIR)/libmpx/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libmpx/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \
-	    mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libmpx/Makefile || exit 0; \
-	$(NORMAL_TARGET_EXPORTS) \
-	 \
-	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-	echo Configuring stage train in $(TARGET_SUBDIR)/libmpx; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx; \
-	cd $(TARGET_SUBDIR)/libmpx || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libmpx; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEtrain_CONFIGURE_FLAGS)
-@endif target-libmpx-bootstrap
-
 .PHONY: configure-stagefeedback-target-libmpx maybe-configure-stagefeedback-target-libmpx
 maybe-configure-stagefeedback-target-libmpx:
 @if target-libmpx-bootstrap
@@ -42102,96 +36015,6 @@ configure-stagefeedback-target-libmpx:
 	  $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif target-libmpx-bootstrap
 
-.PHONY: configure-stageautoprofile-target-libmpx maybe-configure-stageautoprofile-target-libmpx
-maybe-configure-stageautoprofile-target-libmpx:
-@if target-libmpx-bootstrap
-maybe-configure-stageautoprofile-target-libmpx: configure-stageautoprofile-target-libmpx
-configure-stageautoprofile-target-libmpx:
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	echo "Checking multilib configuration for libmpx..."; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libmpx/multilib.tmp 2> /dev/null; \
-	if test -r $(TARGET_SUBDIR)/libmpx/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libmpx/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \
-	    mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libmpx/Makefile || exit 0; \
-	$(NORMAL_TARGET_EXPORTS) \
-	 \
-	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-	echo Configuring stage autoprofile in $(TARGET_SUBDIR)/libmpx; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx; \
-	cd $(TARGET_SUBDIR)/libmpx || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libmpx; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautoprofile_CONFIGURE_FLAGS)
-@endif target-libmpx-bootstrap
-
-.PHONY: configure-stageautofeedback-target-libmpx maybe-configure-stageautofeedback-target-libmpx
-maybe-configure-stageautofeedback-target-libmpx:
-@if target-libmpx-bootstrap
-maybe-configure-stageautofeedback-target-libmpx: configure-stageautofeedback-target-libmpx
-configure-stageautofeedback-target-libmpx:
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	echo "Checking multilib configuration for libmpx..."; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libmpx/multilib.tmp 2> /dev/null; \
-	if test -r $(TARGET_SUBDIR)/libmpx/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libmpx/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \
-	    mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libmpx/Makefile || exit 0; \
-	$(NORMAL_TARGET_EXPORTS) \
-	 \
-	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-	echo Configuring stage autofeedback in $(TARGET_SUBDIR)/libmpx; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx; \
-	cd $(TARGET_SUBDIR)/libmpx || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libmpx; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautofeedback_CONFIGURE_FLAGS)
-@endif target-libmpx-bootstrap
-
 
 
 
@@ -42426,48 +36249,6 @@ clean-stageprofile-target-libmpx:
 @endif target-libmpx-bootstrap
 
 
-.PHONY: all-stagetrain-target-libmpx maybe-all-stagetrain-target-libmpx
-.PHONY: clean-stagetrain-target-libmpx maybe-clean-stagetrain-target-libmpx
-maybe-all-stagetrain-target-libmpx:
-maybe-clean-stagetrain-target-libmpx:
-@if target-libmpx-bootstrap
-maybe-all-stagetrain-target-libmpx: all-stagetrain-target-libmpx
-all-stagetrain: all-stagetrain-target-libmpx
-TARGET-stagetrain-target-libmpx = $(TARGET-target-libmpx)
-all-stagetrain-target-libmpx: configure-stagetrain-target-libmpx
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	$(NORMAL_TARGET_EXPORTS) \
-	  \
-	cd $(TARGET_SUBDIR)/libmpx && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_TARGET_FLAGS)   \
-		TFLAGS="$(STAGEtrain_TFLAGS)"  \
-		$(TARGET-stagetrain-target-libmpx)
-
-maybe-clean-stagetrain-target-libmpx: clean-stagetrain-target-libmpx
-clean-stagetrain: clean-stagetrain-target-libmpx
-clean-stagetrain-target-libmpx:
-	@if [ $(current_stage) = stagetrain ]; then \
-	  [ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
-	else \
-	  [ -f $(TARGET_SUBDIR)/stagetrain-libmpx/Makefile ] || exit 0; \
-	  $(MAKE) stagetrain-start; \
-	fi; \
-	cd $(TARGET_SUBDIR)/libmpx && \
-	$(MAKE) $(EXTRA_TARGET_FLAGS)   clean
-@endif target-libmpx-bootstrap
-
-
 .PHONY: all-stagefeedback-target-libmpx maybe-all-stagefeedback-target-libmpx
 .PHONY: clean-stagefeedback-target-libmpx maybe-clean-stagefeedback-target-libmpx
 maybe-all-stagefeedback-target-libmpx:
@@ -42510,90 +36291,6 @@ clean-stagefeedback-target-libmpx:
 @endif target-libmpx-bootstrap
 
 
-.PHONY: all-stageautoprofile-target-libmpx maybe-all-stageautoprofile-target-libmpx
-.PHONY: clean-stageautoprofile-target-libmpx maybe-clean-stageautoprofile-target-libmpx
-maybe-all-stageautoprofile-target-libmpx:
-maybe-clean-stageautoprofile-target-libmpx:
-@if target-libmpx-bootstrap
-maybe-all-stageautoprofile-target-libmpx: all-stageautoprofile-target-libmpx
-all-stageautoprofile: all-stageautoprofile-target-libmpx
-TARGET-stageautoprofile-target-libmpx = $(TARGET-target-libmpx)
-all-stageautoprofile-target-libmpx: configure-stageautoprofile-target-libmpx
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	$(NORMAL_TARGET_EXPORTS) \
-	  \
-	cd $(TARGET_SUBDIR)/libmpx && \
-	$$s/gcc/config/i386/$(AUTO_PROFILE) \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_TARGET_FLAGS)   \
-		TFLAGS="$(STAGEautoprofile_TFLAGS)"  \
-		$(TARGET-stageautoprofile-target-libmpx)
-
-maybe-clean-stageautoprofile-target-libmpx: clean-stageautoprofile-target-libmpx
-clean-stageautoprofile: clean-stageautoprofile-target-libmpx
-clean-stageautoprofile-target-libmpx:
-	@if [ $(current_stage) = stageautoprofile ]; then \
-	  [ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
-	else \
-	  [ -f $(TARGET_SUBDIR)/stageautoprofile-libmpx/Makefile ] || exit 0; \
-	  $(MAKE) stageautoprofile-start; \
-	fi; \
-	cd $(TARGET_SUBDIR)/libmpx && \
-	$(MAKE) $(EXTRA_TARGET_FLAGS)   clean
-@endif target-libmpx-bootstrap
-
-
-.PHONY: all-stageautofeedback-target-libmpx maybe-all-stageautofeedback-target-libmpx
-.PHONY: clean-stageautofeedback-target-libmpx maybe-clean-stageautofeedback-target-libmpx
-maybe-all-stageautofeedback-target-libmpx:
-maybe-clean-stageautofeedback-target-libmpx:
-@if target-libmpx-bootstrap
-maybe-all-stageautofeedback-target-libmpx: all-stageautofeedback-target-libmpx
-all-stageautofeedback: all-stageautofeedback-target-libmpx
-TARGET-stageautofeedback-target-libmpx = $(TARGET-target-libmpx)
-all-stageautofeedback-target-libmpx: configure-stageautofeedback-target-libmpx
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	$(NORMAL_TARGET_EXPORTS) \
-	  \
-	cd $(TARGET_SUBDIR)/libmpx && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_TARGET_FLAGS)   \
-		TFLAGS="$(STAGEautofeedback_TFLAGS)" PERF_DATA=perf.data \
-		$(TARGET-stageautofeedback-target-libmpx)
-
-maybe-clean-stageautofeedback-target-libmpx: clean-stageautofeedback-target-libmpx
-clean-stageautofeedback: clean-stageautofeedback-target-libmpx
-clean-stageautofeedback-target-libmpx:
-	@if [ $(current_stage) = stageautofeedback ]; then \
-	  [ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \
-	else \
-	  [ -f $(TARGET_SUBDIR)/stageautofeedback-libmpx/Makefile ] || exit 0; \
-	  $(MAKE) stageautofeedback-start; \
-	fi; \
-	cd $(TARGET_SUBDIR)/libmpx && \
-	$(MAKE) $(EXTRA_TARGET_FLAGS)   clean
-@endif target-libmpx-bootstrap
-
-
 
 
 
@@ -43255,51 +36952,6 @@ configure-stageprofile-target-libvtv:
 	  $(STAGEprofile_CONFIGURE_FLAGS)
 @endif target-libvtv-bootstrap
 
-.PHONY: configure-stagetrain-target-libvtv maybe-configure-stagetrain-target-libvtv
-maybe-configure-stagetrain-target-libvtv:
-@if target-libvtv-bootstrap
-maybe-configure-stagetrain-target-libvtv: configure-stagetrain-target-libvtv
-configure-stagetrain-target-libvtv:
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	echo "Checking multilib configuration for libvtv..."; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libvtv/multilib.tmp 2> /dev/null; \
-	if test -r $(TARGET_SUBDIR)/libvtv/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libvtv/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/libvtv/Makefile; \
-	    mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libvtv/Makefile || exit 0; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	 \
-	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-	echo Configuring stage train in $(TARGET_SUBDIR)/libvtv; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv; \
-	cd $(TARGET_SUBDIR)/libvtv || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/libvtv/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libvtv; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEtrain_CONFIGURE_FLAGS)
-@endif target-libvtv-bootstrap
-
 .PHONY: configure-stagefeedback-target-libvtv maybe-configure-stagefeedback-target-libvtv
 maybe-configure-stagefeedback-target-libvtv:
 @if target-libvtv-bootstrap
@@ -43345,96 +36997,6 @@ configure-stagefeedback-target-libvtv:
 	  $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif target-libvtv-bootstrap
 
-.PHONY: configure-stageautoprofile-target-libvtv maybe-configure-stageautoprofile-target-libvtv
-maybe-configure-stageautoprofile-target-libvtv:
-@if target-libvtv-bootstrap
-maybe-configure-stageautoprofile-target-libvtv: configure-stageautoprofile-target-libvtv
-configure-stageautoprofile-target-libvtv:
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	echo "Checking multilib configuration for libvtv..."; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libvtv/multilib.tmp 2> /dev/null; \
-	if test -r $(TARGET_SUBDIR)/libvtv/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libvtv/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/libvtv/Makefile; \
-	    mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libvtv/Makefile || exit 0; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	 \
-	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-	echo Configuring stage autoprofile in $(TARGET_SUBDIR)/libvtv; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv; \
-	cd $(TARGET_SUBDIR)/libvtv || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/libvtv/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libvtv; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautoprofile_CONFIGURE_FLAGS)
-@endif target-libvtv-bootstrap
-
-.PHONY: configure-stageautofeedback-target-libvtv maybe-configure-stageautofeedback-target-libvtv
-maybe-configure-stageautofeedback-target-libvtv:
-@if target-libvtv-bootstrap
-maybe-configure-stageautofeedback-target-libvtv: configure-stageautofeedback-target-libvtv
-configure-stageautofeedback-target-libvtv:
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	echo "Checking multilib configuration for libvtv..."; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libvtv/multilib.tmp 2> /dev/null; \
-	if test -r $(TARGET_SUBDIR)/libvtv/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libvtv/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/libvtv/Makefile; \
-	    mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libvtv/Makefile || exit 0; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	 \
-	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-	echo Configuring stage autofeedback in $(TARGET_SUBDIR)/libvtv; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv; \
-	cd $(TARGET_SUBDIR)/libvtv || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/libvtv/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libvtv; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautofeedback_CONFIGURE_FLAGS)
-@endif target-libvtv-bootstrap
-
 
 
 
@@ -43669,48 +37231,6 @@ clean-stageprofile-target-libvtv:
 @endif target-libvtv-bootstrap
 
 
-.PHONY: all-stagetrain-target-libvtv maybe-all-stagetrain-target-libvtv
-.PHONY: clean-stagetrain-target-libvtv maybe-clean-stagetrain-target-libvtv
-maybe-all-stagetrain-target-libvtv:
-maybe-clean-stagetrain-target-libvtv:
-@if target-libvtv-bootstrap
-maybe-all-stagetrain-target-libvtv: all-stagetrain-target-libvtv
-all-stagetrain: all-stagetrain-target-libvtv
-TARGET-stagetrain-target-libvtv = $(TARGET-target-libvtv)
-all-stagetrain-target-libvtv: configure-stagetrain-target-libvtv
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	  \
-	cd $(TARGET_SUBDIR)/libvtv && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
-		TFLAGS="$(STAGEtrain_TFLAGS)"  \
-		$(TARGET-stagetrain-target-libvtv)
-
-maybe-clean-stagetrain-target-libvtv: clean-stagetrain-target-libvtv
-clean-stagetrain: clean-stagetrain-target-libvtv
-clean-stagetrain-target-libvtv:
-	@if [ $(current_stage) = stagetrain ]; then \
-	  [ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \
-	else \
-	  [ -f $(TARGET_SUBDIR)/stagetrain-libvtv/Makefile ] || exit 0; \
-	  $(MAKE) stagetrain-start; \
-	fi; \
-	cd $(TARGET_SUBDIR)/libvtv && \
-	$(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
-@endif target-libvtv-bootstrap
-
-
 .PHONY: all-stagefeedback-target-libvtv maybe-all-stagefeedback-target-libvtv
 .PHONY: clean-stagefeedback-target-libvtv maybe-clean-stagefeedback-target-libvtv
 maybe-all-stagefeedback-target-libvtv:
@@ -43753,90 +37273,6 @@ clean-stagefeedback-target-libvtv:
 @endif target-libvtv-bootstrap
 
 
-.PHONY: all-stageautoprofile-target-libvtv maybe-all-stageautoprofile-target-libvtv
-.PHONY: clean-stageautoprofile-target-libvtv maybe-clean-stageautoprofile-target-libvtv
-maybe-all-stageautoprofile-target-libvtv:
-maybe-clean-stageautoprofile-target-libvtv:
-@if target-libvtv-bootstrap
-maybe-all-stageautoprofile-target-libvtv: all-stageautoprofile-target-libvtv
-all-stageautoprofile: all-stageautoprofile-target-libvtv
-TARGET-stageautoprofile-target-libvtv = $(TARGET-target-libvtv)
-all-stageautoprofile-target-libvtv: configure-stageautoprofile-target-libvtv
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	  \
-	cd $(TARGET_SUBDIR)/libvtv && \
-	$$s/gcc/config/i386/$(AUTO_PROFILE) \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
-		TFLAGS="$(STAGEautoprofile_TFLAGS)"  \
-		$(TARGET-stageautoprofile-target-libvtv)
-
-maybe-clean-stageautoprofile-target-libvtv: clean-stageautoprofile-target-libvtv
-clean-stageautoprofile: clean-stageautoprofile-target-libvtv
-clean-stageautoprofile-target-libvtv:
-	@if [ $(current_stage) = stageautoprofile ]; then \
-	  [ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \
-	else \
-	  [ -f $(TARGET_SUBDIR)/stageautoprofile-libvtv/Makefile ] || exit 0; \
-	  $(MAKE) stageautoprofile-start; \
-	fi; \
-	cd $(TARGET_SUBDIR)/libvtv && \
-	$(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
-@endif target-libvtv-bootstrap
-
-
-.PHONY: all-stageautofeedback-target-libvtv maybe-all-stageautofeedback-target-libvtv
-.PHONY: clean-stageautofeedback-target-libvtv maybe-clean-stageautofeedback-target-libvtv
-maybe-all-stageautofeedback-target-libvtv:
-maybe-clean-stageautofeedback-target-libvtv:
-@if target-libvtv-bootstrap
-maybe-all-stageautofeedback-target-libvtv: all-stageautofeedback-target-libvtv
-all-stageautofeedback: all-stageautofeedback-target-libvtv
-TARGET-stageautofeedback-target-libvtv = $(TARGET-target-libvtv)
-all-stageautofeedback-target-libvtv: configure-stageautofeedback-target-libvtv
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	$(RAW_CXX_TARGET_EXPORTS) \
-	  \
-	cd $(TARGET_SUBDIR)/libvtv && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
-		TFLAGS="$(STAGEautofeedback_TFLAGS)" PERF_DATA=perf.data \
-		$(TARGET-stageautofeedback-target-libvtv)
-
-maybe-clean-stageautofeedback-target-libvtv: clean-stageautofeedback-target-libvtv
-clean-stageautofeedback: clean-stageautofeedback-target-libvtv
-clean-stageautofeedback-target-libvtv:
-	@if [ $(current_stage) = stageautofeedback ]; then \
-	  [ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \
-	else \
-	  [ -f $(TARGET_SUBDIR)/stageautofeedback-libvtv/Makefile ] || exit 0; \
-	  $(MAKE) stageautofeedback-start; \
-	fi; \
-	cd $(TARGET_SUBDIR)/libvtv && \
-	$(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   clean
-@endif target-libvtv-bootstrap
-
-
 
 
 
@@ -44229,6 +37665,464 @@ maintainer-clean-target-libvtv:
 
 
 
+.PHONY: configure-target-libcilkrts maybe-configure-target-libcilkrts
+maybe-configure-target-libcilkrts:
+@if gcc-bootstrap
+configure-target-libcilkrts: stage_current
+@endif gcc-bootstrap
+@if target-libcilkrts
+maybe-configure-target-libcilkrts: configure-target-libcilkrts
+configure-target-libcilkrts: 
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	echo "Checking multilib configuration for libcilkrts..."; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libcilkrts; \
+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libcilkrts/multilib.tmp 2> /dev/null; \
+	if test -r $(TARGET_SUBDIR)/libcilkrts/multilib.out; then \
+	  if cmp -s $(TARGET_SUBDIR)/libcilkrts/multilib.tmp $(TARGET_SUBDIR)/libcilkrts/multilib.out; then \
+	    rm -f $(TARGET_SUBDIR)/libcilkrts/multilib.tmp; \
+	  else \
+	    rm -f $(TARGET_SUBDIR)/libcilkrts/Makefile; \
+	    mv $(TARGET_SUBDIR)/libcilkrts/multilib.tmp $(TARGET_SUBDIR)/libcilkrts/multilib.out; \
+	  fi; \
+	else \
+	  mv $(TARGET_SUBDIR)/libcilkrts/multilib.tmp $(TARGET_SUBDIR)/libcilkrts/multilib.out; \
+	fi; \
+	test ! -f $(TARGET_SUBDIR)/libcilkrts/Makefile || exit 0; \
+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libcilkrts; \
+	$(NORMAL_TARGET_EXPORTS)  \
+	echo Configuring in $(TARGET_SUBDIR)/libcilkrts; \
+	cd "$(TARGET_SUBDIR)/libcilkrts" || exit 1; \
+	case $(srcdir) in \
+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+	  *) topdir=`echo $(TARGET_SUBDIR)/libcilkrts/ | \
+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+	esac; \
+	module_srcdir=libcilkrts; \
+	rm -f no-such-file || : ; \
+	CONFIG_SITE=no-such-file $(SHELL) \
+	  $$s/$$module_srcdir/configure \
+	  --srcdir=$${topdir}/$$module_srcdir \
+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+	  --target=${target_alias}  \
+	  || exit 1
+@endif target-libcilkrts
+
+
+
+
+
+.PHONY: all-target-libcilkrts maybe-all-target-libcilkrts
+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
+all-target-libcilkrts: configure-target-libcilkrts
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS)  \
+	(cd $(TARGET_SUBDIR)/libcilkrts && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
+		$(TARGET-target-libcilkrts))
+@endif target-libcilkrts
+
+
+
+
+
+.PHONY: check-target-libcilkrts maybe-check-target-libcilkrts
+maybe-check-target-libcilkrts:
+@if target-libcilkrts
+maybe-check-target-libcilkrts: check-target-libcilkrts
+
+check-target-libcilkrts:
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/libcilkrts && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
+
+@endif target-libcilkrts
+
+.PHONY: install-target-libcilkrts maybe-install-target-libcilkrts
+maybe-install-target-libcilkrts:
+@if target-libcilkrts
+maybe-install-target-libcilkrts: install-target-libcilkrts
+
+install-target-libcilkrts: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/libcilkrts && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
+
+@endif target-libcilkrts
+
+.PHONY: install-strip-target-libcilkrts maybe-install-strip-target-libcilkrts
+maybe-install-strip-target-libcilkrts:
+@if target-libcilkrts
+maybe-install-strip-target-libcilkrts: install-strip-target-libcilkrts
+
+install-strip-target-libcilkrts: installdirs
+	@: $(MAKE); $(unstage)
+	@r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	(cd $(TARGET_SUBDIR)/libcilkrts && \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
+
+@endif target-libcilkrts
+
+# Other targets (info, dvi, pdf, etc.)
+
+.PHONY: maybe-info-target-libcilkrts info-target-libcilkrts
+maybe-info-target-libcilkrts:
+@if target-libcilkrts
+maybe-info-target-libcilkrts: info-target-libcilkrts
+
+info-target-libcilkrts: \
+    configure-target-libcilkrts 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing info in $(TARGET_SUBDIR)/libcilkrts"; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libcilkrts && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           info) \
+	  || exit 1
+
+@endif target-libcilkrts
+
+.PHONY: maybe-dvi-target-libcilkrts dvi-target-libcilkrts
+maybe-dvi-target-libcilkrts:
+@if target-libcilkrts
+maybe-dvi-target-libcilkrts: dvi-target-libcilkrts
+
+dvi-target-libcilkrts: \
+    configure-target-libcilkrts 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing dvi in $(TARGET_SUBDIR)/libcilkrts"; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libcilkrts && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           dvi) \
+	  || exit 1
+
+@endif target-libcilkrts
+
+.PHONY: maybe-pdf-target-libcilkrts pdf-target-libcilkrts
+maybe-pdf-target-libcilkrts:
+@if target-libcilkrts
+maybe-pdf-target-libcilkrts: pdf-target-libcilkrts
+
+pdf-target-libcilkrts: \
+    configure-target-libcilkrts 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing pdf in $(TARGET_SUBDIR)/libcilkrts"; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libcilkrts && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           pdf) \
+	  || exit 1
+
+@endif target-libcilkrts
+
+.PHONY: maybe-html-target-libcilkrts html-target-libcilkrts
+maybe-html-target-libcilkrts:
+@if target-libcilkrts
+maybe-html-target-libcilkrts: html-target-libcilkrts
+
+html-target-libcilkrts: \
+    configure-target-libcilkrts 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing html in $(TARGET_SUBDIR)/libcilkrts"; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libcilkrts && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           html) \
+	  || exit 1
+
+@endif target-libcilkrts
+
+.PHONY: maybe-TAGS-target-libcilkrts TAGS-target-libcilkrts
+maybe-TAGS-target-libcilkrts:
+@if target-libcilkrts
+maybe-TAGS-target-libcilkrts: TAGS-target-libcilkrts
+
+TAGS-target-libcilkrts: \
+    configure-target-libcilkrts 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing TAGS in $(TARGET_SUBDIR)/libcilkrts"; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libcilkrts && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           TAGS) \
+	  || exit 1
+
+@endif target-libcilkrts
+
+.PHONY: maybe-install-info-target-libcilkrts install-info-target-libcilkrts
+maybe-install-info-target-libcilkrts:
+@if target-libcilkrts
+maybe-install-info-target-libcilkrts: install-info-target-libcilkrts
+
+install-info-target-libcilkrts: \
+    configure-target-libcilkrts \
+    info-target-libcilkrts 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-info in $(TARGET_SUBDIR)/libcilkrts"; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libcilkrts && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-info) \
+	  || exit 1
+
+@endif target-libcilkrts
+
+.PHONY: maybe-install-pdf-target-libcilkrts install-pdf-target-libcilkrts
+maybe-install-pdf-target-libcilkrts:
+@if target-libcilkrts
+maybe-install-pdf-target-libcilkrts: install-pdf-target-libcilkrts
+
+install-pdf-target-libcilkrts: \
+    configure-target-libcilkrts \
+    pdf-target-libcilkrts 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-pdf in $(TARGET_SUBDIR)/libcilkrts"; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libcilkrts && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-pdf) \
+	  || exit 1
+
+@endif target-libcilkrts
+
+.PHONY: maybe-install-html-target-libcilkrts install-html-target-libcilkrts
+maybe-install-html-target-libcilkrts:
+@if target-libcilkrts
+maybe-install-html-target-libcilkrts: install-html-target-libcilkrts
+
+install-html-target-libcilkrts: \
+    configure-target-libcilkrts \
+    html-target-libcilkrts 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing install-html in $(TARGET_SUBDIR)/libcilkrts"; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libcilkrts && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           install-html) \
+	  || exit 1
+
+@endif target-libcilkrts
+
+.PHONY: maybe-installcheck-target-libcilkrts installcheck-target-libcilkrts
+maybe-installcheck-target-libcilkrts:
+@if target-libcilkrts
+maybe-installcheck-target-libcilkrts: installcheck-target-libcilkrts
+
+installcheck-target-libcilkrts: \
+    configure-target-libcilkrts 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing installcheck in $(TARGET_SUBDIR)/libcilkrts"; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libcilkrts && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           installcheck) \
+	  || exit 1
+
+@endif target-libcilkrts
+
+.PHONY: maybe-mostlyclean-target-libcilkrts mostlyclean-target-libcilkrts
+maybe-mostlyclean-target-libcilkrts:
+@if target-libcilkrts
+maybe-mostlyclean-target-libcilkrts: mostlyclean-target-libcilkrts
+
+mostlyclean-target-libcilkrts: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing mostlyclean in $(TARGET_SUBDIR)/libcilkrts"; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libcilkrts && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           mostlyclean) \
+	  || exit 1
+
+@endif target-libcilkrts
+
+.PHONY: maybe-clean-target-libcilkrts clean-target-libcilkrts
+maybe-clean-target-libcilkrts:
+@if target-libcilkrts
+maybe-clean-target-libcilkrts: clean-target-libcilkrts
+
+clean-target-libcilkrts: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing clean in $(TARGET_SUBDIR)/libcilkrts"; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libcilkrts && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           clean) \
+	  || exit 1
+
+@endif target-libcilkrts
+
+.PHONY: maybe-distclean-target-libcilkrts distclean-target-libcilkrts
+maybe-distclean-target-libcilkrts:
+@if target-libcilkrts
+maybe-distclean-target-libcilkrts: distclean-target-libcilkrts
+
+distclean-target-libcilkrts: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing distclean in $(TARGET_SUBDIR)/libcilkrts"; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libcilkrts && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           distclean) \
+	  || exit 1
+
+@endif target-libcilkrts
+
+.PHONY: maybe-maintainer-clean-target-libcilkrts maintainer-clean-target-libcilkrts
+maybe-maintainer-clean-target-libcilkrts:
+@if target-libcilkrts
+maybe-maintainer-clean-target-libcilkrts: maintainer-clean-target-libcilkrts
+
+maintainer-clean-target-libcilkrts: 
+	@: $(MAKE); $(unstage)
+	@[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \
+	r=`${PWD_COMMAND}`; export r; \
+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+	$(NORMAL_TARGET_EXPORTS) \
+	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libcilkrts"; \
+	for flag in $(EXTRA_TARGET_FLAGS); do \
+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+	done; \
+	(cd $(TARGET_SUBDIR)/libcilkrts && \
+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+	          "RANLIB=$${RANLIB}" \
+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+	           maintainer-clean) \
+	  || exit 1
+
+@endif target-libcilkrts
+
+
+
+
+
 .PHONY: configure-target-liboffloadmic maybe-configure-target-liboffloadmic
 maybe-configure-target-liboffloadmic:
 @if gcc-bootstrap
@@ -45872,51 +39766,6 @@ configure-stageprofile-target-libgcc:
 	  $(STAGEprofile_CONFIGURE_FLAGS)
 @endif target-libgcc-bootstrap
 
-.PHONY: configure-stagetrain-target-libgcc maybe-configure-stagetrain-target-libgcc
-maybe-configure-stagetrain-target-libgcc:
-@if target-libgcc-bootstrap
-maybe-configure-stagetrain-target-libgcc: configure-stagetrain-target-libgcc
-configure-stagetrain-target-libgcc:
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	echo "Checking multilib configuration for libgcc..."; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null; \
-	if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libgcc/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/libgcc/Makefile; \
-	    mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
-	$(NORMAL_TARGET_EXPORTS) \
-	 \
-	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-	echo Configuring stage train in $(TARGET_SUBDIR)/libgcc; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc; \
-	cd $(TARGET_SUBDIR)/libgcc || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libgcc; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEtrain_CONFIGURE_FLAGS)
-@endif target-libgcc-bootstrap
-
 .PHONY: configure-stagefeedback-target-libgcc maybe-configure-stagefeedback-target-libgcc
 maybe-configure-stagefeedback-target-libgcc:
 @if target-libgcc-bootstrap
@@ -45962,96 +39811,6 @@ configure-stagefeedback-target-libgcc:
 	  $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif target-libgcc-bootstrap
 
-.PHONY: configure-stageautoprofile-target-libgcc maybe-configure-stageautoprofile-target-libgcc
-maybe-configure-stageautoprofile-target-libgcc:
-@if target-libgcc-bootstrap
-maybe-configure-stageautoprofile-target-libgcc: configure-stageautoprofile-target-libgcc
-configure-stageautoprofile-target-libgcc:
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	echo "Checking multilib configuration for libgcc..."; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null; \
-	if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libgcc/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/libgcc/Makefile; \
-	    mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
-	$(NORMAL_TARGET_EXPORTS) \
-	 \
-	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-	echo Configuring stage autoprofile in $(TARGET_SUBDIR)/libgcc; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc; \
-	cd $(TARGET_SUBDIR)/libgcc || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libgcc; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautoprofile_CONFIGURE_FLAGS)
-@endif target-libgcc-bootstrap
-
-.PHONY: configure-stageautofeedback-target-libgcc maybe-configure-stageautofeedback-target-libgcc
-maybe-configure-stageautofeedback-target-libgcc:
-@if target-libgcc-bootstrap
-maybe-configure-stageautofeedback-target-libgcc: configure-stageautofeedback-target-libgcc
-configure-stageautofeedback-target-libgcc:
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	echo "Checking multilib configuration for libgcc..."; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null; \
-	if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libgcc/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/libgcc/Makefile; \
-	    mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
-	$(NORMAL_TARGET_EXPORTS) \
-	 \
-	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-	echo Configuring stage autofeedback in $(TARGET_SUBDIR)/libgcc; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc; \
-	cd $(TARGET_SUBDIR)/libgcc || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libgcc; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautofeedback_CONFIGURE_FLAGS)
-@endif target-libgcc-bootstrap
-
 
 
 
@@ -46286,48 +40045,6 @@ clean-stageprofile-target-libgcc:
 @endif target-libgcc-bootstrap
 
 
-.PHONY: all-stagetrain-target-libgcc maybe-all-stagetrain-target-libgcc
-.PHONY: clean-stagetrain-target-libgcc maybe-clean-stagetrain-target-libgcc
-maybe-all-stagetrain-target-libgcc:
-maybe-clean-stagetrain-target-libgcc:
-@if target-libgcc-bootstrap
-maybe-all-stagetrain-target-libgcc: all-stagetrain-target-libgcc
-all-stagetrain: all-stagetrain-target-libgcc
-TARGET-stagetrain-target-libgcc = $(TARGET-target-libgcc)
-all-stagetrain-target-libgcc: configure-stagetrain-target-libgcc
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	$(NORMAL_TARGET_EXPORTS) \
-	  \
-	cd $(TARGET_SUBDIR)/libgcc && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_TARGET_FLAGS)   \
-		TFLAGS="$(STAGEtrain_TFLAGS)"  \
-		$(TARGET-stagetrain-target-libgcc)
-
-maybe-clean-stagetrain-target-libgcc: clean-stagetrain-target-libgcc
-clean-stagetrain: clean-stagetrain-target-libgcc
-clean-stagetrain-target-libgcc:
-	@if [ $(current_stage) = stagetrain ]; then \
-	  [ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
-	else \
-	  [ -f $(TARGET_SUBDIR)/stagetrain-libgcc/Makefile ] || exit 0; \
-	  $(MAKE) stagetrain-start; \
-	fi; \
-	cd $(TARGET_SUBDIR)/libgcc && \
-	$(MAKE) $(EXTRA_TARGET_FLAGS)   clean
-@endif target-libgcc-bootstrap
-
-
 .PHONY: all-stagefeedback-target-libgcc maybe-all-stagefeedback-target-libgcc
 .PHONY: clean-stagefeedback-target-libgcc maybe-clean-stagefeedback-target-libgcc
 maybe-all-stagefeedback-target-libgcc:
@@ -46370,90 +40087,6 @@ clean-stagefeedback-target-libgcc:
 @endif target-libgcc-bootstrap
 
 
-.PHONY: all-stageautoprofile-target-libgcc maybe-all-stageautoprofile-target-libgcc
-.PHONY: clean-stageautoprofile-target-libgcc maybe-clean-stageautoprofile-target-libgcc
-maybe-all-stageautoprofile-target-libgcc:
-maybe-clean-stageautoprofile-target-libgcc:
-@if target-libgcc-bootstrap
-maybe-all-stageautoprofile-target-libgcc: all-stageautoprofile-target-libgcc
-all-stageautoprofile: all-stageautoprofile-target-libgcc
-TARGET-stageautoprofile-target-libgcc = $(TARGET-target-libgcc)
-all-stageautoprofile-target-libgcc: configure-stageautoprofile-target-libgcc
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	$(NORMAL_TARGET_EXPORTS) \
-	  \
-	cd $(TARGET_SUBDIR)/libgcc && \
-	$$s/gcc/config/i386/$(AUTO_PROFILE) \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_TARGET_FLAGS)   \
-		TFLAGS="$(STAGEautoprofile_TFLAGS)"  \
-		$(TARGET-stageautoprofile-target-libgcc)
-
-maybe-clean-stageautoprofile-target-libgcc: clean-stageautoprofile-target-libgcc
-clean-stageautoprofile: clean-stageautoprofile-target-libgcc
-clean-stageautoprofile-target-libgcc:
-	@if [ $(current_stage) = stageautoprofile ]; then \
-	  [ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
-	else \
-	  [ -f $(TARGET_SUBDIR)/stageautoprofile-libgcc/Makefile ] || exit 0; \
-	  $(MAKE) stageautoprofile-start; \
-	fi; \
-	cd $(TARGET_SUBDIR)/libgcc && \
-	$(MAKE) $(EXTRA_TARGET_FLAGS)   clean
-@endif target-libgcc-bootstrap
-
-
-.PHONY: all-stageautofeedback-target-libgcc maybe-all-stageautofeedback-target-libgcc
-.PHONY: clean-stageautofeedback-target-libgcc maybe-clean-stageautofeedback-target-libgcc
-maybe-all-stageautofeedback-target-libgcc:
-maybe-clean-stageautofeedback-target-libgcc:
-@if target-libgcc-bootstrap
-maybe-all-stageautofeedback-target-libgcc: all-stageautofeedback-target-libgcc
-all-stageautofeedback: all-stageautofeedback-target-libgcc
-TARGET-stageautofeedback-target-libgcc = $(TARGET-target-libgcc)
-all-stageautofeedback-target-libgcc: configure-stageautofeedback-target-libgcc
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	$(NORMAL_TARGET_EXPORTS) \
-	  \
-	cd $(TARGET_SUBDIR)/libgcc && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_TARGET_FLAGS)   \
-		TFLAGS="$(STAGEautofeedback_TFLAGS)" PERF_DATA=perf.data \
-		$(TARGET-stageautofeedback-target-libgcc)
-
-maybe-clean-stageautofeedback-target-libgcc: clean-stageautofeedback-target-libgcc
-clean-stageautofeedback: clean-stageautofeedback-target-libgcc
-clean-stageautofeedback-target-libgcc:
-	@if [ $(current_stage) = stageautofeedback ]; then \
-	  [ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \
-	else \
-	  [ -f $(TARGET_SUBDIR)/stageautofeedback-libgcc/Makefile ] || exit 0; \
-	  $(MAKE) stageautofeedback-start; \
-	fi; \
-	cd $(TARGET_SUBDIR)/libgcc && \
-	$(MAKE) $(EXTRA_TARGET_FLAGS)   clean
-@endif target-libgcc-bootstrap
-
-
 
 
 
@@ -49131,922 +42764,6 @@ maintainer-clean-target-libgo:
 
 
 
-.PHONY: configure-target-libhsail-rt maybe-configure-target-libhsail-rt
-maybe-configure-target-libhsail-rt:
-@if gcc-bootstrap
-configure-target-libhsail-rt: stage_current
-@endif gcc-bootstrap
-@if target-libhsail-rt
-maybe-configure-target-libhsail-rt: configure-target-libhsail-rt
-configure-target-libhsail-rt: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for libhsail-rt..."; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libhsail-rt; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libhsail-rt/multilib.tmp 2> /dev/null; \
-	if test -r $(TARGET_SUBDIR)/libhsail-rt/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libhsail-rt/multilib.tmp $(TARGET_SUBDIR)/libhsail-rt/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libhsail-rt/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/libhsail-rt/Makefile; \
-	    mv $(TARGET_SUBDIR)/libhsail-rt/multilib.tmp $(TARGET_SUBDIR)/libhsail-rt/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libhsail-rt/multilib.tmp $(TARGET_SUBDIR)/libhsail-rt/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libhsail-rt/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libhsail-rt; \
-	$(NORMAL_TARGET_EXPORTS)  \
-	echo Configuring in $(TARGET_SUBDIR)/libhsail-rt; \
-	cd "$(TARGET_SUBDIR)/libhsail-rt" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/libhsail-rt/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libhsail-rt; \
-	rm -f no-such-file || : ; \
-	CONFIG_SITE=no-such-file $(SHELL) \
-	  $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-	  --target=${target_alias}  \
-	  || exit 1
-@endif target-libhsail-rt
-
-
-
-
-
-.PHONY: all-target-libhsail-rt maybe-all-target-libhsail-rt
-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
-all-target-libhsail-rt: configure-target-libhsail-rt
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS)  \
-	(cd $(TARGET_SUBDIR)/libhsail-rt && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
-		$(TARGET-target-libhsail-rt))
-@endif target-libhsail-rt
-
-
-
-
-
-.PHONY: check-target-libhsail-rt maybe-check-target-libhsail-rt
-maybe-check-target-libhsail-rt:
-@if target-libhsail-rt
-maybe-check-target-libhsail-rt: check-target-libhsail-rt
-
-check-target-libhsail-rt:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libhsail-rt && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
-
-@endif target-libhsail-rt
-
-.PHONY: install-target-libhsail-rt maybe-install-target-libhsail-rt
-maybe-install-target-libhsail-rt:
-@if target-libhsail-rt
-maybe-install-target-libhsail-rt: install-target-libhsail-rt
-
-install-target-libhsail-rt: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libhsail-rt && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
-
-@endif target-libhsail-rt
-
-.PHONY: install-strip-target-libhsail-rt maybe-install-strip-target-libhsail-rt
-maybe-install-strip-target-libhsail-rt:
-@if target-libhsail-rt
-maybe-install-strip-target-libhsail-rt: install-strip-target-libhsail-rt
-
-install-strip-target-libhsail-rt: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libhsail-rt && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
-
-@endif target-libhsail-rt
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-target-libhsail-rt info-target-libhsail-rt
-maybe-info-target-libhsail-rt:
-@if target-libhsail-rt
-maybe-info-target-libhsail-rt: info-target-libhsail-rt
-
-info-target-libhsail-rt: \
-    configure-target-libhsail-rt 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libhsail-rt/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing info in $(TARGET_SUBDIR)/libhsail-rt"; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libhsail-rt && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	           info) \
-	  || exit 1
-
-@endif target-libhsail-rt
-
-.PHONY: maybe-dvi-target-libhsail-rt dvi-target-libhsail-rt
-maybe-dvi-target-libhsail-rt:
-@if target-libhsail-rt
-maybe-dvi-target-libhsail-rt: dvi-target-libhsail-rt
-
-dvi-target-libhsail-rt: \
-    configure-target-libhsail-rt 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libhsail-rt/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing dvi in $(TARGET_SUBDIR)/libhsail-rt"; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libhsail-rt && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	           dvi) \
-	  || exit 1
-
-@endif target-libhsail-rt
-
-.PHONY: maybe-pdf-target-libhsail-rt pdf-target-libhsail-rt
-maybe-pdf-target-libhsail-rt:
-@if target-libhsail-rt
-maybe-pdf-target-libhsail-rt: pdf-target-libhsail-rt
-
-pdf-target-libhsail-rt: \
-    configure-target-libhsail-rt 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libhsail-rt/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing pdf in $(TARGET_SUBDIR)/libhsail-rt"; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libhsail-rt && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	           pdf) \
-	  || exit 1
-
-@endif target-libhsail-rt
-
-.PHONY: maybe-html-target-libhsail-rt html-target-libhsail-rt
-maybe-html-target-libhsail-rt:
-@if target-libhsail-rt
-maybe-html-target-libhsail-rt: html-target-libhsail-rt
-
-html-target-libhsail-rt: \
-    configure-target-libhsail-rt 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libhsail-rt/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing html in $(TARGET_SUBDIR)/libhsail-rt"; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libhsail-rt && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	           html) \
-	  || exit 1
-
-@endif target-libhsail-rt
-
-.PHONY: maybe-TAGS-target-libhsail-rt TAGS-target-libhsail-rt
-maybe-TAGS-target-libhsail-rt:
-@if target-libhsail-rt
-maybe-TAGS-target-libhsail-rt: TAGS-target-libhsail-rt
-
-TAGS-target-libhsail-rt: \
-    configure-target-libhsail-rt 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libhsail-rt/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing TAGS in $(TARGET_SUBDIR)/libhsail-rt"; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libhsail-rt && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	           TAGS) \
-	  || exit 1
-
-@endif target-libhsail-rt
-
-.PHONY: maybe-install-info-target-libhsail-rt install-info-target-libhsail-rt
-maybe-install-info-target-libhsail-rt:
-@if target-libhsail-rt
-maybe-install-info-target-libhsail-rt: install-info-target-libhsail-rt
-
-install-info-target-libhsail-rt: \
-    configure-target-libhsail-rt \
-    info-target-libhsail-rt 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libhsail-rt/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing install-info in $(TARGET_SUBDIR)/libhsail-rt"; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libhsail-rt && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	           install-info) \
-	  || exit 1
-
-@endif target-libhsail-rt
-
-.PHONY: maybe-install-pdf-target-libhsail-rt install-pdf-target-libhsail-rt
-maybe-install-pdf-target-libhsail-rt:
-@if target-libhsail-rt
-maybe-install-pdf-target-libhsail-rt: install-pdf-target-libhsail-rt
-
-install-pdf-target-libhsail-rt: \
-    configure-target-libhsail-rt \
-    pdf-target-libhsail-rt 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libhsail-rt/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing install-pdf in $(TARGET_SUBDIR)/libhsail-rt"; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libhsail-rt && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	           install-pdf) \
-	  || exit 1
-
-@endif target-libhsail-rt
-
-.PHONY: maybe-install-html-target-libhsail-rt install-html-target-libhsail-rt
-maybe-install-html-target-libhsail-rt:
-@if target-libhsail-rt
-maybe-install-html-target-libhsail-rt: install-html-target-libhsail-rt
-
-install-html-target-libhsail-rt: \
-    configure-target-libhsail-rt \
-    html-target-libhsail-rt 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libhsail-rt/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing install-html in $(TARGET_SUBDIR)/libhsail-rt"; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libhsail-rt && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	           install-html) \
-	  || exit 1
-
-@endif target-libhsail-rt
-
-.PHONY: maybe-installcheck-target-libhsail-rt installcheck-target-libhsail-rt
-maybe-installcheck-target-libhsail-rt:
-@if target-libhsail-rt
-maybe-installcheck-target-libhsail-rt: installcheck-target-libhsail-rt
-
-installcheck-target-libhsail-rt: \
-    configure-target-libhsail-rt 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libhsail-rt/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing installcheck in $(TARGET_SUBDIR)/libhsail-rt"; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libhsail-rt && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	           installcheck) \
-	  || exit 1
-
-@endif target-libhsail-rt
-
-.PHONY: maybe-mostlyclean-target-libhsail-rt mostlyclean-target-libhsail-rt
-maybe-mostlyclean-target-libhsail-rt:
-@if target-libhsail-rt
-maybe-mostlyclean-target-libhsail-rt: mostlyclean-target-libhsail-rt
-
-mostlyclean-target-libhsail-rt: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libhsail-rt/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing mostlyclean in $(TARGET_SUBDIR)/libhsail-rt"; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libhsail-rt && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	           mostlyclean) \
-	  || exit 1
-
-@endif target-libhsail-rt
-
-.PHONY: maybe-clean-target-libhsail-rt clean-target-libhsail-rt
-maybe-clean-target-libhsail-rt:
-@if target-libhsail-rt
-maybe-clean-target-libhsail-rt: clean-target-libhsail-rt
-
-clean-target-libhsail-rt: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libhsail-rt/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing clean in $(TARGET_SUBDIR)/libhsail-rt"; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libhsail-rt && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	           clean) \
-	  || exit 1
-
-@endif target-libhsail-rt
-
-.PHONY: maybe-distclean-target-libhsail-rt distclean-target-libhsail-rt
-maybe-distclean-target-libhsail-rt:
-@if target-libhsail-rt
-maybe-distclean-target-libhsail-rt: distclean-target-libhsail-rt
-
-distclean-target-libhsail-rt: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libhsail-rt/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing distclean in $(TARGET_SUBDIR)/libhsail-rt"; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libhsail-rt && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	           distclean) \
-	  || exit 1
-
-@endif target-libhsail-rt
-
-.PHONY: maybe-maintainer-clean-target-libhsail-rt maintainer-clean-target-libhsail-rt
-maybe-maintainer-clean-target-libhsail-rt:
-@if target-libhsail-rt
-maybe-maintainer-clean-target-libhsail-rt: maintainer-clean-target-libhsail-rt
-
-maintainer-clean-target-libhsail-rt: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libhsail-rt/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libhsail-rt"; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libhsail-rt && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	           maintainer-clean) \
-	  || exit 1
-
-@endif target-libhsail-rt
-
-
-
-
-
-.PHONY: configure-target-libphobos maybe-configure-target-libphobos
-maybe-configure-target-libphobos:
-@if gcc-bootstrap
-configure-target-libphobos: stage_current
-@endif gcc-bootstrap
-@if target-libphobos
-maybe-configure-target-libphobos: configure-target-libphobos
-configure-target-libphobos: 
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	echo "Checking multilib configuration for libphobos..."; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libphobos; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libphobos/multilib.tmp 2> /dev/null; \
-	if test -r $(TARGET_SUBDIR)/libphobos/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libphobos/multilib.tmp $(TARGET_SUBDIR)/libphobos/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libphobos/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/libphobos/Makefile; \
-	    mv $(TARGET_SUBDIR)/libphobos/multilib.tmp $(TARGET_SUBDIR)/libphobos/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libphobos/multilib.tmp $(TARGET_SUBDIR)/libphobos/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libphobos/Makefile || exit 0; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libphobos; \
-	$(NORMAL_TARGET_EXPORTS)  \
-	echo Configuring in $(TARGET_SUBDIR)/libphobos; \
-	cd "$(TARGET_SUBDIR)/libphobos" || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/libphobos/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libphobos; \
-	rm -f no-such-file || : ; \
-	CONFIG_SITE=no-such-file $(SHELL) \
-	  $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-	  --target=${target_alias}  \
-	  || exit 1
-@endif target-libphobos
-
-
-
-
-
-.PHONY: all-target-libphobos maybe-all-target-libphobos
-maybe-all-target-libphobos:
-@if gcc-bootstrap
-all-target-libphobos: stage_current
-@endif gcc-bootstrap
-@if target-libphobos
-TARGET-target-libphobos=all
-maybe-all-target-libphobos: all-target-libphobos
-all-target-libphobos: configure-target-libphobos
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS)  \
-	(cd $(TARGET_SUBDIR)/libphobos && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
-		$(TARGET-target-libphobos))
-@endif target-libphobos
-
-
-
-
-
-.PHONY: check-target-libphobos maybe-check-target-libphobos
-maybe-check-target-libphobos:
-@if target-libphobos
-maybe-check-target-libphobos: check-target-libphobos
-
-check-target-libphobos:
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libphobos && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
-
-@endif target-libphobos
-
-.PHONY: install-target-libphobos maybe-install-target-libphobos
-maybe-install-target-libphobos:
-@if target-libphobos
-maybe-install-target-libphobos: install-target-libphobos
-
-install-target-libphobos: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libphobos && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
-
-@endif target-libphobos
-
-.PHONY: install-strip-target-libphobos maybe-install-strip-target-libphobos
-maybe-install-strip-target-libphobos:
-@if target-libphobos
-maybe-install-strip-target-libphobos: install-strip-target-libphobos
-
-install-strip-target-libphobos: installdirs
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	(cd $(TARGET_SUBDIR)/libphobos && \
-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
-
-@endif target-libphobos
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-target-libphobos info-target-libphobos
-maybe-info-target-libphobos:
-@if target-libphobos
-maybe-info-target-libphobos: info-target-libphobos
-
-info-target-libphobos: \
-    configure-target-libphobos 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing info in $(TARGET_SUBDIR)/libphobos"; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libphobos && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	           info) \
-	  || exit 1
-
-@endif target-libphobos
-
-.PHONY: maybe-dvi-target-libphobos dvi-target-libphobos
-maybe-dvi-target-libphobos:
-@if target-libphobos
-maybe-dvi-target-libphobos: dvi-target-libphobos
-
-dvi-target-libphobos: \
-    configure-target-libphobos 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing dvi in $(TARGET_SUBDIR)/libphobos"; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libphobos && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	           dvi) \
-	  || exit 1
-
-@endif target-libphobos
-
-.PHONY: maybe-pdf-target-libphobos pdf-target-libphobos
-maybe-pdf-target-libphobos:
-@if target-libphobos
-maybe-pdf-target-libphobos: pdf-target-libphobos
-
-pdf-target-libphobos: \
-    configure-target-libphobos 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing pdf in $(TARGET_SUBDIR)/libphobos"; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libphobos && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	           pdf) \
-	  || exit 1
-
-@endif target-libphobos
-
-.PHONY: maybe-html-target-libphobos html-target-libphobos
-maybe-html-target-libphobos:
-@if target-libphobos
-maybe-html-target-libphobos: html-target-libphobos
-
-html-target-libphobos: \
-    configure-target-libphobos 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing html in $(TARGET_SUBDIR)/libphobos"; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libphobos && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	           html) \
-	  || exit 1
-
-@endif target-libphobos
-
-.PHONY: maybe-TAGS-target-libphobos TAGS-target-libphobos
-maybe-TAGS-target-libphobos:
-@if target-libphobos
-maybe-TAGS-target-libphobos: TAGS-target-libphobos
-
-TAGS-target-libphobos: \
-    configure-target-libphobos 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing TAGS in $(TARGET_SUBDIR)/libphobos"; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libphobos && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	           TAGS) \
-	  || exit 1
-
-@endif target-libphobos
-
-.PHONY: maybe-install-info-target-libphobos install-info-target-libphobos
-maybe-install-info-target-libphobos:
-@if target-libphobos
-maybe-install-info-target-libphobos: install-info-target-libphobos
-
-install-info-target-libphobos: \
-    configure-target-libphobos \
-    info-target-libphobos 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing install-info in $(TARGET_SUBDIR)/libphobos"; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libphobos && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	           install-info) \
-	  || exit 1
-
-@endif target-libphobos
-
-.PHONY: maybe-install-pdf-target-libphobos install-pdf-target-libphobos
-maybe-install-pdf-target-libphobos:
-@if target-libphobos
-maybe-install-pdf-target-libphobos: install-pdf-target-libphobos
-
-install-pdf-target-libphobos: \
-    configure-target-libphobos \
-    pdf-target-libphobos 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing install-pdf in $(TARGET_SUBDIR)/libphobos"; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libphobos && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	           install-pdf) \
-	  || exit 1
-
-@endif target-libphobos
-
-.PHONY: maybe-install-html-target-libphobos install-html-target-libphobos
-maybe-install-html-target-libphobos:
-@if target-libphobos
-maybe-install-html-target-libphobos: install-html-target-libphobos
-
-install-html-target-libphobos: \
-    configure-target-libphobos \
-    html-target-libphobos 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing install-html in $(TARGET_SUBDIR)/libphobos"; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libphobos && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	           install-html) \
-	  || exit 1
-
-@endif target-libphobos
-
-.PHONY: maybe-installcheck-target-libphobos installcheck-target-libphobos
-maybe-installcheck-target-libphobos:
-@if target-libphobos
-maybe-installcheck-target-libphobos: installcheck-target-libphobos
-
-installcheck-target-libphobos: \
-    configure-target-libphobos 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing installcheck in $(TARGET_SUBDIR)/libphobos"; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libphobos && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	           installcheck) \
-	  || exit 1
-
-@endif target-libphobos
-
-.PHONY: maybe-mostlyclean-target-libphobos mostlyclean-target-libphobos
-maybe-mostlyclean-target-libphobos:
-@if target-libphobos
-maybe-mostlyclean-target-libphobos: mostlyclean-target-libphobos
-
-mostlyclean-target-libphobos: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing mostlyclean in $(TARGET_SUBDIR)/libphobos"; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libphobos && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	           mostlyclean) \
-	  || exit 1
-
-@endif target-libphobos
-
-.PHONY: maybe-clean-target-libphobos clean-target-libphobos
-maybe-clean-target-libphobos:
-@if target-libphobos
-maybe-clean-target-libphobos: clean-target-libphobos
-
-clean-target-libphobos: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing clean in $(TARGET_SUBDIR)/libphobos"; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libphobos && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	           clean) \
-	  || exit 1
-
-@endif target-libphobos
-
-.PHONY: maybe-distclean-target-libphobos distclean-target-libphobos
-maybe-distclean-target-libphobos:
-@if target-libphobos
-maybe-distclean-target-libphobos: distclean-target-libphobos
-
-distclean-target-libphobos: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing distclean in $(TARGET_SUBDIR)/libphobos"; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libphobos && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	           distclean) \
-	  || exit 1
-
-@endif target-libphobos
-
-.PHONY: maybe-maintainer-clean-target-libphobos maintainer-clean-target-libphobos
-maybe-maintainer-clean-target-libphobos:
-@if target-libphobos
-maybe-maintainer-clean-target-libphobos: maintainer-clean-target-libphobos
-
-maintainer-clean-target-libphobos: 
-	@: $(MAKE); $(unstage)
-	@[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(NORMAL_TARGET_EXPORTS) \
-	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libphobos"; \
-	for flag in $(EXTRA_TARGET_FLAGS); do \
-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-	done; \
-	(cd $(TARGET_SUBDIR)/libphobos && \
-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-	          "RANLIB=$${RANLIB}" \
-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-	           maintainer-clean) \
-	  || exit 1
-
-@endif target-libphobos
-
-
-
-
-
 .PHONY: configure-target-libtermcap maybe-configure-target-libtermcap
 maybe-configure-target-libtermcap:
 @if gcc-bootstrap
@@ -53442,51 +46159,6 @@ configure-stageprofile-target-libgomp:
 	  $(STAGEprofile_CONFIGURE_FLAGS)
 @endif target-libgomp-bootstrap
 
-.PHONY: configure-stagetrain-target-libgomp maybe-configure-stagetrain-target-libgomp
-maybe-configure-stagetrain-target-libgomp:
-@if target-libgomp-bootstrap
-maybe-configure-stagetrain-target-libgomp: configure-stagetrain-target-libgomp
-configure-stagetrain-target-libgomp:
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	echo "Checking multilib configuration for libgomp..."; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgomp/multilib.tmp 2> /dev/null; \
-	if test -r $(TARGET_SUBDIR)/libgomp/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libgomp/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/libgomp/Makefile; \
-	    mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libgomp/Makefile || exit 0; \
-	$(NORMAL_TARGET_EXPORTS) \
-	 \
-	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-	echo Configuring stage train in $(TARGET_SUBDIR)/libgomp; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp; \
-	cd $(TARGET_SUBDIR)/libgomp || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/libgomp/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libgomp; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEtrain_CONFIGURE_FLAGS)
-@endif target-libgomp-bootstrap
-
 .PHONY: configure-stagefeedback-target-libgomp maybe-configure-stagefeedback-target-libgomp
 maybe-configure-stagefeedback-target-libgomp:
 @if target-libgomp-bootstrap
@@ -53532,96 +46204,6 @@ configure-stagefeedback-target-libgomp:
 	  $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif target-libgomp-bootstrap
 
-.PHONY: configure-stageautoprofile-target-libgomp maybe-configure-stageautoprofile-target-libgomp
-maybe-configure-stageautoprofile-target-libgomp:
-@if target-libgomp-bootstrap
-maybe-configure-stageautoprofile-target-libgomp: configure-stageautoprofile-target-libgomp
-configure-stageautoprofile-target-libgomp:
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	echo "Checking multilib configuration for libgomp..."; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgomp/multilib.tmp 2> /dev/null; \
-	if test -r $(TARGET_SUBDIR)/libgomp/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libgomp/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/libgomp/Makefile; \
-	    mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libgomp/Makefile || exit 0; \
-	$(NORMAL_TARGET_EXPORTS) \
-	 \
-	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-	echo Configuring stage autoprofile in $(TARGET_SUBDIR)/libgomp; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp; \
-	cd $(TARGET_SUBDIR)/libgomp || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/libgomp/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libgomp; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautoprofile_CONFIGURE_FLAGS)
-@endif target-libgomp-bootstrap
-
-.PHONY: configure-stageautofeedback-target-libgomp maybe-configure-stageautofeedback-target-libgomp
-maybe-configure-stageautofeedback-target-libgomp:
-@if target-libgomp-bootstrap
-maybe-configure-stageautofeedback-target-libgomp: configure-stageautofeedback-target-libgomp
-configure-stageautofeedback-target-libgomp:
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	echo "Checking multilib configuration for libgomp..."; \
-	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgomp/multilib.tmp 2> /dev/null; \
-	if test -r $(TARGET_SUBDIR)/libgomp/multilib.out; then \
-	  if cmp -s $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; then \
-	    rm -f $(TARGET_SUBDIR)/libgomp/multilib.tmp; \
-	  else \
-	    rm -f $(TARGET_SUBDIR)/libgomp/Makefile; \
-	    mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \
-	  fi; \
-	else \
-	  mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \
-	fi; \
-	test ! -f $(TARGET_SUBDIR)/libgomp/Makefile || exit 0; \
-	$(NORMAL_TARGET_EXPORTS) \
-	 \
-	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-	LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;  \
-	echo Configuring stage autofeedback in $(TARGET_SUBDIR)/libgomp; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp; \
-	cd $(TARGET_SUBDIR)/libgomp || exit 1; \
-	case $(srcdir) in \
-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-	  *) topdir=`echo $(TARGET_SUBDIR)/libgomp/ | \
-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-	esac; \
-	module_srcdir=libgomp; \
-	$(SHELL) $$s/$$module_srcdir/configure \
-	  --srcdir=$${topdir}/$$module_srcdir \
-	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-	  --target=${target_alias} \
-	  --with-build-libsubdir=$(HOST_SUBDIR) \
-	  $(STAGEautofeedback_CONFIGURE_FLAGS)
-@endif target-libgomp-bootstrap
-
 
 
 
@@ -53856,48 +46438,6 @@ clean-stageprofile-target-libgomp:
 @endif target-libgomp-bootstrap
 
 
-.PHONY: all-stagetrain-target-libgomp maybe-all-stagetrain-target-libgomp
-.PHONY: clean-stagetrain-target-libgomp maybe-clean-stagetrain-target-libgomp
-maybe-all-stagetrain-target-libgomp:
-maybe-clean-stagetrain-target-libgomp:
-@if target-libgomp-bootstrap
-maybe-all-stagetrain-target-libgomp: all-stagetrain-target-libgomp
-all-stagetrain: all-stagetrain-target-libgomp
-TARGET-stagetrain-target-libgomp = $(TARGET-target-libgomp)
-all-stagetrain-target-libgomp: configure-stagetrain-target-libgomp
-	@[ $(current_stage) = stagetrain ] || $(MAKE) stagetrain-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEtrain_TFLAGS)"; \
-	$(NORMAL_TARGET_EXPORTS) \
-	  \
-	cd $(TARGET_SUBDIR)/libgomp && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_TARGET_FLAGS)   \
-		TFLAGS="$(STAGEtrain_TFLAGS)"  \
-		$(TARGET-stagetrain-target-libgomp)
-
-maybe-clean-stagetrain-target-libgomp: clean-stagetrain-target-libgomp
-clean-stagetrain: clean-stagetrain-target-libgomp
-clean-stagetrain-target-libgomp:
-	@if [ $(current_stage) = stagetrain ]; then \
-	  [ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \
-	else \
-	  [ -f $(TARGET_SUBDIR)/stagetrain-libgomp/Makefile ] || exit 0; \
-	  $(MAKE) stagetrain-start; \
-	fi; \
-	cd $(TARGET_SUBDIR)/libgomp && \
-	$(MAKE) $(EXTRA_TARGET_FLAGS)   clean
-@endif target-libgomp-bootstrap
-
-
 .PHONY: all-stagefeedback-target-libgomp maybe-all-stagefeedback-target-libgomp
 .PHONY: clean-stagefeedback-target-libgomp maybe-clean-stagefeedback-target-libgomp
 maybe-all-stagefeedback-target-libgomp:
@@ -53940,90 +46480,6 @@ clean-stagefeedback-target-libgomp:
 @endif target-libgomp-bootstrap
 
 
-.PHONY: all-stageautoprofile-target-libgomp maybe-all-stageautoprofile-target-libgomp
-.PHONY: clean-stageautoprofile-target-libgomp maybe-clean-stageautoprofile-target-libgomp
-maybe-all-stageautoprofile-target-libgomp:
-maybe-clean-stageautoprofile-target-libgomp:
-@if target-libgomp-bootstrap
-maybe-all-stageautoprofile-target-libgomp: all-stageautoprofile-target-libgomp
-all-stageautoprofile: all-stageautoprofile-target-libgomp
-TARGET-stageautoprofile-target-libgomp = $(TARGET-target-libgomp)
-all-stageautoprofile-target-libgomp: configure-stageautoprofile-target-libgomp
-	@[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautoprofile_TFLAGS)"; \
-	$(NORMAL_TARGET_EXPORTS) \
-	  \
-	cd $(TARGET_SUBDIR)/libgomp && \
-	$$s/gcc/config/i386/$(AUTO_PROFILE) \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_TARGET_FLAGS)   \
-		TFLAGS="$(STAGEautoprofile_TFLAGS)"  \
-		$(TARGET-stageautoprofile-target-libgomp)
-
-maybe-clean-stageautoprofile-target-libgomp: clean-stageautoprofile-target-libgomp
-clean-stageautoprofile: clean-stageautoprofile-target-libgomp
-clean-stageautoprofile-target-libgomp:
-	@if [ $(current_stage) = stageautoprofile ]; then \
-	  [ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \
-	else \
-	  [ -f $(TARGET_SUBDIR)/stageautoprofile-libgomp/Makefile ] || exit 0; \
-	  $(MAKE) stageautoprofile-start; \
-	fi; \
-	cd $(TARGET_SUBDIR)/libgomp && \
-	$(MAKE) $(EXTRA_TARGET_FLAGS)   clean
-@endif target-libgomp-bootstrap
-
-
-.PHONY: all-stageautofeedback-target-libgomp maybe-all-stageautofeedback-target-libgomp
-.PHONY: clean-stageautofeedback-target-libgomp maybe-clean-stageautofeedback-target-libgomp
-maybe-all-stageautofeedback-target-libgomp:
-maybe-clean-stageautofeedback-target-libgomp:
-@if target-libgomp-bootstrap
-maybe-all-stageautofeedback-target-libgomp: all-stageautofeedback-target-libgomp
-all-stageautofeedback: all-stageautofeedback-target-libgomp
-TARGET-stageautofeedback-target-libgomp = $(TARGET-target-libgomp)
-all-stageautofeedback-target-libgomp: configure-stageautofeedback-target-libgomp
-	@[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	$(NORMAL_TARGET_EXPORTS) \
-	  \
-	cd $(TARGET_SUBDIR)/libgomp && \
-	 \
-	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-		CFLAGS="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
-		LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
-		$(EXTRA_TARGET_FLAGS)   \
-		TFLAGS="$(STAGEautofeedback_TFLAGS)" PERF_DATA=perf.data \
-		$(TARGET-stageautofeedback-target-libgomp)
-
-maybe-clean-stageautofeedback-target-libgomp: clean-stageautofeedback-target-libgomp
-clean-stageautofeedback: clean-stageautofeedback-target-libgomp
-clean-stageautofeedback-target-libgomp:
-	@if [ $(current_stage) = stageautofeedback ]; then \
-	  [ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \
-	else \
-	  [ -f $(TARGET_SUBDIR)/stageautofeedback-libgomp/Makefile ] || exit 0; \
-	  $(MAKE) stageautofeedback-start; \
-	fi; \
-	cd $(TARGET_SUBDIR)/libgomp && \
-	$(MAKE) $(EXTRA_TARGET_FLAGS)   clean
-@endif target-libgomp-bootstrap
-
-
 
 
 
@@ -55422,23 +47878,7 @@ check-gcc-go:
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	$(HOST_EXPORTS) \
 	(cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-go);
-check-go: check-gcc-go check-target-libgo check-gotools
-
-.PHONY: check-gcc-brig check-brig
-check-gcc-brig:
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-brig);
-check-brig: check-gcc-brig check-target-libhsail-rt
-
-.PHONY: check-gcc-d check-d
-check-gcc-d:
-	r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(HOST_EXPORTS) \
-	(cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-d);
-check-d: check-gcc-d check-target-libphobos
+check-go: check-gcc-go check-target-libgo
 
 
 # The gcc part of install-no-fixedincludes, which relies on an intimate
@@ -56476,7 +48916,7 @@ compare:
         sed=`echo stage3 | sed 's,^stage,,;s,.,.,g'`; \
 	files=`find stage3-* -name "*$(objext)" -print | \
 		 sed -n s,^stage$$sed-,,p`; \
-	for file in $${files} ${extra-compare}; do \
+	for file in $${files}; do \
 	  f1=$$r/stage2-$$file; f2=$$r/stage3-$$file; \
 	  if test ! -f $$f1; then continue; fi; \
 	  $(do-compare) > /dev/null 2>&1; \
@@ -56886,7 +49326,7 @@ compare3:
         sed=`echo stage4 | sed 's,^stage,,;s,.,.,g'`; \
 	files=`find stage4-* -name "*$(objext)" -print | \
 		 sed -n s,^stage$$sed-,,p`; \
-	for file in $${files} ${extra-compare}; do \
+	for file in $${files}; do \
 	  f1=$$r/stage3-$$file; f2=$$r/stage4-$$file; \
 	  if test ! -f $$f1; then continue; fi; \
 	  $(do-compare3) > /dev/null 2>&1; \
@@ -57281,337 +49721,6 @@ distclean-stageprofile::
 @endif gcc-bootstrap
 
 
-.PHONY: stagetrain-start stagetrain-end
-
-stagetrain-start::
-	@: $(MAKE); $(stage); \
-	echo stagetrain > stage_current; \
-	echo stagetrain > stage_last; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
-@if bfd
-	@cd $(HOST_SUBDIR); [ -d stagetrain-bfd ] || \
-	  mkdir stagetrain-bfd; \
-	mv stagetrain-bfd bfd; \
-	mv stageprofile-bfd prev-bfd || test -f stageprofile-lean 
-@endif bfd
-@if opcodes
-	@cd $(HOST_SUBDIR); [ -d stagetrain-opcodes ] || \
-	  mkdir stagetrain-opcodes; \
-	mv stagetrain-opcodes opcodes; \
-	mv stageprofile-opcodes prev-opcodes || test -f stageprofile-lean 
-@endif opcodes
-@if binutils
-	@cd $(HOST_SUBDIR); [ -d stagetrain-binutils ] || \
-	  mkdir stagetrain-binutils; \
-	mv stagetrain-binutils binutils; \
-	mv stageprofile-binutils prev-binutils || test -f stageprofile-lean 
-@endif binutils
-@if fixincludes
-	@cd $(HOST_SUBDIR); [ -d stagetrain-fixincludes ] || \
-	  mkdir stagetrain-fixincludes; \
-	mv stagetrain-fixincludes fixincludes; \
-	mv stageprofile-fixincludes prev-fixincludes || test -f stageprofile-lean 
-@endif fixincludes
-@if gas
-	@cd $(HOST_SUBDIR); [ -d stagetrain-gas ] || \
-	  mkdir stagetrain-gas; \
-	mv stagetrain-gas gas; \
-	mv stageprofile-gas prev-gas || test -f stageprofile-lean 
-@endif gas
-@if gcc
-	@cd $(HOST_SUBDIR); [ -d stagetrain-gcc ] || \
-	  mkdir stagetrain-gcc; \
-	mv stagetrain-gcc gcc; \
-	mv stageprofile-gcc prev-gcc || test -f stageprofile-lean 
-@endif gcc
-@if gmp
-	@cd $(HOST_SUBDIR); [ -d stagetrain-gmp ] || \
-	  mkdir stagetrain-gmp; \
-	mv stagetrain-gmp gmp; \
-	mv stageprofile-gmp prev-gmp || test -f stageprofile-lean 
-@endif gmp
-@if mpfr
-	@cd $(HOST_SUBDIR); [ -d stagetrain-mpfr ] || \
-	  mkdir stagetrain-mpfr; \
-	mv stagetrain-mpfr mpfr; \
-	mv stageprofile-mpfr prev-mpfr || test -f stageprofile-lean 
-@endif mpfr
-@if mpc
-	@cd $(HOST_SUBDIR); [ -d stagetrain-mpc ] || \
-	  mkdir stagetrain-mpc; \
-	mv stagetrain-mpc mpc; \
-	mv stageprofile-mpc prev-mpc || test -f stageprofile-lean 
-@endif mpc
-@if isl
-	@cd $(HOST_SUBDIR); [ -d stagetrain-isl ] || \
-	  mkdir stagetrain-isl; \
-	mv stagetrain-isl isl; \
-	mv stageprofile-isl prev-isl || test -f stageprofile-lean 
-@endif isl
-@if libelf
-	@cd $(HOST_SUBDIR); [ -d stagetrain-libelf ] || \
-	  mkdir stagetrain-libelf; \
-	mv stagetrain-libelf libelf; \
-	mv stageprofile-libelf prev-libelf || test -f stageprofile-lean 
-@endif libelf
-@if gold
-	@cd $(HOST_SUBDIR); [ -d stagetrain-gold ] || \
-	  mkdir stagetrain-gold; \
-	mv stagetrain-gold gold; \
-	mv stageprofile-gold prev-gold || test -f stageprofile-lean 
-@endif gold
-@if intl
-	@cd $(HOST_SUBDIR); [ -d stagetrain-intl ] || \
-	  mkdir stagetrain-intl; \
-	mv stagetrain-intl intl; \
-	mv stageprofile-intl prev-intl || test -f stageprofile-lean 
-@endif intl
-@if ld
-	@cd $(HOST_SUBDIR); [ -d stagetrain-ld ] || \
-	  mkdir stagetrain-ld; \
-	mv stagetrain-ld ld; \
-	mv stageprofile-ld prev-ld || test -f stageprofile-lean 
-@endif ld
-@if libbacktrace
-	@cd $(HOST_SUBDIR); [ -d stagetrain-libbacktrace ] || \
-	  mkdir stagetrain-libbacktrace; \
-	mv stagetrain-libbacktrace libbacktrace; \
-	mv stageprofile-libbacktrace prev-libbacktrace || test -f stageprofile-lean 
-@endif libbacktrace
-@if libcpp
-	@cd $(HOST_SUBDIR); [ -d stagetrain-libcpp ] || \
-	  mkdir stagetrain-libcpp; \
-	mv stagetrain-libcpp libcpp; \
-	mv stageprofile-libcpp prev-libcpp || test -f stageprofile-lean 
-@endif libcpp
-@if libdecnumber
-	@cd $(HOST_SUBDIR); [ -d stagetrain-libdecnumber ] || \
-	  mkdir stagetrain-libdecnumber; \
-	mv stagetrain-libdecnumber libdecnumber; \
-	mv stageprofile-libdecnumber prev-libdecnumber || test -f stageprofile-lean 
-@endif libdecnumber
-@if libiberty
-	@cd $(HOST_SUBDIR); [ -d stagetrain-libiberty ] || \
-	  mkdir stagetrain-libiberty; \
-	mv stagetrain-libiberty libiberty; \
-	mv stageprofile-libiberty prev-libiberty || test -f stageprofile-lean 
-@endif libiberty
-@if libiberty-linker-plugin
-	@cd $(HOST_SUBDIR); [ -d stagetrain-libiberty-linker-plugin ] || \
-	  mkdir stagetrain-libiberty-linker-plugin; \
-	mv stagetrain-libiberty-linker-plugin libiberty-linker-plugin; \
-	mv stageprofile-libiberty-linker-plugin prev-libiberty-linker-plugin || test -f stageprofile-lean 
-@endif libiberty-linker-plugin
-@if libiconv
-	@cd $(HOST_SUBDIR); [ -d stagetrain-libiconv ] || \
-	  mkdir stagetrain-libiconv; \
-	mv stagetrain-libiconv libiconv; \
-	mv stageprofile-libiconv prev-libiconv || test -f stageprofile-lean 
-@endif libiconv
-@if zlib
-	@cd $(HOST_SUBDIR); [ -d stagetrain-zlib ] || \
-	  mkdir stagetrain-zlib; \
-	mv stagetrain-zlib zlib; \
-	mv stageprofile-zlib prev-zlib || test -f stageprofile-lean 
-@endif zlib
-@if lto-plugin
-	@cd $(HOST_SUBDIR); [ -d stagetrain-lto-plugin ] || \
-	  mkdir stagetrain-lto-plugin; \
-	mv stagetrain-lto-plugin lto-plugin; \
-	mv stageprofile-lto-plugin prev-lto-plugin || test -f stageprofile-lean 
-@endif lto-plugin
-@if libctf
-	@cd $(HOST_SUBDIR); [ -d stagetrain-libctf ] || \
-	  mkdir stagetrain-libctf; \
-	mv stagetrain-libctf libctf; \
-	mv stageprofile-libctf prev-libctf || test -f stageprofile-lean 
-@endif libctf
-	@[ -d stagetrain-$(TARGET_SUBDIR) ] || \
-	  mkdir stagetrain-$(TARGET_SUBDIR); \
-	mv stagetrain-$(TARGET_SUBDIR) $(TARGET_SUBDIR); \
-	mv stageprofile-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stageprofile-lean 
-
-stagetrain-end:: 
-@if bfd
-	@if test -d $(HOST_SUBDIR)/bfd; then \
-	  cd $(HOST_SUBDIR); mv bfd stagetrain-bfd; \
-	  mv prev-bfd stageprofile-bfd; : ; \
-	fi
-@endif bfd
-@if opcodes
-	@if test -d $(HOST_SUBDIR)/opcodes; then \
-	  cd $(HOST_SUBDIR); mv opcodes stagetrain-opcodes; \
-	  mv prev-opcodes stageprofile-opcodes; : ; \
-	fi
-@endif opcodes
-@if binutils
-	@if test -d $(HOST_SUBDIR)/binutils; then \
-	  cd $(HOST_SUBDIR); mv binutils stagetrain-binutils; \
-	  mv prev-binutils stageprofile-binutils; : ; \
-	fi
-@endif binutils
-@if fixincludes
-	@if test -d $(HOST_SUBDIR)/fixincludes; then \
-	  cd $(HOST_SUBDIR); mv fixincludes stagetrain-fixincludes; \
-	  mv prev-fixincludes stageprofile-fixincludes; : ; \
-	fi
-@endif fixincludes
-@if gas
-	@if test -d $(HOST_SUBDIR)/gas; then \
-	  cd $(HOST_SUBDIR); mv gas stagetrain-gas; \
-	  mv prev-gas stageprofile-gas; : ; \
-	fi
-@endif gas
-@if gcc
-	@if test -d $(HOST_SUBDIR)/gcc; then \
-	  cd $(HOST_SUBDIR); mv gcc stagetrain-gcc; \
-	  mv prev-gcc stageprofile-gcc; : ; \
-	fi
-@endif gcc
-@if gmp
-	@if test -d $(HOST_SUBDIR)/gmp; then \
-	  cd $(HOST_SUBDIR); mv gmp stagetrain-gmp; \
-	  mv prev-gmp stageprofile-gmp; : ; \
-	fi
-@endif gmp
-@if mpfr
-	@if test -d $(HOST_SUBDIR)/mpfr; then \
-	  cd $(HOST_SUBDIR); mv mpfr stagetrain-mpfr; \
-	  mv prev-mpfr stageprofile-mpfr; : ; \
-	fi
-@endif mpfr
-@if mpc
-	@if test -d $(HOST_SUBDIR)/mpc; then \
-	  cd $(HOST_SUBDIR); mv mpc stagetrain-mpc; \
-	  mv prev-mpc stageprofile-mpc; : ; \
-	fi
-@endif mpc
-@if isl
-	@if test -d $(HOST_SUBDIR)/isl; then \
-	  cd $(HOST_SUBDIR); mv isl stagetrain-isl; \
-	  mv prev-isl stageprofile-isl; : ; \
-	fi
-@endif isl
-@if libelf
-	@if test -d $(HOST_SUBDIR)/libelf; then \
-	  cd $(HOST_SUBDIR); mv libelf stagetrain-libelf; \
-	  mv prev-libelf stageprofile-libelf; : ; \
-	fi
-@endif libelf
-@if gold
-	@if test -d $(HOST_SUBDIR)/gold; then \
-	  cd $(HOST_SUBDIR); mv gold stagetrain-gold; \
-	  mv prev-gold stageprofile-gold; : ; \
-	fi
-@endif gold
-@if intl
-	@if test -d $(HOST_SUBDIR)/intl; then \
-	  cd $(HOST_SUBDIR); mv intl stagetrain-intl; \
-	  mv prev-intl stageprofile-intl; : ; \
-	fi
-@endif intl
-@if ld
-	@if test -d $(HOST_SUBDIR)/ld; then \
-	  cd $(HOST_SUBDIR); mv ld stagetrain-ld; \
-	  mv prev-ld stageprofile-ld; : ; \
-	fi
-@endif ld
-@if libbacktrace
-	@if test -d $(HOST_SUBDIR)/libbacktrace; then \
-	  cd $(HOST_SUBDIR); mv libbacktrace stagetrain-libbacktrace; \
-	  mv prev-libbacktrace stageprofile-libbacktrace; : ; \
-	fi
-@endif libbacktrace
-@if libcpp
-	@if test -d $(HOST_SUBDIR)/libcpp; then \
-	  cd $(HOST_SUBDIR); mv libcpp stagetrain-libcpp; \
-	  mv prev-libcpp stageprofile-libcpp; : ; \
-	fi
-@endif libcpp
-@if libdecnumber
-	@if test -d $(HOST_SUBDIR)/libdecnumber; then \
-	  cd $(HOST_SUBDIR); mv libdecnumber stagetrain-libdecnumber; \
-	  mv prev-libdecnumber stageprofile-libdecnumber; : ; \
-	fi
-@endif libdecnumber
-@if libiberty
-	@if test -d $(HOST_SUBDIR)/libiberty; then \
-	  cd $(HOST_SUBDIR); mv libiberty stagetrain-libiberty; \
-	  mv prev-libiberty stageprofile-libiberty; : ; \
-	fi
-@endif libiberty
-@if libiberty-linker-plugin
-	@if test -d $(HOST_SUBDIR)/libiberty-linker-plugin; then \
-	  cd $(HOST_SUBDIR); mv libiberty-linker-plugin stagetrain-libiberty-linker-plugin; \
-	  mv prev-libiberty-linker-plugin stageprofile-libiberty-linker-plugin; : ; \
-	fi
-@endif libiberty-linker-plugin
-@if libiconv
-	@if test -d $(HOST_SUBDIR)/libiconv; then \
-	  cd $(HOST_SUBDIR); mv libiconv stagetrain-libiconv; \
-	  mv prev-libiconv stageprofile-libiconv; : ; \
-	fi
-@endif libiconv
-@if zlib
-	@if test -d $(HOST_SUBDIR)/zlib; then \
-	  cd $(HOST_SUBDIR); mv zlib stagetrain-zlib; \
-	  mv prev-zlib stageprofile-zlib; : ; \
-	fi
-@endif zlib
-@if lto-plugin
-	@if test -d $(HOST_SUBDIR)/lto-plugin; then \
-	  cd $(HOST_SUBDIR); mv lto-plugin stagetrain-lto-plugin; \
-	  mv prev-lto-plugin stageprofile-lto-plugin; : ; \
-	fi
-@endif lto-plugin
-@if libctf
-	@if test -d $(HOST_SUBDIR)/libctf; then \
-	  cd $(HOST_SUBDIR); mv libctf stagetrain-libctf; \
-	  mv prev-libctf stageprofile-libctf; : ; \
-	fi
-@endif libctf
-	@if test -d $(TARGET_SUBDIR); then \
-	  mv $(TARGET_SUBDIR) stagetrain-$(TARGET_SUBDIR); \
-	  mv prev-$(TARGET_SUBDIR) stageprofile-$(TARGET_SUBDIR); : ; \
-	fi
-	rm -f stage_current
-
-# Bubble a bug fix through all the stages up to stage train.  They are
-# remade, but not reconfigured.  The next stage (if any) will not be
-# reconfigured either.
-.PHONY: stagetrain-bubble
-stagetrain-bubble:: stageprofile-bubble
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	if test -f stagetrain-lean || test -f stageprofile-lean ; then \
-	  echo Skipping rebuild of stagetrain; \
-	else \
-	  $(MAKE) stagetrain-start; \
-	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stagetrain; \
-	fi
-
-.PHONY: all-stagetrain clean-stagetrain
-do-clean: clean-stagetrain
-
-# 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
-
-
-
-
-# Rules to wipe a stage and all the following ones, also used for cleanstrap
-distclean-stageprofile:: distclean-stagetrain 
-.PHONY: distclean-stagetrain
-distclean-stagetrain::
-	@: $(MAKE); $(stage)
-	@test "`cat stage_last`" != stagetrain || rm -f stage_last
-	rm -rf stagetrain-* 
-
-
-@endif gcc-bootstrap
-
-
 .PHONY: stagefeedback-start stagefeedback-end
 
 stagefeedback-start::
@@ -57623,287 +49732,287 @@ stagefeedback-start::
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-bfd ] || \
 	  mkdir stagefeedback-bfd; \
 	mv stagefeedback-bfd bfd; \
-	mv stagetrain-bfd prev-bfd || test -f stagetrain-lean 
+	mv stageprofile-bfd prev-bfd || test -f stageprofile-lean 
 @endif bfd
 @if opcodes
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-opcodes ] || \
 	  mkdir stagefeedback-opcodes; \
 	mv stagefeedback-opcodes opcodes; \
-	mv stagetrain-opcodes prev-opcodes || test -f stagetrain-lean 
+	mv stageprofile-opcodes prev-opcodes || test -f stageprofile-lean 
 @endif opcodes
 @if binutils
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-binutils ] || \
 	  mkdir stagefeedback-binutils; \
 	mv stagefeedback-binutils binutils; \
-	mv stagetrain-binutils prev-binutils || test -f stagetrain-lean 
+	mv stageprofile-binutils prev-binutils || test -f stageprofile-lean 
 @endif binutils
 @if fixincludes
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-fixincludes ] || \
 	  mkdir stagefeedback-fixincludes; \
 	mv stagefeedback-fixincludes fixincludes; \
-	mv stagetrain-fixincludes prev-fixincludes || test -f stagetrain-lean 
+	mv stageprofile-fixincludes prev-fixincludes || test -f stageprofile-lean 
 @endif fixincludes
 @if gas
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-gas ] || \
 	  mkdir stagefeedback-gas; \
 	mv stagefeedback-gas gas; \
-	mv stagetrain-gas prev-gas || test -f stagetrain-lean 
+	mv stageprofile-gas prev-gas || test -f stageprofile-lean 
 @endif gas
 @if gcc
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-gcc ] || \
 	  mkdir stagefeedback-gcc; \
 	mv stagefeedback-gcc gcc; \
-	mv stagetrain-gcc prev-gcc || test -f stagetrain-lean 
+	mv stageprofile-gcc prev-gcc || test -f stageprofile-lean 
 @endif gcc
 @if gmp
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-gmp ] || \
 	  mkdir stagefeedback-gmp; \
 	mv stagefeedback-gmp gmp; \
-	mv stagetrain-gmp prev-gmp || test -f stagetrain-lean 
+	mv stageprofile-gmp prev-gmp || test -f stageprofile-lean 
 @endif gmp
 @if mpfr
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-mpfr ] || \
 	  mkdir stagefeedback-mpfr; \
 	mv stagefeedback-mpfr mpfr; \
-	mv stagetrain-mpfr prev-mpfr || test -f stagetrain-lean 
+	mv stageprofile-mpfr prev-mpfr || test -f stageprofile-lean 
 @endif mpfr
 @if mpc
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-mpc ] || \
 	  mkdir stagefeedback-mpc; \
 	mv stagefeedback-mpc mpc; \
-	mv stagetrain-mpc prev-mpc || test -f stagetrain-lean 
+	mv stageprofile-mpc prev-mpc || test -f stageprofile-lean 
 @endif mpc
 @if isl
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-isl ] || \
 	  mkdir stagefeedback-isl; \
 	mv stagefeedback-isl isl; \
-	mv stagetrain-isl prev-isl || test -f stagetrain-lean 
+	mv stageprofile-isl prev-isl || test -f stageprofile-lean 
 @endif isl
 @if libelf
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-libelf ] || \
 	  mkdir stagefeedback-libelf; \
 	mv stagefeedback-libelf libelf; \
-	mv stagetrain-libelf prev-libelf || test -f stagetrain-lean 
+	mv stageprofile-libelf prev-libelf || test -f stageprofile-lean 
 @endif libelf
 @if gold
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-gold ] || \
 	  mkdir stagefeedback-gold; \
 	mv stagefeedback-gold gold; \
-	mv stagetrain-gold prev-gold || test -f stagetrain-lean 
+	mv stageprofile-gold prev-gold || test -f stageprofile-lean 
 @endif gold
 @if intl
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-intl ] || \
 	  mkdir stagefeedback-intl; \
 	mv stagefeedback-intl intl; \
-	mv stagetrain-intl prev-intl || test -f stagetrain-lean 
+	mv stageprofile-intl prev-intl || test -f stageprofile-lean 
 @endif intl
 @if ld
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-ld ] || \
 	  mkdir stagefeedback-ld; \
 	mv stagefeedback-ld ld; \
-	mv stagetrain-ld prev-ld || test -f stagetrain-lean 
+	mv stageprofile-ld prev-ld || test -f stageprofile-lean 
 @endif ld
 @if libbacktrace
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-libbacktrace ] || \
 	  mkdir stagefeedback-libbacktrace; \
 	mv stagefeedback-libbacktrace libbacktrace; \
-	mv stagetrain-libbacktrace prev-libbacktrace || test -f stagetrain-lean 
+	mv stageprofile-libbacktrace prev-libbacktrace || test -f stageprofile-lean 
 @endif libbacktrace
 @if libcpp
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-libcpp ] || \
 	  mkdir stagefeedback-libcpp; \
 	mv stagefeedback-libcpp libcpp; \
-	mv stagetrain-libcpp prev-libcpp || test -f stagetrain-lean 
+	mv stageprofile-libcpp prev-libcpp || test -f stageprofile-lean 
 @endif libcpp
 @if libdecnumber
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-libdecnumber ] || \
 	  mkdir stagefeedback-libdecnumber; \
 	mv stagefeedback-libdecnumber libdecnumber; \
-	mv stagetrain-libdecnumber prev-libdecnumber || test -f stagetrain-lean 
+	mv stageprofile-libdecnumber prev-libdecnumber || test -f stageprofile-lean 
 @endif libdecnumber
 @if libiberty
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-libiberty ] || \
 	  mkdir stagefeedback-libiberty; \
 	mv stagefeedback-libiberty libiberty; \
-	mv stagetrain-libiberty prev-libiberty || test -f stagetrain-lean 
+	mv stageprofile-libiberty prev-libiberty || test -f stageprofile-lean 
 @endif libiberty
 @if libiberty-linker-plugin
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-libiberty-linker-plugin ] || \
 	  mkdir stagefeedback-libiberty-linker-plugin; \
 	mv stagefeedback-libiberty-linker-plugin libiberty-linker-plugin; \
-	mv stagetrain-libiberty-linker-plugin prev-libiberty-linker-plugin || test -f stagetrain-lean 
+	mv stageprofile-libiberty-linker-plugin prev-libiberty-linker-plugin || test -f stageprofile-lean 
 @endif libiberty-linker-plugin
 @if libiconv
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-libiconv ] || \
 	  mkdir stagefeedback-libiconv; \
 	mv stagefeedback-libiconv libiconv; \
-	mv stagetrain-libiconv prev-libiconv || test -f stagetrain-lean 
+	mv stageprofile-libiconv prev-libiconv || test -f stageprofile-lean 
 @endif libiconv
 @if zlib
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-zlib ] || \
 	  mkdir stagefeedback-zlib; \
 	mv stagefeedback-zlib zlib; \
-	mv stagetrain-zlib prev-zlib || test -f stagetrain-lean 
+	mv stageprofile-zlib prev-zlib || test -f stageprofile-lean 
 @endif zlib
 @if lto-plugin
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-lto-plugin ] || \
 	  mkdir stagefeedback-lto-plugin; \
 	mv stagefeedback-lto-plugin lto-plugin; \
-	mv stagetrain-lto-plugin prev-lto-plugin || test -f stagetrain-lean 
+	mv stageprofile-lto-plugin prev-lto-plugin || test -f stageprofile-lean 
 @endif lto-plugin
 @if libctf
 	@cd $(HOST_SUBDIR); [ -d stagefeedback-libctf ] || \
 	  mkdir stagefeedback-libctf; \
 	mv stagefeedback-libctf libctf; \
-	mv stagetrain-libctf prev-libctf || test -f stagetrain-lean 
+	mv stageprofile-libctf prev-libctf || test -f stageprofile-lean 
 @endif libctf
 	@[ -d stagefeedback-$(TARGET_SUBDIR) ] || \
 	  mkdir stagefeedback-$(TARGET_SUBDIR); \
 	mv stagefeedback-$(TARGET_SUBDIR) $(TARGET_SUBDIR); \
-	mv stagetrain-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stagetrain-lean 
+	mv stageprofile-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stageprofile-lean 
 
 stagefeedback-end:: 
 @if bfd
 	@if test -d $(HOST_SUBDIR)/bfd; then \
 	  cd $(HOST_SUBDIR); mv bfd stagefeedback-bfd; \
-	  mv prev-bfd stagetrain-bfd; : ; \
+	  mv prev-bfd stageprofile-bfd; : ; \
 	fi
 @endif bfd
 @if opcodes
 	@if test -d $(HOST_SUBDIR)/opcodes; then \
 	  cd $(HOST_SUBDIR); mv opcodes stagefeedback-opcodes; \
-	  mv prev-opcodes stagetrain-opcodes; : ; \
+	  mv prev-opcodes stageprofile-opcodes; : ; \
 	fi
 @endif opcodes
 @if binutils
 	@if test -d $(HOST_SUBDIR)/binutils; then \
 	  cd $(HOST_SUBDIR); mv binutils stagefeedback-binutils; \
-	  mv prev-binutils stagetrain-binutils; : ; \
+	  mv prev-binutils stageprofile-binutils; : ; \
 	fi
 @endif binutils
 @if fixincludes
 	@if test -d $(HOST_SUBDIR)/fixincludes; then \
 	  cd $(HOST_SUBDIR); mv fixincludes stagefeedback-fixincludes; \
-	  mv prev-fixincludes stagetrain-fixincludes; : ; \
+	  mv prev-fixincludes stageprofile-fixincludes; : ; \
 	fi
 @endif fixincludes
 @if gas
 	@if test -d $(HOST_SUBDIR)/gas; then \
 	  cd $(HOST_SUBDIR); mv gas stagefeedback-gas; \
-	  mv prev-gas stagetrain-gas; : ; \
+	  mv prev-gas stageprofile-gas; : ; \
 	fi
 @endif gas
 @if gcc
 	@if test -d $(HOST_SUBDIR)/gcc; then \
 	  cd $(HOST_SUBDIR); mv gcc stagefeedback-gcc; \
-	  mv prev-gcc stagetrain-gcc; : ; \
+	  mv prev-gcc stageprofile-gcc; : ; \
 	fi
 @endif gcc
 @if gmp
 	@if test -d $(HOST_SUBDIR)/gmp; then \
 	  cd $(HOST_SUBDIR); mv gmp stagefeedback-gmp; \
-	  mv prev-gmp stagetrain-gmp; : ; \
+	  mv prev-gmp stageprofile-gmp; : ; \
 	fi
 @endif gmp
 @if mpfr
 	@if test -d $(HOST_SUBDIR)/mpfr; then \
 	  cd $(HOST_SUBDIR); mv mpfr stagefeedback-mpfr; \
-	  mv prev-mpfr stagetrain-mpfr; : ; \
+	  mv prev-mpfr stageprofile-mpfr; : ; \
 	fi
 @endif mpfr
 @if mpc
 	@if test -d $(HOST_SUBDIR)/mpc; then \
 	  cd $(HOST_SUBDIR); mv mpc stagefeedback-mpc; \
-	  mv prev-mpc stagetrain-mpc; : ; \
+	  mv prev-mpc stageprofile-mpc; : ; \
 	fi
 @endif mpc
 @if isl
 	@if test -d $(HOST_SUBDIR)/isl; then \
 	  cd $(HOST_SUBDIR); mv isl stagefeedback-isl; \
-	  mv prev-isl stagetrain-isl; : ; \
+	  mv prev-isl stageprofile-isl; : ; \
 	fi
 @endif isl
 @if libelf
 	@if test -d $(HOST_SUBDIR)/libelf; then \
 	  cd $(HOST_SUBDIR); mv libelf stagefeedback-libelf; \
-	  mv prev-libelf stagetrain-libelf; : ; \
+	  mv prev-libelf stageprofile-libelf; : ; \
 	fi
 @endif libelf
 @if gold
 	@if test -d $(HOST_SUBDIR)/gold; then \
 	  cd $(HOST_SUBDIR); mv gold stagefeedback-gold; \
-	  mv prev-gold stagetrain-gold; : ; \
+	  mv prev-gold stageprofile-gold; : ; \
 	fi
 @endif gold
 @if intl
 	@if test -d $(HOST_SUBDIR)/intl; then \
 	  cd $(HOST_SUBDIR); mv intl stagefeedback-intl; \
-	  mv prev-intl stagetrain-intl; : ; \
+	  mv prev-intl stageprofile-intl; : ; \
 	fi
 @endif intl
 @if ld
 	@if test -d $(HOST_SUBDIR)/ld; then \
 	  cd $(HOST_SUBDIR); mv ld stagefeedback-ld; \
-	  mv prev-ld stagetrain-ld; : ; \
+	  mv prev-ld stageprofile-ld; : ; \
 	fi
 @endif ld
 @if libbacktrace
 	@if test -d $(HOST_SUBDIR)/libbacktrace; then \
 	  cd $(HOST_SUBDIR); mv libbacktrace stagefeedback-libbacktrace; \
-	  mv prev-libbacktrace stagetrain-libbacktrace; : ; \
+	  mv prev-libbacktrace stageprofile-libbacktrace; : ; \
 	fi
 @endif libbacktrace
 @if libcpp
 	@if test -d $(HOST_SUBDIR)/libcpp; then \
 	  cd $(HOST_SUBDIR); mv libcpp stagefeedback-libcpp; \
-	  mv prev-libcpp stagetrain-libcpp; : ; \
+	  mv prev-libcpp stageprofile-libcpp; : ; \
 	fi
 @endif libcpp
 @if libdecnumber
 	@if test -d $(HOST_SUBDIR)/libdecnumber; then \
 	  cd $(HOST_SUBDIR); mv libdecnumber stagefeedback-libdecnumber; \
-	  mv prev-libdecnumber stagetrain-libdecnumber; : ; \
+	  mv prev-libdecnumber stageprofile-libdecnumber; : ; \
 	fi
 @endif libdecnumber
 @if libiberty
 	@if test -d $(HOST_SUBDIR)/libiberty; then \
 	  cd $(HOST_SUBDIR); mv libiberty stagefeedback-libiberty; \
-	  mv prev-libiberty stagetrain-libiberty; : ; \
+	  mv prev-libiberty stageprofile-libiberty; : ; \
 	fi
 @endif libiberty
 @if libiberty-linker-plugin
 	@if test -d $(HOST_SUBDIR)/libiberty-linker-plugin; then \
 	  cd $(HOST_SUBDIR); mv libiberty-linker-plugin stagefeedback-libiberty-linker-plugin; \
-	  mv prev-libiberty-linker-plugin stagetrain-libiberty-linker-plugin; : ; \
+	  mv prev-libiberty-linker-plugin stageprofile-libiberty-linker-plugin; : ; \
 	fi
 @endif libiberty-linker-plugin
 @if libiconv
 	@if test -d $(HOST_SUBDIR)/libiconv; then \
 	  cd $(HOST_SUBDIR); mv libiconv stagefeedback-libiconv; \
-	  mv prev-libiconv stagetrain-libiconv; : ; \
+	  mv prev-libiconv stageprofile-libiconv; : ; \
 	fi
 @endif libiconv
 @if zlib
 	@if test -d $(HOST_SUBDIR)/zlib; then \
 	  cd $(HOST_SUBDIR); mv zlib stagefeedback-zlib; \
-	  mv prev-zlib stagetrain-zlib; : ; \
+	  mv prev-zlib stageprofile-zlib; : ; \
 	fi
 @endif zlib
 @if lto-plugin
 	@if test -d $(HOST_SUBDIR)/lto-plugin; then \
 	  cd $(HOST_SUBDIR); mv lto-plugin stagefeedback-lto-plugin; \
-	  mv prev-lto-plugin stagetrain-lto-plugin; : ; \
+	  mv prev-lto-plugin stageprofile-lto-plugin; : ; \
 	fi
 @endif lto-plugin
 @if libctf
 	@if test -d $(HOST_SUBDIR)/libctf; then \
 	  cd $(HOST_SUBDIR); mv libctf stagefeedback-libctf; \
-	  mv prev-libctf stagetrain-libctf; : ; \
+	  mv prev-libctf stageprofile-libctf; : ; \
 	fi
 @endif libctf
 	@if test -d $(TARGET_SUBDIR); then \
 	  mv $(TARGET_SUBDIR) stagefeedback-$(TARGET_SUBDIR); \
-	  mv prev-$(TARGET_SUBDIR) stagetrain-$(TARGET_SUBDIR); : ; \
+	  mv prev-$(TARGET_SUBDIR) stageprofile-$(TARGET_SUBDIR); : ; \
 	fi
 	rm -f stage_current
 
@@ -57911,10 +50020,10 @@ stagefeedback-end::
 # remade, but not reconfigured.  The next stage (if any) will not be
 # reconfigured either.
 .PHONY: stagefeedback-bubble
-stagefeedback-bubble:: stagetrain-bubble
+stagefeedback-bubble:: stageprofile-bubble
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	if test -f stagefeedback-lean || test -f stagetrain-lean ; then \
+	if test -f stagefeedback-lean || test -f stageprofile-lean ; then \
 	  echo Skipping rebuild of stagefeedback; \
 	else \
 	  $(MAKE) stagefeedback-start; \
@@ -57955,7 +50064,7 @@ profiledbootstrap-lean:
 
 
 # Rules to wipe a stage and all the following ones, also used for cleanstrap
-distclean-stagetrain:: distclean-stagefeedback 
+distclean-stageprofile:: distclean-stagefeedback 
 .PHONY: distclean-stagefeedback
 distclean-stagefeedback::
 	@: $(MAKE); $(stage)
@@ -57966,691 +50075,6 @@ distclean-stagefeedback::
 @endif gcc-bootstrap
 
 
-.PHONY: stageautoprofile-start stageautoprofile-end
-
-stageautoprofile-start::
-	@: $(MAKE); $(stage); \
-	echo stageautoprofile > stage_current; \
-	echo stageautoprofile > stage_last; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
-@if bfd
-	@cd $(HOST_SUBDIR); [ -d stageautoprofile-bfd ] || \
-	  mkdir stageautoprofile-bfd; \
-	mv stageautoprofile-bfd bfd; \
-	mv stage1-bfd prev-bfd || test -f stage1-lean 
-@endif bfd
-@if opcodes
-	@cd $(HOST_SUBDIR); [ -d stageautoprofile-opcodes ] || \
-	  mkdir stageautoprofile-opcodes; \
-	mv stageautoprofile-opcodes opcodes; \
-	mv stage1-opcodes prev-opcodes || test -f stage1-lean 
-@endif opcodes
-@if binutils
-	@cd $(HOST_SUBDIR); [ -d stageautoprofile-binutils ] || \
-	  mkdir stageautoprofile-binutils; \
-	mv stageautoprofile-binutils binutils; \
-	mv stage1-binutils prev-binutils || test -f stage1-lean 
-@endif binutils
-@if fixincludes
-	@cd $(HOST_SUBDIR); [ -d stageautoprofile-fixincludes ] || \
-	  mkdir stageautoprofile-fixincludes; \
-	mv stageautoprofile-fixincludes fixincludes; \
-	mv stage1-fixincludes prev-fixincludes || test -f stage1-lean 
-@endif fixincludes
-@if gas
-	@cd $(HOST_SUBDIR); [ -d stageautoprofile-gas ] || \
-	  mkdir stageautoprofile-gas; \
-	mv stageautoprofile-gas gas; \
-	mv stage1-gas prev-gas || test -f stage1-lean 
-@endif gas
-@if gcc
-	@cd $(HOST_SUBDIR); [ -d stageautoprofile-gcc ] || \
-	  mkdir stageautoprofile-gcc; \
-	mv stageautoprofile-gcc gcc; \
-	mv stage1-gcc prev-gcc || test -f stage1-lean 
-@endif gcc
-@if gmp
-	@cd $(HOST_SUBDIR); [ -d stageautoprofile-gmp ] || \
-	  mkdir stageautoprofile-gmp; \
-	mv stageautoprofile-gmp gmp; \
-	mv stage1-gmp prev-gmp || test -f stage1-lean 
-@endif gmp
-@if mpfr
-	@cd $(HOST_SUBDIR); [ -d stageautoprofile-mpfr ] || \
-	  mkdir stageautoprofile-mpfr; \
-	mv stageautoprofile-mpfr mpfr; \
-	mv stage1-mpfr prev-mpfr || test -f stage1-lean 
-@endif mpfr
-@if mpc
-	@cd $(HOST_SUBDIR); [ -d stageautoprofile-mpc ] || \
-	  mkdir stageautoprofile-mpc; \
-	mv stageautoprofile-mpc mpc; \
-	mv stage1-mpc prev-mpc || test -f stage1-lean 
-@endif mpc
-@if isl
-	@cd $(HOST_SUBDIR); [ -d stageautoprofile-isl ] || \
-	  mkdir stageautoprofile-isl; \
-	mv stageautoprofile-isl isl; \
-	mv stage1-isl prev-isl || test -f stage1-lean 
-@endif isl
-@if libelf
-	@cd $(HOST_SUBDIR); [ -d stageautoprofile-libelf ] || \
-	  mkdir stageautoprofile-libelf; \
-	mv stageautoprofile-libelf libelf; \
-	mv stage1-libelf prev-libelf || test -f stage1-lean 
-@endif libelf
-@if gold
-	@cd $(HOST_SUBDIR); [ -d stageautoprofile-gold ] || \
-	  mkdir stageautoprofile-gold; \
-	mv stageautoprofile-gold gold; \
-	mv stage1-gold prev-gold || test -f stage1-lean 
-@endif gold
-@if intl
-	@cd $(HOST_SUBDIR); [ -d stageautoprofile-intl ] || \
-	  mkdir stageautoprofile-intl; \
-	mv stageautoprofile-intl intl; \
-	mv stage1-intl prev-intl || test -f stage1-lean 
-@endif intl
-@if ld
-	@cd $(HOST_SUBDIR); [ -d stageautoprofile-ld ] || \
-	  mkdir stageautoprofile-ld; \
-	mv stageautoprofile-ld ld; \
-	mv stage1-ld prev-ld || test -f stage1-lean 
-@endif ld
-@if libbacktrace
-	@cd $(HOST_SUBDIR); [ -d stageautoprofile-libbacktrace ] || \
-	  mkdir stageautoprofile-libbacktrace; \
-	mv stageautoprofile-libbacktrace libbacktrace; \
-	mv stage1-libbacktrace prev-libbacktrace || test -f stage1-lean 
-@endif libbacktrace
-@if libcpp
-	@cd $(HOST_SUBDIR); [ -d stageautoprofile-libcpp ] || \
-	  mkdir stageautoprofile-libcpp; \
-	mv stageautoprofile-libcpp libcpp; \
-	mv stage1-libcpp prev-libcpp || test -f stage1-lean 
-@endif libcpp
-@if libdecnumber
-	@cd $(HOST_SUBDIR); [ -d stageautoprofile-libdecnumber ] || \
-	  mkdir stageautoprofile-libdecnumber; \
-	mv stageautoprofile-libdecnumber libdecnumber; \
-	mv stage1-libdecnumber prev-libdecnumber || test -f stage1-lean 
-@endif libdecnumber
-@if libiberty
-	@cd $(HOST_SUBDIR); [ -d stageautoprofile-libiberty ] || \
-	  mkdir stageautoprofile-libiberty; \
-	mv stageautoprofile-libiberty libiberty; \
-	mv stage1-libiberty prev-libiberty || test -f stage1-lean 
-@endif libiberty
-@if libiberty-linker-plugin
-	@cd $(HOST_SUBDIR); [ -d stageautoprofile-libiberty-linker-plugin ] || \
-	  mkdir stageautoprofile-libiberty-linker-plugin; \
-	mv stageautoprofile-libiberty-linker-plugin libiberty-linker-plugin; \
-	mv stage1-libiberty-linker-plugin prev-libiberty-linker-plugin || test -f stage1-lean 
-@endif libiberty-linker-plugin
-@if libiconv
-	@cd $(HOST_SUBDIR); [ -d stageautoprofile-libiconv ] || \
-	  mkdir stageautoprofile-libiconv; \
-	mv stageautoprofile-libiconv libiconv; \
-	mv stage1-libiconv prev-libiconv || test -f stage1-lean 
-@endif libiconv
-@if zlib
-	@cd $(HOST_SUBDIR); [ -d stageautoprofile-zlib ] || \
-	  mkdir stageautoprofile-zlib; \
-	mv stageautoprofile-zlib zlib; \
-	mv stage1-zlib prev-zlib || test -f stage1-lean 
-@endif zlib
-@if lto-plugin
-	@cd $(HOST_SUBDIR); [ -d stageautoprofile-lto-plugin ] || \
-	  mkdir stageautoprofile-lto-plugin; \
-	mv stageautoprofile-lto-plugin lto-plugin; \
-	mv stage1-lto-plugin prev-lto-plugin || test -f stage1-lean 
-@endif lto-plugin
-@if libctf
-	@cd $(HOST_SUBDIR); [ -d stageautoprofile-libctf ] || \
-	  mkdir stageautoprofile-libctf; \
-	mv stageautoprofile-libctf libctf; \
-	mv stage1-libctf prev-libctf || test -f stage1-lean 
-@endif libctf
-	@[ -d stageautoprofile-$(TARGET_SUBDIR) ] || \
-	  mkdir stageautoprofile-$(TARGET_SUBDIR); \
-	mv stageautoprofile-$(TARGET_SUBDIR) $(TARGET_SUBDIR); \
-	mv stage1-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage1-lean 
-
-stageautoprofile-end:: 
-@if bfd
-	@if test -d $(HOST_SUBDIR)/bfd; then \
-	  cd $(HOST_SUBDIR); mv bfd stageautoprofile-bfd; \
-	  mv prev-bfd stage1-bfd; : ; \
-	fi
-@endif bfd
-@if opcodes
-	@if test -d $(HOST_SUBDIR)/opcodes; then \
-	  cd $(HOST_SUBDIR); mv opcodes stageautoprofile-opcodes; \
-	  mv prev-opcodes stage1-opcodes; : ; \
-	fi
-@endif opcodes
-@if binutils
-	@if test -d $(HOST_SUBDIR)/binutils; then \
-	  cd $(HOST_SUBDIR); mv binutils stageautoprofile-binutils; \
-	  mv prev-binutils stage1-binutils; : ; \
-	fi
-@endif binutils
-@if fixincludes
-	@if test -d $(HOST_SUBDIR)/fixincludes; then \
-	  cd $(HOST_SUBDIR); mv fixincludes stageautoprofile-fixincludes; \
-	  mv prev-fixincludes stage1-fixincludes; : ; \
-	fi
-@endif fixincludes
-@if gas
-	@if test -d $(HOST_SUBDIR)/gas; then \
-	  cd $(HOST_SUBDIR); mv gas stageautoprofile-gas; \
-	  mv prev-gas stage1-gas; : ; \
-	fi
-@endif gas
-@if gcc
-	@if test -d $(HOST_SUBDIR)/gcc; then \
-	  cd $(HOST_SUBDIR); mv gcc stageautoprofile-gcc; \
-	  mv prev-gcc stage1-gcc; : ; \
-	fi
-@endif gcc
-@if gmp
-	@if test -d $(HOST_SUBDIR)/gmp; then \
-	  cd $(HOST_SUBDIR); mv gmp stageautoprofile-gmp; \
-	  mv prev-gmp stage1-gmp; : ; \
-	fi
-@endif gmp
-@if mpfr
-	@if test -d $(HOST_SUBDIR)/mpfr; then \
-	  cd $(HOST_SUBDIR); mv mpfr stageautoprofile-mpfr; \
-	  mv prev-mpfr stage1-mpfr; : ; \
-	fi
-@endif mpfr
-@if mpc
-	@if test -d $(HOST_SUBDIR)/mpc; then \
-	  cd $(HOST_SUBDIR); mv mpc stageautoprofile-mpc; \
-	  mv prev-mpc stage1-mpc; : ; \
-	fi
-@endif mpc
-@if isl
-	@if test -d $(HOST_SUBDIR)/isl; then \
-	  cd $(HOST_SUBDIR); mv isl stageautoprofile-isl; \
-	  mv prev-isl stage1-isl; : ; \
-	fi
-@endif isl
-@if libelf
-	@if test -d $(HOST_SUBDIR)/libelf; then \
-	  cd $(HOST_SUBDIR); mv libelf stageautoprofile-libelf; \
-	  mv prev-libelf stage1-libelf; : ; \
-	fi
-@endif libelf
-@if gold
-	@if test -d $(HOST_SUBDIR)/gold; then \
-	  cd $(HOST_SUBDIR); mv gold stageautoprofile-gold; \
-	  mv prev-gold stage1-gold; : ; \
-	fi
-@endif gold
-@if intl
-	@if test -d $(HOST_SUBDIR)/intl; then \
-	  cd $(HOST_SUBDIR); mv intl stageautoprofile-intl; \
-	  mv prev-intl stage1-intl; : ; \
-	fi
-@endif intl
-@if ld
-	@if test -d $(HOST_SUBDIR)/ld; then \
-	  cd $(HOST_SUBDIR); mv ld stageautoprofile-ld; \
-	  mv prev-ld stage1-ld; : ; \
-	fi
-@endif ld
-@if libbacktrace
-	@if test -d $(HOST_SUBDIR)/libbacktrace; then \
-	  cd $(HOST_SUBDIR); mv libbacktrace stageautoprofile-libbacktrace; \
-	  mv prev-libbacktrace stage1-libbacktrace; : ; \
-	fi
-@endif libbacktrace
-@if libcpp
-	@if test -d $(HOST_SUBDIR)/libcpp; then \
-	  cd $(HOST_SUBDIR); mv libcpp stageautoprofile-libcpp; \
-	  mv prev-libcpp stage1-libcpp; : ; \
-	fi
-@endif libcpp
-@if libdecnumber
-	@if test -d $(HOST_SUBDIR)/libdecnumber; then \
-	  cd $(HOST_SUBDIR); mv libdecnumber stageautoprofile-libdecnumber; \
-	  mv prev-libdecnumber stage1-libdecnumber; : ; \
-	fi
-@endif libdecnumber
-@if libiberty
-	@if test -d $(HOST_SUBDIR)/libiberty; then \
-	  cd $(HOST_SUBDIR); mv libiberty stageautoprofile-libiberty; \
-	  mv prev-libiberty stage1-libiberty; : ; \
-	fi
-@endif libiberty
-@if libiberty-linker-plugin
-	@if test -d $(HOST_SUBDIR)/libiberty-linker-plugin; then \
-	  cd $(HOST_SUBDIR); mv libiberty-linker-plugin stageautoprofile-libiberty-linker-plugin; \
-	  mv prev-libiberty-linker-plugin stage1-libiberty-linker-plugin; : ; \
-	fi
-@endif libiberty-linker-plugin
-@if libiconv
-	@if test -d $(HOST_SUBDIR)/libiconv; then \
-	  cd $(HOST_SUBDIR); mv libiconv stageautoprofile-libiconv; \
-	  mv prev-libiconv stage1-libiconv; : ; \
-	fi
-@endif libiconv
-@if zlib
-	@if test -d $(HOST_SUBDIR)/zlib; then \
-	  cd $(HOST_SUBDIR); mv zlib stageautoprofile-zlib; \
-	  mv prev-zlib stage1-zlib; : ; \
-	fi
-@endif zlib
-@if lto-plugin
-	@if test -d $(HOST_SUBDIR)/lto-plugin; then \
-	  cd $(HOST_SUBDIR); mv lto-plugin stageautoprofile-lto-plugin; \
-	  mv prev-lto-plugin stage1-lto-plugin; : ; \
-	fi
-@endif lto-plugin
-@if libctf
-	@if test -d $(HOST_SUBDIR)/libctf; then \
-	  cd $(HOST_SUBDIR); mv libctf stageautoprofile-libctf; \
-	  mv prev-libctf stage1-libctf; : ; \
-	fi
-@endif libctf
-	@if test -d $(TARGET_SUBDIR); then \
-	  mv $(TARGET_SUBDIR) stageautoprofile-$(TARGET_SUBDIR); \
-	  mv prev-$(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR); : ; \
-	fi
-	rm -f stage_current
-
-# Bubble a bug fix through all the stages up to stage autoprofile.  They are
-# remade, but not reconfigured.  The next stage (if any) will not be
-# reconfigured either.
-.PHONY: stageautoprofile-bubble
-stageautoprofile-bubble:: stage1-bubble
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	if test -f stageautoprofile-lean || test -f stage1-lean ; then \
-	  echo Skipping rebuild of stageautoprofile; \
-	else \
-	  $(MAKE) stageautoprofile-start; \
-	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stageautoprofile; \
-	fi
-
-.PHONY: all-stageautoprofile clean-stageautoprofile
-do-clean: clean-stageautoprofile
-
-# 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
-
-
-
-
-# Rules to wipe a stage and all the following ones, also used for cleanstrap
-distclean-stage1:: distclean-stageautoprofile 
-.PHONY: distclean-stageautoprofile
-distclean-stageautoprofile::
-	@: $(MAKE); $(stage)
-	@test "`cat stage_last`" != stageautoprofile || rm -f stage_last
-	rm -rf stageautoprofile-* 
-
-
-@endif gcc-bootstrap
-
-
-.PHONY: stageautofeedback-start stageautofeedback-end
-
-stageautofeedback-start::
-	@: $(MAKE); $(stage); \
-	echo stageautofeedback > stage_current; \
-	echo stageautofeedback > stage_last; \
-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)
-@if bfd
-	@cd $(HOST_SUBDIR); [ -d stageautofeedback-bfd ] || \
-	  mkdir stageautofeedback-bfd; \
-	mv stageautofeedback-bfd bfd; \
-	mv stageautoprofile-bfd prev-bfd || test -f stageautoprofile-lean 
-@endif bfd
-@if opcodes
-	@cd $(HOST_SUBDIR); [ -d stageautofeedback-opcodes ] || \
-	  mkdir stageautofeedback-opcodes; \
-	mv stageautofeedback-opcodes opcodes; \
-	mv stageautoprofile-opcodes prev-opcodes || test -f stageautoprofile-lean 
-@endif opcodes
-@if binutils
-	@cd $(HOST_SUBDIR); [ -d stageautofeedback-binutils ] || \
-	  mkdir stageautofeedback-binutils; \
-	mv stageautofeedback-binutils binutils; \
-	mv stageautoprofile-binutils prev-binutils || test -f stageautoprofile-lean 
-@endif binutils
-@if fixincludes
-	@cd $(HOST_SUBDIR); [ -d stageautofeedback-fixincludes ] || \
-	  mkdir stageautofeedback-fixincludes; \
-	mv stageautofeedback-fixincludes fixincludes; \
-	mv stageautoprofile-fixincludes prev-fixincludes || test -f stageautoprofile-lean 
-@endif fixincludes
-@if gas
-	@cd $(HOST_SUBDIR); [ -d stageautofeedback-gas ] || \
-	  mkdir stageautofeedback-gas; \
-	mv stageautofeedback-gas gas; \
-	mv stageautoprofile-gas prev-gas || test -f stageautoprofile-lean 
-@endif gas
-@if gcc
-	@cd $(HOST_SUBDIR); [ -d stageautofeedback-gcc ] || \
-	  mkdir stageautofeedback-gcc; \
-	mv stageautofeedback-gcc gcc; \
-	mv stageautoprofile-gcc prev-gcc || test -f stageautoprofile-lean 
-@endif gcc
-@if gmp
-	@cd $(HOST_SUBDIR); [ -d stageautofeedback-gmp ] || \
-	  mkdir stageautofeedback-gmp; \
-	mv stageautofeedback-gmp gmp; \
-	mv stageautoprofile-gmp prev-gmp || test -f stageautoprofile-lean 
-@endif gmp
-@if mpfr
-	@cd $(HOST_SUBDIR); [ -d stageautofeedback-mpfr ] || \
-	  mkdir stageautofeedback-mpfr; \
-	mv stageautofeedback-mpfr mpfr; \
-	mv stageautoprofile-mpfr prev-mpfr || test -f stageautoprofile-lean 
-@endif mpfr
-@if mpc
-	@cd $(HOST_SUBDIR); [ -d stageautofeedback-mpc ] || \
-	  mkdir stageautofeedback-mpc; \
-	mv stageautofeedback-mpc mpc; \
-	mv stageautoprofile-mpc prev-mpc || test -f stageautoprofile-lean 
-@endif mpc
-@if isl
-	@cd $(HOST_SUBDIR); [ -d stageautofeedback-isl ] || \
-	  mkdir stageautofeedback-isl; \
-	mv stageautofeedback-isl isl; \
-	mv stageautoprofile-isl prev-isl || test -f stageautoprofile-lean 
-@endif isl
-@if libelf
-	@cd $(HOST_SUBDIR); [ -d stageautofeedback-libelf ] || \
-	  mkdir stageautofeedback-libelf; \
-	mv stageautofeedback-libelf libelf; \
-	mv stageautoprofile-libelf prev-libelf || test -f stageautoprofile-lean 
-@endif libelf
-@if gold
-	@cd $(HOST_SUBDIR); [ -d stageautofeedback-gold ] || \
-	  mkdir stageautofeedback-gold; \
-	mv stageautofeedback-gold gold; \
-	mv stageautoprofile-gold prev-gold || test -f stageautoprofile-lean 
-@endif gold
-@if intl
-	@cd $(HOST_SUBDIR); [ -d stageautofeedback-intl ] || \
-	  mkdir stageautofeedback-intl; \
-	mv stageautofeedback-intl intl; \
-	mv stageautoprofile-intl prev-intl || test -f stageautoprofile-lean 
-@endif intl
-@if ld
-	@cd $(HOST_SUBDIR); [ -d stageautofeedback-ld ] || \
-	  mkdir stageautofeedback-ld; \
-	mv stageautofeedback-ld ld; \
-	mv stageautoprofile-ld prev-ld || test -f stageautoprofile-lean 
-@endif ld
-@if libbacktrace
-	@cd $(HOST_SUBDIR); [ -d stageautofeedback-libbacktrace ] || \
-	  mkdir stageautofeedback-libbacktrace; \
-	mv stageautofeedback-libbacktrace libbacktrace; \
-	mv stageautoprofile-libbacktrace prev-libbacktrace || test -f stageautoprofile-lean 
-@endif libbacktrace
-@if libcpp
-	@cd $(HOST_SUBDIR); [ -d stageautofeedback-libcpp ] || \
-	  mkdir stageautofeedback-libcpp; \
-	mv stageautofeedback-libcpp libcpp; \
-	mv stageautoprofile-libcpp prev-libcpp || test -f stageautoprofile-lean 
-@endif libcpp
-@if libdecnumber
-	@cd $(HOST_SUBDIR); [ -d stageautofeedback-libdecnumber ] || \
-	  mkdir stageautofeedback-libdecnumber; \
-	mv stageautofeedback-libdecnumber libdecnumber; \
-	mv stageautoprofile-libdecnumber prev-libdecnumber || test -f stageautoprofile-lean 
-@endif libdecnumber
-@if libiberty
-	@cd $(HOST_SUBDIR); [ -d stageautofeedback-libiberty ] || \
-	  mkdir stageautofeedback-libiberty; \
-	mv stageautofeedback-libiberty libiberty; \
-	mv stageautoprofile-libiberty prev-libiberty || test -f stageautoprofile-lean 
-@endif libiberty
-@if libiberty-linker-plugin
-	@cd $(HOST_SUBDIR); [ -d stageautofeedback-libiberty-linker-plugin ] || \
-	  mkdir stageautofeedback-libiberty-linker-plugin; \
-	mv stageautofeedback-libiberty-linker-plugin libiberty-linker-plugin; \
-	mv stageautoprofile-libiberty-linker-plugin prev-libiberty-linker-plugin || test -f stageautoprofile-lean 
-@endif libiberty-linker-plugin
-@if libiconv
-	@cd $(HOST_SUBDIR); [ -d stageautofeedback-libiconv ] || \
-	  mkdir stageautofeedback-libiconv; \
-	mv stageautofeedback-libiconv libiconv; \
-	mv stageautoprofile-libiconv prev-libiconv || test -f stageautoprofile-lean 
-@endif libiconv
-@if zlib
-	@cd $(HOST_SUBDIR); [ -d stageautofeedback-zlib ] || \
-	  mkdir stageautofeedback-zlib; \
-	mv stageautofeedback-zlib zlib; \
-	mv stageautoprofile-zlib prev-zlib || test -f stageautoprofile-lean 
-@endif zlib
-@if lto-plugin
-	@cd $(HOST_SUBDIR); [ -d stageautofeedback-lto-plugin ] || \
-	  mkdir stageautofeedback-lto-plugin; \
-	mv stageautofeedback-lto-plugin lto-plugin; \
-	mv stageautoprofile-lto-plugin prev-lto-plugin || test -f stageautoprofile-lean 
-@endif lto-plugin
-@if libctf
-	@cd $(HOST_SUBDIR); [ -d stageautofeedback-libctf ] || \
-	  mkdir stageautofeedback-libctf; \
-	mv stageautofeedback-libctf libctf; \
-	mv stageautoprofile-libctf prev-libctf || test -f stageautoprofile-lean 
-@endif libctf
-	@[ -d stageautofeedback-$(TARGET_SUBDIR) ] || \
-	  mkdir stageautofeedback-$(TARGET_SUBDIR); \
-	mv stageautofeedback-$(TARGET_SUBDIR) $(TARGET_SUBDIR); \
-	mv stageautoprofile-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stageautoprofile-lean 
-
-stageautofeedback-end:: 
-@if bfd
-	@if test -d $(HOST_SUBDIR)/bfd; then \
-	  cd $(HOST_SUBDIR); mv bfd stageautofeedback-bfd; \
-	  mv prev-bfd stageautoprofile-bfd; : ; \
-	fi
-@endif bfd
-@if opcodes
-	@if test -d $(HOST_SUBDIR)/opcodes; then \
-	  cd $(HOST_SUBDIR); mv opcodes stageautofeedback-opcodes; \
-	  mv prev-opcodes stageautoprofile-opcodes; : ; \
-	fi
-@endif opcodes
-@if binutils
-	@if test -d $(HOST_SUBDIR)/binutils; then \
-	  cd $(HOST_SUBDIR); mv binutils stageautofeedback-binutils; \
-	  mv prev-binutils stageautoprofile-binutils; : ; \
-	fi
-@endif binutils
-@if fixincludes
-	@if test -d $(HOST_SUBDIR)/fixincludes; then \
-	  cd $(HOST_SUBDIR); mv fixincludes stageautofeedback-fixincludes; \
-	  mv prev-fixincludes stageautoprofile-fixincludes; : ; \
-	fi
-@endif fixincludes
-@if gas
-	@if test -d $(HOST_SUBDIR)/gas; then \
-	  cd $(HOST_SUBDIR); mv gas stageautofeedback-gas; \
-	  mv prev-gas stageautoprofile-gas; : ; \
-	fi
-@endif gas
-@if gcc
-	@if test -d $(HOST_SUBDIR)/gcc; then \
-	  cd $(HOST_SUBDIR); mv gcc stageautofeedback-gcc; \
-	  mv prev-gcc stageautoprofile-gcc; : ; \
-	fi
-@endif gcc
-@if gmp
-	@if test -d $(HOST_SUBDIR)/gmp; then \
-	  cd $(HOST_SUBDIR); mv gmp stageautofeedback-gmp; \
-	  mv prev-gmp stageautoprofile-gmp; : ; \
-	fi
-@endif gmp
-@if mpfr
-	@if test -d $(HOST_SUBDIR)/mpfr; then \
-	  cd $(HOST_SUBDIR); mv mpfr stageautofeedback-mpfr; \
-	  mv prev-mpfr stageautoprofile-mpfr; : ; \
-	fi
-@endif mpfr
-@if mpc
-	@if test -d $(HOST_SUBDIR)/mpc; then \
-	  cd $(HOST_SUBDIR); mv mpc stageautofeedback-mpc; \
-	  mv prev-mpc stageautoprofile-mpc; : ; \
-	fi
-@endif mpc
-@if isl
-	@if test -d $(HOST_SUBDIR)/isl; then \
-	  cd $(HOST_SUBDIR); mv isl stageautofeedback-isl; \
-	  mv prev-isl stageautoprofile-isl; : ; \
-	fi
-@endif isl
-@if libelf
-	@if test -d $(HOST_SUBDIR)/libelf; then \
-	  cd $(HOST_SUBDIR); mv libelf stageautofeedback-libelf; \
-	  mv prev-libelf stageautoprofile-libelf; : ; \
-	fi
-@endif libelf
-@if gold
-	@if test -d $(HOST_SUBDIR)/gold; then \
-	  cd $(HOST_SUBDIR); mv gold stageautofeedback-gold; \
-	  mv prev-gold stageautoprofile-gold; : ; \
-	fi
-@endif gold
-@if intl
-	@if test -d $(HOST_SUBDIR)/intl; then \
-	  cd $(HOST_SUBDIR); mv intl stageautofeedback-intl; \
-	  mv prev-intl stageautoprofile-intl; : ; \
-	fi
-@endif intl
-@if ld
-	@if test -d $(HOST_SUBDIR)/ld; then \
-	  cd $(HOST_SUBDIR); mv ld stageautofeedback-ld; \
-	  mv prev-ld stageautoprofile-ld; : ; \
-	fi
-@endif ld
-@if libbacktrace
-	@if test -d $(HOST_SUBDIR)/libbacktrace; then \
-	  cd $(HOST_SUBDIR); mv libbacktrace stageautofeedback-libbacktrace; \
-	  mv prev-libbacktrace stageautoprofile-libbacktrace; : ; \
-	fi
-@endif libbacktrace
-@if libcpp
-	@if test -d $(HOST_SUBDIR)/libcpp; then \
-	  cd $(HOST_SUBDIR); mv libcpp stageautofeedback-libcpp; \
-	  mv prev-libcpp stageautoprofile-libcpp; : ; \
-	fi
-@endif libcpp
-@if libdecnumber
-	@if test -d $(HOST_SUBDIR)/libdecnumber; then \
-	  cd $(HOST_SUBDIR); mv libdecnumber stageautofeedback-libdecnumber; \
-	  mv prev-libdecnumber stageautoprofile-libdecnumber; : ; \
-	fi
-@endif libdecnumber
-@if libiberty
-	@if test -d $(HOST_SUBDIR)/libiberty; then \
-	  cd $(HOST_SUBDIR); mv libiberty stageautofeedback-libiberty; \
-	  mv prev-libiberty stageautoprofile-libiberty; : ; \
-	fi
-@endif libiberty
-@if libiberty-linker-plugin
-	@if test -d $(HOST_SUBDIR)/libiberty-linker-plugin; then \
-	  cd $(HOST_SUBDIR); mv libiberty-linker-plugin stageautofeedback-libiberty-linker-plugin; \
-	  mv prev-libiberty-linker-plugin stageautoprofile-libiberty-linker-plugin; : ; \
-	fi
-@endif libiberty-linker-plugin
-@if libiconv
-	@if test -d $(HOST_SUBDIR)/libiconv; then \
-	  cd $(HOST_SUBDIR); mv libiconv stageautofeedback-libiconv; \
-	  mv prev-libiconv stageautoprofile-libiconv; : ; \
-	fi
-@endif libiconv
-@if zlib
-	@if test -d $(HOST_SUBDIR)/zlib; then \
-	  cd $(HOST_SUBDIR); mv zlib stageautofeedback-zlib; \
-	  mv prev-zlib stageautoprofile-zlib; : ; \
-	fi
-@endif zlib
-@if lto-plugin
-	@if test -d $(HOST_SUBDIR)/lto-plugin; then \
-	  cd $(HOST_SUBDIR); mv lto-plugin stageautofeedback-lto-plugin; \
-	  mv prev-lto-plugin stageautoprofile-lto-plugin; : ; \
-	fi
-@endif lto-plugin
-@if libctf
-	@if test -d $(HOST_SUBDIR)/libctf; then \
-	  cd $(HOST_SUBDIR); mv libctf stageautofeedback-libctf; \
-	  mv prev-libctf stageautoprofile-libctf; : ; \
-	fi
-@endif libctf
-	@if test -d $(TARGET_SUBDIR); then \
-	  mv $(TARGET_SUBDIR) stageautofeedback-$(TARGET_SUBDIR); \
-	  mv prev-$(TARGET_SUBDIR) stageautoprofile-$(TARGET_SUBDIR); : ; \
-	fi
-	rm -f stage_current
-
-# Bubble a bug fix through all the stages up to stage autofeedback.  They are
-# remade, but not reconfigured.  The next stage (if any) will not be
-# reconfigured either.
-.PHONY: stageautofeedback-bubble
-stageautofeedback-bubble:: stageautoprofile-bubble
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	if test -f stageautofeedback-lean || test -f stageautoprofile-lean ; then \
-	  echo Skipping rebuild of stageautofeedback; \
-	else \
-	  $(MAKE) stageautofeedback-start; \
-	  $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stageautofeedback; \
-	fi
-
-.PHONY: all-stageautofeedback clean-stageautofeedback
-do-clean: clean-stageautofeedback
-
-# 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
-
-
-
-.PHONY: autoprofiledbootstrap autoprofiledbootstrap-lean
-autoprofiledbootstrap:
-	echo stageautofeedback > stage_final
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) stageautofeedback-bubble
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
-
-autoprofiledbootstrap-lean:
-	echo stageautofeedback > stage_final
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	$(MAKE) $(RECURSE_FLAGS_TO_PASS) LEAN=: stageautofeedback-bubble
-	@: $(MAKE); $(unstage)
-	@r=`${PWD_COMMAND}`; export r; \
-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-	TFLAGS="$(STAGEautofeedback_TFLAGS)"; \
-	$(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target
-
-
-# Rules to wipe a stage and all the following ones, also used for cleanstrap
-distclean-stageautoprofile:: distclean-stageautofeedback 
-.PHONY: distclean-stageautofeedback
-distclean-stageautofeedback::
-	@: $(MAKE); $(stage)
-	@test "`cat stage_last`" != stageautofeedback || rm -f stage_last
-	rm -rf stageautofeedback-* 
-
-
-@endif gcc-bootstrap
-
-
 
 stageprofile-end::
 	$(MAKE) distclean-stagefeedback
@@ -58683,7 +50107,7 @@ stage_current:
 .PHONY: restrap
 restrap::
 	@: $(MAKE); $(stage)
-	rm -rf stage1-$(TARGET_SUBDIR) stage2-* stage3-* stage4-* stageprofile-* stagetrain-* stagefeedback-* stageautoprofile-* stageautofeedback-*
+	rm -rf stage1-$(TARGET_SUBDIR) stage2-* stage3-* stage4-* stageprofile-* stagefeedback-*
 restrap:: all
 @endif gcc-bootstrap
 
@@ -58698,37 +50122,26 @@ configure-stage2-target-libstdc++-v3: maybe-all-stage2-gcc
 configure-stage3-target-libstdc++-v3: maybe-all-stage3-gcc
 configure-stage4-target-libstdc++-v3: maybe-all-stage4-gcc
 configure-stageprofile-target-libstdc++-v3: maybe-all-stageprofile-gcc
-configure-stagetrain-target-libstdc++-v3: maybe-all-stagetrain-gcc
 configure-stagefeedback-target-libstdc++-v3: maybe-all-stagefeedback-gcc
-configure-stageautoprofile-target-libstdc++-v3: maybe-all-stageautoprofile-gcc
-configure-stageautofeedback-target-libstdc++-v3: maybe-all-stageautofeedback-gcc
 configure-stage1-target-libsanitizer: maybe-all-stage1-gcc
 configure-stage2-target-libsanitizer: maybe-all-stage2-gcc
 configure-stage3-target-libsanitizer: maybe-all-stage3-gcc
 configure-stage4-target-libsanitizer: maybe-all-stage4-gcc
 configure-stageprofile-target-libsanitizer: maybe-all-stageprofile-gcc
-configure-stagetrain-target-libsanitizer: maybe-all-stagetrain-gcc
 configure-stagefeedback-target-libsanitizer: maybe-all-stagefeedback-gcc
-configure-stageautoprofile-target-libsanitizer: maybe-all-stageautoprofile-gcc
-configure-stageautofeedback-target-libsanitizer: maybe-all-stageautofeedback-gcc
 configure-stage1-target-libmpx: maybe-all-stage1-gcc
 configure-stage2-target-libmpx: maybe-all-stage2-gcc
 configure-stage3-target-libmpx: maybe-all-stage3-gcc
 configure-stage4-target-libmpx: maybe-all-stage4-gcc
 configure-stageprofile-target-libmpx: maybe-all-stageprofile-gcc
-configure-stagetrain-target-libmpx: maybe-all-stagetrain-gcc
 configure-stagefeedback-target-libmpx: maybe-all-stagefeedback-gcc
-configure-stageautoprofile-target-libmpx: maybe-all-stageautoprofile-gcc
-configure-stageautofeedback-target-libmpx: maybe-all-stageautofeedback-gcc
 configure-stage1-target-libvtv: maybe-all-stage1-gcc
 configure-stage2-target-libvtv: maybe-all-stage2-gcc
 configure-stage3-target-libvtv: maybe-all-stage3-gcc
 configure-stage4-target-libvtv: maybe-all-stage4-gcc
 configure-stageprofile-target-libvtv: maybe-all-stageprofile-gcc
-configure-stagetrain-target-libvtv: maybe-all-stagetrain-gcc
 configure-stagefeedback-target-libvtv: maybe-all-stagefeedback-gcc
-configure-stageautoprofile-target-libvtv: maybe-all-stageautoprofile-gcc
-configure-stageautofeedback-target-libvtv: maybe-all-stageautofeedback-gcc
+configure-target-libcilkrts: stage_last
 configure-target-liboffloadmic: stage_last
 configure-target-libssp: stage_last
 configure-target-newlib: stage_last
@@ -58737,17 +50150,12 @@ configure-stage2-target-libgcc: maybe-all-stage2-gcc
 configure-stage3-target-libgcc: maybe-all-stage3-gcc
 configure-stage4-target-libgcc: maybe-all-stage4-gcc
 configure-stageprofile-target-libgcc: maybe-all-stageprofile-gcc
-configure-stagetrain-target-libgcc: maybe-all-stagetrain-gcc
 configure-stagefeedback-target-libgcc: maybe-all-stagefeedback-gcc
-configure-stageautoprofile-target-libgcc: maybe-all-stageautoprofile-gcc
-configure-stageautofeedback-target-libgcc: maybe-all-stageautofeedback-gcc
 configure-target-libbacktrace: stage_last
 configure-target-libquadmath: stage_last
 configure-target-libgfortran: stage_last
 configure-target-libobjc: stage_last
 configure-target-libgo: stage_last
-configure-target-libhsail-rt: stage_last
-configure-target-libphobos: stage_last
 configure-target-libtermcap: stage_last
 configure-target-winsup: stage_last
 configure-target-libgloss: stage_last
@@ -58760,10 +50168,7 @@ configure-stage2-target-libgomp: maybe-all-stage2-gcc
 configure-stage3-target-libgomp: maybe-all-stage3-gcc
 configure-stage4-target-libgomp: maybe-all-stage4-gcc
 configure-stageprofile-target-libgomp: maybe-all-stageprofile-gcc
-configure-stagetrain-target-libgomp: maybe-all-stagetrain-gcc
 configure-stagefeedback-target-libgomp: maybe-all-stagefeedback-gcc
-configure-stageautoprofile-target-libgomp: maybe-all-stageautoprofile-gcc
-configure-stageautofeedback-target-libgomp: maybe-all-stageautofeedback-gcc
 configure-target-libitm: stage_last
 configure-target-libatomic: stage_last
 @endif gcc-bootstrap
@@ -58773,6 +50178,7 @@ configure-target-libstdc++-v3: maybe-all-gcc
 configure-target-libsanitizer: maybe-all-gcc
 configure-target-libmpx: maybe-all-gcc
 configure-target-libvtv: maybe-all-gcc
+configure-target-libcilkrts: maybe-all-gcc
 configure-target-liboffloadmic: maybe-all-gcc
 configure-target-libssp: maybe-all-gcc
 configure-target-newlib: maybe-all-gcc
@@ -58782,8 +50188,6 @@ configure-target-libquadmath: maybe-all-gcc
 configure-target-libgfortran: maybe-all-gcc
 configure-target-libobjc: maybe-all-gcc
 configure-target-libgo: maybe-all-gcc
-configure-target-libhsail-rt: maybe-all-gcc
-configure-target-libphobos: maybe-all-gcc
 configure-target-libtermcap: maybe-all-gcc
 configure-target-winsup: maybe-all-gcc
 configure-target-libgloss: maybe-all-gcc
@@ -58828,350 +50232,245 @@ configure-stage2-gcc: maybe-configure-stage2-intl
 configure-stage3-gcc: maybe-configure-stage3-intl
 configure-stage4-gcc: maybe-configure-stage4-intl
 configure-stageprofile-gcc: maybe-configure-stageprofile-intl
-configure-stagetrain-gcc: maybe-configure-stagetrain-intl
 configure-stagefeedback-gcc: maybe-configure-stagefeedback-intl
-configure-stageautoprofile-gcc: maybe-configure-stageautoprofile-intl
-configure-stageautofeedback-gcc: maybe-configure-stageautofeedback-intl
 configure-gcc: maybe-all-gmp
 configure-stage1-gcc: maybe-all-stage1-gmp
 configure-stage2-gcc: maybe-all-stage2-gmp
 configure-stage3-gcc: maybe-all-stage3-gmp
 configure-stage4-gcc: maybe-all-stage4-gmp
 configure-stageprofile-gcc: maybe-all-stageprofile-gmp
-configure-stagetrain-gcc: maybe-all-stagetrain-gmp
 configure-stagefeedback-gcc: maybe-all-stagefeedback-gmp
-configure-stageautoprofile-gcc: maybe-all-stageautoprofile-gmp
-configure-stageautofeedback-gcc: maybe-all-stageautofeedback-gmp
 configure-gcc: maybe-all-mpfr
 configure-stage1-gcc: maybe-all-stage1-mpfr
 configure-stage2-gcc: maybe-all-stage2-mpfr
 configure-stage3-gcc: maybe-all-stage3-mpfr
 configure-stage4-gcc: maybe-all-stage4-mpfr
 configure-stageprofile-gcc: maybe-all-stageprofile-mpfr
-configure-stagetrain-gcc: maybe-all-stagetrain-mpfr
 configure-stagefeedback-gcc: maybe-all-stagefeedback-mpfr
-configure-stageautoprofile-gcc: maybe-all-stageautoprofile-mpfr
-configure-stageautofeedback-gcc: maybe-all-stageautofeedback-mpfr
 configure-gcc: maybe-all-mpc
 configure-stage1-gcc: maybe-all-stage1-mpc
 configure-stage2-gcc: maybe-all-stage2-mpc
 configure-stage3-gcc: maybe-all-stage3-mpc
 configure-stage4-gcc: maybe-all-stage4-mpc
 configure-stageprofile-gcc: maybe-all-stageprofile-mpc
-configure-stagetrain-gcc: maybe-all-stagetrain-mpc
 configure-stagefeedback-gcc: maybe-all-stagefeedback-mpc
-configure-stageautoprofile-gcc: maybe-all-stageautoprofile-mpc
-configure-stageautofeedback-gcc: maybe-all-stageautofeedback-mpc
 configure-gcc: maybe-all-isl
 configure-stage1-gcc: maybe-all-stage1-isl
 configure-stage2-gcc: maybe-all-stage2-isl
 configure-stage3-gcc: maybe-all-stage3-isl
 configure-stage4-gcc: maybe-all-stage4-isl
 configure-stageprofile-gcc: maybe-all-stageprofile-isl
-configure-stagetrain-gcc: maybe-all-stagetrain-isl
 configure-stagefeedback-gcc: maybe-all-stagefeedback-isl
-configure-stageautoprofile-gcc: maybe-all-stageautoprofile-isl
-configure-stageautofeedback-gcc: maybe-all-stageautofeedback-isl
 configure-gcc: maybe-all-lto-plugin
 configure-stage1-gcc: maybe-all-stage1-lto-plugin
 configure-stage2-gcc: maybe-all-stage2-lto-plugin
 configure-stage3-gcc: maybe-all-stage3-lto-plugin
 configure-stage4-gcc: maybe-all-stage4-lto-plugin
 configure-stageprofile-gcc: maybe-all-stageprofile-lto-plugin
-configure-stagetrain-gcc: maybe-all-stagetrain-lto-plugin
 configure-stagefeedback-gcc: maybe-all-stagefeedback-lto-plugin
-configure-stageautoprofile-gcc: maybe-all-stageautoprofile-lto-plugin
-configure-stageautofeedback-gcc: maybe-all-stageautofeedback-lto-plugin
 configure-gcc: maybe-all-binutils
 configure-stage1-gcc: maybe-all-stage1-binutils
 configure-stage2-gcc: maybe-all-stage2-binutils
 configure-stage3-gcc: maybe-all-stage3-binutils
 configure-stage4-gcc: maybe-all-stage4-binutils
 configure-stageprofile-gcc: maybe-all-stageprofile-binutils
-configure-stagetrain-gcc: maybe-all-stagetrain-binutils
 configure-stagefeedback-gcc: maybe-all-stagefeedback-binutils
-configure-stageautoprofile-gcc: maybe-all-stageautoprofile-binutils
-configure-stageautofeedback-gcc: maybe-all-stageautofeedback-binutils
 configure-gcc: maybe-all-gas
 configure-stage1-gcc: maybe-all-stage1-gas
 configure-stage2-gcc: maybe-all-stage2-gas
 configure-stage3-gcc: maybe-all-stage3-gas
 configure-stage4-gcc: maybe-all-stage4-gas
 configure-stageprofile-gcc: maybe-all-stageprofile-gas
-configure-stagetrain-gcc: maybe-all-stagetrain-gas
 configure-stagefeedback-gcc: maybe-all-stagefeedback-gas
-configure-stageautoprofile-gcc: maybe-all-stageautoprofile-gas
-configure-stageautofeedback-gcc: maybe-all-stageautofeedback-gas
 configure-gcc: maybe-all-ld
 configure-stage1-gcc: maybe-all-stage1-ld
 configure-stage2-gcc: maybe-all-stage2-ld
 configure-stage3-gcc: maybe-all-stage3-ld
 configure-stage4-gcc: maybe-all-stage4-ld
 configure-stageprofile-gcc: maybe-all-stageprofile-ld
-configure-stagetrain-gcc: maybe-all-stagetrain-ld
 configure-stagefeedback-gcc: maybe-all-stagefeedback-ld
-configure-stageautoprofile-gcc: maybe-all-stageautoprofile-ld
-configure-stageautofeedback-gcc: maybe-all-stageautofeedback-ld
 configure-gcc: maybe-all-gold
 configure-stage1-gcc: maybe-all-stage1-gold
 configure-stage2-gcc: maybe-all-stage2-gold
 configure-stage3-gcc: maybe-all-stage3-gold
 configure-stage4-gcc: maybe-all-stage4-gold
 configure-stageprofile-gcc: maybe-all-stageprofile-gold
-configure-stagetrain-gcc: maybe-all-stagetrain-gold
 configure-stagefeedback-gcc: maybe-all-stagefeedback-gold
-configure-stageautoprofile-gcc: maybe-all-stageautoprofile-gold
-configure-stageautofeedback-gcc: maybe-all-stageautofeedback-gold
 configure-gcc: maybe-all-libelf
 configure-stage1-gcc: maybe-all-stage1-libelf
 configure-stage2-gcc: maybe-all-stage2-libelf
 configure-stage3-gcc: maybe-all-stage3-libelf
 configure-stage4-gcc: maybe-all-stage4-libelf
 configure-stageprofile-gcc: maybe-all-stageprofile-libelf
-configure-stagetrain-gcc: maybe-all-stagetrain-libelf
 configure-stagefeedback-gcc: maybe-all-stagefeedback-libelf
-configure-stageautoprofile-gcc: maybe-all-stageautoprofile-libelf
-configure-stageautofeedback-gcc: maybe-all-stageautofeedback-libelf
 configure-gcc: maybe-all-libiconv
 configure-stage1-gcc: maybe-all-stage1-libiconv
 configure-stage2-gcc: maybe-all-stage2-libiconv
 configure-stage3-gcc: maybe-all-stage3-libiconv
 configure-stage4-gcc: maybe-all-stage4-libiconv
 configure-stageprofile-gcc: maybe-all-stageprofile-libiconv
-configure-stagetrain-gcc: maybe-all-stagetrain-libiconv
 configure-stagefeedback-gcc: maybe-all-stagefeedback-libiconv
-configure-stageautoprofile-gcc: maybe-all-stageautoprofile-libiconv
-configure-stageautofeedback-gcc: maybe-all-stageautofeedback-libiconv
 all-gcc: all-libiberty
 all-stage1-gcc: all-stage1-libiberty
 all-stage2-gcc: all-stage2-libiberty
 all-stage3-gcc: all-stage3-libiberty
 all-stage4-gcc: all-stage4-libiberty
 all-stageprofile-gcc: all-stageprofile-libiberty
-all-stagetrain-gcc: all-stagetrain-libiberty
 all-stagefeedback-gcc: all-stagefeedback-libiberty
-all-stageautoprofile-gcc: all-stageautoprofile-libiberty
-all-stageautofeedback-gcc: all-stageautofeedback-libiberty
 all-gcc: maybe-all-intl
 all-stage1-gcc: maybe-all-stage1-intl
 all-stage2-gcc: maybe-all-stage2-intl
 all-stage3-gcc: maybe-all-stage3-intl
 all-stage4-gcc: maybe-all-stage4-intl
 all-stageprofile-gcc: maybe-all-stageprofile-intl
-all-stagetrain-gcc: maybe-all-stagetrain-intl
 all-stagefeedback-gcc: maybe-all-stagefeedback-intl
-all-stageautoprofile-gcc: maybe-all-stageautoprofile-intl
-all-stageautofeedback-gcc: maybe-all-stageautofeedback-intl
 all-gcc: maybe-all-mpfr
 all-stage1-gcc: maybe-all-stage1-mpfr
 all-stage2-gcc: maybe-all-stage2-mpfr
 all-stage3-gcc: maybe-all-stage3-mpfr
 all-stage4-gcc: maybe-all-stage4-mpfr
 all-stageprofile-gcc: maybe-all-stageprofile-mpfr
-all-stagetrain-gcc: maybe-all-stagetrain-mpfr
 all-stagefeedback-gcc: maybe-all-stagefeedback-mpfr
-all-stageautoprofile-gcc: maybe-all-stageautoprofile-mpfr
-all-stageautofeedback-gcc: maybe-all-stageautofeedback-mpfr
 all-gcc: maybe-all-mpc
 all-stage1-gcc: maybe-all-stage1-mpc
 all-stage2-gcc: maybe-all-stage2-mpc
 all-stage3-gcc: maybe-all-stage3-mpc
 all-stage4-gcc: maybe-all-stage4-mpc
 all-stageprofile-gcc: maybe-all-stageprofile-mpc
-all-stagetrain-gcc: maybe-all-stagetrain-mpc
 all-stagefeedback-gcc: maybe-all-stagefeedback-mpc
-all-stageautoprofile-gcc: maybe-all-stageautoprofile-mpc
-all-stageautofeedback-gcc: maybe-all-stageautofeedback-mpc
 all-gcc: maybe-all-isl
 all-stage1-gcc: maybe-all-stage1-isl
 all-stage2-gcc: maybe-all-stage2-isl
 all-stage3-gcc: maybe-all-stage3-isl
 all-stage4-gcc: maybe-all-stage4-isl
 all-stageprofile-gcc: maybe-all-stageprofile-isl
-all-stagetrain-gcc: maybe-all-stagetrain-isl
 all-stagefeedback-gcc: maybe-all-stagefeedback-isl
-all-stageautoprofile-gcc: maybe-all-stageautoprofile-isl
-all-stageautofeedback-gcc: maybe-all-stageautofeedback-isl
 all-gcc: maybe-all-build-texinfo
 all-stage1-gcc: maybe-all-build-texinfo
 all-stage2-gcc: maybe-all-build-texinfo
 all-stage3-gcc: maybe-all-build-texinfo
 all-stage4-gcc: maybe-all-build-texinfo
 all-stageprofile-gcc: maybe-all-build-texinfo
-all-stagetrain-gcc: maybe-all-build-texinfo
 all-stagefeedback-gcc: maybe-all-build-texinfo
-all-stageautoprofile-gcc: maybe-all-build-texinfo
-all-stageautofeedback-gcc: maybe-all-build-texinfo
 all-gcc: maybe-all-build-bison
 all-stage1-gcc: maybe-all-build-bison
 all-stage2-gcc: maybe-all-build-bison
 all-stage3-gcc: maybe-all-build-bison
 all-stage4-gcc: maybe-all-build-bison
 all-stageprofile-gcc: maybe-all-build-bison
-all-stagetrain-gcc: maybe-all-build-bison
 all-stagefeedback-gcc: maybe-all-build-bison
-all-stageautoprofile-gcc: maybe-all-build-bison
-all-stageautofeedback-gcc: maybe-all-build-bison
 all-gcc: maybe-all-build-flex
 all-stage1-gcc: maybe-all-build-flex
 all-stage2-gcc: maybe-all-build-flex
 all-stage3-gcc: maybe-all-build-flex
 all-stage4-gcc: maybe-all-build-flex
 all-stageprofile-gcc: maybe-all-build-flex
-all-stagetrain-gcc: maybe-all-build-flex
 all-stagefeedback-gcc: maybe-all-build-flex
-all-stageautoprofile-gcc: maybe-all-build-flex
-all-stageautofeedback-gcc: maybe-all-build-flex
 all-gcc: maybe-all-build-libiberty
 all-stage1-gcc: maybe-all-build-libiberty
 all-stage2-gcc: maybe-all-build-libiberty
 all-stage3-gcc: maybe-all-build-libiberty
 all-stage4-gcc: maybe-all-build-libiberty
 all-stageprofile-gcc: maybe-all-build-libiberty
-all-stagetrain-gcc: maybe-all-build-libiberty
 all-stagefeedback-gcc: maybe-all-build-libiberty
-all-stageautoprofile-gcc: maybe-all-build-libiberty
-all-stageautofeedback-gcc: maybe-all-build-libiberty
 all-gcc: maybe-all-build-fixincludes
 all-stage1-gcc: maybe-all-build-fixincludes
 all-stage2-gcc: maybe-all-build-fixincludes
 all-stage3-gcc: maybe-all-build-fixincludes
 all-stage4-gcc: maybe-all-build-fixincludes
 all-stageprofile-gcc: maybe-all-build-fixincludes
-all-stagetrain-gcc: maybe-all-build-fixincludes
 all-stagefeedback-gcc: maybe-all-build-fixincludes
-all-stageautoprofile-gcc: maybe-all-build-fixincludes
-all-stageautofeedback-gcc: maybe-all-build-fixincludes
 all-gcc: maybe-all-build-libcpp
 all-stage1-gcc: maybe-all-build-libcpp
 all-stage2-gcc: maybe-all-build-libcpp
 all-stage3-gcc: maybe-all-build-libcpp
 all-stage4-gcc: maybe-all-build-libcpp
 all-stageprofile-gcc: maybe-all-build-libcpp
-all-stagetrain-gcc: maybe-all-build-libcpp
 all-stagefeedback-gcc: maybe-all-build-libcpp
-all-stageautoprofile-gcc: maybe-all-build-libcpp
-all-stageautofeedback-gcc: maybe-all-build-libcpp
 all-gcc: maybe-all-zlib
 all-stage1-gcc: maybe-all-stage1-zlib
 all-stage2-gcc: maybe-all-stage2-zlib
 all-stage3-gcc: maybe-all-stage3-zlib
 all-stage4-gcc: maybe-all-stage4-zlib
 all-stageprofile-gcc: maybe-all-stageprofile-zlib
-all-stagetrain-gcc: maybe-all-stagetrain-zlib
 all-stagefeedback-gcc: maybe-all-stagefeedback-zlib
-all-stageautoprofile-gcc: maybe-all-stageautoprofile-zlib
-all-stageautofeedback-gcc: maybe-all-stageautofeedback-zlib
 all-gcc: all-libbacktrace
 all-stage1-gcc: all-stage1-libbacktrace
 all-stage2-gcc: all-stage2-libbacktrace
 all-stage3-gcc: all-stage3-libbacktrace
 all-stage4-gcc: all-stage4-libbacktrace
 all-stageprofile-gcc: all-stageprofile-libbacktrace
-all-stagetrain-gcc: all-stagetrain-libbacktrace
 all-stagefeedback-gcc: all-stagefeedback-libbacktrace
-all-stageautoprofile-gcc: all-stageautoprofile-libbacktrace
-all-stageautofeedback-gcc: all-stageautofeedback-libbacktrace
 all-gcc: all-libcpp
 all-stage1-gcc: all-stage1-libcpp
 all-stage2-gcc: all-stage2-libcpp
 all-stage3-gcc: all-stage3-libcpp
 all-stage4-gcc: all-stage4-libcpp
 all-stageprofile-gcc: all-stageprofile-libcpp
-all-stagetrain-gcc: all-stagetrain-libcpp
 all-stagefeedback-gcc: all-stagefeedback-libcpp
-all-stageautoprofile-gcc: all-stageautoprofile-libcpp
-all-stageautofeedback-gcc: all-stageautofeedback-libcpp
 all-gcc: all-libdecnumber
 all-stage1-gcc: all-stage1-libdecnumber
 all-stage2-gcc: all-stage2-libdecnumber
 all-stage3-gcc: all-stage3-libdecnumber
 all-stage4-gcc: all-stage4-libdecnumber
 all-stageprofile-gcc: all-stageprofile-libdecnumber
-all-stagetrain-gcc: all-stagetrain-libdecnumber
 all-stagefeedback-gcc: all-stagefeedback-libdecnumber
-all-stageautoprofile-gcc: all-stageautoprofile-libdecnumber
-all-stageautofeedback-gcc: all-stageautofeedback-libdecnumber
 all-gcc: maybe-all-libiberty
 all-stage1-gcc: maybe-all-stage1-libiberty
 all-stage2-gcc: maybe-all-stage2-libiberty
 all-stage3-gcc: maybe-all-stage3-libiberty
 all-stage4-gcc: maybe-all-stage4-libiberty
 all-stageprofile-gcc: maybe-all-stageprofile-libiberty
-all-stagetrain-gcc: maybe-all-stagetrain-libiberty
 all-stagefeedback-gcc: maybe-all-stagefeedback-libiberty
-all-stageautoprofile-gcc: maybe-all-stageautoprofile-libiberty
-all-stageautofeedback-gcc: maybe-all-stageautofeedback-libiberty
 all-gcc: maybe-all-fixincludes
 all-stage1-gcc: maybe-all-stage1-fixincludes
 all-stage2-gcc: maybe-all-stage2-fixincludes
 all-stage3-gcc: maybe-all-stage3-fixincludes
 all-stage4-gcc: maybe-all-stage4-fixincludes
 all-stageprofile-gcc: maybe-all-stageprofile-fixincludes
-all-stagetrain-gcc: maybe-all-stagetrain-fixincludes
 all-stagefeedback-gcc: maybe-all-stagefeedback-fixincludes
-all-stageautoprofile-gcc: maybe-all-stageautoprofile-fixincludes
-all-stageautofeedback-gcc: maybe-all-stageautofeedback-fixincludes
 all-gcc: maybe-all-lto-plugin
 all-stage1-gcc: maybe-all-stage1-lto-plugin
 all-stage2-gcc: maybe-all-stage2-lto-plugin
 all-stage3-gcc: maybe-all-stage3-lto-plugin
 all-stage4-gcc: maybe-all-stage4-lto-plugin
 all-stageprofile-gcc: maybe-all-stageprofile-lto-plugin
-all-stagetrain-gcc: maybe-all-stagetrain-lto-plugin
 all-stagefeedback-gcc: maybe-all-stagefeedback-lto-plugin
-all-stageautoprofile-gcc: maybe-all-stageautoprofile-lto-plugin
-all-stageautofeedback-gcc: maybe-all-stageautofeedback-lto-plugin
 all-gcc: maybe-all-libiconv
 all-stage1-gcc: maybe-all-stage1-libiconv
 all-stage2-gcc: maybe-all-stage2-libiconv
 all-stage3-gcc: maybe-all-stage3-libiconv
 all-stage4-gcc: maybe-all-stage4-libiconv
 all-stageprofile-gcc: maybe-all-stageprofile-libiconv
-all-stagetrain-gcc: maybe-all-stagetrain-libiconv
 all-stagefeedback-gcc: maybe-all-stagefeedback-libiconv
-all-stageautoprofile-gcc: maybe-all-stageautoprofile-libiconv
-all-stageautofeedback-gcc: maybe-all-stageautofeedback-libiconv
 info-gcc: maybe-all-build-libiberty
 info-stage1-gcc: maybe-all-build-libiberty
 info-stage2-gcc: maybe-all-build-libiberty
 info-stage3-gcc: maybe-all-build-libiberty
 info-stage4-gcc: maybe-all-build-libiberty
 info-stageprofile-gcc: maybe-all-build-libiberty
-info-stagetrain-gcc: maybe-all-build-libiberty
 info-stagefeedback-gcc: maybe-all-build-libiberty
-info-stageautoprofile-gcc: maybe-all-build-libiberty
-info-stageautofeedback-gcc: maybe-all-build-libiberty
 dvi-gcc: maybe-all-build-libiberty
 dvi-stage1-gcc: maybe-all-build-libiberty
 dvi-stage2-gcc: maybe-all-build-libiberty
 dvi-stage3-gcc: maybe-all-build-libiberty
 dvi-stage4-gcc: maybe-all-build-libiberty
 dvi-stageprofile-gcc: maybe-all-build-libiberty
-dvi-stagetrain-gcc: maybe-all-build-libiberty
 dvi-stagefeedback-gcc: maybe-all-build-libiberty
-dvi-stageautoprofile-gcc: maybe-all-build-libiberty
-dvi-stageautofeedback-gcc: maybe-all-build-libiberty
 pdf-gcc: maybe-all-build-libiberty
 pdf-stage1-gcc: maybe-all-build-libiberty
 pdf-stage2-gcc: maybe-all-build-libiberty
 pdf-stage3-gcc: maybe-all-build-libiberty
 pdf-stage4-gcc: maybe-all-build-libiberty
 pdf-stageprofile-gcc: maybe-all-build-libiberty
-pdf-stagetrain-gcc: maybe-all-build-libiberty
 pdf-stagefeedback-gcc: maybe-all-build-libiberty
-pdf-stageautoprofile-gcc: maybe-all-build-libiberty
-pdf-stageautofeedback-gcc: maybe-all-build-libiberty
 html-gcc: maybe-all-build-libiberty
 html-stage1-gcc: maybe-all-build-libiberty
 html-stage2-gcc: maybe-all-build-libiberty
 html-stage3-gcc: maybe-all-build-libiberty
 html-stage4-gcc: maybe-all-build-libiberty
 html-stageprofile-gcc: maybe-all-build-libiberty
-html-stagetrain-gcc: maybe-all-build-libiberty
 html-stagefeedback-gcc: maybe-all-build-libiberty
-html-stageautoprofile-gcc: maybe-all-build-libiberty
-html-stageautofeedback-gcc: maybe-all-build-libiberty
 install-gcc: maybe-install-fixincludes
 install-gcc: maybe-install-lto-plugin
 install-strip-gcc: maybe-install-strip-fixincludes
@@ -59182,70 +50481,49 @@ configure-stage2-libcpp: configure-stage2-libiberty
 configure-stage3-libcpp: configure-stage3-libiberty
 configure-stage4-libcpp: configure-stage4-libiberty
 configure-stageprofile-libcpp: configure-stageprofile-libiberty
-configure-stagetrain-libcpp: configure-stagetrain-libiberty
 configure-stagefeedback-libcpp: configure-stagefeedback-libiberty
-configure-stageautoprofile-libcpp: configure-stageautoprofile-libiberty
-configure-stageautofeedback-libcpp: configure-stageautofeedback-libiberty
 configure-libcpp: maybe-configure-intl
 configure-stage1-libcpp: maybe-configure-stage1-intl
 configure-stage2-libcpp: maybe-configure-stage2-intl
 configure-stage3-libcpp: maybe-configure-stage3-intl
 configure-stage4-libcpp: maybe-configure-stage4-intl
 configure-stageprofile-libcpp: maybe-configure-stageprofile-intl
-configure-stagetrain-libcpp: maybe-configure-stagetrain-intl
 configure-stagefeedback-libcpp: maybe-configure-stagefeedback-intl
-configure-stageautoprofile-libcpp: maybe-configure-stageautoprofile-intl
-configure-stageautofeedback-libcpp: maybe-configure-stageautofeedback-intl
 configure-libcpp: maybe-all-libiconv
 configure-stage1-libcpp: maybe-all-stage1-libiconv
 configure-stage2-libcpp: maybe-all-stage2-libiconv
 configure-stage3-libcpp: maybe-all-stage3-libiconv
 configure-stage4-libcpp: maybe-all-stage4-libiconv
 configure-stageprofile-libcpp: maybe-all-stageprofile-libiconv
-configure-stagetrain-libcpp: maybe-all-stagetrain-libiconv
 configure-stagefeedback-libcpp: maybe-all-stagefeedback-libiconv
-configure-stageautoprofile-libcpp: maybe-all-stageautoprofile-libiconv
-configure-stageautofeedback-libcpp: maybe-all-stageautofeedback-libiconv
 all-libcpp: all-libiberty
 all-stage1-libcpp: all-stage1-libiberty
 all-stage2-libcpp: all-stage2-libiberty
 all-stage3-libcpp: all-stage3-libiberty
 all-stage4-libcpp: all-stage4-libiberty
 all-stageprofile-libcpp: all-stageprofile-libiberty
-all-stagetrain-libcpp: all-stagetrain-libiberty
 all-stagefeedback-libcpp: all-stagefeedback-libiberty
-all-stageautoprofile-libcpp: all-stageautoprofile-libiberty
-all-stageautofeedback-libcpp: all-stageautofeedback-libiberty
 all-libcpp: maybe-all-intl
 all-stage1-libcpp: maybe-all-stage1-intl
 all-stage2-libcpp: maybe-all-stage2-intl
 all-stage3-libcpp: maybe-all-stage3-intl
 all-stage4-libcpp: maybe-all-stage4-intl
 all-stageprofile-libcpp: maybe-all-stageprofile-intl
-all-stagetrain-libcpp: maybe-all-stagetrain-intl
 all-stagefeedback-libcpp: maybe-all-stagefeedback-intl
-all-stageautoprofile-libcpp: maybe-all-stageautoprofile-intl
-all-stageautofeedback-libcpp: maybe-all-stageautofeedback-intl
 all-libcpp: maybe-all-libiconv
 all-stage1-libcpp: maybe-all-stage1-libiconv
 all-stage2-libcpp: maybe-all-stage2-libiconv
 all-stage3-libcpp: maybe-all-stage3-libiconv
 all-stage4-libcpp: maybe-all-stage4-libiconv
 all-stageprofile-libcpp: maybe-all-stageprofile-libiconv
-all-stagetrain-libcpp: maybe-all-stagetrain-libiconv
 all-stagefeedback-libcpp: maybe-all-stagefeedback-libiconv
-all-stageautoprofile-libcpp: maybe-all-stageautoprofile-libiconv
-all-stageautofeedback-libcpp: maybe-all-stageautofeedback-libiconv
 all-fixincludes: maybe-all-libiberty
 all-stage1-fixincludes: maybe-all-stage1-libiberty
 all-stage2-fixincludes: maybe-all-stage2-libiberty
 all-stage3-fixincludes: maybe-all-stage3-libiberty
 all-stage4-fixincludes: maybe-all-stage4-libiberty
 all-stageprofile-fixincludes: maybe-all-stageprofile-libiberty
-all-stagetrain-fixincludes: maybe-all-stagetrain-libiberty
 all-stagefeedback-fixincludes: maybe-all-stagefeedback-libiberty
-all-stageautoprofile-fixincludes: maybe-all-stageautoprofile-libiberty
-all-stageautofeedback-fixincludes: maybe-all-stageautofeedback-libiberty
 all-gnattools: maybe-all-target-libada
 all-lto-plugin: maybe-all-libiberty
 all-stage1-lto-plugin: maybe-all-stage1-libiberty
@@ -59253,20 +50531,14 @@ all-stage2-lto-plugin: maybe-all-stage2-libiberty
 all-stage3-lto-plugin: maybe-all-stage3-libiberty
 all-stage4-lto-plugin: maybe-all-stage4-libiberty
 all-stageprofile-lto-plugin: maybe-all-stageprofile-libiberty
-all-stagetrain-lto-plugin: maybe-all-stagetrain-libiberty
 all-stagefeedback-lto-plugin: maybe-all-stagefeedback-libiberty
-all-stageautoprofile-lto-plugin: maybe-all-stageautoprofile-libiberty
-all-stageautofeedback-lto-plugin: maybe-all-stageautofeedback-libiberty
 all-lto-plugin: maybe-all-libiberty-linker-plugin
 all-stage1-lto-plugin: maybe-all-stage1-libiberty-linker-plugin
 all-stage2-lto-plugin: maybe-all-stage2-libiberty-linker-plugin
 all-stage3-lto-plugin: maybe-all-stage3-libiberty-linker-plugin
 all-stage4-lto-plugin: maybe-all-stage4-libiberty-linker-plugin
 all-stageprofile-lto-plugin: maybe-all-stageprofile-libiberty-linker-plugin
-all-stagetrain-lto-plugin: maybe-all-stagetrain-libiberty-linker-plugin
 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
 all-gotools: maybe-all-target-libgo
 configure-intl: maybe-all-libiconv
 configure-stage1-intl: maybe-all-stage1-libiconv
@@ -59274,50 +50546,35 @@ configure-stage2-intl: maybe-all-stage2-libiconv
 configure-stage3-intl: maybe-all-stage3-libiconv
 configure-stage4-intl: maybe-all-stage4-libiconv
 configure-stageprofile-intl: maybe-all-stageprofile-libiconv
-configure-stagetrain-intl: maybe-all-stagetrain-libiconv
 configure-stagefeedback-intl: maybe-all-stagefeedback-libiconv
-configure-stageautoprofile-intl: maybe-all-stageautoprofile-libiconv
-configure-stageautofeedback-intl: maybe-all-stageautofeedback-libiconv
 configure-mpfr: maybe-all-gmp
 configure-stage1-mpfr: maybe-all-stage1-gmp
 configure-stage2-mpfr: maybe-all-stage2-gmp
 configure-stage3-mpfr: maybe-all-stage3-gmp
 configure-stage4-mpfr: maybe-all-stage4-gmp
 configure-stageprofile-mpfr: maybe-all-stageprofile-gmp
-configure-stagetrain-mpfr: maybe-all-stagetrain-gmp
 configure-stagefeedback-mpfr: maybe-all-stagefeedback-gmp
-configure-stageautoprofile-mpfr: maybe-all-stageautoprofile-gmp
-configure-stageautofeedback-mpfr: maybe-all-stageautofeedback-gmp
 configure-mpc: maybe-all-mpfr
 configure-stage1-mpc: maybe-all-stage1-mpfr
 configure-stage2-mpc: maybe-all-stage2-mpfr
 configure-stage3-mpc: maybe-all-stage3-mpfr
 configure-stage4-mpc: maybe-all-stage4-mpfr
 configure-stageprofile-mpc: maybe-all-stageprofile-mpfr
-configure-stagetrain-mpc: maybe-all-stagetrain-mpfr
 configure-stagefeedback-mpc: maybe-all-stagefeedback-mpfr
-configure-stageautoprofile-mpc: maybe-all-stageautoprofile-mpfr
-configure-stageautofeedback-mpc: maybe-all-stageautofeedback-mpfr
 configure-isl: maybe-all-gmp
 configure-stage1-isl: maybe-all-stage1-gmp
 configure-stage2-isl: maybe-all-stage2-gmp
 configure-stage3-isl: maybe-all-stage3-gmp
 configure-stage4-isl: maybe-all-stage4-gmp
 configure-stageprofile-isl: maybe-all-stageprofile-gmp
-configure-stagetrain-isl: maybe-all-stagetrain-gmp
 configure-stagefeedback-isl: maybe-all-stagefeedback-gmp
-configure-stageautoprofile-isl: maybe-all-stageautoprofile-gmp
-configure-stageautofeedback-isl: maybe-all-stageautofeedback-gmp
 all-intl: maybe-all-libiconv
 all-stage1-intl: maybe-all-stage1-libiconv
 all-stage2-intl: maybe-all-stage2-libiconv
 all-stage3-intl: maybe-all-stage3-libiconv
 all-stage4-intl: maybe-all-stage4-libiconv
 all-stageprofile-intl: maybe-all-stageprofile-libiconv
-all-stagetrain-intl: maybe-all-stagetrain-libiconv
 all-stagefeedback-intl: maybe-all-stagefeedback-libiconv
-all-stageautoprofile-intl: maybe-all-stageautoprofile-libiconv
-all-stageautofeedback-intl: maybe-all-stageautofeedback-libiconv
 configure-gdb: maybe-configure-sim
 all-gdb: maybe-all-readline
 all-gdb: maybe-all-build-bison
@@ -59334,160 +50591,112 @@ configure-stage2-bfd: configure-stage2-libiberty
 configure-stage3-bfd: configure-stage3-libiberty
 configure-stage4-bfd: configure-stage4-libiberty
 configure-stageprofile-bfd: configure-stageprofile-libiberty
-configure-stagetrain-bfd: configure-stagetrain-libiberty
 configure-stagefeedback-bfd: configure-stagefeedback-libiberty
-configure-stageautoprofile-bfd: configure-stageautoprofile-libiberty
-configure-stageautofeedback-bfd: configure-stageautofeedback-libiberty
 configure-bfd: maybe-configure-intl
 configure-stage1-bfd: maybe-configure-stage1-intl
 configure-stage2-bfd: maybe-configure-stage2-intl
 configure-stage3-bfd: maybe-configure-stage3-intl
 configure-stage4-bfd: maybe-configure-stage4-intl
 configure-stageprofile-bfd: maybe-configure-stageprofile-intl
-configure-stagetrain-bfd: maybe-configure-stagetrain-intl
 configure-stagefeedback-bfd: maybe-configure-stagefeedback-intl
-configure-stageautoprofile-bfd: maybe-configure-stageautoprofile-intl
-configure-stageautofeedback-bfd: maybe-configure-stageautofeedback-intl
 all-bfd: maybe-all-libiberty
 all-stage1-bfd: maybe-all-stage1-libiberty
 all-stage2-bfd: maybe-all-stage2-libiberty
 all-stage3-bfd: maybe-all-stage3-libiberty
 all-stage4-bfd: maybe-all-stage4-libiberty
 all-stageprofile-bfd: maybe-all-stageprofile-libiberty
-all-stagetrain-bfd: maybe-all-stagetrain-libiberty
 all-stagefeedback-bfd: maybe-all-stagefeedback-libiberty
-all-stageautoprofile-bfd: maybe-all-stageautoprofile-libiberty
-all-stageautofeedback-bfd: maybe-all-stageautofeedback-libiberty
 all-bfd: maybe-all-intl
 all-stage1-bfd: maybe-all-stage1-intl
 all-stage2-bfd: maybe-all-stage2-intl
 all-stage3-bfd: maybe-all-stage3-intl
 all-stage4-bfd: maybe-all-stage4-intl
 all-stageprofile-bfd: maybe-all-stageprofile-intl
-all-stagetrain-bfd: maybe-all-stagetrain-intl
 all-stagefeedback-bfd: maybe-all-stagefeedback-intl
-all-stageautoprofile-bfd: maybe-all-stageautoprofile-intl
-all-stageautofeedback-bfd: maybe-all-stageautofeedback-intl
 all-bfd: maybe-all-zlib
 all-stage1-bfd: maybe-all-stage1-zlib
 all-stage2-bfd: maybe-all-stage2-zlib
 all-stage3-bfd: maybe-all-stage3-zlib
 all-stage4-bfd: maybe-all-stage4-zlib
 all-stageprofile-bfd: maybe-all-stageprofile-zlib
-all-stagetrain-bfd: maybe-all-stagetrain-zlib
 all-stagefeedback-bfd: maybe-all-stagefeedback-zlib
-all-stageautoprofile-bfd: maybe-all-stageautoprofile-zlib
-all-stageautofeedback-bfd: maybe-all-stageautofeedback-zlib
 configure-opcodes: configure-libiberty
 configure-stage1-opcodes: configure-stage1-libiberty
 configure-stage2-opcodes: configure-stage2-libiberty
 configure-stage3-opcodes: configure-stage3-libiberty
 configure-stage4-opcodes: configure-stage4-libiberty
 configure-stageprofile-opcodes: configure-stageprofile-libiberty
-configure-stagetrain-opcodes: configure-stagetrain-libiberty
 configure-stagefeedback-opcodes: configure-stagefeedback-libiberty
-configure-stageautoprofile-opcodes: configure-stageautoprofile-libiberty
-configure-stageautofeedback-opcodes: configure-stageautofeedback-libiberty
 all-opcodes: maybe-all-libiberty
 all-stage1-opcodes: maybe-all-stage1-libiberty
 all-stage2-opcodes: maybe-all-stage2-libiberty
 all-stage3-opcodes: maybe-all-stage3-libiberty
 all-stage4-opcodes: maybe-all-stage4-libiberty
 all-stageprofile-opcodes: maybe-all-stageprofile-libiberty
-all-stagetrain-opcodes: maybe-all-stagetrain-libiberty
 all-stagefeedback-opcodes: maybe-all-stagefeedback-libiberty
-all-stageautoprofile-opcodes: maybe-all-stageautoprofile-libiberty
-all-stageautofeedback-opcodes: maybe-all-stageautofeedback-libiberty
 configure-binutils: maybe-configure-intl
 configure-stage1-binutils: maybe-configure-stage1-intl
 configure-stage2-binutils: maybe-configure-stage2-intl
 configure-stage3-binutils: maybe-configure-stage3-intl
 configure-stage4-binutils: maybe-configure-stage4-intl
 configure-stageprofile-binutils: maybe-configure-stageprofile-intl
-configure-stagetrain-binutils: maybe-configure-stagetrain-intl
 configure-stagefeedback-binutils: maybe-configure-stagefeedback-intl
-configure-stageautoprofile-binutils: maybe-configure-stageautoprofile-intl
-configure-stageautofeedback-binutils: maybe-configure-stageautofeedback-intl
 all-binutils: maybe-all-libiberty
 all-stage1-binutils: maybe-all-stage1-libiberty
 all-stage2-binutils: maybe-all-stage2-libiberty
 all-stage3-binutils: maybe-all-stage3-libiberty
 all-stage4-binutils: maybe-all-stage4-libiberty
 all-stageprofile-binutils: maybe-all-stageprofile-libiberty
-all-stagetrain-binutils: maybe-all-stagetrain-libiberty
 all-stagefeedback-binutils: maybe-all-stagefeedback-libiberty
-all-stageautoprofile-binutils: maybe-all-stageautoprofile-libiberty
-all-stageautofeedback-binutils: maybe-all-stageautofeedback-libiberty
 all-binutils: maybe-all-opcodes
 all-stage1-binutils: maybe-all-stage1-opcodes
 all-stage2-binutils: maybe-all-stage2-opcodes
 all-stage3-binutils: maybe-all-stage3-opcodes
 all-stage4-binutils: maybe-all-stage4-opcodes
 all-stageprofile-binutils: maybe-all-stageprofile-opcodes
-all-stagetrain-binutils: maybe-all-stagetrain-opcodes
 all-stagefeedback-binutils: maybe-all-stagefeedback-opcodes
-all-stageautoprofile-binutils: maybe-all-stageautoprofile-opcodes
-all-stageautofeedback-binutils: maybe-all-stageautofeedback-opcodes
 all-binutils: maybe-all-bfd
 all-stage1-binutils: maybe-all-stage1-bfd
 all-stage2-binutils: maybe-all-stage2-bfd
 all-stage3-binutils: maybe-all-stage3-bfd
 all-stage4-binutils: maybe-all-stage4-bfd
 all-stageprofile-binutils: maybe-all-stageprofile-bfd
-all-stagetrain-binutils: maybe-all-stagetrain-bfd
 all-stagefeedback-binutils: maybe-all-stagefeedback-bfd
-all-stageautoprofile-binutils: maybe-all-stageautoprofile-bfd
-all-stageautofeedback-binutils: maybe-all-stageautofeedback-bfd
 all-binutils: maybe-all-build-flex
 all-stage1-binutils: maybe-all-build-flex
 all-stage2-binutils: maybe-all-build-flex
 all-stage3-binutils: maybe-all-build-flex
 all-stage4-binutils: maybe-all-build-flex
 all-stageprofile-binutils: maybe-all-build-flex
-all-stagetrain-binutils: maybe-all-build-flex
 all-stagefeedback-binutils: maybe-all-build-flex
-all-stageautoprofile-binutils: maybe-all-build-flex
-all-stageautofeedback-binutils: maybe-all-build-flex
 all-binutils: maybe-all-build-bison
 all-stage1-binutils: maybe-all-build-bison
 all-stage2-binutils: maybe-all-build-bison
 all-stage3-binutils: maybe-all-build-bison
 all-stage4-binutils: maybe-all-build-bison
 all-stageprofile-binutils: maybe-all-build-bison
-all-stagetrain-binutils: maybe-all-build-bison
 all-stagefeedback-binutils: maybe-all-build-bison
-all-stageautoprofile-binutils: maybe-all-build-bison
-all-stageautofeedback-binutils: maybe-all-build-bison
 all-binutils: maybe-all-intl
 all-stage1-binutils: maybe-all-stage1-intl
 all-stage2-binutils: maybe-all-stage2-intl
 all-stage3-binutils: maybe-all-stage3-intl
 all-stage4-binutils: maybe-all-stage4-intl
 all-stageprofile-binutils: maybe-all-stageprofile-intl
-all-stagetrain-binutils: maybe-all-stagetrain-intl
 all-stagefeedback-binutils: maybe-all-stagefeedback-intl
-all-stageautoprofile-binutils: maybe-all-stageautoprofile-intl
-all-stageautofeedback-binutils: maybe-all-stageautofeedback-intl
 all-binutils: maybe-all-gas
 all-stage1-binutils: maybe-all-stage1-gas
 all-stage2-binutils: maybe-all-stage2-gas
 all-stage3-binutils: maybe-all-stage3-gas
 all-stage4-binutils: maybe-all-stage4-gas
 all-stageprofile-binutils: maybe-all-stageprofile-gas
-all-stagetrain-binutils: maybe-all-stagetrain-gas
 all-stagefeedback-binutils: maybe-all-stagefeedback-gas
-all-stageautoprofile-binutils: maybe-all-stageautoprofile-gas
-all-stageautofeedback-binutils: maybe-all-stageautofeedback-gas
 all-binutils: maybe-all-libctf
 all-stage1-binutils: maybe-all-stage1-libctf
 all-stage2-binutils: maybe-all-stage2-libctf
 all-stage3-binutils: maybe-all-stage3-libctf
 all-stage4-binutils: maybe-all-stage4-libctf
 all-stageprofile-binutils: maybe-all-stageprofile-libctf
-all-stagetrain-binutils: maybe-all-stagetrain-libctf
 all-stagefeedback-binutils: maybe-all-stagefeedback-libctf
-all-stageautoprofile-binutils: maybe-all-stageautoprofile-libctf
-all-stageautofeedback-binutils: maybe-all-stageautofeedback-libctf
 install-binutils: maybe-install-opcodes
 install-strip-binutils: maybe-install-strip-opcodes
 install-opcodes: maybe-install-bfd
@@ -59498,140 +50707,98 @@ configure-stage2-gas: maybe-configure-stage2-intl
 configure-stage3-gas: maybe-configure-stage3-intl
 configure-stage4-gas: maybe-configure-stage4-intl
 configure-stageprofile-gas: maybe-configure-stageprofile-intl
-configure-stagetrain-gas: maybe-configure-stagetrain-intl
 configure-stagefeedback-gas: maybe-configure-stagefeedback-intl
-configure-stageautoprofile-gas: maybe-configure-stageautoprofile-intl
-configure-stageautofeedback-gas: maybe-configure-stageautofeedback-intl
 all-gas: maybe-all-libiberty
 all-stage1-gas: maybe-all-stage1-libiberty
 all-stage2-gas: maybe-all-stage2-libiberty
 all-stage3-gas: maybe-all-stage3-libiberty
 all-stage4-gas: maybe-all-stage4-libiberty
 all-stageprofile-gas: maybe-all-stageprofile-libiberty
-all-stagetrain-gas: maybe-all-stagetrain-libiberty
 all-stagefeedback-gas: maybe-all-stagefeedback-libiberty
-all-stageautoprofile-gas: maybe-all-stageautoprofile-libiberty
-all-stageautofeedback-gas: maybe-all-stageautofeedback-libiberty
 all-gas: maybe-all-opcodes
 all-stage1-gas: maybe-all-stage1-opcodes
 all-stage2-gas: maybe-all-stage2-opcodes
 all-stage3-gas: maybe-all-stage3-opcodes
 all-stage4-gas: maybe-all-stage4-opcodes
 all-stageprofile-gas: maybe-all-stageprofile-opcodes
-all-stagetrain-gas: maybe-all-stagetrain-opcodes
 all-stagefeedback-gas: maybe-all-stagefeedback-opcodes
-all-stageautoprofile-gas: maybe-all-stageautoprofile-opcodes
-all-stageautofeedback-gas: maybe-all-stageautofeedback-opcodes
 all-gas: maybe-all-bfd
 all-stage1-gas: maybe-all-stage1-bfd
 all-stage2-gas: maybe-all-stage2-bfd
 all-stage3-gas: maybe-all-stage3-bfd
 all-stage4-gas: maybe-all-stage4-bfd
 all-stageprofile-gas: maybe-all-stageprofile-bfd
-all-stagetrain-gas: maybe-all-stagetrain-bfd
 all-stagefeedback-gas: maybe-all-stagefeedback-bfd
-all-stageautoprofile-gas: maybe-all-stageautoprofile-bfd
-all-stageautofeedback-gas: maybe-all-stageautofeedback-bfd
 all-gas: maybe-all-intl
 all-stage1-gas: maybe-all-stage1-intl
 all-stage2-gas: maybe-all-stage2-intl
 all-stage3-gas: maybe-all-stage3-intl
 all-stage4-gas: maybe-all-stage4-intl
 all-stageprofile-gas: maybe-all-stageprofile-intl
-all-stagetrain-gas: maybe-all-stagetrain-intl
 all-stagefeedback-gas: maybe-all-stagefeedback-intl
-all-stageautoprofile-gas: maybe-all-stageautoprofile-intl
-all-stageautofeedback-gas: maybe-all-stageautofeedback-intl
 configure-ld: maybe-configure-intl
 configure-stage1-ld: maybe-configure-stage1-intl
 configure-stage2-ld: maybe-configure-stage2-intl
 configure-stage3-ld: maybe-configure-stage3-intl
 configure-stage4-ld: maybe-configure-stage4-intl
 configure-stageprofile-ld: maybe-configure-stageprofile-intl
-configure-stagetrain-ld: maybe-configure-stagetrain-intl
 configure-stagefeedback-ld: maybe-configure-stagefeedback-intl
-configure-stageautoprofile-ld: maybe-configure-stageautoprofile-intl
-configure-stageautofeedback-ld: maybe-configure-stageautofeedback-intl
 all-ld: maybe-all-libiberty
 all-stage1-ld: maybe-all-stage1-libiberty
 all-stage2-ld: maybe-all-stage2-libiberty
 all-stage3-ld: maybe-all-stage3-libiberty
 all-stage4-ld: maybe-all-stage4-libiberty
 all-stageprofile-ld: maybe-all-stageprofile-libiberty
-all-stagetrain-ld: maybe-all-stagetrain-libiberty
 all-stagefeedback-ld: maybe-all-stagefeedback-libiberty
-all-stageautoprofile-ld: maybe-all-stageautoprofile-libiberty
-all-stageautofeedback-ld: maybe-all-stageautofeedback-libiberty
 all-ld: maybe-all-bfd
 all-stage1-ld: maybe-all-stage1-bfd
 all-stage2-ld: maybe-all-stage2-bfd
 all-stage3-ld: maybe-all-stage3-bfd
 all-stage4-ld: maybe-all-stage4-bfd
 all-stageprofile-ld: maybe-all-stageprofile-bfd
-all-stagetrain-ld: maybe-all-stagetrain-bfd
 all-stagefeedback-ld: maybe-all-stagefeedback-bfd
-all-stageautoprofile-ld: maybe-all-stageautoprofile-bfd
-all-stageautofeedback-ld: maybe-all-stageautofeedback-bfd
 all-ld: maybe-all-opcodes
 all-stage1-ld: maybe-all-stage1-opcodes
 all-stage2-ld: maybe-all-stage2-opcodes
 all-stage3-ld: maybe-all-stage3-opcodes
 all-stage4-ld: maybe-all-stage4-opcodes
 all-stageprofile-ld: maybe-all-stageprofile-opcodes
-all-stagetrain-ld: maybe-all-stagetrain-opcodes
 all-stagefeedback-ld: maybe-all-stagefeedback-opcodes
-all-stageautoprofile-ld: maybe-all-stageautoprofile-opcodes
-all-stageautofeedback-ld: maybe-all-stageautofeedback-opcodes
 all-ld: maybe-all-build-bison
 all-stage1-ld: maybe-all-build-bison
 all-stage2-ld: maybe-all-build-bison
 all-stage3-ld: maybe-all-build-bison
 all-stage4-ld: maybe-all-build-bison
 all-stageprofile-ld: maybe-all-build-bison
-all-stagetrain-ld: maybe-all-build-bison
 all-stagefeedback-ld: maybe-all-build-bison
-all-stageautoprofile-ld: maybe-all-build-bison
-all-stageautofeedback-ld: maybe-all-build-bison
 all-ld: maybe-all-build-flex
 all-stage1-ld: maybe-all-build-flex
 all-stage2-ld: maybe-all-build-flex
 all-stage3-ld: maybe-all-build-flex
 all-stage4-ld: maybe-all-build-flex
 all-stageprofile-ld: maybe-all-build-flex
-all-stagetrain-ld: maybe-all-build-flex
 all-stagefeedback-ld: maybe-all-build-flex
-all-stageautoprofile-ld: maybe-all-build-flex
-all-stageautofeedback-ld: maybe-all-build-flex
 all-ld: maybe-all-intl
 all-stage1-ld: maybe-all-stage1-intl
 all-stage2-ld: maybe-all-stage2-intl
 all-stage3-ld: maybe-all-stage3-intl
 all-stage4-ld: maybe-all-stage4-intl
 all-stageprofile-ld: maybe-all-stageprofile-intl
-all-stagetrain-ld: maybe-all-stagetrain-intl
 all-stagefeedback-ld: maybe-all-stagefeedback-intl
-all-stageautoprofile-ld: maybe-all-stageautoprofile-intl
-all-stageautofeedback-ld: maybe-all-stageautofeedback-intl
 all-ld: maybe-all-gas
 all-stage1-ld: maybe-all-stage1-gas
 all-stage2-ld: maybe-all-stage2-gas
 all-stage3-ld: maybe-all-stage3-gas
 all-stage4-ld: maybe-all-stage4-gas
 all-stageprofile-ld: maybe-all-stageprofile-gas
-all-stagetrain-ld: maybe-all-stagetrain-gas
 all-stagefeedback-ld: maybe-all-stagefeedback-gas
-all-stageautoprofile-ld: maybe-all-stageautoprofile-gas
-all-stageautofeedback-ld: maybe-all-stageautofeedback-gas
 all-ld: maybe-all-binutils
 all-stage1-ld: maybe-all-stage1-binutils
 all-stage2-ld: maybe-all-stage2-binutils
 all-stage3-ld: maybe-all-stage3-binutils
 all-stage4-ld: maybe-all-stage4-binutils
 all-stageprofile-ld: maybe-all-stageprofile-binutils
-all-stagetrain-ld: maybe-all-stagetrain-binutils
 all-stagefeedback-ld: maybe-all-stagefeedback-binutils
-all-stageautoprofile-ld: maybe-all-stageautoprofile-binutils
-all-stageautofeedback-ld: maybe-all-stageautofeedback-binutils
 install-ld: maybe-install-gold
 install-strip-ld: maybe-install-strip-gold
 configure-gold: maybe-configure-intl
@@ -59640,120 +50807,84 @@ configure-stage2-gold: maybe-configure-stage2-intl
 configure-stage3-gold: maybe-configure-stage3-intl
 configure-stage4-gold: maybe-configure-stage4-intl
 configure-stageprofile-gold: maybe-configure-stageprofile-intl
-configure-stagetrain-gold: maybe-configure-stagetrain-intl
 configure-stagefeedback-gold: maybe-configure-stagefeedback-intl
-configure-stageautoprofile-gold: maybe-configure-stageautoprofile-intl
-configure-stageautofeedback-gold: maybe-configure-stageautofeedback-intl
 all-gold: maybe-all-libiberty
 all-stage1-gold: maybe-all-stage1-libiberty
 all-stage2-gold: maybe-all-stage2-libiberty
 all-stage3-gold: maybe-all-stage3-libiberty
 all-stage4-gold: maybe-all-stage4-libiberty
 all-stageprofile-gold: maybe-all-stageprofile-libiberty
-all-stagetrain-gold: maybe-all-stagetrain-libiberty
 all-stagefeedback-gold: maybe-all-stagefeedback-libiberty
-all-stageautoprofile-gold: maybe-all-stageautoprofile-libiberty
-all-stageautofeedback-gold: maybe-all-stageautofeedback-libiberty
 all-gold: maybe-all-intl
 all-stage1-gold: maybe-all-stage1-intl
 all-stage2-gold: maybe-all-stage2-intl
 all-stage3-gold: maybe-all-stage3-intl
 all-stage4-gold: maybe-all-stage4-intl
 all-stageprofile-gold: maybe-all-stageprofile-intl
-all-stagetrain-gold: maybe-all-stagetrain-intl
 all-stagefeedback-gold: maybe-all-stagefeedback-intl
-all-stageautoprofile-gold: maybe-all-stageautoprofile-intl
-all-stageautofeedback-gold: maybe-all-stageautofeedback-intl
 all-gold: maybe-all-bfd
 all-stage1-gold: maybe-all-stage1-bfd
 all-stage2-gold: maybe-all-stage2-bfd
 all-stage3-gold: maybe-all-stage3-bfd
 all-stage4-gold: maybe-all-stage4-bfd
 all-stageprofile-gold: maybe-all-stageprofile-bfd
-all-stagetrain-gold: maybe-all-stagetrain-bfd
 all-stagefeedback-gold: maybe-all-stagefeedback-bfd
-all-stageautoprofile-gold: maybe-all-stageautoprofile-bfd
-all-stageautofeedback-gold: maybe-all-stageautofeedback-bfd
 all-gold: maybe-all-build-bison
 all-stage1-gold: maybe-all-build-bison
 all-stage2-gold: maybe-all-build-bison
 all-stage3-gold: maybe-all-build-bison
 all-stage4-gold: maybe-all-build-bison
 all-stageprofile-gold: maybe-all-build-bison
-all-stagetrain-gold: maybe-all-build-bison
 all-stagefeedback-gold: maybe-all-build-bison
-all-stageautoprofile-gold: maybe-all-build-bison
-all-stageautofeedback-gold: maybe-all-build-bison
 all-gold: maybe-all-gas
 all-stage1-gold: maybe-all-stage1-gas
 all-stage2-gold: maybe-all-stage2-gas
 all-stage3-gold: maybe-all-stage3-gas
 all-stage4-gold: maybe-all-stage4-gas
 all-stageprofile-gold: maybe-all-stageprofile-gas
-all-stagetrain-gold: maybe-all-stagetrain-gas
 all-stagefeedback-gold: maybe-all-stagefeedback-gas
-all-stageautoprofile-gold: maybe-all-stageautoprofile-gas
-all-stageautofeedback-gold: maybe-all-stageautofeedback-gas
 check-gold: maybe-all-binutils
 check-stage1-gold: maybe-all-stage1-binutils
 check-stage2-gold: maybe-all-stage2-binutils
 check-stage3-gold: maybe-all-stage3-binutils
 check-stage4-gold: maybe-all-stage4-binutils
 check-stageprofile-gold: maybe-all-stageprofile-binutils
-check-stagetrain-gold: maybe-all-stagetrain-binutils
 check-stagefeedback-gold: maybe-all-stagefeedback-binutils
-check-stageautoprofile-gold: maybe-all-stageautoprofile-binutils
-check-stageautofeedback-gold: maybe-all-stageautofeedback-binutils
 check-gold: maybe-all-gas
 check-stage1-gold: maybe-all-stage1-gas
 check-stage2-gold: maybe-all-stage2-gas
 check-stage3-gold: maybe-all-stage3-gas
 check-stage4-gold: maybe-all-stage4-gas
 check-stageprofile-gold: maybe-all-stageprofile-gas
-check-stagetrain-gold: maybe-all-stagetrain-gas
 check-stagefeedback-gold: maybe-all-stagefeedback-gas
-check-stageautoprofile-gold: maybe-all-stageautoprofile-gas
-check-stageautofeedback-gold: maybe-all-stageautofeedback-gas
 configure-opcodes: maybe-configure-intl
 configure-stage1-opcodes: maybe-configure-stage1-intl
 configure-stage2-opcodes: maybe-configure-stage2-intl
 configure-stage3-opcodes: maybe-configure-stage3-intl
 configure-stage4-opcodes: maybe-configure-stage4-intl
 configure-stageprofile-opcodes: maybe-configure-stageprofile-intl
-configure-stagetrain-opcodes: maybe-configure-stagetrain-intl
 configure-stagefeedback-opcodes: maybe-configure-stagefeedback-intl
-configure-stageautoprofile-opcodes: maybe-configure-stageautoprofile-intl
-configure-stageautofeedback-opcodes: maybe-configure-stageautofeedback-intl
 all-opcodes: maybe-all-bfd
 all-stage1-opcodes: maybe-all-stage1-bfd
 all-stage2-opcodes: maybe-all-stage2-bfd
 all-stage3-opcodes: maybe-all-stage3-bfd
 all-stage4-opcodes: maybe-all-stage4-bfd
 all-stageprofile-opcodes: maybe-all-stageprofile-bfd
-all-stagetrain-opcodes: maybe-all-stagetrain-bfd
 all-stagefeedback-opcodes: maybe-all-stagefeedback-bfd
-all-stageautoprofile-opcodes: maybe-all-stageautoprofile-bfd
-all-stageautofeedback-opcodes: maybe-all-stageautofeedback-bfd
 all-opcodes: maybe-all-libiberty
 all-stage1-opcodes: maybe-all-stage1-libiberty
 all-stage2-opcodes: maybe-all-stage2-libiberty
 all-stage3-opcodes: maybe-all-stage3-libiberty
 all-stage4-opcodes: maybe-all-stage4-libiberty
 all-stageprofile-opcodes: maybe-all-stageprofile-libiberty
-all-stagetrain-opcodes: maybe-all-stagetrain-libiberty
 all-stagefeedback-opcodes: maybe-all-stagefeedback-libiberty
-all-stageautoprofile-opcodes: maybe-all-stageautoprofile-libiberty
-all-stageautofeedback-opcodes: maybe-all-stageautofeedback-libiberty
 all-opcodes: maybe-all-intl
 all-stage1-opcodes: maybe-all-stage1-intl
 all-stage2-opcodes: maybe-all-stage2-intl
 all-stage3-opcodes: maybe-all-stage3-intl
 all-stage4-opcodes: maybe-all-stage4-intl
 all-stageprofile-opcodes: maybe-all-stageprofile-intl
-all-stagetrain-opcodes: maybe-all-stagetrain-intl
 all-stagefeedback-opcodes: maybe-all-stagefeedback-intl
-all-stageautoprofile-opcodes: maybe-all-stageautoprofile-intl
-all-stageautofeedback-opcodes: maybe-all-stageautofeedback-intl
 all-dejagnu: maybe-all-tcl
 all-dejagnu: maybe-all-expect
 all-dejagnu: maybe-all-tk
@@ -59784,70 +50915,49 @@ all-stage2-libctf: all-stage2-libiberty
 all-stage3-libctf: all-stage3-libiberty
 all-stage4-libctf: all-stage4-libiberty
 all-stageprofile-libctf: all-stageprofile-libiberty
-all-stagetrain-libctf: all-stagetrain-libiberty
 all-stagefeedback-libctf: all-stagefeedback-libiberty
-all-stageautoprofile-libctf: all-stageautoprofile-libiberty
-all-stageautofeedback-libctf: all-stageautofeedback-libiberty
 all-libctf: maybe-all-bfd
 all-stage1-libctf: maybe-all-stage1-bfd
 all-stage2-libctf: maybe-all-stage2-bfd
 all-stage3-libctf: maybe-all-stage3-bfd
 all-stage4-libctf: maybe-all-stage4-bfd
 all-stageprofile-libctf: maybe-all-stageprofile-bfd
-all-stagetrain-libctf: maybe-all-stagetrain-bfd
 all-stagefeedback-libctf: maybe-all-stagefeedback-bfd
-all-stageautoprofile-libctf: maybe-all-stageautoprofile-bfd
-all-stageautofeedback-libctf: maybe-all-stageautofeedback-bfd
 all-libctf: maybe-all-zlib
 all-stage1-libctf: maybe-all-stage1-zlib
 all-stage2-libctf: maybe-all-stage2-zlib
 all-stage3-libctf: maybe-all-stage3-zlib
 all-stage4-libctf: maybe-all-stage4-zlib
 all-stageprofile-libctf: maybe-all-stageprofile-zlib
-all-stagetrain-libctf: maybe-all-stagetrain-zlib
 all-stagefeedback-libctf: maybe-all-stagefeedback-zlib
-all-stageautoprofile-libctf: maybe-all-stageautoprofile-zlib
-all-stageautofeedback-libctf: maybe-all-stageautofeedback-zlib
 configure-libctf: maybe-all-bfd
 configure-stage1-libctf: maybe-all-stage1-bfd
 configure-stage2-libctf: maybe-all-stage2-bfd
 configure-stage3-libctf: maybe-all-stage3-bfd
 configure-stage4-libctf: maybe-all-stage4-bfd
 configure-stageprofile-libctf: maybe-all-stageprofile-bfd
-configure-stagetrain-libctf: maybe-all-stagetrain-bfd
 configure-stagefeedback-libctf: maybe-all-stagefeedback-bfd
-configure-stageautoprofile-libctf: maybe-all-stageautoprofile-bfd
-configure-stageautofeedback-libctf: maybe-all-stageautofeedback-bfd
 configure-libctf: maybe-all-intl
 configure-stage1-libctf: maybe-all-stage1-intl
 configure-stage2-libctf: maybe-all-stage2-intl
 configure-stage3-libctf: maybe-all-stage3-intl
 configure-stage4-libctf: maybe-all-stage4-intl
 configure-stageprofile-libctf: maybe-all-stageprofile-intl
-configure-stagetrain-libctf: maybe-all-stagetrain-intl
 configure-stagefeedback-libctf: maybe-all-stagefeedback-intl
-configure-stageautoprofile-libctf: maybe-all-stageautoprofile-intl
-configure-stageautofeedback-libctf: maybe-all-stageautofeedback-intl
 configure-libctf: maybe-all-zlib
 configure-stage1-libctf: maybe-all-stage1-zlib
 configure-stage2-libctf: maybe-all-stage2-zlib
 configure-stage3-libctf: maybe-all-stage3-zlib
 configure-stage4-libctf: maybe-all-stage4-zlib
 configure-stageprofile-libctf: maybe-all-stageprofile-zlib
-configure-stagetrain-libctf: maybe-all-stagetrain-zlib
 configure-stagefeedback-libctf: maybe-all-stagefeedback-zlib
-configure-stageautoprofile-libctf: maybe-all-stageautoprofile-zlib
-configure-stageautofeedback-libctf: maybe-all-stageautofeedback-zlib
 configure-libctf: maybe-all-libiconv
 configure-stage1-libctf: maybe-all-stage1-libiconv
 configure-stage2-libctf: maybe-all-stage2-libiconv
 configure-stage3-libctf: maybe-all-stage3-libiconv
 configure-stage4-libctf: maybe-all-stage4-libiconv
 configure-stageprofile-libctf: maybe-all-stageprofile-libiconv
-configure-stagetrain-libctf: maybe-all-stagetrain-libiconv
 configure-stagefeedback-libctf: maybe-all-stagefeedback-libiconv
-configure-stageautoprofile-libctf: maybe-all-stageautoprofile-libiconv
-configure-stageautofeedback-libctf: maybe-all-stageautofeedback-libiconv
 all-bison: maybe-all-build-texinfo
 all-flex: maybe-all-build-bison
 all-flex: maybe-all-m4
@@ -59859,59 +50969,43 @@ configure-target-libgo: maybe-configure-target-libffi
 all-target-libgo: maybe-all-target-libbacktrace
 all-target-libgo: maybe-all-target-libffi
 all-target-libgo: maybe-all-target-libatomic
-configure-target-libphobos: maybe-configure-target-libbacktrace
-configure-target-libphobos: maybe-configure-target-zlib
-all-target-libphobos: maybe-all-target-libbacktrace
-all-target-libphobos: maybe-all-target-zlib
-all-target-libphobos: maybe-all-target-libatomic
 configure-target-libstdc++-v3: maybe-configure-target-libgomp
 configure-stage1-target-libstdc++-v3: maybe-configure-stage1-target-libgomp
 configure-stage2-target-libstdc++-v3: maybe-configure-stage2-target-libgomp
 configure-stage3-target-libstdc++-v3: maybe-configure-stage3-target-libgomp
 configure-stage4-target-libstdc++-v3: maybe-configure-stage4-target-libgomp
 configure-stageprofile-target-libstdc++-v3: maybe-configure-stageprofile-target-libgomp
-configure-stagetrain-target-libstdc++-v3: maybe-configure-stagetrain-target-libgomp
 configure-stagefeedback-target-libstdc++-v3: maybe-configure-stagefeedback-target-libgomp
-configure-stageautoprofile-target-libstdc++-v3: maybe-configure-stageautoprofile-target-libgomp
-configure-stageautofeedback-target-libstdc++-v3: maybe-configure-stageautofeedback-target-libgomp
 configure-target-libsanitizer: maybe-all-target-libstdc++-v3
 configure-stage1-target-libsanitizer: maybe-all-stage1-target-libstdc++-v3
 configure-stage2-target-libsanitizer: maybe-all-stage2-target-libstdc++-v3
 configure-stage3-target-libsanitizer: maybe-all-stage3-target-libstdc++-v3
 configure-stage4-target-libsanitizer: maybe-all-stage4-target-libstdc++-v3
 configure-stageprofile-target-libsanitizer: maybe-all-stageprofile-target-libstdc++-v3
-configure-stagetrain-target-libsanitizer: maybe-all-stagetrain-target-libstdc++-v3
 configure-stagefeedback-target-libsanitizer: maybe-all-stagefeedback-target-libstdc++-v3
-configure-stageautoprofile-target-libsanitizer: maybe-all-stageautoprofile-target-libstdc++-v3
-configure-stageautofeedback-target-libsanitizer: maybe-all-stageautofeedback-target-libstdc++-v3
 configure-target-libvtv: maybe-all-target-libstdc++-v3
 configure-stage1-target-libvtv: maybe-all-stage1-target-libstdc++-v3
 configure-stage2-target-libvtv: maybe-all-stage2-target-libstdc++-v3
 configure-stage3-target-libvtv: maybe-all-stage3-target-libstdc++-v3
 configure-stage4-target-libvtv: maybe-all-stage4-target-libstdc++-v3
 configure-stageprofile-target-libvtv: maybe-all-stageprofile-target-libstdc++-v3
-configure-stagetrain-target-libvtv: maybe-all-stagetrain-target-libstdc++-v3
 configure-stagefeedback-target-libvtv: maybe-all-stagefeedback-target-libstdc++-v3
-configure-stageautoprofile-target-libvtv: maybe-all-stageautoprofile-target-libstdc++-v3
-configure-stageautofeedback-target-libvtv: maybe-all-stageautofeedback-target-libstdc++-v3
 all-target-libstdc++-v3: maybe-configure-target-libgomp
 all-stage1-target-libstdc++-v3: maybe-configure-stage1-target-libgomp
 all-stage2-target-libstdc++-v3: maybe-configure-stage2-target-libgomp
 all-stage3-target-libstdc++-v3: maybe-configure-stage3-target-libgomp
 all-stage4-target-libstdc++-v3: maybe-configure-stage4-target-libgomp
 all-stageprofile-target-libstdc++-v3: maybe-configure-stageprofile-target-libgomp
-all-stagetrain-target-libstdc++-v3: maybe-configure-stagetrain-target-libgomp
 all-stagefeedback-target-libstdc++-v3: maybe-configure-stagefeedback-target-libgomp
-all-stageautoprofile-target-libstdc++-v3: maybe-configure-stageautoprofile-target-libgomp
-all-stageautofeedback-target-libstdc++-v3: maybe-configure-stageautofeedback-target-libgomp
 install-target-libgo: maybe-install-target-libatomic
 install-target-libgfortran: maybe-install-target-libquadmath
 install-target-libgfortran: maybe-install-target-libgcc
-install-target-libphobos: maybe-install-target-libatomic
 install-target-libsanitizer: maybe-install-target-libstdc++-v3
 install-target-libsanitizer: maybe-install-target-libgcc
 install-target-libvtv: maybe-install-target-libstdc++-v3
 install-target-libvtv: maybe-install-target-libgcc
+install-target-libcilkrts: maybe-install-target-libstdc++-v3
+install-target-libcilkrts: maybe-install-target-libgcc
 install-target-liboffloadmic: maybe-install-target-libstdc++-v3
 install-target-liboffloadmic: maybe-install-target-libgcc
 install-target-libitm: maybe-install-target-libgcc
@@ -59986,46 +51080,31 @@ configure-stage2-target-libstdc++-v3: maybe-all-stage2-target-libgcc
 configure-stage3-target-libstdc++-v3: maybe-all-stage3-target-libgcc
 configure-stage4-target-libstdc++-v3: maybe-all-stage4-target-libgcc
 configure-stageprofile-target-libstdc++-v3: maybe-all-stageprofile-target-libgcc
-configure-stagetrain-target-libstdc++-v3: maybe-all-stagetrain-target-libgcc
 configure-stagefeedback-target-libstdc++-v3: maybe-all-stagefeedback-target-libgcc
-configure-stageautoprofile-target-libstdc++-v3: maybe-all-stageautoprofile-target-libgcc
-configure-stageautofeedback-target-libstdc++-v3: maybe-all-stageautofeedback-target-libgcc
 configure-stage1-target-libsanitizer: maybe-all-stage1-target-libgcc
 configure-stage2-target-libsanitizer: maybe-all-stage2-target-libgcc
 configure-stage3-target-libsanitizer: maybe-all-stage3-target-libgcc
 configure-stage4-target-libsanitizer: maybe-all-stage4-target-libgcc
 configure-stageprofile-target-libsanitizer: maybe-all-stageprofile-target-libgcc
-configure-stagetrain-target-libsanitizer: maybe-all-stagetrain-target-libgcc
 configure-stagefeedback-target-libsanitizer: maybe-all-stagefeedback-target-libgcc
-configure-stageautoprofile-target-libsanitizer: maybe-all-stageautoprofile-target-libgcc
-configure-stageautofeedback-target-libsanitizer: maybe-all-stageautofeedback-target-libgcc
 configure-stage1-target-libmpx: maybe-all-stage1-target-libgcc
 configure-stage2-target-libmpx: maybe-all-stage2-target-libgcc
 configure-stage3-target-libmpx: maybe-all-stage3-target-libgcc
 configure-stage4-target-libmpx: maybe-all-stage4-target-libgcc
 configure-stageprofile-target-libmpx: maybe-all-stageprofile-target-libgcc
-configure-stagetrain-target-libmpx: maybe-all-stagetrain-target-libgcc
 configure-stagefeedback-target-libmpx: maybe-all-stagefeedback-target-libgcc
-configure-stageautoprofile-target-libmpx: maybe-all-stageautoprofile-target-libgcc
-configure-stageautofeedback-target-libmpx: maybe-all-stageautofeedback-target-libgcc
 configure-stage1-target-libvtv: maybe-all-stage1-target-libgcc
 configure-stage2-target-libvtv: maybe-all-stage2-target-libgcc
 configure-stage3-target-libvtv: maybe-all-stage3-target-libgcc
 configure-stage4-target-libvtv: maybe-all-stage4-target-libgcc
 configure-stageprofile-target-libvtv: maybe-all-stageprofile-target-libgcc
-configure-stagetrain-target-libvtv: maybe-all-stagetrain-target-libgcc
 configure-stagefeedback-target-libvtv: maybe-all-stagefeedback-target-libgcc
-configure-stageautoprofile-target-libvtv: maybe-all-stageautoprofile-target-libgcc
-configure-stageautofeedback-target-libvtv: maybe-all-stageautofeedback-target-libgcc
 configure-stage1-target-libgomp: maybe-all-stage1-target-libgcc
 configure-stage2-target-libgomp: maybe-all-stage2-target-libgcc
 configure-stage3-target-libgomp: maybe-all-stage3-target-libgcc
 configure-stage4-target-libgomp: maybe-all-stage4-target-libgcc
 configure-stageprofile-target-libgomp: maybe-all-stageprofile-target-libgcc
-configure-stagetrain-target-libgomp: maybe-all-stagetrain-target-libgcc
 configure-stagefeedback-target-libgomp: maybe-all-stagefeedback-target-libgcc
-configure-stageautoprofile-target-libgomp: maybe-all-stageautoprofile-target-libgcc
-configure-stageautofeedback-target-libgomp: maybe-all-stageautofeedback-target-libgcc
 @endif gcc-bootstrap
 
 @if gcc-no-bootstrap
@@ -60033,6 +51112,7 @@ configure-target-libstdc++-v3: maybe-all-target-libgcc
 configure-target-libsanitizer: maybe-all-target-libgcc
 configure-target-libmpx: maybe-all-target-libgcc
 configure-target-libvtv: maybe-all-target-libgcc
+configure-target-libcilkrts: maybe-all-target-libgcc
 configure-target-liboffloadmic: maybe-all-target-libgcc
 configure-target-libssp: maybe-all-target-libgcc
 configure-target-newlib: maybe-all-target-libgcc
@@ -60041,8 +51121,6 @@ configure-target-libquadmath: maybe-all-target-libgcc
 configure-target-libgfortran: maybe-all-target-libgcc
 configure-target-libobjc: maybe-all-target-libgcc
 configure-target-libgo: maybe-all-target-libgcc
-configure-target-libhsail-rt: maybe-all-target-libgcc
-configure-target-libphobos: maybe-all-target-libgcc
 configure-target-libtermcap: maybe-all-target-libgcc
 configure-target-winsup: maybe-all-target-libgcc
 configure-target-libgloss: maybe-all-target-libgcc
@@ -60064,6 +51142,9 @@ configure-target-libmpx: maybe-all-target-newlib maybe-all-target-libgloss
 
 configure-target-libvtv: maybe-all-target-newlib maybe-all-target-libgloss
 
+configure-target-libcilkrts: maybe-all-target-newlib maybe-all-target-libgloss
+configure-target-libcilkrts: maybe-all-target-libstdc++-v3
+
 configure-target-liboffloadmic: maybe-all-target-newlib maybe-all-target-libgloss
 configure-target-liboffloadmic: maybe-all-target-libstdc++-v3
 
@@ -60081,10 +51162,6 @@ configure-target-libobjc: maybe-all-target-newlib maybe-all-target-libgloss
 
 configure-target-libgo: maybe-all-target-newlib maybe-all-target-libgloss
 
-configure-target-libhsail-rt: maybe-all-target-newlib maybe-all-target-libgloss
-
-configure-target-libphobos: maybe-all-target-newlib maybe-all-target-libgloss
-
 configure-target-libtermcap: maybe-all-target-newlib maybe-all-target-libgloss
 
 configure-target-winsup: maybe-all-target-newlib maybe-all-target-libgloss
diff --git a/Makefile.tpl b/Makefile.tpl
index f42cabea28f..5b118a8ba4a 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -7,7 +7,7 @@ in
 # Makefile for directory with subdirs to build.
 #   Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
 #   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019
+#   2011, 2012, 2013, 2014, 2015, 2016, 2017
 #   Free Software Foundation
 #
 # This file is free software; you can redistribute it and/or modify
@@ -160,8 +160,6 @@ BUILD_EXPORTS = \
 	GFORTRAN="$(GFORTRAN_FOR_BUILD)"; export GFORTRAN; \
 	GOC="$(GOC_FOR_BUILD)"; export GOC; \
 	GOCFLAGS="$(GOCFLAGS_FOR_BUILD)"; export GOCFLAGS; \
-	GDC="$(GDC_FOR_BUILD)"; export GDC; \
-	GDCFLAGS="$(GDCFLAGS_FOR_BUILD)"; export GDCFLAGS; \
 	DLLTOOL="$(DLLTOOL_FOR_BUILD)"; export DLLTOOL; \
 	LD="$(LD_FOR_BUILD)"; export LD; \
 	LDFLAGS="$(LDFLAGS_FOR_BUILD)"; export LDFLAGS; \
@@ -198,7 +196,6 @@ HOST_EXPORTS = \
 	CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
 	GFORTRAN="$(GFORTRAN)"; export GFORTRAN; \
 	GOC="$(GOC)"; export GOC; \
-	GDC="$(GDC)"; export GDC; \
 	AR="$(AR)"; export AR; \
 	AS="$(AS)"; export AS; \
 	CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
@@ -211,7 +208,6 @@ HOST_EXPORTS = \
 	WINDMC="$(WINDMC)"; export WINDMC; \
 	OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
 	OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
-	OTOOL="$(OTOOL)"; export OTOOL; \
 	READELF="$(READELF)"; export READELF; \
 	AR_FOR_TARGET="$(AR_FOR_TARGET)"; export AR_FOR_TARGET; \
 	AS_FOR_TARGET="$(AS_FOR_TARGET)"; export AS_FOR_TARGET; \
@@ -220,7 +216,6 @@ HOST_EXPORTS = \
 	NM_FOR_TARGET="$(NM_FOR_TARGET)"; export NM_FOR_TARGET; \
 	OBJDUMP_FOR_TARGET="$(OBJDUMP_FOR_TARGET)"; export OBJDUMP_FOR_TARGET; \
 	OBJCOPY_FOR_TARGET="$(OBJCOPY_FOR_TARGET)"; export OBJCOPY_FOR_TARGET; \
-	OTOOL_FOR_TARGET="$(OTOOL_FOR_TARGET)"; export OTOOL_FOR_TARGET; \
 	RANLIB_FOR_TARGET="$(RANLIB_FOR_TARGET)"; export RANLIB_FOR_TARGET; \
 	READELF_FOR_TARGET="$(READELF_FOR_TARGET)"; export READELF_FOR_TARGET; \
 	TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
@@ -229,6 +224,7 @@ HOST_EXPORTS = \
 	GMPINC="$(HOST_GMPINC)"; export GMPINC; \
 	ISLLIBS="$(HOST_ISLLIBS)"; export ISLLIBS; \
 	ISLINC="$(HOST_ISLINC)"; export ISLINC; \
+	ISLVER="$(HOST_ISLVER)"; export ISLVER; \
 	LIBELFLIBS="$(HOST_LIBELFLIBS)"; export LIBELFLIBS; \
 	LIBELFINC="$(HOST_LIBELFINC)"; export LIBELFINC; \
 	XGCC_FLAGS_FOR_TARGET="$(XGCC_FLAGS_FOR_TARGET)"; export XGCC_FLAGS_FOR_TARGET; \
@@ -265,14 +261,6 @@ POSTSTAGE1_HOST_EXPORTS = \
 	CC_FOR_BUILD="$$CC"; export CC_FOR_BUILD; \
 	$(POSTSTAGE1_CXX_EXPORT) \
 	$(LTO_EXPORTS) \
-	GDC="$$r/$(HOST_SUBDIR)/prev-gcc/gdc$(exeext) -B$$r/$(HOST_SUBDIR)/prev-gcc/ \
-	  -B$(build_tooldir)/bin/ $(GDC_FLAGS_FOR_TARGET) \
-	  -B$$r/prev-$(TARGET_SUBDIR)/libphobos/src \
-	  -I$$r/prev-$(TARGET_SUBDIR)/libphobos/libdruntime -I$$s/libphobos/libdruntime \
-	  -L$$r/prev-$(TARGET_SUBDIR)/libphobos/src/.libs \
-	  -L$$r/prev-$(TARGET_SUBDIR)/libphobos/libdruntime/.libs"; \
-	export GDC; \
-	GDC_FOR_BUILD="$$GDC"; export GDC_FOR_BUILD; \
 	GNATBIND="$$r/$(HOST_SUBDIR)/prev-gcc/gnatbind"; export GNATBIND; \
 	LDFLAGS="$(POSTSTAGE1_LDFLAGS) $(BOOT_LDFLAGS)"; export LDFLAGS; \
 	HOST_LIBS="$(POSTSTAGE1_LIBS)"; export HOST_LIBS;
@@ -295,7 +283,6 @@ BASE_TARGET_EXPORTS = \
 	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
 	GFORTRAN="$(GFORTRAN_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GFORTRAN; \
 	GOC="$(GOC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GOC; \
-	GDC="$(GDC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GDC; \
 	DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
 	LD="$(COMPILER_LD_FOR_TARGET)"; export LD; \
 	LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
@@ -303,7 +290,6 @@ BASE_TARGET_EXPORTS = \
 	NM="$(COMPILER_NM_FOR_TARGET)"; export NM; \
 	OBJDUMP="$(OBJDUMP_FOR_TARGET)"; export OBJDUMP; \
 	OBJCOPY="$(OBJCOPY_FOR_TARGET)"; export OBJCOPY; \
-	OTOOL="$(OTOOL_FOR_TARGET)"; export OTOOL; \
 	RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
 	READELF="$(READELF_FOR_TARGET)"; export READELF; \
 	STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
@@ -331,6 +317,7 @@ HOST_GMPINC = @gmpinc@
 # Where to find isl
 HOST_ISLLIBS = @isllibs@
 HOST_ISLINC = @islinc@
+HOST_ISLVER = @islver@
 
 # Where to find libelf
 HOST_LIBELFLIBS = @libelflibs@
@@ -361,7 +348,6 @@ CXX_FOR_BUILD = @CXX_FOR_BUILD@
 DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@
 GFORTRAN_FOR_BUILD = @GFORTRAN_FOR_BUILD@
 GOC_FOR_BUILD = @GOC_FOR_BUILD@
-GDC_FOR_BUILD = @GDC_FOR_BUILD@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
 LD_FOR_BUILD = @LD_FOR_BUILD@
 NM_FOR_BUILD = @NM_FOR_BUILD@
@@ -391,7 +377,7 @@ MAKEINFO = @MAKEINFO@
 EXPECT = @EXPECT@
 RUNTEST = @RUNTEST@
 
-AUTO_PROFILE = gcc-auto-profile -c 10000000
+AUTO_PROFILE = gcc-auto-profile -c 1000000
 
 # This just becomes part of the MAKEINFO definition passed down to
 # sub-makes.  It lets flags be given on the command line while still
@@ -413,14 +399,12 @@ LD = @LD@
 LIPO = @LIPO@
 NM = @NM@
 OBJDUMP = @OBJDUMP@
-OTOOL = @OTOOL@
 RANLIB = @RANLIB@
 READELF = @READELF@
 STRIP = @STRIP@
 WINDRES = @WINDRES@
 WINDMC = @WINDMC@
 
-GDC = @GDC@
 GNATBIND = @GNATBIND@
 GNATMAKE = @GNATMAKE@
 
@@ -430,7 +414,6 @@ LIBCFLAGS = $(CFLAGS)
 CXXFLAGS = @CXXFLAGS@
 LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
 GOCFLAGS = $(CFLAGS)
-GDCFLAGS = $(CFLAGS)
 
 CREATE_GCOV = create_gcov
 
@@ -472,24 +455,11 @@ STAGE1_CONFIGURE_FLAGS = --disable-intermodule $(STAGE1_CHECKING) \
 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" \
 	  --disable-build-format-warnings
 
-# When using the slow stage1 compiler disable IL verification and forcefully
-# enable it when using the stage2 compiler instead.  As we later compare
-# stage2 and stage3 we are merely avoid doing redundant work, plus we apply
-# checking when building all target libraries for release builds.
-STAGE1_TFLAGS += -fno-checking
-STAGE2_CFLAGS += -fno-checking
-STAGE2_TFLAGS += -fno-checking
-STAGE3_CFLAGS += -fchecking=1
-STAGE3_TFLAGS += -fchecking=1
-
 STAGEprofile_CFLAGS = $(STAGE2_CFLAGS) -fprofile-generate
 STAGEprofile_TFLAGS = $(STAGE2_TFLAGS)
 
-STAGEtrain_CFLAGS = $(filter-out -fchecking=1,$(STAGE3_CFLAGS))
-STAGEtrain_TFLAGS = $(filter-out -fchecking=1,$(STAGE3_TFLAGS))
-
-STAGEfeedback_CFLAGS = $(STAGE4_CFLAGS) -fprofile-use
-STAGEfeedback_TFLAGS = $(STAGE4_TFLAGS)
+STAGEfeedback_CFLAGS = $(STAGE3_CFLAGS) -fprofile-use
+STAGEfeedback_TFLAGS = $(STAGE3_TFLAGS)
 
 STAGEautoprofile_CFLAGS = $(STAGE2_CFLAGS) -g
 STAGEautoprofile_TFLAGS = $(STAGE2_TFLAGS)
@@ -517,7 +487,6 @@ CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @CXX_FOR_TARGET@
 RAW_CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @RAW_CXX_FOR_TARGET@
 GFORTRAN_FOR_TARGET=$(STAGE_CC_WRAPPER) @GFORTRAN_FOR_TARGET@
 GOC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GOC_FOR_TARGET@
-GDC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GDC_FOR_TARGET@
 DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@
 LD_FOR_TARGET=@LD_FOR_TARGET@
 
@@ -525,7 +494,6 @@ LIPO_FOR_TARGET=@LIPO_FOR_TARGET@
 NM_FOR_TARGET=@NM_FOR_TARGET@
 OBJDUMP_FOR_TARGET=@OBJDUMP_FOR_TARGET@
 OBJCOPY_FOR_TARGET=@OBJCOPY_FOR_TARGET@
-OTOOL_FOR_TARGET=@OTOOL_FOR_TARGET@
 RANLIB_FOR_TARGET=@RANLIB_FOR_TARGET@
 READELF_FOR_TARGET=@READELF_FOR_TARGET@
 STRIP_FOR_TARGET=@STRIP_FOR_TARGET@
@@ -543,7 +511,6 @@ LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
 LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
 LDFLAGS_FOR_TARGET = @LDFLAGS_FOR_TARGET@
 GOCFLAGS_FOR_TARGET = -O2 -g
-GDCFLAGS_FOR_TARGET = -O2 -g
 
 FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@
 SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
@@ -625,7 +592,6 @@ BASE_FLAGS_TO_PASS =[+ FOR flags_to_pass +][+ IF optional +] \
 	"[+flag+]=$([+flag+])"[+ ENDIF optional+][+ ENDFOR flags_to_pass +][+ FOR bootstrap-stage +] \
 	"STAGE[+id+]_CFLAGS=$(STAGE[+id+]_CFLAGS)" \
 	"STAGE[+id+]_CXXFLAGS=$(STAGE[+id+]_CXXFLAGS)" \
-	"STAGE[+id+]_GENERATOR_CFLAGS=$(STAGE[+id+]_GENERATOR_CFLAGS)" \
 	"STAGE[+id+]_TFLAGS=$(STAGE[+id+]_TFLAGS)"[+ ENDFOR bootstrap-stage +] \
 	$(CXX_FOR_TARGET_FLAG_TO_PASS) \
 	"TFLAGS=$(TFLAGS)" \
@@ -646,12 +612,10 @@ EXTRA_HOST_FLAGS = \
 	'DLLTOOL=$(DLLTOOL)' \
 	'GFORTRAN=$(GFORTRAN)' \
 	'GOC=$(GOC)' \
-	'GDC=$(GDC)' \
 	'LD=$(LD)' \
 	'LIPO=$(LIPO)' \
 	'NM=$(NM)' \
 	'OBJDUMP=$(OBJDUMP)' \
-	'OTOOL=$(OTOOL)' \
 	'RANLIB=$(RANLIB)' \
 	'READELF=$(READELF)' \
 	'STRIP=$(STRIP)' \
@@ -672,7 +636,6 @@ STAGE1_FLAGS_TO_PASS = \
 POSTSTAGE1_FLAGS_TO_PASS = \
 	CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \
 	CXX="$${CXX}" CXX_FOR_BUILD="$${CXX_FOR_BUILD}" \
-	GDC="$${GDC}" GDC_FOR_BUILD="$${GDC_FOR_BUILD}" \
 	GNATBIND="$${GNATBIND}" \
 	LDFLAGS="$${LDFLAGS}" \
 	HOST_LIBS="$${HOST_LIBS}" \
@@ -705,8 +668,6 @@ EXTRA_TARGET_FLAGS = \
 	'GFORTRAN=$$(GFORTRAN_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
 	'GOC=$$(GOC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
 	'GOCFLAGS=$$(GOCFLAGS_FOR_TARGET)' \
-	'GDC=$$(GDC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
-	'GDCFLAGS=$$(GDCFLAGS_FOR_TARGET)' \
 	'LD=$(COMPILER_LD_FOR_TARGET)' \
 	'LDFLAGS=$$(LDFLAGS_FOR_TARGET)' \
 	'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \
@@ -1195,7 +1156,6 @@ all-stage[+id+]-[+prefix+][+module+]: configure-stage[+id+]-[+prefix+][+module+]
 		CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
 		LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"[+ ELSE prefix +] \
 		CFLAGS="$(STAGE[+id+]_CFLAGS)" \
-		GENERATOR_CFLAGS="$(STAGE[+id+]_GENERATOR_CFLAGS)" \
 		CXXFLAGS="$(STAGE[+id+]_CXXFLAGS)"[+ IF prev +] \
 		LIBCFLAGS="$(STAGE[+id+]_CFLAGS)"[+ ELSE prev +] \
 		LIBCFLAGS="$(LIBCFLAGS)"[+ ENDIF prev +][+ ENDIF prefix +] \
@@ -1678,7 +1638,7 @@ do-clean: clean-stage[+id+]
         sed=`echo stage[+id+] | sed 's,^stage,,;s,.,.,g'`; \
 	files=`find stage[+id+]-* -name "*$(objext)" -print | \
 		 sed -n s,^stage$$sed-,,p`; \
-	for file in $${files} ${extra-compare}; do \
+	for file in $${files}; do \
 	  f1=$$r/stage[+prev+]-$$file; f2=$$r/stage[+id+]-$$file; \
 	  if test ! -f $$f1; then continue; fi; \
 	  $(do-[+compare-target+]) > /dev/null 2>&1; \
diff --git a/configure b/configure
index 4cd58c9c621..86dc0407fa0 100755
--- a/configure
+++ b/configure
@@ -603,7 +603,6 @@ WINDRES_FOR_TARGET
 STRIP_FOR_TARGET
 READELF_FOR_TARGET
 RANLIB_FOR_TARGET
-OTOOL_FOR_TARGET
 OBJDUMP_FOR_TARGET
 OBJCOPY_FOR_TARGET
 NM_FOR_TARGET
@@ -612,14 +611,12 @@ LD_FOR_TARGET
 DLLTOOL_FOR_TARGET
 AS_FOR_TARGET
 AR_FOR_TARGET
-GDC_FOR_TARGET
 GOC_FOR_TARGET
 GFORTRAN_FOR_TARGET
 GCC_FOR_TARGET
 CXX_FOR_TARGET
 CC_FOR_TARGET
 READELF
-OTOOL
 OBJDUMP
 OBJCOPY
 WINDMC
@@ -646,7 +643,6 @@ RANLIB_FOR_BUILD
 NM_FOR_BUILD
 LD_FOR_BUILD
 LDFLAGS_FOR_BUILD
-GDC_FOR_BUILD
 GOC_FOR_BUILD
 GFORTRAN_FOR_BUILD
 DLLTOOL_FOR_BUILD
@@ -859,14 +855,12 @@ WINDRES
 WINDMC
 OBJCOPY
 OBJDUMP
-OTOOL
 READELF
 CC_FOR_TARGET
 CXX_FOR_TARGET
 GCC_FOR_TARGET
 GFORTRAN_FOR_TARGET
 GOC_FOR_TARGET
-GDC_FOR_TARGET
 AR_FOR_TARGET
 AS_FOR_TARGET
 DLLTOOL_FOR_TARGET
@@ -875,7 +869,6 @@ LIPO_FOR_TARGET
 NM_FOR_TARGET
 OBJCOPY_FOR_TARGET
 OBJDUMP_FOR_TARGET
-OTOOL_FOR_TARGET
 RANLIB_FOR_TARGET
 READELF_FOR_TARGET
 STRIP_FOR_TARGET
@@ -1639,7 +1632,6 @@ Some influential environment variables:
   WINDMC      WINDMC for the host
   OBJCOPY     OBJCOPY for the host
   OBJDUMP     OBJDUMP for the host
-  OTOOL       OTOOL for the host
   READELF     READELF for the host
   CC_FOR_TARGET
               CC for the target
@@ -1651,8 +1643,6 @@ Some influential environment variables:
               GFORTRAN for the target
   GOC_FOR_TARGET
               GOC for the target
-  GDC_FOR_TARGET
-              GDC for the target
   AR_FOR_TARGET
               AR for the target
   AS_FOR_TARGET
@@ -1669,8 +1659,6 @@ Some influential environment variables:
               OBJCOPY for the target
   OBJDUMP_FOR_TARGET
               OBJDUMP for the target
-  OTOOL_FOR_TARGET
-              OTOOL for the target
   RANLIB_FOR_TARGET
               RANLIB for the target
   READELF_FOR_TARGET
@@ -2812,9 +2800,7 @@ target_libraries="target-libgcc \
 		target-libffi \
 		target-libobjc \
 		target-libada \
-		target-libgo \
-		target-libphobos \
-		target-zlib"
+		target-libgo"
 
 # these tools are built using the target libraries, and are intended to
 # run only in the target environment
@@ -3395,40 +3381,6 @@ if test "${ENABLE_LIBSTDCXX}" = "default" ; then
   esac
 fi
 
-# Disable D on systems where it is known to not work.
-# For testing, you can override this with --enable-languages=d.
-case ,${enable_languages}, in
-  *,d,*)
-    ;;
-  *)
-    case "${target}" in
-      *-*-darwin*)
-	unsupported_languages="$unsupported_languages d"
-	;;
-    esac
-    ;;
-esac
-
-# Disable libphobos on unsupported systems.
-# For testing, you can override this with --enable-libphobos.
-if test -d ${srcdir}/libphobos; then
-    if test x$enable_libphobos = x; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libphobos support" >&5
-$as_echo_n "checking for libphobos support... " >&6; }
-	if (srcdir=${srcdir}/libphobos; \
-		. ${srcdir}/configure.tgt; \
-		test "$LIBPHOBOS_SUPPORTED" != "yes")
-	then
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	    noconfigdirs="$noconfigdirs target-libphobos"
-	else
-	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	fi
-    fi
-fi
-
 # Disable Fortran for some systems.
 case "${target}" in
   mmix-*-*)
@@ -3675,8 +3627,6 @@ case "${target}" in
     noconfigdirs="$noconfigdirs ld gas gdb gprof"
     noconfigdirs="$noconfigdirs sim target-rda"
     ;;
-  amdgcn*-*-*)
-    ;;
   arm-*-darwin*)
     noconfigdirs="$noconfigdirs ld gas gdb gprof"
     noconfigdirs="$noconfigdirs sim target-rda"
@@ -4028,7 +3978,6 @@ if test "${build}" != "${host}" ; then
   CXX_FOR_BUILD=${CXX_FOR_BUILD-g++}
   GFORTRAN_FOR_BUILD=${GFORTRAN_FOR_BUILD-gfortran}
   GOC_FOR_BUILD=${GOC_FOR_BUILD-gccgo}
-  GDC_FOR_BUILD=${GDC_FOR_BUILD-gdc}
   DLLTOOL_FOR_BUILD=${DLLTOOL_FOR_BUILD-dlltool}
   LD_FOR_BUILD=${LD_FOR_BUILD-ld}
   NM_FOR_BUILD=${NM_FOR_BUILD-nm}
@@ -4042,7 +3991,6 @@ else
   CXX_FOR_BUILD="\$(CXX)"
   GFORTRAN_FOR_BUILD="\$(GFORTRAN)"
   GOC_FOR_BUILD="\$(GOC)"
-  GDC_FOR_BUILD="\$(GDC)"
   DLLTOOL_FOR_BUILD="\$(DLLTOOL)"
   LD_FOR_BUILD="\$(LD)"
   NM_FOR_BUILD="\$(NM)"
@@ -7784,7 +7732,6 @@ done
 
 
 
-
 # Generate default definitions for YACC, M4, LEX and other programs that run
 # on the build machine.  These are used if the Makefile can't locate these
 # programs in objdir.
@@ -9876,147 +9823,6 @@ fi
 
 
 
-if test -n "$OTOOL"; then
-  ac_cv_prog_OTOOL=$OTOOL
-elif test -n "$ac_cv_prog_OTOOL"; then
-  OTOOL=$ac_cv_prog_OTOOL
-fi
-
-if test -n "$ac_cv_prog_OTOOL"; then
-  for ncn_progname in otool; do
-    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OTOOL"; then
-  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_OTOOL="${ncn_progname}"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OTOOL=$ac_cv_prog_OTOOL
-if test -n "$OTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
-$as_echo "$OTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  done
-fi
-
-for ncn_progname in otool; do
-  if test -n "$ncn_tool_prefix"; then
-    # Extract the first word of "${ncn_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_tool_prefix}${ncn_progname}; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OTOOL"; then
-  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_OTOOL="${ncn_tool_prefix}${ncn_progname}"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OTOOL=$ac_cv_prog_OTOOL
-if test -n "$OTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
-$as_echo "$OTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-  if test -z "$ac_cv_prog_OTOOL" && test $build = $host ; then
-    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OTOOL"; then
-  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_OTOOL="${ncn_progname}"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OTOOL=$ac_cv_prog_OTOOL
-if test -n "$OTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
-$as_echo "$OTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-  test -n "$ac_cv_prog_OTOOL" && break
-done
-
-if test -z "$ac_cv_prog_OTOOL" ; then
-  set dummy otool
-  if test $build = $host ; then
-    OTOOL="$2"
-  else
-    OTOOL="${ncn_tool_prefix}$2"
-  fi
-fi
-
-
-
 if test -n "$READELF"; then
   ac_cv_prog_READELF=$READELF
 elif test -n "$ac_cv_prog_READELF"; then
@@ -10980,167 +10786,6 @@ fi
 
 
 
-if test -n "$GDC_FOR_TARGET"; then
-  ac_cv_prog_GDC_FOR_TARGET=$GDC_FOR_TARGET
-elif test -n "$ac_cv_prog_GDC_FOR_TARGET"; then
-  GDC_FOR_TARGET=$ac_cv_prog_GDC_FOR_TARGET
-fi
-
-if test -n "$ac_cv_prog_GDC_FOR_TARGET"; then
-  for ncn_progname in gdc; do
-    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_GDC_FOR_TARGET+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$GDC_FOR_TARGET"; then
-  ac_cv_prog_GDC_FOR_TARGET="$GDC_FOR_TARGET" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_GDC_FOR_TARGET="${ncn_progname}"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-GDC_FOR_TARGET=$ac_cv_prog_GDC_FOR_TARGET
-if test -n "$GDC_FOR_TARGET"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GDC_FOR_TARGET" >&5
-$as_echo "$GDC_FOR_TARGET" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  done
-fi
-
-if test -z "$ac_cv_prog_GDC_FOR_TARGET" && test -n "$with_build_time_tools"; then
-  for ncn_progname in gdc; do
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ncn_progname} in $with_build_time_tools" >&5
-$as_echo_n "checking for ${ncn_progname} in $with_build_time_tools... " >&6; }
-    if test -x $with_build_time_tools/${ncn_progname}; then
-      ac_cv_prog_GDC_FOR_TARGET=$with_build_time_tools/${ncn_progname}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-      break
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    fi
-  done
-fi
-
-if test -z "$ac_cv_prog_GDC_FOR_TARGET"; then
-  for ncn_progname in gdc; do
-    if test -n "$ncn_target_tool_prefix"; then
-      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_GDC_FOR_TARGET+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$GDC_FOR_TARGET"; then
-  ac_cv_prog_GDC_FOR_TARGET="$GDC_FOR_TARGET" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_GDC_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-GDC_FOR_TARGET=$ac_cv_prog_GDC_FOR_TARGET
-if test -n "$GDC_FOR_TARGET"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GDC_FOR_TARGET" >&5
-$as_echo "$GDC_FOR_TARGET" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    fi
-    if test -z "$ac_cv_prog_GDC_FOR_TARGET" && test $build = $target ; then
-      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_GDC_FOR_TARGET+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$GDC_FOR_TARGET"; then
-  ac_cv_prog_GDC_FOR_TARGET="$GDC_FOR_TARGET" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_GDC_FOR_TARGET="${ncn_progname}"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-GDC_FOR_TARGET=$ac_cv_prog_GDC_FOR_TARGET
-if test -n "$GDC_FOR_TARGET"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GDC_FOR_TARGET" >&5
-$as_echo "$GDC_FOR_TARGET" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    fi
-    test -n "$ac_cv_prog_GDC_FOR_TARGET" && break
-  done
-fi
-
-if test -z "$ac_cv_prog_GDC_FOR_TARGET" ; then
-  set dummy gdc
-  if test $build = $target ; then
-    GDC_FOR_TARGET="$2"
-  else
-    GDC_FOR_TARGET="${ncn_target_tool_prefix}$2"
-  fi
-else
-  GDC_FOR_TARGET="$ac_cv_prog_GDC_FOR_TARGET"
-fi
-
-
-
 cat > conftest.c << \EOF
 #ifdef __GNUC__
   gcc_yay;
@@ -12997,236 +12642,6 @@ fi
 
 
 
-if test -z "$ac_cv_path_OTOOL_FOR_TARGET" ; then
-  if test -n "$with_build_time_tools"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for otool in $with_build_time_tools" >&5
-$as_echo_n "checking for otool in $with_build_time_tools... " >&6; }
-    if test -x $with_build_time_tools/otool; then
-      OTOOL_FOR_TARGET=`cd $with_build_time_tools && pwd`/otool
-      ac_cv_path_OTOOL_FOR_TARGET=$OTOOL_FOR_TARGET
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_OTOOL_FOR_TARGET" >&5
-$as_echo "$ac_cv_path_OTOOL_FOR_TARGET" >&6; }
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    fi
-  elif test $build != $host && test $have_gcc_for_target = yes; then
-    OTOOL_FOR_TARGET=`$GCC_FOR_TARGET --print-prog-name=otool`
-    test $OTOOL_FOR_TARGET = otool && OTOOL_FOR_TARGET=
-    test -n "$OTOOL_FOR_TARGET" && ac_cv_path_OTOOL_FOR_TARGET=$OTOOL_FOR_TARGET
-  fi
-fi
-if test -z "$ac_cv_path_OTOOL_FOR_TARGET" && test -n "$gcc_cv_tool_dirs"; then
-  # Extract the first word of "otool", so it can be a program name with args.
-set dummy otool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_OTOOL_FOR_TARGET+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $OTOOL_FOR_TARGET in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_OTOOL_FOR_TARGET="$OTOOL_FOR_TARGET" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $gcc_cv_tool_dirs
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_OTOOL_FOR_TARGET="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-OTOOL_FOR_TARGET=$ac_cv_path_OTOOL_FOR_TARGET
-if test -n "$OTOOL_FOR_TARGET"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL_FOR_TARGET" >&5
-$as_echo "$OTOOL_FOR_TARGET" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_path_OTOOL_FOR_TARGET" ; then
-
-
-if test -n "$OTOOL_FOR_TARGET"; then
-  ac_cv_prog_OTOOL_FOR_TARGET=$OTOOL_FOR_TARGET
-elif test -n "$ac_cv_prog_OTOOL_FOR_TARGET"; then
-  OTOOL_FOR_TARGET=$ac_cv_prog_OTOOL_FOR_TARGET
-fi
-
-if test -n "$ac_cv_prog_OTOOL_FOR_TARGET"; then
-  for ncn_progname in otool; do
-    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OTOOL_FOR_TARGET+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OTOOL_FOR_TARGET"; then
-  ac_cv_prog_OTOOL_FOR_TARGET="$OTOOL_FOR_TARGET" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_OTOOL_FOR_TARGET="${ncn_progname}"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OTOOL_FOR_TARGET=$ac_cv_prog_OTOOL_FOR_TARGET
-if test -n "$OTOOL_FOR_TARGET"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL_FOR_TARGET" >&5
-$as_echo "$OTOOL_FOR_TARGET" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  done
-fi
-
-if test -z "$ac_cv_prog_OTOOL_FOR_TARGET" && test -n "$with_build_time_tools"; then
-  for ncn_progname in otool; do
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ncn_progname} in $with_build_time_tools" >&5
-$as_echo_n "checking for ${ncn_progname} in $with_build_time_tools... " >&6; }
-    if test -x $with_build_time_tools/${ncn_progname}; then
-      ac_cv_prog_OTOOL_FOR_TARGET=$with_build_time_tools/${ncn_progname}
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-      break
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    fi
-  done
-fi
-
-if test -z "$ac_cv_prog_OTOOL_FOR_TARGET"; then
-  for ncn_progname in otool; do
-    if test -n "$ncn_target_tool_prefix"; then
-      # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OTOOL_FOR_TARGET+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OTOOL_FOR_TARGET"; then
-  ac_cv_prog_OTOOL_FOR_TARGET="$OTOOL_FOR_TARGET" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_OTOOL_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OTOOL_FOR_TARGET=$ac_cv_prog_OTOOL_FOR_TARGET
-if test -n "$OTOOL_FOR_TARGET"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL_FOR_TARGET" >&5
-$as_echo "$OTOOL_FOR_TARGET" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    fi
-    if test -z "$ac_cv_prog_OTOOL_FOR_TARGET" && test $build = $target ; then
-      # Extract the first word of "${ncn_progname}", so it can be a program name with args.
-set dummy ${ncn_progname}; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OTOOL_FOR_TARGET+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OTOOL_FOR_TARGET"; then
-  ac_cv_prog_OTOOL_FOR_TARGET="$OTOOL_FOR_TARGET" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_OTOOL_FOR_TARGET="${ncn_progname}"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OTOOL_FOR_TARGET=$ac_cv_prog_OTOOL_FOR_TARGET
-if test -n "$OTOOL_FOR_TARGET"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL_FOR_TARGET" >&5
-$as_echo "$OTOOL_FOR_TARGET" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    fi
-    test -n "$ac_cv_prog_OTOOL_FOR_TARGET" && break
-  done
-fi
-
-if test -z "$ac_cv_prog_OTOOL_FOR_TARGET" ; then
-  set dummy otool
-  if test $build = $target ; then
-    OTOOL_FOR_TARGET="$2"
-  else
-    OTOOL_FOR_TARGET="${ncn_target_tool_prefix}$2"
-  fi
-else
-  OTOOL_FOR_TARGET="$ac_cv_prog_OTOOL_FOR_TARGET"
-fi
-
-else
-  OTOOL_FOR_TARGET=$ac_cv_path_OTOOL_FOR_TARGET
-fi
-
-
-
-
 if test -z "$ac_cv_path_RANLIB_FOR_TARGET" ; then
   if test -n "$with_build_time_tools"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ranlib in $with_build_time_tools" >&5
@@ -14767,51 +14182,6 @@ $as_echo "pre-installed" >&6; }
   fi
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where to find the target gdc" >&5
-$as_echo_n "checking where to find the target gdc... " >&6; }
-if test "x${build}" != "x${host}" ; then
-  if expr "x$GDC_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    ac_dir=`dirname $GDC_FOR_TARGET`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5
-$as_echo "pre-installed in $ac_dir" >&6; }
-  else
-    # Canadian cross, just use what we found
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5
-$as_echo "pre-installed" >&6; }
-  fi
-else
-  ok=yes
-  case " ${configdirs} " in
-    *" gcc "*) ;;
-    *) ok=no ;;
-  esac
-  case ,${enable_languages}, in
-    *,d,*) ;;
-    *) ok=no ;;
-  esac
-  if test $ok = yes; then
-    # An in-tree tool is available and we can use it
-    GDC_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/gdc -B$$r/$(HOST_SUBDIR)/gcc/'
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: just compiled" >&5
-$as_echo "just compiled" >&6; }
-  elif expr "x$GDC_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    ac_dir=`dirname $GDC_FOR_TARGET`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5
-$as_echo "pre-installed in $ac_dir" >&6; }
-  elif test "x$target" = "x$host"; then
-    # We can use an host tool
-    GDC_FOR_TARGET='$(GDC)'
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: host tool" >&5
-$as_echo "host tool" >&6; }
-  else
-    # We need a cross tool
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5
-$as_echo "pre-installed" >&6; }
-  fi
-fi
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking where to find the target ld" >&5
 $as_echo_n "checking where to find the target ld... " >&6; }
 if test "x${build}" != "x${host}" ; then
@@ -15011,37 +14381,6 @@ $as_echo "pre-installed" >&6; }
   fi
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where to find the target otool" >&5
-$as_echo_n "checking where to find the target otool... " >&6; }
-if test "x${build}" != "x${host}" ; then
-  if expr "x$OTOOL_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    ac_dir=`dirname $OTOOL_FOR_TARGET`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5
-$as_echo "pre-installed in $ac_dir" >&6; }
-  else
-    # Canadian cross, just use what we found
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5
-$as_echo "pre-installed" >&6; }
-  fi
-else
-  if expr "x$OTOOL_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    ac_dir=`dirname $OTOOL_FOR_TARGET`
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed in $ac_dir" >&5
-$as_echo "pre-installed in $ac_dir" >&6; }
-  elif test "x$target" = "x$host"; then
-    # We can use an host tool
-    OTOOL_FOR_TARGET='$(OTOOL)'
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: host tool" >&5
-$as_echo "host tool" >&6; }
-  else
-    # We need a cross tool
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: pre-installed" >&5
-$as_echo "pre-installed" >&6; }
-  fi
-fi
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking where to find the target ranlib" >&5
 $as_echo_n "checking where to find the target ranlib... " >&6; }
 if test "x${build}" != "x${host}" ; then
diff --git a/configure.ac b/configure.ac
index 39bd2b184d1..c205698cd6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -162,9 +162,7 @@ target_libraries="target-libgcc \
 		target-libffi \
 		target-libobjc \
 		target-libada \
-		target-libgo \
-		target-libphobos \
-		target-zlib"
+		target-libgo"
 
 # these tools are built using the target libraries, and are intended to
 # run only in the target environment
@@ -680,37 +678,6 @@ if test "${ENABLE_LIBSTDCXX}" = "default" ; then
   esac
 fi
 
-# Disable D on systems where it is known to not work.
-# For testing, you can override this with --enable-languages=d.
-case ,${enable_languages}, in
-  *,d,*)
-    ;;
-  *)
-    case "${target}" in
-      *-*-darwin*)
-	unsupported_languages="$unsupported_languages d"
-	;;
-    esac
-    ;;
-esac
-
-# Disable libphobos on unsupported systems.
-# For testing, you can override this with --enable-libphobos.
-if test -d ${srcdir}/libphobos; then
-    if test x$enable_libphobos = x; then
-	AC_MSG_CHECKING([for libphobos support])
-	if (srcdir=${srcdir}/libphobos; \
-		. ${srcdir}/configure.tgt; \
-		test "$LIBPHOBOS_SUPPORTED" != "yes")
-	then
-	    AC_MSG_RESULT([no])
-	    noconfigdirs="$noconfigdirs target-libphobos"
-	else
-	    AC_MSG_RESULT([yes])
-	fi
-    fi
-fi
-
 # Disable Fortran for some systems.
 case "${target}" in
   mmix-*-*)
@@ -957,8 +924,6 @@ case "${target}" in
     noconfigdirs="$noconfigdirs ld gas gdb gprof"
     noconfigdirs="$noconfigdirs sim target-rda"
     ;;
-  amdgcn*-*-*)
-    ;;
   arm-*-darwin*)
     noconfigdirs="$noconfigdirs ld gas gdb gprof"
     noconfigdirs="$noconfigdirs sim target-rda"
@@ -1291,7 +1256,6 @@ if test "${build}" != "${host}" ; then
   CXX_FOR_BUILD=${CXX_FOR_BUILD-g++}
   GFORTRAN_FOR_BUILD=${GFORTRAN_FOR_BUILD-gfortran}
   GOC_FOR_BUILD=${GOC_FOR_BUILD-gccgo}
-  GDC_FOR_BUILD=${GDC_FOR_BUILD-gdc}
   DLLTOOL_FOR_BUILD=${DLLTOOL_FOR_BUILD-dlltool}
   LD_FOR_BUILD=${LD_FOR_BUILD-ld}
   NM_FOR_BUILD=${NM_FOR_BUILD-nm}
@@ -1305,7 +1269,6 @@ else
   CXX_FOR_BUILD="\$(CXX)"
   GFORTRAN_FOR_BUILD="\$(GFORTRAN)"
   GOC_FOR_BUILD="\$(GOC)"
-  GDC_FOR_BUILD="\$(GDC)"
   DLLTOOL_FOR_BUILD="\$(DLLTOOL)"
   LD_FOR_BUILD="\$(LD)"
   NM_FOR_BUILD="\$(NM)"
@@ -3293,7 +3256,6 @@ AC_SUBST(CXX_FOR_BUILD)
 AC_SUBST(DLLTOOL_FOR_BUILD)
 AC_SUBST(GFORTRAN_FOR_BUILD)
 AC_SUBST(GOC_FOR_BUILD)
-AC_SUBST(GDC_FOR_BUILD)
 AC_SUBST(LDFLAGS_FOR_BUILD)
 AC_SUBST(LD_FOR_BUILD)
 AC_SUBST(NM_FOR_BUILD)
@@ -3379,7 +3341,6 @@ NCN_STRICT_CHECK_TOOLS(WINDRES, windres)
 NCN_STRICT_CHECK_TOOLS(WINDMC, windmc)
 NCN_STRICT_CHECK_TOOLS(OBJCOPY, objcopy)
 NCN_STRICT_CHECK_TOOLS(OBJDUMP, objdump)
-NCN_STRICT_CHECK_TOOLS(OTOOL, otool)
 NCN_STRICT_CHECK_TOOLS(READELF, readelf)
 AC_SUBST(CC)
 AC_SUBST(CXX)
@@ -3404,7 +3365,6 @@ NCN_STRICT_CHECK_TARGET_TOOLS(CXX_FOR_TARGET, c++ g++ cxx gxx)
 NCN_STRICT_CHECK_TARGET_TOOLS(GCC_FOR_TARGET, gcc, ${CC_FOR_TARGET})
 NCN_STRICT_CHECK_TARGET_TOOLS(GFORTRAN_FOR_TARGET, gfortran)
 NCN_STRICT_CHECK_TARGET_TOOLS(GOC_FOR_TARGET, gccgo)
-NCN_STRICT_CHECK_TARGET_TOOLS(GDC_FOR_TARGET, gdc)
 
 ACX_CHECK_INSTALLED_TARGET_TOOL(AR_FOR_TARGET, ar)
 ACX_CHECK_INSTALLED_TARGET_TOOL(AS_FOR_TARGET, as)
@@ -3414,7 +3374,6 @@ ACX_CHECK_INSTALLED_TARGET_TOOL(LIPO_FOR_TARGET, lipo)
 ACX_CHECK_INSTALLED_TARGET_TOOL(NM_FOR_TARGET, nm)
 ACX_CHECK_INSTALLED_TARGET_TOOL(OBJCOPY_FOR_TARGET, objcopy)
 ACX_CHECK_INSTALLED_TARGET_TOOL(OBJDUMP_FOR_TARGET, objdump)
-ACX_CHECK_INSTALLED_TARGET_TOOL(OTOOL_FOR_TARGET, otool)
 ACX_CHECK_INSTALLED_TARGET_TOOL(RANLIB_FOR_TARGET, ranlib)
 ACX_CHECK_INSTALLED_TARGET_TOOL(READELF_FOR_TARGET, readelf)
 ACX_CHECK_INSTALLED_TARGET_TOOL(STRIP_FOR_TARGET, strip)
@@ -3439,14 +3398,11 @@ GCC_TARGET_TOOL(gfortran, GFORTRAN_FOR_TARGET, GFORTRAN,
 		[gcc/gfortran -B$$r/$(HOST_SUBDIR)/gcc/], fortran)
 GCC_TARGET_TOOL(gccgo, GOC_FOR_TARGET, GOC,
 		[gcc/gccgo -B$$r/$(HOST_SUBDIR)/gcc/], go)
-GCC_TARGET_TOOL(gdc, GDC_FOR_TARGET, GDC,
-		[gcc/gdc -B$$r/$(HOST_SUBDIR)/gcc/], d)
 GCC_TARGET_TOOL(ld, LD_FOR_TARGET, LD, [ld/ld-new])
 GCC_TARGET_TOOL(lipo, LIPO_FOR_TARGET, LIPO)
 GCC_TARGET_TOOL(nm, NM_FOR_TARGET, NM, [binutils/nm-new])
 GCC_TARGET_TOOL(objcopy, OBJCOPY_FOR_TARGET, OBJCOPY, [binutils/objcopy])
 GCC_TARGET_TOOL(objdump, OBJDUMP_FOR_TARGET, OBJDUMP, [binutils/objdump])
-GCC_TARGET_TOOL(otool, OTOOL_FOR_TARGET, OTOOL)
 GCC_TARGET_TOOL(ranlib, RANLIB_FOR_TARGET, RANLIB, [binutils/ranlib])
 GCC_TARGET_TOOL(readelf, READELF_FOR_TARGET, READELF, [binutils/readelf])
 GCC_TARGET_TOOL(strip, STRIP_FOR_TARGET, STRIP, [binutils/strip-new])