Sync top-level make and configure files with FSF GCC mainline versions.

author Nick Clifton <nickc@redhat.com>

Mon, 23 Jan 2017 11:55:48 +0000 (11:55 +0000)

committer Nick Clifton <nickc@redhat.com>

Mon, 23 Jan 2017 11:55:48 +0000 (11:55 +0000)
author Nick Clifton <nickc@redhat.com>
Mon, 23 Jan 2017 11:55:48 +0000 (11:55 +0000)
committer Nick Clifton <nickc@redhat.com>
Mon, 23 Jan 2017 11:55:48 +0000 (11:55 +0000)
diff --git a/ChangeLog b/ChangeLog

index 1e9a495831d0782297fe1986cedde403956564a6..c9a95fedf9cf931a53abade120183976e23cf128 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,53 @@
+2017-01-23  Nick Clifton  <nickc@redhat.com>
+
+       * configure.ac: Update year in copyright notice.
+       Sync from FSF GCC mainline, bringing in the following patches.
+       * Makefile.def: Likewise.
+       * Makefile.tpl: Likewise.
+       * configure: Regenerate.
+       * Makefile.in: Regenerate.
+
+       2016-12-21  Jakub Jelinek  <jakub@redhat.com>
+
+       * configure.ac: Don't bootstrap libmpx unless --with-build-config
+       includes bootstrap-mpx.
+
+       2016-12-01  Matthias Klose  <doko@ubuntu.com>
+
+       * configure.ac: Don't use pkg-config to check for bdw-gc.
+
+       2016-11-30  Matthias Klose  <doko@ubuntu.com>
+
+       * Makefile.def: Remove reference to boehm-gc target module.
+       * configure.ac: Include pkg.m4, check for --with-target-bdw-gc
+       options and for the bdw-gc pkg-config module.
+
+       2016-11-15  Matthias Klose  <doko@ubuntu.com>
+
+       * config-ml.in: Remove references to GCJ.
+       * configure.ac: Likewise.
+
+       2016-09-30  Jakub Jelinek  <jakub@redhat.com>
+
+       * configure.ac: Add target-libffi to target_libraries.
+       Readd libgcj target disablings, modified to only target-libffi.
+       Readd target addition of go to unsupported languages.
+
+       2016-09-30  Andrew Haley  <aph@redhat.com>
+
+       * Makefile.def: Remove libjava.
+       * Makefile.tpl: Likewise.
+       * configure.ac: Likewise.
+
+       2016-09-26  Anton Kolesov  <Anton.Kolesov@synopsys.com>
+
+       * configure.ac: Disable "sim" directory for arc*-*-*.
+
+       2016-09-12  Maciej W. Rozycki  <macro@imgtec.com>
+
+       * configure.ac: Check for the minimum in-tree MPFR version
+       handled.
+
  2016-12-31  Alan Modra  <amodra@gmail.com>
  
         * config.sub: Import from upstream.
diff --git a/Makefile.def b/Makefile.def

index ea8453e851f181bd2cdd2c587e688af6cf0075d8..0d13f037d0d5f639ff1eefe20e8d7034af75fb5b 100644 (file)
--- 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-2013 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
@@ -50,6 +50,7 @@ host_modules= { module= gcc; bootstrap=true;
  host_modules= { module= gmp; lib_path=.libs; bootstrap=true;
                 // Work around in-tree gmp configure bug with missing flex.
                 extra_configure_flags='--disable-shared LEX="touch lex.yy.c"';
+               extra_make_flags='AM_CFLAGS="-DNO_ASM"';
                 no_install= true;
                 // none-*-* disables asm optimizations, bootstrap-testing
                 // the compiler more thoroughly.
@@ -57,11 +58,11 @@ host_modules= { module= gmp; lib_path=.libs; bootstrap=true;
                 // gmp's configure will complain if given anything
                 // different from host for target.
                 target="none-${host_vendor}-${host_os}"; };
-host_modules= { module= mpfr; lib_path=.libs; bootstrap=true;
+host_modules= { module= mpfr; lib_path=src/.libs; bootstrap=true;
                 extra_configure_flags='--disable-shared @extra_mpfr_configure_flags@';
                 extra_make_flags='AM_CFLAGS="-DNO_ASM"';
                 no_install= true; };
-host_modules= { module= mpc; lib_path=.libs; bootstrap=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@';
                 no_install= true; };
  host_modules= { module= isl; lib_path=.libs; bootstrap=true;
@@ -164,10 +165,7 @@ target_modules = { module= libtermcap; no_check=true;
  target_modules = { module= winsup; };
  target_modules = { module= libgloss; no_check=true; };
  target_modules = { module= libffi; no_install=true; };
-target_modules = { module= libjava; raw_cxx=true;
-                   extra_configure_flags="$(EXTRA_CONFIGARGS_LIBJAVA)"; };
  target_modules = { module= zlib; };
-target_modules = { module= boehm-gc; };
  target_modules = { module= rda; };
  target_modules = { module= libada; };
  target_modules = { module= libgomp; bootstrap= true; lib_path=.libs; };
@@ -281,7 +279,6 @@ flags_to_pass = { flag= CPPFLAGS_FOR_TARGET ; };
  flags_to_pass = { flag= CXXFLAGS_FOR_TARGET ; };
  flags_to_pass = { flag= DLLTOOL_FOR_TARGET ; };
  flags_to_pass = { flag= FLAGS_FOR_TARGET ; };
-flags_to_pass = { flag= GCJ_FOR_TARGET ; };
  flags_to_pass = { flag= GFORTRAN_FOR_TARGET ; };
  flags_to_pass = { flag= GOC_FOR_TARGET ; };
  flags_to_pass = { flag= GOCFLAGS_FOR_TARGET ; };
@@ -533,7 +530,6 @@ dependencies = { module=all-m4; on=all-build-texinfo; };
  // Target modules.  These can also have dependencies on the language
  // environment (e.g. on libstdc++).  By default target modules depend
  // on libgcc and newlib/libgloss.
-lang_env_dependencies = { module=libjava; cxx=true; };
  lang_env_dependencies = { module=libitm; cxx=true; };
  lang_env_dependencies = { module=libffi; cxx=true; };
  lang_env_dependencies = { module=libcilkrts; cxx=true; };
@@ -546,7 +542,6 @@ lang_env_dependencies = { module=libgcc; no_gcc=true; no_c=true; };
  // a dependency on libgcc for native targets to configure.
  lang_env_dependencies = { module=libiberty; no_c=true; };
  
-dependencies = { module=configure-target-boehm-gc; on=all-target-libstdc++-v3; };
  dependencies = { module=configure-target-fastjar; on=configure-target-zlib; };
  dependencies = { module=all-target-fastjar; on=all-target-zlib; };
  dependencies = { module=configure-target-libgo; on=configure-target-libffi; };
@@ -554,15 +549,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-libjava; on=configure-target-zlib; };
-dependencies = { module=configure-target-libjava; on=configure-target-boehm-gc; };
-dependencies = { module=configure-target-libjava; on=configure-target-libffi; };
-dependencies = { module=all-target-libjava; on=all-fastjar; };
-dependencies = { module=all-target-libjava; on=all-target-zlib; };
-dependencies = { module=all-target-libjava; on=all-target-boehm-gc; };
-dependencies = { module=all-target-libjava; on=all-target-libffi; };
-dependencies = { module=configure-target-libobjc; on=configure-target-boehm-gc; };
-dependencies = { module=all-target-libobjc; on=all-target-boehm-gc; };
  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; };
@@ -584,7 +570,6 @@ dependencies = { module=install-target-libcilkrts; on=install-target-libstdc++-v
  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-libjava; on=install-target-libgcc; };
  dependencies = { module=install-target-libitm; on=install-target-libgcc; };
  dependencies = { module=install-target-libobjc; on=install-target-libgcc; };
  dependencies = { module=install-target-libstdc++-v3; on=install-target-libgcc; };
@@ -609,8 +594,6 @@ languages = { language=c++; gcc-check-target=check-c++;
  languages = { language=fortran;        gcc-check-target=check-fortran;
                                 lib-check-target=check-target-libquadmath;
                                 lib-check-target=check-target-libgfortran; };
-languages = { language=java;   gcc-check-target=check-java;
-                               lib-check-target=check-target-libjava; };
  languages = { language=ada;    gcc-check-target=check-ada;
                                 lib-check-target=check-target-libada; };
  languages = { language=objc;   gcc-check-target=check-objc;
diff --git a/Makefile.in b/Makefile.in

index cb0136e8f81aed4b44a6a099f70447bc591725bf..3acb83b8def4f75b5c2fc2057d25b80dd96e1ebe 100644 (file)
--- 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
+#   2011, 2012, 2013, 2014, 2015, 2016, 2017
  #   Free Software Foundation
  #
  # This file is free software; you can redistribute it and/or modify
@@ -154,7 +154,6 @@ BUILD_EXPORTS = \
         CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX_FOR_BUILD)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS_FOR_BUILD)"; export CXXFLAGS; \
-       GCJ="$(GCJ_FOR_BUILD)"; export GCJ; \
         GFORTRAN="$(GFORTRAN_FOR_BUILD)"; export GFORTRAN; \
         GOC="$(GOC_FOR_BUILD)"; export GOC; \
         GOCFLAGS="$(GOCFLAGS_FOR_BUILD)"; export GOCFLAGS; \
@@ -192,7 +191,6 @@ HOST_EXPORTS = \
         CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       GCJ="$(GCJ)"; export GCJ; \
         GFORTRAN="$(GFORTRAN)"; export GFORTRAN; \
         GOC="$(GOC)"; export GOC; \
         AR="$(AR)"; export AR; \
@@ -280,7 +278,6 @@ BASE_TARGET_EXPORTS = \
         CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
         CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-       GCJ="$(GCJ_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GCJ; \
         GFORTRAN="$(GFORTRAN_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GFORTRAN; \
         GOC="$(GOC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GOC; \
         DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
@@ -323,8 +320,6 @@ HOST_ISLVER = @islver@
  HOST_LIBELFLIBS = @libelflibs@
  HOST_LIBELFINC = @libelfinc@
  
-EXTRA_CONFIGARGS_LIBJAVA = @EXTRA_CONFIGARGS_LIBJAVA@
-
  # ----------------------------------------------
  # Programs producing files for the BUILD machine
  # ----------------------------------------------
@@ -348,7 +343,6 @@ CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
  CXXFLAGS_FOR_BUILD = @CXXFLAGS_FOR_BUILD@
  CXX_FOR_BUILD = @CXX_FOR_BUILD@
  DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@
-GCJ_FOR_BUILD = @GCJ_FOR_BUILD@
  GFORTRAN_FOR_BUILD = @GFORTRAN_FOR_BUILD@
  GOC_FOR_BUILD = @GOC_FOR_BUILD@
  LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
@@ -380,6 +374,8 @@ MAKEINFO = @MAKEINFO@
  EXPECT = @EXPECT@
  RUNTEST = @RUNTEST@
  
+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
  # using the makeinfo from the object tree.
@@ -416,6 +412,8 @@ CXXFLAGS = @CXXFLAGS@
  LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
  GOCFLAGS = $(CFLAGS)
  
+CREATE_GCOV = create_gcov
+
  TFLAGS =
  
  # Defaults for all stages; some are overridden below.
@@ -510,6 +508,12 @@ STAGEprofile_TFLAGS = $(STAGE2_TFLAGS)
  STAGEfeedback_CFLAGS = $(STAGE3_CFLAGS) -fprofile-use
  STAGEfeedback_TFLAGS = $(STAGE3_TFLAGS)
  
+STAGEautoprofile_CFLAGS = $(STAGE2_CFLAGS) -g
+STAGEautoprofile_TFLAGS = $(STAGE2_TFLAGS)
+
+STAGEautofeedback_CFLAGS = $(STAGE3_CFLAGS)
+STAGEautofeedback_TFLAGS = $(STAGE3_TFLAGS)
+
  do-compare = @do_compare@
  do-compare3 = $(do-compare)
  
@@ -528,7 +532,6 @@ CC_FOR_TARGET=$(STAGE_CC_WRAPPER) @CC_FOR_TARGET@
  GCC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCC_FOR_TARGET@
  CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @CXX_FOR_TARGET@
  RAW_CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @RAW_CXX_FOR_TARGET@
-GCJ_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCJ_FOR_TARGET@
  GFORTRAN_FOR_TARGET=$(STAGE_CC_WRAPPER) @GFORTRAN_FOR_TARGET@
  GOC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GOC_FOR_TARGET@
  DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@
@@ -640,12 +643,12 @@ HOST_LIB_PATH_gmp = \
  
  @if mpfr
  HOST_LIB_PATH_mpfr = \
-  $$r/$(HOST_SUBDIR)/mpfr/.libs:$$r/$(HOST_SUBDIR)/prev-mpfr/.libs:
+  $$r/$(HOST_SUBDIR)/mpfr/src/.libs:$$r/$(HOST_SUBDIR)/prev-mpfr/src/.libs:
  @endif mpfr
  
  @if mpc
  HOST_LIB_PATH_mpc = \
-  $$r/$(HOST_SUBDIR)/mpc/.libs:$$r/$(HOST_SUBDIR)/prev-mpc/.libs:
+  $$r/$(HOST_SUBDIR)/mpc/src/.libs:$$r/$(HOST_SUBDIR)/prev-mpc/src/.libs:
  @endif mpc
  
  @if isl
@@ -751,7 +754,6 @@ BASE_FLAGS_TO_PASS = \
         "CXXFLAGS_FOR_TARGET=$(CXXFLAGS_FOR_TARGET)" \
         "DLLTOOL_FOR_TARGET=$(DLLTOOL_FOR_TARGET)" \
         "FLAGS_FOR_TARGET=$(FLAGS_FOR_TARGET)" \
-       "GCJ_FOR_TARGET=$(GCJ_FOR_TARGET)" \
         "GFORTRAN_FOR_TARGET=$(GFORTRAN_FOR_TARGET)" \
         "GOC_FOR_TARGET=$(GOC_FOR_TARGET)" \
         "GOCFLAGS_FOR_TARGET=$(GOCFLAGS_FOR_TARGET)" \
@@ -806,7 +808,6 @@ EXTRA_HOST_FLAGS = \
         'CC=$(CC)' \
         'CXX=$(CXX)' \
         'DLLTOOL=$(DLLTOOL)' \
-       'GCJ=$(GCJ)' \
         'GFORTRAN=$(GFORTRAN)' \
         'GOC=$(GOC)' \
         'LD=$(LD)' \
@@ -817,7 +818,8 @@ EXTRA_HOST_FLAGS = \
         'READELF=$(READELF)' \
         'STRIP=$(STRIP)' \
         'WINDRES=$(WINDRES)' \
-       'WINDMC=$(WINDMC)'
+       'WINDMC=$(WINDMC)' \
+       'CREATE_GCOV=$(CREATE_GCOV)'
  
  FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)
  
@@ -861,7 +863,6 @@ EXTRA_TARGET_FLAGS = \
          $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
         'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \
         'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
-       'GCJ=$$(GCJ_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
         'GFORTRAN=$$(GFORTRAN_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
         'GOC=$$(GOC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
         'GOCFLAGS=$$(GOCFLAGS_FOR_TARGET)' \
@@ -971,9 +972,7 @@ configure-target:  \
      maybe-configure-target-winsup \
      maybe-configure-target-libgloss \
      maybe-configure-target-libffi \
-    maybe-configure-target-libjava \
      maybe-configure-target-zlib \
-    maybe-configure-target-boehm-gc \
      maybe-configure-target-rda \
      maybe-configure-target-libada \
      maybe-configure-target-libgomp \
@@ -1138,9 +1137,7 @@ all-target: maybe-all-target-libtermcap
  all-target: maybe-all-target-winsup
  all-target: maybe-all-target-libgloss
  all-target: maybe-all-target-libffi
-all-target: maybe-all-target-libjava
  all-target: maybe-all-target-zlib
-all-target: maybe-all-target-boehm-gc
  all-target: maybe-all-target-rda
  all-target: maybe-all-target-libada
  @if target-libgomp-no-bootstrap
@@ -1232,9 +1229,7 @@ info-target: maybe-info-target-libtermcap
  info-target: maybe-info-target-winsup
  info-target: maybe-info-target-libgloss
  info-target: maybe-info-target-libffi
-info-target: maybe-info-target-libjava
  info-target: maybe-info-target-zlib
-info-target: maybe-info-target-boehm-gc
  info-target: maybe-info-target-rda
  info-target: maybe-info-target-libada
  info-target: maybe-info-target-libgomp
@@ -1319,9 +1314,7 @@ dvi-target: maybe-dvi-target-libtermcap
  dvi-target: maybe-dvi-target-winsup
  dvi-target: maybe-dvi-target-libgloss
  dvi-target: maybe-dvi-target-libffi
-dvi-target: maybe-dvi-target-libjava
  dvi-target: maybe-dvi-target-zlib
-dvi-target: maybe-dvi-target-boehm-gc
  dvi-target: maybe-dvi-target-rda
  dvi-target: maybe-dvi-target-libada
  dvi-target: maybe-dvi-target-libgomp
@@ -1406,9 +1399,7 @@ pdf-target: maybe-pdf-target-libtermcap
  pdf-target: maybe-pdf-target-winsup
  pdf-target: maybe-pdf-target-libgloss
  pdf-target: maybe-pdf-target-libffi
-pdf-target: maybe-pdf-target-libjava
  pdf-target: maybe-pdf-target-zlib
-pdf-target: maybe-pdf-target-boehm-gc
  pdf-target: maybe-pdf-target-rda
  pdf-target: maybe-pdf-target-libada
  pdf-target: maybe-pdf-target-libgomp
@@ -1493,9 +1484,7 @@ html-target: maybe-html-target-libtermcap
  html-target: maybe-html-target-winsup
  html-target: maybe-html-target-libgloss
  html-target: maybe-html-target-libffi
-html-target: maybe-html-target-libjava
  html-target: maybe-html-target-zlib
-html-target: maybe-html-target-boehm-gc
  html-target: maybe-html-target-rda
  html-target: maybe-html-target-libada
  html-target: maybe-html-target-libgomp
@@ -1580,9 +1569,7 @@ TAGS-target: maybe-TAGS-target-libtermcap
  TAGS-target: maybe-TAGS-target-winsup
  TAGS-target: maybe-TAGS-target-libgloss
  TAGS-target: maybe-TAGS-target-libffi
-TAGS-target: maybe-TAGS-target-libjava
  TAGS-target: maybe-TAGS-target-zlib
-TAGS-target: maybe-TAGS-target-boehm-gc
  TAGS-target: maybe-TAGS-target-rda
  TAGS-target: maybe-TAGS-target-libada
  TAGS-target: maybe-TAGS-target-libgomp
@@ -1667,9 +1654,7 @@ install-info-target: maybe-install-info-target-libtermcap
  install-info-target: maybe-install-info-target-winsup
  install-info-target: maybe-install-info-target-libgloss
  install-info-target: maybe-install-info-target-libffi
-install-info-target: maybe-install-info-target-libjava
  install-info-target: maybe-install-info-target-zlib
-install-info-target: maybe-install-info-target-boehm-gc
  install-info-target: maybe-install-info-target-rda
  install-info-target: maybe-install-info-target-libada
  install-info-target: maybe-install-info-target-libgomp
@@ -1754,9 +1739,7 @@ install-pdf-target: maybe-install-pdf-target-libtermcap
  install-pdf-target: maybe-install-pdf-target-winsup
  install-pdf-target: maybe-install-pdf-target-libgloss
  install-pdf-target: maybe-install-pdf-target-libffi
-install-pdf-target: maybe-install-pdf-target-libjava
  install-pdf-target: maybe-install-pdf-target-zlib
-install-pdf-target: maybe-install-pdf-target-boehm-gc
  install-pdf-target: maybe-install-pdf-target-rda
  install-pdf-target: maybe-install-pdf-target-libada
  install-pdf-target: maybe-install-pdf-target-libgomp
@@ -1841,9 +1824,7 @@ install-html-target: maybe-install-html-target-libtermcap
  install-html-target: maybe-install-html-target-winsup
  install-html-target: maybe-install-html-target-libgloss
  install-html-target: maybe-install-html-target-libffi
-install-html-target: maybe-install-html-target-libjava
  install-html-target: maybe-install-html-target-zlib
-install-html-target: maybe-install-html-target-boehm-gc
  install-html-target: maybe-install-html-target-rda
  install-html-target: maybe-install-html-target-libada
  install-html-target: maybe-install-html-target-libgomp
@@ -1928,9 +1909,7 @@ installcheck-target: maybe-installcheck-target-libtermcap
  installcheck-target: maybe-installcheck-target-winsup
  installcheck-target: maybe-installcheck-target-libgloss
  installcheck-target: maybe-installcheck-target-libffi
-installcheck-target: maybe-installcheck-target-libjava
  installcheck-target: maybe-installcheck-target-zlib
-installcheck-target: maybe-installcheck-target-boehm-gc
  installcheck-target: maybe-installcheck-target-rda
  installcheck-target: maybe-installcheck-target-libada
  installcheck-target: maybe-installcheck-target-libgomp
@@ -2015,9 +1994,7 @@ mostlyclean-target: maybe-mostlyclean-target-libtermcap
  mostlyclean-target: maybe-mostlyclean-target-winsup
  mostlyclean-target: maybe-mostlyclean-target-libgloss
  mostlyclean-target: maybe-mostlyclean-target-libffi
-mostlyclean-target: maybe-mostlyclean-target-libjava
  mostlyclean-target: maybe-mostlyclean-target-zlib
-mostlyclean-target: maybe-mostlyclean-target-boehm-gc
  mostlyclean-target: maybe-mostlyclean-target-rda
  mostlyclean-target: maybe-mostlyclean-target-libada
  mostlyclean-target: maybe-mostlyclean-target-libgomp
@@ -2102,9 +2079,7 @@ clean-target: maybe-clean-target-libtermcap
  clean-target: maybe-clean-target-winsup
  clean-target: maybe-clean-target-libgloss
  clean-target: maybe-clean-target-libffi
-clean-target: maybe-clean-target-libjava
  clean-target: maybe-clean-target-zlib
-clean-target: maybe-clean-target-boehm-gc
  clean-target: maybe-clean-target-rda
  clean-target: maybe-clean-target-libada
  clean-target: maybe-clean-target-libgomp
@@ -2189,9 +2164,7 @@ distclean-target: maybe-distclean-target-libtermcap
  distclean-target: maybe-distclean-target-winsup
  distclean-target: maybe-distclean-target-libgloss
  distclean-target: maybe-distclean-target-libffi
-distclean-target: maybe-distclean-target-libjava
  distclean-target: maybe-distclean-target-zlib
-distclean-target: maybe-distclean-target-boehm-gc
  distclean-target: maybe-distclean-target-rda
  distclean-target: maybe-distclean-target-libada
  distclean-target: maybe-distclean-target-libgomp
@@ -2276,9 +2249,7 @@ maintainer-clean-target: maybe-maintainer-clean-target-libtermcap
  maintainer-clean-target: maybe-maintainer-clean-target-winsup
  maintainer-clean-target: maybe-maintainer-clean-target-libgloss
  maintainer-clean-target: maybe-maintainer-clean-target-libffi
-maintainer-clean-target: maybe-maintainer-clean-target-libjava
  maintainer-clean-target: maybe-maintainer-clean-target-zlib
-maintainer-clean-target: maybe-maintainer-clean-target-boehm-gc
  maintainer-clean-target: maybe-maintainer-clean-target-rda
  maintainer-clean-target: maybe-maintainer-clean-target-libada
  maintainer-clean-target: maybe-maintainer-clean-target-libgomp
@@ -2419,9 +2390,7 @@ check-target:  \
      maybe-check-target-winsup \
      maybe-check-target-libgloss \
      maybe-check-target-libffi \
-    maybe-check-target-libjava \
      maybe-check-target-zlib \
-    maybe-check-target-boehm-gc \
      maybe-check-target-rda \
      maybe-check-target-libada \
      maybe-check-target-libgomp \
@@ -2602,9 +2571,7 @@ install-target:  \
      maybe-install-target-winsup \
      maybe-install-target-libgloss \
      maybe-install-target-libffi \
-    maybe-install-target-libjava \
      maybe-install-target-zlib \
-    maybe-install-target-boehm-gc \
      maybe-install-target-rda \
      maybe-install-target-libada \
      maybe-install-target-libgomp \
@@ -2709,9 +2676,7 @@ install-strip-target:  \
      maybe-install-strip-target-winsup \
      maybe-install-strip-target-libgloss \
      maybe-install-strip-target-libffi \
-    maybe-install-strip-target-libjava \
      maybe-install-strip-target-zlib \
-    maybe-install-strip-target-boehm-gc \
      maybe-install-strip-target-rda \
      maybe-install-strip-target-libada \
      maybe-install-strip-target-libgomp \
@@ -3432,6 +3397,7 @@ all-stage1-bfd: configure-stage1-bfd
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/bfd && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE1_CFLAGS)" \
                 CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -3441,7 +3407,7 @@ all-stage1-bfd: configure-stage1-bfd
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS)  \
                 $(STAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE1_TFLAGS)" \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                 $(TARGET-stage1-bfd)
  
  maybe-clean-stage1-bfd: clean-stage1-bfd
@@ -3475,6 +3441,7 @@ all-stage2-bfd: configure-stage2-bfd
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/bfd && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE2_CFLAGS)" \
                 CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -3483,7 +3450,7 @@ all-stage2-bfd: configure-stage2-bfd
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE2_TFLAGS)" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                 $(TARGET-stage2-bfd)
  
  maybe-clean-stage2-bfd: clean-stage2-bfd
@@ -3516,6 +3483,7 @@ all-stage3-bfd: configure-stage3-bfd
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/bfd && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE3_CFLAGS)" \
                 CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -3524,7 +3492,7 @@ all-stage3-bfd: configure-stage3-bfd
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE3_TFLAGS)" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                 $(TARGET-stage3-bfd)
  
  maybe-clean-stage3-bfd: clean-stage3-bfd
@@ -3557,6 +3525,7 @@ all-stage4-bfd: configure-stage4-bfd
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/bfd && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE4_CFLAGS)" \
                 CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -3565,7 +3534,7 @@ all-stage4-bfd: configure-stage4-bfd
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE4_TFLAGS)" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                 $(TARGET-stage4-bfd)
  
  maybe-clean-stage4-bfd: clean-stage4-bfd
@@ -3598,6 +3567,7 @@ all-stageprofile-bfd: configure-stageprofile-bfd
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/bfd && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEprofile_CFLAGS)" \
                 CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -3606,7 +3576,7 @@ all-stageprofile-bfd: configure-stageprofile-bfd
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                 $(TARGET-stageprofile-bfd)
  
  maybe-clean-stageprofile-bfd: clean-stageprofile-bfd
@@ -3639,6 +3609,7 @@ all-stagefeedback-bfd: configure-stagefeedback-bfd
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/bfd && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEfeedback_CFLAGS)" \
                 CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -3647,7 +3618,7 @@ all-stagefeedback-bfd: configure-stagefeedback-bfd
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                 $(TARGET-stagefeedback-bfd)
  
  maybe-clean-stagefeedback-bfd: clean-stagefeedback-bfd
@@ -4306,6 +4277,7 @@ all-stage1-opcodes: configure-stage1-opcodes
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/opcodes && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE1_CFLAGS)" \
                 CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -4315,7 +4287,7 @@ all-stage1-opcodes: configure-stage1-opcodes
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS)  \
                 $(STAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE1_TFLAGS)" \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                 $(TARGET-stage1-opcodes)
  
  maybe-clean-stage1-opcodes: clean-stage1-opcodes
@@ -4349,6 +4321,7 @@ all-stage2-opcodes: configure-stage2-opcodes
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/opcodes && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE2_CFLAGS)" \
                 CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -4357,7 +4330,7 @@ all-stage2-opcodes: configure-stage2-opcodes
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE2_TFLAGS)" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                 $(TARGET-stage2-opcodes)
  
  maybe-clean-stage2-opcodes: clean-stage2-opcodes
@@ -4390,6 +4363,7 @@ all-stage3-opcodes: configure-stage3-opcodes
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/opcodes && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE3_CFLAGS)" \
                 CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -4398,7 +4372,7 @@ all-stage3-opcodes: configure-stage3-opcodes
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE3_TFLAGS)" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                 $(TARGET-stage3-opcodes)
  
  maybe-clean-stage3-opcodes: clean-stage3-opcodes
@@ -4431,6 +4405,7 @@ all-stage4-opcodes: configure-stage4-opcodes
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/opcodes && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE4_CFLAGS)" \
                 CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -4439,7 +4414,7 @@ all-stage4-opcodes: configure-stage4-opcodes
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE4_TFLAGS)" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                 $(TARGET-stage4-opcodes)
  
  maybe-clean-stage4-opcodes: clean-stage4-opcodes
@@ -4472,6 +4447,7 @@ all-stageprofile-opcodes: configure-stageprofile-opcodes
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/opcodes && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEprofile_CFLAGS)" \
                 CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -4480,7 +4456,7 @@ all-stageprofile-opcodes: configure-stageprofile-opcodes
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                 $(TARGET-stageprofile-opcodes)
  
  maybe-clean-stageprofile-opcodes: clean-stageprofile-opcodes
@@ -4513,6 +4489,7 @@ all-stagefeedback-opcodes: configure-stagefeedback-opcodes
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/opcodes && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEfeedback_CFLAGS)" \
                 CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -4521,7 +4498,7 @@ all-stagefeedback-opcodes: configure-stagefeedback-opcodes
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                 $(TARGET-stagefeedback-opcodes)
  
  maybe-clean-stagefeedback-opcodes: clean-stagefeedback-opcodes
@@ -5180,6 +5157,7 @@ all-stage1-binutils: configure-stage1-binutils
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/binutils && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE1_CFLAGS)" \
                 CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -5189,7 +5167,7 @@ all-stage1-binutils: configure-stage1-binutils
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS)  \
                 $(STAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE1_TFLAGS)" \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                 $(TARGET-stage1-binutils)
  
  maybe-clean-stage1-binutils: clean-stage1-binutils
@@ -5223,6 +5201,7 @@ all-stage2-binutils: configure-stage2-binutils
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/binutils && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE2_CFLAGS)" \
                 CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -5231,7 +5210,7 @@ all-stage2-binutils: configure-stage2-binutils
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE2_TFLAGS)" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                 $(TARGET-stage2-binutils)
  
  maybe-clean-stage2-binutils: clean-stage2-binutils
@@ -5264,6 +5243,7 @@ all-stage3-binutils: configure-stage3-binutils
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/binutils && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE3_CFLAGS)" \
                 CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -5272,7 +5252,7 @@ all-stage3-binutils: configure-stage3-binutils
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE3_TFLAGS)" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                 $(TARGET-stage3-binutils)
  
  maybe-clean-stage3-binutils: clean-stage3-binutils
@@ -5305,6 +5285,7 @@ all-stage4-binutils: configure-stage4-binutils
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/binutils && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE4_CFLAGS)" \
                 CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -5313,7 +5294,7 @@ all-stage4-binutils: configure-stage4-binutils
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE4_TFLAGS)" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                 $(TARGET-stage4-binutils)
  
  maybe-clean-stage4-binutils: clean-stage4-binutils
@@ -5346,6 +5327,7 @@ all-stageprofile-binutils: configure-stageprofile-binutils
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/binutils && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEprofile_CFLAGS)" \
                 CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -5354,7 +5336,7 @@ all-stageprofile-binutils: configure-stageprofile-binutils
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                 $(TARGET-stageprofile-binutils)
  
  maybe-clean-stageprofile-binutils: clean-stageprofile-binutils
@@ -5387,6 +5369,7 @@ all-stagefeedback-binutils: configure-stagefeedback-binutils
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/binutils && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEfeedback_CFLAGS)" \
                 CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -5395,7 +5378,7 @@ all-stagefeedback-binutils: configure-stagefeedback-binutils
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                 $(TARGET-stagefeedback-binutils)
  
  maybe-clean-stagefeedback-binutils: clean-stagefeedback-binutils
@@ -8265,6 +8248,7 @@ all-stage1-fixincludes: configure-stage1-fixincludes
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/fixincludes && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE1_CFLAGS)" \
                 CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -8274,7 +8258,7 @@ all-stage1-fixincludes: configure-stage1-fixincludes
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS)  \
                 $(STAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE1_TFLAGS)" \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                 $(TARGET-stage1-fixincludes)
  
  maybe-clean-stage1-fixincludes: clean-stage1-fixincludes
@@ -8308,6 +8292,7 @@ all-stage2-fixincludes: configure-stage2-fixincludes
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/fixincludes && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE2_CFLAGS)" \
                 CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -8316,7 +8301,7 @@ all-stage2-fixincludes: configure-stage2-fixincludes
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE2_TFLAGS)" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                 $(TARGET-stage2-fixincludes)
  
  maybe-clean-stage2-fixincludes: clean-stage2-fixincludes
@@ -8349,6 +8334,7 @@ all-stage3-fixincludes: configure-stage3-fixincludes
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/fixincludes && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE3_CFLAGS)" \
                 CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -8357,7 +8343,7 @@ all-stage3-fixincludes: configure-stage3-fixincludes
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE3_TFLAGS)" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                 $(TARGET-stage3-fixincludes)
  
  maybe-clean-stage3-fixincludes: clean-stage3-fixincludes
@@ -8390,6 +8376,7 @@ all-stage4-fixincludes: configure-stage4-fixincludes
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/fixincludes && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE4_CFLAGS)" \
                 CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -8398,7 +8385,7 @@ all-stage4-fixincludes: configure-stage4-fixincludes
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE4_TFLAGS)" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                 $(TARGET-stage4-fixincludes)
  
  maybe-clean-stage4-fixincludes: clean-stage4-fixincludes
@@ -8431,6 +8418,7 @@ all-stageprofile-fixincludes: configure-stageprofile-fixincludes
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/fixincludes && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEprofile_CFLAGS)" \
                 CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -8439,7 +8427,7 @@ all-stageprofile-fixincludes: configure-stageprofile-fixincludes
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                 $(TARGET-stageprofile-fixincludes)
  
  maybe-clean-stageprofile-fixincludes: clean-stageprofile-fixincludes
@@ -8472,6 +8460,7 @@ all-stagefeedback-fixincludes: configure-stagefeedback-fixincludes
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/fixincludes && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEfeedback_CFLAGS)" \
                 CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -8480,7 +8469,7 @@ all-stagefeedback-fixincludes: configure-stagefeedback-fixincludes
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                 $(TARGET-stagefeedback-fixincludes)
  
  maybe-clean-stagefeedback-fixincludes: clean-stagefeedback-fixincludes
@@ -9568,6 +9557,7 @@ all-stage1-gas: configure-stage1-gas
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/gas && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE1_CFLAGS)" \
                 CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -9577,7 +9567,7 @@ all-stage1-gas: configure-stage1-gas
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS)  \
                 $(STAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE1_TFLAGS)" \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                 $(TARGET-stage1-gas)
  
  maybe-clean-stage1-gas: clean-stage1-gas
@@ -9611,6 +9601,7 @@ all-stage2-gas: configure-stage2-gas
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/gas && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE2_CFLAGS)" \
                 CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -9619,7 +9610,7 @@ all-stage2-gas: configure-stage2-gas
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE2_TFLAGS)" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                 $(TARGET-stage2-gas)
  
  maybe-clean-stage2-gas: clean-stage2-gas
@@ -9652,6 +9643,7 @@ all-stage3-gas: configure-stage3-gas
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/gas && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE3_CFLAGS)" \
                 CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -9660,7 +9652,7 @@ all-stage3-gas: configure-stage3-gas
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE3_TFLAGS)" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                 $(TARGET-stage3-gas)
  
  maybe-clean-stage3-gas: clean-stage3-gas
@@ -9693,6 +9685,7 @@ all-stage4-gas: configure-stage4-gas
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/gas && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE4_CFLAGS)" \
                 CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -9701,7 +9694,7 @@ all-stage4-gas: configure-stage4-gas
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE4_TFLAGS)" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                 $(TARGET-stage4-gas)
  
  maybe-clean-stage4-gas: clean-stage4-gas
@@ -9734,6 +9727,7 @@ all-stageprofile-gas: configure-stageprofile-gas
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/gas && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEprofile_CFLAGS)" \
                 CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -9742,7 +9736,7 @@ all-stageprofile-gas: configure-stageprofile-gas
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                 $(TARGET-stageprofile-gas)
  
  maybe-clean-stageprofile-gas: clean-stageprofile-gas
@@ -9775,6 +9769,7 @@ all-stagefeedback-gas: configure-stagefeedback-gas
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/gas && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEfeedback_CFLAGS)" \
                 CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -9783,7 +9778,7 @@ all-stagefeedback-gas: configure-stagefeedback-gas
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                 $(TARGET-stagefeedback-gas)
  
  maybe-clean-stagefeedback-gas: clean-stagefeedback-gas
@@ -10442,6 +10437,7 @@ all-stage1-gcc: configure-stage1-gcc
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/gcc && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE1_CFLAGS)" \
                 CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -10451,7 +10447,7 @@ all-stage1-gcc: configure-stage1-gcc
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS)  \
                 $(STAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
-               TFLAGS="$(STAGE1_TFLAGS)" \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                 $(TARGET-stage1-gcc)
  
  maybe-clean-stage1-gcc: clean-stage1-gcc
@@ -10485,6 +10481,7 @@ all-stage2-gcc: configure-stage2-gcc
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/gcc && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE2_CFLAGS)" \
                 CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -10493,7 +10490,7 @@ all-stage2-gcc: configure-stage2-gcc
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
-               TFLAGS="$(STAGE2_TFLAGS)" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                 $(TARGET-stage2-gcc)
  
  maybe-clean-stage2-gcc: clean-stage2-gcc
@@ -10526,6 +10523,7 @@ all-stage3-gcc: configure-stage3-gcc
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/gcc && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE3_CFLAGS)" \
                 CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -10534,7 +10532,7 @@ all-stage3-gcc: configure-stage3-gcc
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
-               TFLAGS="$(STAGE3_TFLAGS)" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                 $(TARGET-stage3-gcc)
  
  maybe-clean-stage3-gcc: clean-stage3-gcc
@@ -10567,6 +10565,7 @@ all-stage4-gcc: configure-stage4-gcc
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/gcc && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE4_CFLAGS)" \
                 CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -10575,7 +10574,7 @@ all-stage4-gcc: configure-stage4-gcc
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
-               TFLAGS="$(STAGE4_TFLAGS)" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                 $(TARGET-stage4-gcc)
  
  maybe-clean-stage4-gcc: clean-stage4-gcc
@@ -10608,6 +10607,7 @@ all-stageprofile-gcc: configure-stageprofile-gcc
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/gcc && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEprofile_CFLAGS)" \
                 CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -10616,7 +10616,7 @@ all-stageprofile-gcc: configure-stageprofile-gcc
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                 $(TARGET-stageprofile-gcc)
  
  maybe-clean-stageprofile-gcc: clean-stageprofile-gcc
@@ -10649,6 +10649,7 @@ all-stagefeedback-gcc: configure-stagefeedback-gcc
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/gcc && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEfeedback_CFLAGS)" \
                 CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -10657,7 +10658,7 @@ all-stagefeedback-gcc: configure-stagefeedback-gcc
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                 $(TARGET-stagefeedback-gcc)
  
  maybe-clean-stagefeedback-gcc: clean-stagefeedback-gcc
@@ -11301,7 +11302,7 @@ all-gmp: configure-gmp
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS)  \
         (cd $(HOST_SUBDIR)/gmp && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS)  \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
                 $(TARGET-gmp))
  @endif gmp
  
@@ -11322,6 +11323,7 @@ all-stage1-gmp: configure-stage1-gmp
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/gmp && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE1_CFLAGS)" \
                 CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -11330,8 +11332,8 @@ all-stage1-gmp: configure-stage1-gmp
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS)  \
-               $(STAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE1_TFLAGS)" \
+               $(STAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                 $(TARGET-stage1-gmp)
  
  maybe-clean-stage1-gmp: clean-stage1-gmp
@@ -11345,7 +11347,7 @@ clean-stage1-gmp:
         fi; \
         cd $(HOST_SUBDIR)/gmp && \
         $(MAKE) $(EXTRA_HOST_FLAGS)  \
-       $(STAGE1_FLAGS_TO_PASS)  clean
+       $(STAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
  @endif gmp-bootstrap
  
  
@@ -11365,6 +11367,7 @@ all-stage2-gmp: configure-stage2-gmp
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/gmp && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE2_CFLAGS)" \
                 CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -11372,8 +11375,8 @@ all-stage2-gmp: configure-stage2-gmp
                 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="$(STAGE2_TFLAGS)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                 $(TARGET-stage2-gmp)
  
  maybe-clean-stage2-gmp: clean-stage2-gmp
@@ -11386,7 +11389,7 @@ clean-stage2-gmp:
           $(MAKE) stage2-start; \
         fi; \
         cd $(HOST_SUBDIR)/gmp && \
-       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
  @endif gmp-bootstrap
  
  
@@ -11406,6 +11409,7 @@ all-stage3-gmp: configure-stage3-gmp
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/gmp && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE3_CFLAGS)" \
                 CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -11413,8 +11417,8 @@ all-stage3-gmp: configure-stage3-gmp
                 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="$(STAGE3_TFLAGS)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                 $(TARGET-stage3-gmp)
  
  maybe-clean-stage3-gmp: clean-stage3-gmp
@@ -11427,7 +11431,7 @@ clean-stage3-gmp:
           $(MAKE) stage3-start; \
         fi; \
         cd $(HOST_SUBDIR)/gmp && \
-       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
  @endif gmp-bootstrap
  
  
@@ -11447,6 +11451,7 @@ all-stage4-gmp: configure-stage4-gmp
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/gmp && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE4_CFLAGS)" \
                 CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -11454,8 +11459,8 @@ all-stage4-gmp: configure-stage4-gmp
                 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="$(STAGE4_TFLAGS)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                 $(TARGET-stage4-gmp)
  
  maybe-clean-stage4-gmp: clean-stage4-gmp
@@ -11468,7 +11473,7 @@ clean-stage4-gmp:
           $(MAKE) stage4-start; \
         fi; \
         cd $(HOST_SUBDIR)/gmp && \
-       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
  @endif gmp-bootstrap
  
  
@@ -11488,6 +11493,7 @@ all-stageprofile-gmp: configure-stageprofile-gmp
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/gmp && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEprofile_CFLAGS)" \
                 CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -11495,8 +11501,8 @@ all-stageprofile-gmp: configure-stageprofile-gmp
                 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="$(STAGEprofile_TFLAGS)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                 $(TARGET-stageprofile-gmp)
  
  maybe-clean-stageprofile-gmp: clean-stageprofile-gmp
@@ -11509,7 +11515,7 @@ clean-stageprofile-gmp:
           $(MAKE) stageprofile-start; \
         fi; \
         cd $(HOST_SUBDIR)/gmp && \
-       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
  @endif gmp-bootstrap
  
  
@@ -11529,6 +11535,7 @@ all-stagefeedback-gmp: configure-stagefeedback-gmp
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/gmp && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEfeedback_CFLAGS)" \
                 CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -11536,8 +11543,8 @@ all-stagefeedback-gmp: configure-stagefeedback-gmp
                 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="$(STAGEfeedback_TFLAGS)" \
+               $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                 $(TARGET-stagefeedback-gmp)
  
  maybe-clean-stagefeedback-gmp: clean-stagefeedback-gmp
@@ -11550,7 +11557,7 @@ clean-stagefeedback-gmp:
           $(MAKE) stagefeedback-start; \
         fi; \
         cd $(HOST_SUBDIR)/gmp && \
-       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  clean
+       $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean
  @endif gmp-bootstrap
  
  
@@ -11568,7 +11575,7 @@ check-gmp:
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
         (cd $(HOST_SUBDIR)/gmp && \
-         $(MAKE) $(FLAGS_TO_PASS)  $(EXTRA_BOOTSTRAP_FLAGS) check)
+         $(MAKE) $(FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" $(EXTRA_BOOTSTRAP_FLAGS) check)
  
  @endif gmp
  
@@ -11603,7 +11610,7 @@ info-gmp: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing info in gmp"; \
@@ -11628,7 +11635,7 @@ dvi-gmp: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing dvi in gmp"; \
@@ -11653,7 +11660,7 @@ pdf-gmp: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing pdf in gmp"; \
@@ -11678,7 +11685,7 @@ html-gmp: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing html in gmp"; \
@@ -11703,7 +11710,7 @@ TAGS-gmp: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing TAGS in gmp"; \
@@ -11729,7 +11736,7 @@ install-info-gmp: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-info in gmp"; \
@@ -11755,7 +11762,7 @@ install-pdf-gmp: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-pdf in gmp"; \
@@ -11781,7 +11788,7 @@ install-html-gmp: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing install-html in gmp"; \
@@ -11806,7 +11813,7 @@ installcheck-gmp: \
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing installcheck in gmp"; \
@@ -11830,7 +11837,7 @@ mostlyclean-gmp:
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing mostlyclean in gmp"; \
@@ -11854,7 +11861,7 @@ clean-gmp:
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing clean in gmp"; \
@@ -11878,7 +11885,7 @@ distclean-gmp:
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing distclean in gmp"; \
@@ -11902,7 +11909,7 @@ maintainer-clean-gmp:
         r=`${PWD_COMMAND}`; export r; \
         s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
         $(HOST_EXPORTS) \
-       for flag in $(EXTRA_HOST_FLAGS) ; do \
+       for flag in $(EXTRA_HOST_FLAGS) AM_CFLAGS="-DNO_ASM"; do \
           eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
         done; \
         echo "Doing maintainer-clean in gmp"; \
@@ -12190,6 +12197,7 @@ all-stage1-mpfr: configure-stage1-mpfr
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/mpfr && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE1_CFLAGS)" \
                 CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -12199,7 +12207,7 @@ all-stage1-mpfr: configure-stage1-mpfr
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS)  \
                 $(STAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
-               TFLAGS="$(STAGE1_TFLAGS)" \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                 $(TARGET-stage1-mpfr)
  
  maybe-clean-stage1-mpfr: clean-stage1-mpfr
@@ -12233,6 +12241,7 @@ all-stage2-mpfr: configure-stage2-mpfr
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/mpfr && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE2_CFLAGS)" \
                 CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -12241,7 +12250,7 @@ all-stage2-mpfr: configure-stage2-mpfr
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
-               TFLAGS="$(STAGE2_TFLAGS)" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                 $(TARGET-stage2-mpfr)
  
  maybe-clean-stage2-mpfr: clean-stage2-mpfr
@@ -12274,6 +12283,7 @@ all-stage3-mpfr: configure-stage3-mpfr
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/mpfr && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE3_CFLAGS)" \
                 CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -12282,7 +12292,7 @@ all-stage3-mpfr: configure-stage3-mpfr
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
-               TFLAGS="$(STAGE3_TFLAGS)" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                 $(TARGET-stage3-mpfr)
  
  maybe-clean-stage3-mpfr: clean-stage3-mpfr
@@ -12315,6 +12325,7 @@ all-stage4-mpfr: configure-stage4-mpfr
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/mpfr && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE4_CFLAGS)" \
                 CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -12323,7 +12334,7 @@ all-stage4-mpfr: configure-stage4-mpfr
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
-               TFLAGS="$(STAGE4_TFLAGS)" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                 $(TARGET-stage4-mpfr)
  
  maybe-clean-stage4-mpfr: clean-stage4-mpfr
@@ -12356,6 +12367,7 @@ all-stageprofile-mpfr: configure-stageprofile-mpfr
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/mpfr && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEprofile_CFLAGS)" \
                 CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -12364,7 +12376,7 @@ all-stageprofile-mpfr: configure-stageprofile-mpfr
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                 $(TARGET-stageprofile-mpfr)
  
  maybe-clean-stageprofile-mpfr: clean-stageprofile-mpfr
@@ -12397,6 +12409,7 @@ all-stagefeedback-mpfr: configure-stagefeedback-mpfr
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/mpfr && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEfeedback_CFLAGS)" \
                 CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -12405,7 +12418,7 @@ all-stagefeedback-mpfr: configure-stagefeedback-mpfr
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                 $(TARGET-stagefeedback-mpfr)
  
  maybe-clean-stagefeedback-mpfr: clean-stagefeedback-mpfr
@@ -13058,6 +13071,7 @@ all-stage1-mpc: configure-stage1-mpc
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/mpc && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE1_CFLAGS)" \
                 CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -13067,7 +13081,7 @@ all-stage1-mpc: configure-stage1-mpc
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS)  \
                 $(STAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE1_TFLAGS)" \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                 $(TARGET-stage1-mpc)
  
  maybe-clean-stage1-mpc: clean-stage1-mpc
@@ -13101,6 +13115,7 @@ all-stage2-mpc: configure-stage2-mpc
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/mpc && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE2_CFLAGS)" \
                 CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -13109,7 +13124,7 @@ all-stage2-mpc: configure-stage2-mpc
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE2_TFLAGS)" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                 $(TARGET-stage2-mpc)
  
  maybe-clean-stage2-mpc: clean-stage2-mpc
@@ -13142,6 +13157,7 @@ all-stage3-mpc: configure-stage3-mpc
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/mpc && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE3_CFLAGS)" \
                 CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -13150,7 +13166,7 @@ all-stage3-mpc: configure-stage3-mpc
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE3_TFLAGS)" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                 $(TARGET-stage3-mpc)
  
  maybe-clean-stage3-mpc: clean-stage3-mpc
@@ -13183,6 +13199,7 @@ all-stage4-mpc: configure-stage4-mpc
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/mpc && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE4_CFLAGS)" \
                 CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -13191,7 +13208,7 @@ all-stage4-mpc: configure-stage4-mpc
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE4_TFLAGS)" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                 $(TARGET-stage4-mpc)
  
  maybe-clean-stage4-mpc: clean-stage4-mpc
@@ -13224,6 +13241,7 @@ all-stageprofile-mpc: configure-stageprofile-mpc
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/mpc && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEprofile_CFLAGS)" \
                 CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -13232,7 +13250,7 @@ all-stageprofile-mpc: configure-stageprofile-mpc
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                 $(TARGET-stageprofile-mpc)
  
  maybe-clean-stageprofile-mpc: clean-stageprofile-mpc
@@ -13265,6 +13283,7 @@ all-stagefeedback-mpc: configure-stagefeedback-mpc
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/mpc && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEfeedback_CFLAGS)" \
                 CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -13273,7 +13292,7 @@ all-stagefeedback-mpc: configure-stagefeedback-mpc
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                 $(TARGET-stagefeedback-mpc)
  
  maybe-clean-stagefeedback-mpc: clean-stagefeedback-mpc
@@ -13926,6 +13945,7 @@ all-stage1-isl: configure-stage1-isl
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/isl && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE1_CFLAGS)" \
                 CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -13935,7 +13955,7 @@ all-stage1-isl: configure-stage1-isl
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS)  \
                 $(STAGE1_FLAGS_TO_PASS) V=1 \
-               TFLAGS="$(STAGE1_TFLAGS)" \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                 $(TARGET-stage1-isl)
  
  maybe-clean-stage1-isl: clean-stage1-isl
@@ -13969,6 +13989,7 @@ all-stage2-isl: configure-stage2-isl
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/isl && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE2_CFLAGS)" \
                 CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -13977,7 +13998,7 @@ all-stage2-isl: configure-stage2-isl
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) V=1 \
-               TFLAGS="$(STAGE2_TFLAGS)" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                 $(TARGET-stage2-isl)
  
  maybe-clean-stage2-isl: clean-stage2-isl
@@ -14010,6 +14031,7 @@ all-stage3-isl: configure-stage3-isl
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/isl && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE3_CFLAGS)" \
                 CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -14018,7 +14040,7 @@ all-stage3-isl: configure-stage3-isl
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) V=1 \
-               TFLAGS="$(STAGE3_TFLAGS)" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                 $(TARGET-stage3-isl)
  
  maybe-clean-stage3-isl: clean-stage3-isl
@@ -14051,6 +14073,7 @@ all-stage4-isl: configure-stage4-isl
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/isl && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE4_CFLAGS)" \
                 CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -14059,7 +14082,7 @@ all-stage4-isl: configure-stage4-isl
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) V=1 \
-               TFLAGS="$(STAGE4_TFLAGS)" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                 $(TARGET-stage4-isl)
  
  maybe-clean-stage4-isl: clean-stage4-isl
@@ -14092,6 +14115,7 @@ all-stageprofile-isl: configure-stageprofile-isl
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/isl && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEprofile_CFLAGS)" \
                 CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -14100,7 +14124,7 @@ all-stageprofile-isl: configure-stageprofile-isl
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) V=1 \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                 $(TARGET-stageprofile-isl)
  
  maybe-clean-stageprofile-isl: clean-stageprofile-isl
@@ -14133,6 +14157,7 @@ all-stagefeedback-isl: configure-stagefeedback-isl
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/isl && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEfeedback_CFLAGS)" \
                 CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -14141,7 +14166,7 @@ all-stagefeedback-isl: configure-stagefeedback-isl
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) V=1 \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                 $(TARGET-stagefeedback-isl)
  
  maybe-clean-stagefeedback-isl: clean-stagefeedback-isl
@@ -14794,6 +14819,7 @@ all-stage1-libelf: configure-stage1-libelf
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libelf && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE1_CFLAGS)" \
                 CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -14803,7 +14829,7 @@ all-stage1-libelf: configure-stage1-libelf
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS)  \
                 $(STAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE1_TFLAGS)" \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                 $(TARGET-stage1-libelf)
  
  maybe-clean-stage1-libelf: clean-stage1-libelf
@@ -14837,6 +14863,7 @@ all-stage2-libelf: configure-stage2-libelf
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libelf && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE2_CFLAGS)" \
                 CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -14845,7 +14872,7 @@ all-stage2-libelf: configure-stage2-libelf
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE2_TFLAGS)" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                 $(TARGET-stage2-libelf)
  
  maybe-clean-stage2-libelf: clean-stage2-libelf
@@ -14878,6 +14905,7 @@ all-stage3-libelf: configure-stage3-libelf
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libelf && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE3_CFLAGS)" \
                 CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -14886,7 +14914,7 @@ all-stage3-libelf: configure-stage3-libelf
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE3_TFLAGS)" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                 $(TARGET-stage3-libelf)
  
  maybe-clean-stage3-libelf: clean-stage3-libelf
@@ -14919,6 +14947,7 @@ all-stage4-libelf: configure-stage4-libelf
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libelf && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE4_CFLAGS)" \
                 CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -14927,7 +14956,7 @@ all-stage4-libelf: configure-stage4-libelf
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE4_TFLAGS)" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                 $(TARGET-stage4-libelf)
  
  maybe-clean-stage4-libelf: clean-stage4-libelf
@@ -14960,6 +14989,7 @@ all-stageprofile-libelf: configure-stageprofile-libelf
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libelf && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEprofile_CFLAGS)" \
                 CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -14968,7 +14998,7 @@ all-stageprofile-libelf: configure-stageprofile-libelf
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                 $(TARGET-stageprofile-libelf)
  
  maybe-clean-stageprofile-libelf: clean-stageprofile-libelf
@@ -15001,6 +15031,7 @@ all-stagefeedback-libelf: configure-stagefeedback-libelf
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libelf && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEfeedback_CFLAGS)" \
                 CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -15009,7 +15040,7 @@ all-stagefeedback-libelf: configure-stagefeedback-libelf
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                 $(TARGET-stagefeedback-libelf)
  
  maybe-clean-stagefeedback-libelf: clean-stagefeedback-libelf
@@ -15656,6 +15687,7 @@ all-stage1-gold: configure-stage1-gold
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/gold && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE1_CFLAGS)" \
                 CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -15665,7 +15697,7 @@ all-stage1-gold: configure-stage1-gold
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS)  \
                 $(STAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE1_TFLAGS)" \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                 $(TARGET-stage1-gold)
  
  maybe-clean-stage1-gold: clean-stage1-gold
@@ -15699,6 +15731,7 @@ all-stage2-gold: configure-stage2-gold
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/gold && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE2_CFLAGS)" \
                 CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -15707,7 +15740,7 @@ all-stage2-gold: configure-stage2-gold
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE2_TFLAGS)" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                 $(TARGET-stage2-gold)
  
  maybe-clean-stage2-gold: clean-stage2-gold
@@ -15740,6 +15773,7 @@ all-stage3-gold: configure-stage3-gold
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/gold && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE3_CFLAGS)" \
                 CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -15748,7 +15782,7 @@ all-stage3-gold: configure-stage3-gold
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE3_TFLAGS)" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                 $(TARGET-stage3-gold)
  
  maybe-clean-stage3-gold: clean-stage3-gold
@@ -15781,6 +15815,7 @@ all-stage4-gold: configure-stage4-gold
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/gold && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE4_CFLAGS)" \
                 CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -15789,7 +15824,7 @@ all-stage4-gold: configure-stage4-gold
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE4_TFLAGS)" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                 $(TARGET-stage4-gold)
  
  maybe-clean-stage4-gold: clean-stage4-gold
@@ -15822,6 +15857,7 @@ all-stageprofile-gold: configure-stageprofile-gold
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/gold && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEprofile_CFLAGS)" \
                 CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -15830,7 +15866,7 @@ all-stageprofile-gold: configure-stageprofile-gold
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                 $(TARGET-stageprofile-gold)
  
  maybe-clean-stageprofile-gold: clean-stageprofile-gold
@@ -15863,6 +15899,7 @@ all-stagefeedback-gold: configure-stagefeedback-gold
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/gold && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEfeedback_CFLAGS)" \
                 CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -15871,7 +15908,7 @@ all-stagefeedback-gold: configure-stagefeedback-gold
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                 $(TARGET-stagefeedback-gold)
  
  maybe-clean-stagefeedback-gold: clean-stagefeedback-gold
@@ -16971,6 +17008,7 @@ all-stage1-intl: configure-stage1-intl
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/intl && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE1_CFLAGS)" \
                 CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -16980,7 +17018,7 @@ all-stage1-intl: configure-stage1-intl
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS)  \
                 $(STAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE1_TFLAGS)" \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                 $(TARGET-stage1-intl)
  
  maybe-clean-stage1-intl: clean-stage1-intl
@@ -17014,6 +17052,7 @@ all-stage2-intl: configure-stage2-intl
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/intl && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE2_CFLAGS)" \
                 CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -17022,7 +17061,7 @@ all-stage2-intl: configure-stage2-intl
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE2_TFLAGS)" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                 $(TARGET-stage2-intl)
  
  maybe-clean-stage2-intl: clean-stage2-intl
@@ -17055,6 +17094,7 @@ all-stage3-intl: configure-stage3-intl
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/intl && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE3_CFLAGS)" \
                 CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -17063,7 +17103,7 @@ all-stage3-intl: configure-stage3-intl
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE3_TFLAGS)" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                 $(TARGET-stage3-intl)
  
  maybe-clean-stage3-intl: clean-stage3-intl
@@ -17096,6 +17136,7 @@ all-stage4-intl: configure-stage4-intl
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/intl && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE4_CFLAGS)" \
                 CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -17104,7 +17145,7 @@ all-stage4-intl: configure-stage4-intl
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE4_TFLAGS)" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                 $(TARGET-stage4-intl)
  
  maybe-clean-stage4-intl: clean-stage4-intl
@@ -17137,6 +17178,7 @@ all-stageprofile-intl: configure-stageprofile-intl
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/intl && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEprofile_CFLAGS)" \
                 CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -17145,7 +17187,7 @@ all-stageprofile-intl: configure-stageprofile-intl
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                 $(TARGET-stageprofile-intl)
  
  maybe-clean-stageprofile-intl: clean-stageprofile-intl
@@ -17178,6 +17220,7 @@ all-stagefeedback-intl: configure-stagefeedback-intl
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/intl && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEfeedback_CFLAGS)" \
                 CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -17186,7 +17229,7 @@ all-stagefeedback-intl: configure-stagefeedback-intl
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                 $(TARGET-stagefeedback-intl)
  
  maybe-clean-stagefeedback-intl: clean-stagefeedback-intl
@@ -18712,6 +18755,7 @@ all-stage1-ld: configure-stage1-ld
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/ld && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE1_CFLAGS)" \
                 CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -18721,7 +18765,7 @@ all-stage1-ld: configure-stage1-ld
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS)  \
                 $(STAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE1_TFLAGS)" \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                 $(TARGET-stage1-ld)
  
  maybe-clean-stage1-ld: clean-stage1-ld
@@ -18755,6 +18799,7 @@ all-stage2-ld: configure-stage2-ld
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/ld && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE2_CFLAGS)" \
                 CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -18763,7 +18808,7 @@ all-stage2-ld: configure-stage2-ld
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE2_TFLAGS)" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                 $(TARGET-stage2-ld)
  
  maybe-clean-stage2-ld: clean-stage2-ld
@@ -18796,6 +18841,7 @@ all-stage3-ld: configure-stage3-ld
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/ld && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE3_CFLAGS)" \
                 CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -18804,7 +18850,7 @@ all-stage3-ld: configure-stage3-ld
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE3_TFLAGS)" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                 $(TARGET-stage3-ld)
  
  maybe-clean-stage3-ld: clean-stage3-ld
@@ -18837,6 +18883,7 @@ all-stage4-ld: configure-stage4-ld
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/ld && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE4_CFLAGS)" \
                 CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -18845,7 +18892,7 @@ all-stage4-ld: configure-stage4-ld
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE4_TFLAGS)" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                 $(TARGET-stage4-ld)
  
  maybe-clean-stage4-ld: clean-stage4-ld
@@ -18878,6 +18925,7 @@ all-stageprofile-ld: configure-stageprofile-ld
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/ld && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEprofile_CFLAGS)" \
                 CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -18886,7 +18934,7 @@ all-stageprofile-ld: configure-stageprofile-ld
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                 $(TARGET-stageprofile-ld)
  
  maybe-clean-stageprofile-ld: clean-stageprofile-ld
@@ -18919,6 +18967,7 @@ all-stagefeedback-ld: configure-stagefeedback-ld
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/ld && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEfeedback_CFLAGS)" \
                 CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -18927,7 +18976,7 @@ all-stagefeedback-ld: configure-stagefeedback-ld
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                 $(TARGET-stagefeedback-ld)
  
  maybe-clean-stagefeedback-ld: clean-stagefeedback-ld
@@ -19586,6 +19635,7 @@ all-stage1-libbacktrace: configure-stage1-libbacktrace
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libbacktrace && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE1_CFLAGS)" \
                 CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -19595,7 +19645,7 @@ all-stage1-libbacktrace: configure-stage1-libbacktrace
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS)  \
                 $(STAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE1_TFLAGS)" \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                 $(TARGET-stage1-libbacktrace)
  
  maybe-clean-stage1-libbacktrace: clean-stage1-libbacktrace
@@ -19629,6 +19679,7 @@ all-stage2-libbacktrace: configure-stage2-libbacktrace
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libbacktrace && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE2_CFLAGS)" \
                 CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -19637,7 +19688,7 @@ all-stage2-libbacktrace: configure-stage2-libbacktrace
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE2_TFLAGS)" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                 $(TARGET-stage2-libbacktrace)
  
  maybe-clean-stage2-libbacktrace: clean-stage2-libbacktrace
@@ -19670,6 +19721,7 @@ all-stage3-libbacktrace: configure-stage3-libbacktrace
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libbacktrace && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE3_CFLAGS)" \
                 CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -19678,7 +19730,7 @@ all-stage3-libbacktrace: configure-stage3-libbacktrace
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE3_TFLAGS)" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                 $(TARGET-stage3-libbacktrace)
  
  maybe-clean-stage3-libbacktrace: clean-stage3-libbacktrace
@@ -19711,6 +19763,7 @@ all-stage4-libbacktrace: configure-stage4-libbacktrace
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libbacktrace && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE4_CFLAGS)" \
                 CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -19719,7 +19772,7 @@ all-stage4-libbacktrace: configure-stage4-libbacktrace
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE4_TFLAGS)" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                 $(TARGET-stage4-libbacktrace)
  
  maybe-clean-stage4-libbacktrace: clean-stage4-libbacktrace
@@ -19752,6 +19805,7 @@ all-stageprofile-libbacktrace: configure-stageprofile-libbacktrace
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libbacktrace && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEprofile_CFLAGS)" \
                 CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -19760,7 +19814,7 @@ all-stageprofile-libbacktrace: configure-stageprofile-libbacktrace
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                 $(TARGET-stageprofile-libbacktrace)
  
  maybe-clean-stageprofile-libbacktrace: clean-stageprofile-libbacktrace
@@ -19793,6 +19847,7 @@ all-stagefeedback-libbacktrace: configure-stagefeedback-libbacktrace
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libbacktrace && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEfeedback_CFLAGS)" \
                 CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -19801,7 +19856,7 @@ all-stagefeedback-libbacktrace: configure-stagefeedback-libbacktrace
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                 $(TARGET-stagefeedback-libbacktrace)
  
  maybe-clean-stagefeedback-libbacktrace: clean-stagefeedback-libbacktrace
@@ -20460,6 +20515,7 @@ all-stage1-libcpp: configure-stage1-libcpp
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libcpp && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE1_CFLAGS)" \
                 CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -20469,7 +20525,7 @@ all-stage1-libcpp: configure-stage1-libcpp
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS)  \
                 $(STAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE1_TFLAGS)" \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                 $(TARGET-stage1-libcpp)
  
  maybe-clean-stage1-libcpp: clean-stage1-libcpp
@@ -20503,6 +20559,7 @@ all-stage2-libcpp: configure-stage2-libcpp
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libcpp && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE2_CFLAGS)" \
                 CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -20511,7 +20568,7 @@ all-stage2-libcpp: configure-stage2-libcpp
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE2_TFLAGS)" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                 $(TARGET-stage2-libcpp)
  
  maybe-clean-stage2-libcpp: clean-stage2-libcpp
@@ -20544,6 +20601,7 @@ all-stage3-libcpp: configure-stage3-libcpp
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libcpp && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE3_CFLAGS)" \
                 CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -20552,7 +20610,7 @@ all-stage3-libcpp: configure-stage3-libcpp
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE3_TFLAGS)" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                 $(TARGET-stage3-libcpp)
  
  maybe-clean-stage3-libcpp: clean-stage3-libcpp
@@ -20585,6 +20643,7 @@ all-stage4-libcpp: configure-stage4-libcpp
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libcpp && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE4_CFLAGS)" \
                 CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -20593,7 +20652,7 @@ all-stage4-libcpp: configure-stage4-libcpp
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE4_TFLAGS)" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                 $(TARGET-stage4-libcpp)
  
  maybe-clean-stage4-libcpp: clean-stage4-libcpp
@@ -20626,6 +20685,7 @@ all-stageprofile-libcpp: configure-stageprofile-libcpp
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libcpp && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEprofile_CFLAGS)" \
                 CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -20634,7 +20694,7 @@ all-stageprofile-libcpp: configure-stageprofile-libcpp
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                 $(TARGET-stageprofile-libcpp)
  
  maybe-clean-stageprofile-libcpp: clean-stageprofile-libcpp
@@ -20667,6 +20727,7 @@ all-stagefeedback-libcpp: configure-stagefeedback-libcpp
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libcpp && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEfeedback_CFLAGS)" \
                 CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -20675,7 +20736,7 @@ all-stagefeedback-libcpp: configure-stagefeedback-libcpp
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                 $(TARGET-stagefeedback-libcpp)
  
  maybe-clean-stagefeedback-libcpp: clean-stagefeedback-libcpp
@@ -21334,6 +21395,7 @@ all-stage1-libdecnumber: configure-stage1-libdecnumber
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libdecnumber && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE1_CFLAGS)" \
                 CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -21343,7 +21405,7 @@ all-stage1-libdecnumber: configure-stage1-libdecnumber
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS)  \
                 $(STAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE1_TFLAGS)" \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                 $(TARGET-stage1-libdecnumber)
  
  maybe-clean-stage1-libdecnumber: clean-stage1-libdecnumber
@@ -21377,6 +21439,7 @@ all-stage2-libdecnumber: configure-stage2-libdecnumber
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libdecnumber && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE2_CFLAGS)" \
                 CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -21385,7 +21448,7 @@ all-stage2-libdecnumber: configure-stage2-libdecnumber
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE2_TFLAGS)" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                 $(TARGET-stage2-libdecnumber)
  
  maybe-clean-stage2-libdecnumber: clean-stage2-libdecnumber
@@ -21418,6 +21481,7 @@ all-stage3-libdecnumber: configure-stage3-libdecnumber
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libdecnumber && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE3_CFLAGS)" \
                 CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -21426,7 +21490,7 @@ all-stage3-libdecnumber: configure-stage3-libdecnumber
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE3_TFLAGS)" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                 $(TARGET-stage3-libdecnumber)
  
  maybe-clean-stage3-libdecnumber: clean-stage3-libdecnumber
@@ -21459,6 +21523,7 @@ all-stage4-libdecnumber: configure-stage4-libdecnumber
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libdecnumber && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE4_CFLAGS)" \
                 CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -21467,7 +21532,7 @@ all-stage4-libdecnumber: configure-stage4-libdecnumber
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE4_TFLAGS)" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                 $(TARGET-stage4-libdecnumber)
  
  maybe-clean-stage4-libdecnumber: clean-stage4-libdecnumber
@@ -21500,6 +21565,7 @@ all-stageprofile-libdecnumber: configure-stageprofile-libdecnumber
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libdecnumber && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEprofile_CFLAGS)" \
                 CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -21508,7 +21574,7 @@ all-stageprofile-libdecnumber: configure-stageprofile-libdecnumber
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                 $(TARGET-stageprofile-libdecnumber)
  
  maybe-clean-stageprofile-libdecnumber: clean-stageprofile-libdecnumber
@@ -21541,6 +21607,7 @@ all-stagefeedback-libdecnumber: configure-stagefeedback-libdecnumber
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libdecnumber && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEfeedback_CFLAGS)" \
                 CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -21549,7 +21616,7 @@ all-stagefeedback-libdecnumber: configure-stagefeedback-libdecnumber
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                 $(TARGET-stagefeedback-libdecnumber)
  
  maybe-clean-stagefeedback-libdecnumber: clean-stagefeedback-libdecnumber
@@ -22655,6 +22722,7 @@ all-stage1-libiberty: configure-stage1-libiberty
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libiberty && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE1_CFLAGS)" \
                 CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -22664,7 +22732,7 @@ all-stage1-libiberty: configure-stage1-libiberty
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS)  \
                 $(STAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE1_TFLAGS)" \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                 $(TARGET-stage1-libiberty)
  
  maybe-clean-stage1-libiberty: clean-stage1-libiberty
@@ -22698,6 +22766,7 @@ all-stage2-libiberty: configure-stage2-libiberty
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libiberty && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE2_CFLAGS)" \
                 CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -22706,7 +22775,7 @@ all-stage2-libiberty: configure-stage2-libiberty
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE2_TFLAGS)" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                 $(TARGET-stage2-libiberty)
  
  maybe-clean-stage2-libiberty: clean-stage2-libiberty
@@ -22739,6 +22808,7 @@ all-stage3-libiberty: configure-stage3-libiberty
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libiberty && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE3_CFLAGS)" \
                 CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -22747,7 +22817,7 @@ all-stage3-libiberty: configure-stage3-libiberty
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE3_TFLAGS)" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                 $(TARGET-stage3-libiberty)
  
  maybe-clean-stage3-libiberty: clean-stage3-libiberty
@@ -22780,6 +22850,7 @@ all-stage4-libiberty: configure-stage4-libiberty
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libiberty && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE4_CFLAGS)" \
                 CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -22788,7 +22859,7 @@ all-stage4-libiberty: configure-stage4-libiberty
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE4_TFLAGS)" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                 $(TARGET-stage4-libiberty)
  
  maybe-clean-stage4-libiberty: clean-stage4-libiberty
@@ -22821,6 +22892,7 @@ all-stageprofile-libiberty: configure-stageprofile-libiberty
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libiberty && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEprofile_CFLAGS)" \
                 CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -22829,7 +22901,7 @@ all-stageprofile-libiberty: configure-stageprofile-libiberty
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                 $(TARGET-stageprofile-libiberty)
  
  maybe-clean-stageprofile-libiberty: clean-stageprofile-libiberty
@@ -22862,6 +22934,7 @@ all-stagefeedback-libiberty: configure-stagefeedback-libiberty
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libiberty && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEfeedback_CFLAGS)" \
                 CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -22870,7 +22943,7 @@ all-stagefeedback-libiberty: configure-stagefeedback-libiberty
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                 $(TARGET-stagefeedback-libiberty)
  
  maybe-clean-stagefeedback-libiberty: clean-stagefeedback-libiberty
@@ -23535,6 +23608,7 @@ all-stage1-libiberty-linker-plugin: configure-stage1-libiberty-linker-plugin
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE1_CFLAGS)" \
                 CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -23544,7 +23618,7 @@ all-stage1-libiberty-linker-plugin: configure-stage1-libiberty-linker-plugin
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS)  \
                 $(STAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
-               TFLAGS="$(STAGE1_TFLAGS)" \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                 $(TARGET-stage1-libiberty-linker-plugin)
  
  maybe-clean-stage1-libiberty-linker-plugin: clean-stage1-libiberty-linker-plugin
@@ -23578,6 +23652,7 @@ all-stage2-libiberty-linker-plugin: configure-stage2-libiberty-linker-plugin
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE2_CFLAGS)" \
                 CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -23586,7 +23661,7 @@ all-stage2-libiberty-linker-plugin: configure-stage2-libiberty-linker-plugin
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
-               TFLAGS="$(STAGE2_TFLAGS)" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                 $(TARGET-stage2-libiberty-linker-plugin)
  
  maybe-clean-stage2-libiberty-linker-plugin: clean-stage2-libiberty-linker-plugin
@@ -23619,6 +23694,7 @@ all-stage3-libiberty-linker-plugin: configure-stage3-libiberty-linker-plugin
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE3_CFLAGS)" \
                 CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -23627,7 +23703,7 @@ all-stage3-libiberty-linker-plugin: configure-stage3-libiberty-linker-plugin
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
-               TFLAGS="$(STAGE3_TFLAGS)" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                 $(TARGET-stage3-libiberty-linker-plugin)
  
  maybe-clean-stage3-libiberty-linker-plugin: clean-stage3-libiberty-linker-plugin
@@ -23660,6 +23736,7 @@ all-stage4-libiberty-linker-plugin: configure-stage4-libiberty-linker-plugin
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE4_CFLAGS)" \
                 CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -23668,7 +23745,7 @@ all-stage4-libiberty-linker-plugin: configure-stage4-libiberty-linker-plugin
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
-               TFLAGS="$(STAGE4_TFLAGS)" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                 $(TARGET-stage4-libiberty-linker-plugin)
  
  maybe-clean-stage4-libiberty-linker-plugin: clean-stage4-libiberty-linker-plugin
@@ -23701,6 +23778,7 @@ all-stageprofile-libiberty-linker-plugin: configure-stageprofile-libiberty-linke
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEprofile_CFLAGS)" \
                 CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -23709,7 +23787,7 @@ all-stageprofile-libiberty-linker-plugin: configure-stageprofile-libiberty-linke
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                 $(TARGET-stageprofile-libiberty-linker-plugin)
  
  maybe-clean-stageprofile-libiberty-linker-plugin: clean-stageprofile-libiberty-linker-plugin
@@ -23742,6 +23820,7 @@ all-stagefeedback-libiberty-linker-plugin: configure-stagefeedback-libiberty-lin
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libiberty-linker-plugin && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEfeedback_CFLAGS)" \
                 CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -23750,7 +23829,7 @@ all-stagefeedback-libiberty-linker-plugin: configure-stagefeedback-libiberty-lin
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                 $(TARGET-stagefeedback-libiberty-linker-plugin)
  
  maybe-clean-stagefeedback-libiberty-linker-plugin: clean-stagefeedback-libiberty-linker-plugin
@@ -24415,6 +24494,7 @@ all-stage1-libiconv: configure-stage1-libiconv
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libiconv && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE1_CFLAGS)" \
                 CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -24424,7 +24504,7 @@ all-stage1-libiconv: configure-stage1-libiconv
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS)  \
                 $(STAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE1_TFLAGS)" \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                 $(TARGET-stage1-libiconv)
  
  maybe-clean-stage1-libiconv: clean-stage1-libiconv
@@ -24458,6 +24538,7 @@ all-stage2-libiconv: configure-stage2-libiconv
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libiconv && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE2_CFLAGS)" \
                 CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -24466,7 +24547,7 @@ all-stage2-libiconv: configure-stage2-libiconv
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE2_TFLAGS)" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                 $(TARGET-stage2-libiconv)
  
  maybe-clean-stage2-libiconv: clean-stage2-libiconv
@@ -24499,6 +24580,7 @@ all-stage3-libiconv: configure-stage3-libiconv
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libiconv && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE3_CFLAGS)" \
                 CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -24507,7 +24589,7 @@ all-stage3-libiconv: configure-stage3-libiconv
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE3_TFLAGS)" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                 $(TARGET-stage3-libiconv)
  
  maybe-clean-stage3-libiconv: clean-stage3-libiconv
@@ -24540,6 +24622,7 @@ all-stage4-libiconv: configure-stage4-libiconv
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libiconv && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE4_CFLAGS)" \
                 CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -24548,7 +24631,7 @@ all-stage4-libiconv: configure-stage4-libiconv
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE4_TFLAGS)" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                 $(TARGET-stage4-libiconv)
  
  maybe-clean-stage4-libiconv: clean-stage4-libiconv
@@ -24581,6 +24664,7 @@ all-stageprofile-libiconv: configure-stageprofile-libiconv
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libiconv && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEprofile_CFLAGS)" \
                 CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -24589,7 +24673,7 @@ all-stageprofile-libiconv: configure-stageprofile-libiconv
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                 $(TARGET-stageprofile-libiconv)
  
  maybe-clean-stageprofile-libiconv: clean-stageprofile-libiconv
@@ -24622,6 +24706,7 @@ all-stagefeedback-libiconv: configure-stagefeedback-libiconv
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/libiconv && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEfeedback_CFLAGS)" \
                 CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -24630,7 +24715,7 @@ all-stagefeedback-libiconv: configure-stagefeedback-libiconv
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                 $(TARGET-stagefeedback-libiconv)
  
  maybe-clean-stagefeedback-libiconv: clean-stagefeedback-libiconv
@@ -27383,6 +27468,7 @@ all-stage1-zlib: configure-stage1-zlib
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/zlib && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE1_CFLAGS)" \
                 CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -27392,7 +27478,7 @@ all-stage1-zlib: configure-stage1-zlib
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS)  \
                 $(STAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE1_TFLAGS)" \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                 $(TARGET-stage1-zlib)
  
  maybe-clean-stage1-zlib: clean-stage1-zlib
@@ -27426,6 +27512,7 @@ all-stage2-zlib: configure-stage2-zlib
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/zlib && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE2_CFLAGS)" \
                 CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -27434,7 +27521,7 @@ all-stage2-zlib: configure-stage2-zlib
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE2_TFLAGS)" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                 $(TARGET-stage2-zlib)
  
  maybe-clean-stage2-zlib: clean-stage2-zlib
@@ -27467,6 +27554,7 @@ all-stage3-zlib: configure-stage3-zlib
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/zlib && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE3_CFLAGS)" \
                 CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -27475,7 +27563,7 @@ all-stage3-zlib: configure-stage3-zlib
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE3_TFLAGS)" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                 $(TARGET-stage3-zlib)
  
  maybe-clean-stage3-zlib: clean-stage3-zlib
@@ -27508,6 +27596,7 @@ all-stage4-zlib: configure-stage4-zlib
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/zlib && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE4_CFLAGS)" \
                 CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -27516,7 +27605,7 @@ all-stage4-zlib: configure-stage4-zlib
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGE4_TFLAGS)" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                 $(TARGET-stage4-zlib)
  
  maybe-clean-stage4-zlib: clean-stage4-zlib
@@ -27549,6 +27638,7 @@ all-stageprofile-zlib: configure-stageprofile-zlib
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/zlib && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEprofile_CFLAGS)" \
                 CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -27557,7 +27647,7 @@ all-stageprofile-zlib: configure-stageprofile-zlib
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                 $(TARGET-stageprofile-zlib)
  
  maybe-clean-stageprofile-zlib: clean-stageprofile-zlib
@@ -27590,6 +27680,7 @@ all-stagefeedback-zlib: configure-stagefeedback-zlib
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/zlib && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEfeedback_CFLAGS)" \
                 CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -27598,7 +27689,7 @@ all-stagefeedback-zlib: configure-stagefeedback-zlib
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                 $(TARGET-stagefeedback-zlib)
  
  maybe-clean-stagefeedback-zlib: clean-stagefeedback-zlib
@@ -31260,6 +31351,7 @@ all-stage1-lto-plugin: configure-stage1-lto-plugin
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/lto-plugin && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE1_CFLAGS)" \
                 CXXFLAGS="$(STAGE1_CXXFLAGS)" \
@@ -31269,7 +31361,7 @@ all-stage1-lto-plugin: configure-stage1-lto-plugin
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS)  \
                 $(STAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
-               TFLAGS="$(STAGE1_TFLAGS)" \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                 $(TARGET-stage1-lto-plugin)
  
  maybe-clean-stage1-lto-plugin: clean-stage1-lto-plugin
@@ -31303,6 +31395,7 @@ all-stage2-lto-plugin: configure-stage2-lto-plugin
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/lto-plugin && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE2_CFLAGS)" \
                 CXXFLAGS="$(STAGE2_CXXFLAGS)" \
@@ -31311,7 +31404,7 @@ all-stage2-lto-plugin: configure-stage2-lto-plugin
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
-               TFLAGS="$(STAGE2_TFLAGS)" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                 $(TARGET-stage2-lto-plugin)
  
  maybe-clean-stage2-lto-plugin: clean-stage2-lto-plugin
@@ -31344,6 +31437,7 @@ all-stage3-lto-plugin: configure-stage3-lto-plugin
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/lto-plugin && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE3_CFLAGS)" \
                 CXXFLAGS="$(STAGE3_CXXFLAGS)" \
@@ -31352,7 +31446,7 @@ all-stage3-lto-plugin: configure-stage3-lto-plugin
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
-               TFLAGS="$(STAGE3_TFLAGS)" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                 $(TARGET-stage3-lto-plugin)
  
  maybe-clean-stage3-lto-plugin: clean-stage3-lto-plugin
@@ -31385,6 +31479,7 @@ all-stage4-lto-plugin: configure-stage4-lto-plugin
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/lto-plugin && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGE4_CFLAGS)" \
                 CXXFLAGS="$(STAGE4_CXXFLAGS)" \
@@ -31393,7 +31488,7 @@ all-stage4-lto-plugin: configure-stage4-lto-plugin
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
-               TFLAGS="$(STAGE4_TFLAGS)" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                 $(TARGET-stage4-lto-plugin)
  
  maybe-clean-stage4-lto-plugin: clean-stage4-lto-plugin
@@ -31426,6 +31521,7 @@ all-stageprofile-lto-plugin: configure-stageprofile-lto-plugin
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/lto-plugin && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEprofile_CFLAGS)" \
                 CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \
@@ -31434,7 +31530,7 @@ all-stageprofile-lto-plugin: configure-stageprofile-lto-plugin
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                 $(TARGET-stageprofile-lto-plugin)
  
  maybe-clean-stageprofile-lto-plugin: clean-stageprofile-lto-plugin
@@ -31467,6 +31563,7 @@ all-stagefeedback-lto-plugin: configure-stagefeedback-lto-plugin
         $(HOST_EXPORTS) \
         $(POSTSTAGE1_HOST_EXPORTS)  \
         cd $(HOST_SUBDIR)/lto-plugin && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(STAGEfeedback_CFLAGS)" \
                 CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \
@@ -31475,7 +31572,7 @@ all-stagefeedback-lto-plugin: configure-stagefeedback-lto-plugin
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                 $(TARGET-stagefeedback-lto-plugin)
  
  maybe-clean-stagefeedback-lto-plugin: clean-stagefeedback-lto-plugin
@@ -33109,6 +33206,7 @@ all-stage1-target-libstdc++-v3: configure-stage1-target-libstdc++-v3
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(RAW_CXX_TARGET_EXPORTS)  \
         cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -33118,7 +33216,7 @@ all-stage1-target-libstdc++-v3: configure-stage1-target-libstdc++-v3
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  \
                   \
-               TFLAGS="$(STAGE1_TFLAGS)" \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                 $(TARGET-stage1-target-libstdc++-v3)
  
  maybe-clean-stage1-target-libstdc++-v3: clean-stage1-target-libstdc++-v3
@@ -33152,6 +33250,7 @@ all-stage2-target-libstdc++-v3: configure-stage2-target-libstdc++-v3
         $(RAW_CXX_TARGET_EXPORTS) \
           \
         cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -33160,7 +33259,7 @@ all-stage2-target-libstdc++-v3: configure-stage2-target-libstdc++-v3
                 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="$(STAGE2_TFLAGS)" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                 $(TARGET-stage2-target-libstdc++-v3)
  
  maybe-clean-stage2-target-libstdc++-v3: clean-stage2-target-libstdc++-v3
@@ -33193,6 +33292,7 @@ all-stage3-target-libstdc++-v3: configure-stage3-target-libstdc++-v3
         $(RAW_CXX_TARGET_EXPORTS) \
           \
         cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -33201,7 +33301,7 @@ all-stage3-target-libstdc++-v3: configure-stage3-target-libstdc++-v3
                 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="$(STAGE3_TFLAGS)" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                 $(TARGET-stage3-target-libstdc++-v3)
  
  maybe-clean-stage3-target-libstdc++-v3: clean-stage3-target-libstdc++-v3
@@ -33234,6 +33334,7 @@ all-stage4-target-libstdc++-v3: configure-stage4-target-libstdc++-v3
         $(RAW_CXX_TARGET_EXPORTS) \
           \
         cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -33242,7 +33343,7 @@ all-stage4-target-libstdc++-v3: configure-stage4-target-libstdc++-v3
                 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="$(STAGE4_TFLAGS)" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                 $(TARGET-stage4-target-libstdc++-v3)
  
  maybe-clean-stage4-target-libstdc++-v3: clean-stage4-target-libstdc++-v3
@@ -33275,6 +33376,7 @@ all-stageprofile-target-libstdc++-v3: configure-stageprofile-target-libstdc++-v3
         $(RAW_CXX_TARGET_EXPORTS) \
           \
         cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -33283,7 +33385,7 @@ all-stageprofile-target-libstdc++-v3: configure-stageprofile-target-libstdc++-v3
                 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="$(STAGEprofile_TFLAGS)" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                 $(TARGET-stageprofile-target-libstdc++-v3)
  
  maybe-clean-stageprofile-target-libstdc++-v3: clean-stageprofile-target-libstdc++-v3
@@ -33316,6 +33418,7 @@ all-stagefeedback-target-libstdc++-v3: configure-stagefeedback-target-libstdc++-
         $(RAW_CXX_TARGET_EXPORTS) \
           \
         cd $(TARGET_SUBDIR)/libstdc++-v3 && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -33324,7 +33427,7 @@ all-stagefeedback-target-libstdc++-v3: configure-stagefeedback-target-libstdc++-
                 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="$(STAGEfeedback_TFLAGS)" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                 $(TARGET-stagefeedback-target-libstdc++-v3)
  
  maybe-clean-stagefeedback-target-libstdc++-v3: clean-stagefeedback-target-libstdc++-v3
@@ -34085,6 +34188,7 @@ all-stage1-target-libsanitizer: configure-stage1-target-libsanitizer
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(RAW_CXX_TARGET_EXPORTS)  \
         cd $(TARGET_SUBDIR)/libsanitizer && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -34094,7 +34198,7 @@ all-stage1-target-libsanitizer: configure-stage1-target-libsanitizer
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  \
                   \
-               TFLAGS="$(STAGE1_TFLAGS)" \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                 $(TARGET-stage1-target-libsanitizer)
  
  maybe-clean-stage1-target-libsanitizer: clean-stage1-target-libsanitizer
@@ -34128,6 +34232,7 @@ all-stage2-target-libsanitizer: configure-stage2-target-libsanitizer
         $(RAW_CXX_TARGET_EXPORTS) \
           \
         cd $(TARGET_SUBDIR)/libsanitizer && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -34136,7 +34241,7 @@ all-stage2-target-libsanitizer: configure-stage2-target-libsanitizer
                 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="$(STAGE2_TFLAGS)" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                 $(TARGET-stage2-target-libsanitizer)
  
  maybe-clean-stage2-target-libsanitizer: clean-stage2-target-libsanitizer
@@ -34169,6 +34274,7 @@ all-stage3-target-libsanitizer: configure-stage3-target-libsanitizer
         $(RAW_CXX_TARGET_EXPORTS) \
           \
         cd $(TARGET_SUBDIR)/libsanitizer && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -34177,7 +34283,7 @@ all-stage3-target-libsanitizer: configure-stage3-target-libsanitizer
                 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="$(STAGE3_TFLAGS)" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                 $(TARGET-stage3-target-libsanitizer)
  
  maybe-clean-stage3-target-libsanitizer: clean-stage3-target-libsanitizer
@@ -34210,6 +34316,7 @@ all-stage4-target-libsanitizer: configure-stage4-target-libsanitizer
         $(RAW_CXX_TARGET_EXPORTS) \
           \
         cd $(TARGET_SUBDIR)/libsanitizer && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -34218,7 +34325,7 @@ all-stage4-target-libsanitizer: configure-stage4-target-libsanitizer
                 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="$(STAGE4_TFLAGS)" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                 $(TARGET-stage4-target-libsanitizer)
  
  maybe-clean-stage4-target-libsanitizer: clean-stage4-target-libsanitizer
@@ -34251,6 +34358,7 @@ all-stageprofile-target-libsanitizer: configure-stageprofile-target-libsanitizer
         $(RAW_CXX_TARGET_EXPORTS) \
           \
         cd $(TARGET_SUBDIR)/libsanitizer && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -34259,7 +34367,7 @@ all-stageprofile-target-libsanitizer: configure-stageprofile-target-libsanitizer
                 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="$(STAGEprofile_TFLAGS)" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                 $(TARGET-stageprofile-target-libsanitizer)
  
  maybe-clean-stageprofile-target-libsanitizer: clean-stageprofile-target-libsanitizer
@@ -34292,6 +34400,7 @@ all-stagefeedback-target-libsanitizer: configure-stagefeedback-target-libsanitiz
         $(RAW_CXX_TARGET_EXPORTS) \
           \
         cd $(TARGET_SUBDIR)/libsanitizer && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -34300,7 +34409,7 @@ all-stagefeedback-target-libsanitizer: configure-stagefeedback-target-libsanitiz
                 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="$(STAGEfeedback_TFLAGS)" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                 $(TARGET-stagefeedback-target-libsanitizer)
  
  maybe-clean-stagefeedback-target-libsanitizer: clean-stagefeedback-target-libsanitizer
@@ -35061,6 +35170,7 @@ all-stage1-target-libmpx: configure-stage1-target-libmpx
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(NORMAL_TARGET_EXPORTS)  \
         cd $(TARGET_SUBDIR)/libmpx && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -35070,7 +35180,7 @@ all-stage1-target-libmpx: configure-stage1-target-libmpx
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_TARGET_FLAGS)  \
                   \
-               TFLAGS="$(STAGE1_TFLAGS)" \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                 $(TARGET-stage1-target-libmpx)
  
  maybe-clean-stage1-target-libmpx: clean-stage1-target-libmpx
@@ -35104,6 +35214,7 @@ all-stage2-target-libmpx: configure-stage2-target-libmpx
         $(NORMAL_TARGET_EXPORTS) \
           \
         cd $(TARGET_SUBDIR)/libmpx && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -35112,7 +35223,7 @@ all-stage2-target-libmpx: configure-stage2-target-libmpx
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_TARGET_FLAGS)   \
-               TFLAGS="$(STAGE2_TFLAGS)" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                 $(TARGET-stage2-target-libmpx)
  
  maybe-clean-stage2-target-libmpx: clean-stage2-target-libmpx
@@ -35145,6 +35256,7 @@ all-stage3-target-libmpx: configure-stage3-target-libmpx
         $(NORMAL_TARGET_EXPORTS) \
           \
         cd $(TARGET_SUBDIR)/libmpx && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -35153,7 +35265,7 @@ all-stage3-target-libmpx: configure-stage3-target-libmpx
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_TARGET_FLAGS)   \
-               TFLAGS="$(STAGE3_TFLAGS)" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                 $(TARGET-stage3-target-libmpx)
  
  maybe-clean-stage3-target-libmpx: clean-stage3-target-libmpx
@@ -35186,6 +35298,7 @@ all-stage4-target-libmpx: configure-stage4-target-libmpx
         $(NORMAL_TARGET_EXPORTS) \
           \
         cd $(TARGET_SUBDIR)/libmpx && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -35194,7 +35307,7 @@ all-stage4-target-libmpx: configure-stage4-target-libmpx
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_TARGET_FLAGS)   \
-               TFLAGS="$(STAGE4_TFLAGS)" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                 $(TARGET-stage4-target-libmpx)
  
  maybe-clean-stage4-target-libmpx: clean-stage4-target-libmpx
@@ -35227,6 +35340,7 @@ all-stageprofile-target-libmpx: configure-stageprofile-target-libmpx
         $(NORMAL_TARGET_EXPORTS) \
           \
         cd $(TARGET_SUBDIR)/libmpx && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -35235,7 +35349,7 @@ all-stageprofile-target-libmpx: configure-stageprofile-target-libmpx
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_TARGET_FLAGS)   \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                 $(TARGET-stageprofile-target-libmpx)
  
  maybe-clean-stageprofile-target-libmpx: clean-stageprofile-target-libmpx
@@ -35268,6 +35382,7 @@ all-stagefeedback-target-libmpx: configure-stagefeedback-target-libmpx
         $(NORMAL_TARGET_EXPORTS) \
           \
         cd $(TARGET_SUBDIR)/libmpx && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -35276,7 +35391,7 @@ all-stagefeedback-target-libmpx: configure-stagefeedback-target-libmpx
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_TARGET_FLAGS)   \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                 $(TARGET-stagefeedback-target-libmpx)
  
  maybe-clean-stagefeedback-target-libmpx: clean-stagefeedback-target-libmpx
@@ -36037,6 +36152,7 @@ all-stage1-target-libvtv: configure-stage1-target-libvtv
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(RAW_CXX_TARGET_EXPORTS)  \
         cd $(TARGET_SUBDIR)/libvtv && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -36046,7 +36162,7 @@ all-stage1-target-libvtv: configure-stage1-target-libvtv
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  \
                   \
-               TFLAGS="$(STAGE1_TFLAGS)" \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                 $(TARGET-stage1-target-libvtv)
  
  maybe-clean-stage1-target-libvtv: clean-stage1-target-libvtv
@@ -36080,6 +36196,7 @@ all-stage2-target-libvtv: configure-stage2-target-libvtv
         $(RAW_CXX_TARGET_EXPORTS) \
           \
         cd $(TARGET_SUBDIR)/libvtv && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -36088,7 +36205,7 @@ all-stage2-target-libvtv: configure-stage2-target-libvtv
                 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="$(STAGE2_TFLAGS)" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                 $(TARGET-stage2-target-libvtv)
  
  maybe-clean-stage2-target-libvtv: clean-stage2-target-libvtv
@@ -36121,6 +36238,7 @@ all-stage3-target-libvtv: configure-stage3-target-libvtv
         $(RAW_CXX_TARGET_EXPORTS) \
           \
         cd $(TARGET_SUBDIR)/libvtv && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -36129,7 +36247,7 @@ all-stage3-target-libvtv: configure-stage3-target-libvtv
                 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="$(STAGE3_TFLAGS)" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                 $(TARGET-stage3-target-libvtv)
  
  maybe-clean-stage3-target-libvtv: clean-stage3-target-libvtv
@@ -36162,6 +36280,7 @@ all-stage4-target-libvtv: configure-stage4-target-libvtv
         $(RAW_CXX_TARGET_EXPORTS) \
           \
         cd $(TARGET_SUBDIR)/libvtv && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -36170,7 +36289,7 @@ all-stage4-target-libvtv: configure-stage4-target-libvtv
                 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="$(STAGE4_TFLAGS)" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                 $(TARGET-stage4-target-libvtv)
  
  maybe-clean-stage4-target-libvtv: clean-stage4-target-libvtv
@@ -36203,6 +36322,7 @@ all-stageprofile-target-libvtv: configure-stageprofile-target-libvtv
         $(RAW_CXX_TARGET_EXPORTS) \
           \
         cd $(TARGET_SUBDIR)/libvtv && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -36211,7 +36331,7 @@ all-stageprofile-target-libvtv: configure-stageprofile-target-libvtv
                 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="$(STAGEprofile_TFLAGS)" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                 $(TARGET-stageprofile-target-libvtv)
  
  maybe-clean-stageprofile-target-libvtv: clean-stageprofile-target-libvtv
@@ -36244,6 +36364,7 @@ all-stagefeedback-target-libvtv: configure-stagefeedback-target-libvtv
         $(RAW_CXX_TARGET_EXPORTS) \
           \
         cd $(TARGET_SUBDIR)/libvtv && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -36252,7 +36373,7 @@ all-stagefeedback-target-libvtv: configure-stagefeedback-target-libvtv
                 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="$(STAGEfeedback_TFLAGS)" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                 $(TARGET-stagefeedback-target-libvtv)
  
  maybe-clean-stagefeedback-target-libvtv: clean-stagefeedback-target-libvtv
@@ -38845,6 +38966,7 @@ all-stage1-target-libgcc: configure-stage1-target-libgcc
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(NORMAL_TARGET_EXPORTS)  \
         cd $(TARGET_SUBDIR)/libgcc && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -38854,7 +38976,7 @@ all-stage1-target-libgcc: configure-stage1-target-libgcc
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_TARGET_FLAGS)  \
                   \
-               TFLAGS="$(STAGE1_TFLAGS)" \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                 $(TARGET-stage1-target-libgcc)
  
  maybe-clean-stage1-target-libgcc: clean-stage1-target-libgcc
@@ -38888,6 +39010,7 @@ all-stage2-target-libgcc: configure-stage2-target-libgcc
         $(NORMAL_TARGET_EXPORTS) \
           \
         cd $(TARGET_SUBDIR)/libgcc && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -38896,7 +39019,7 @@ all-stage2-target-libgcc: configure-stage2-target-libgcc
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_TARGET_FLAGS)   \
-               TFLAGS="$(STAGE2_TFLAGS)" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                 $(TARGET-stage2-target-libgcc)
  
  maybe-clean-stage2-target-libgcc: clean-stage2-target-libgcc
@@ -38929,6 +39052,7 @@ all-stage3-target-libgcc: configure-stage3-target-libgcc
         $(NORMAL_TARGET_EXPORTS) \
           \
         cd $(TARGET_SUBDIR)/libgcc && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -38937,7 +39061,7 @@ all-stage3-target-libgcc: configure-stage3-target-libgcc
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_TARGET_FLAGS)   \
-               TFLAGS="$(STAGE3_TFLAGS)" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                 $(TARGET-stage3-target-libgcc)
  
  maybe-clean-stage3-target-libgcc: clean-stage3-target-libgcc
@@ -38970,6 +39094,7 @@ all-stage4-target-libgcc: configure-stage4-target-libgcc
         $(NORMAL_TARGET_EXPORTS) \
           \
         cd $(TARGET_SUBDIR)/libgcc && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -38978,7 +39103,7 @@ all-stage4-target-libgcc: configure-stage4-target-libgcc
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_TARGET_FLAGS)   \
-               TFLAGS="$(STAGE4_TFLAGS)" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                 $(TARGET-stage4-target-libgcc)
  
  maybe-clean-stage4-target-libgcc: clean-stage4-target-libgcc
@@ -39011,6 +39136,7 @@ all-stageprofile-target-libgcc: configure-stageprofile-target-libgcc
         $(NORMAL_TARGET_EXPORTS) \
           \
         cd $(TARGET_SUBDIR)/libgcc && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -39019,7 +39145,7 @@ all-stageprofile-target-libgcc: configure-stageprofile-target-libgcc
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_TARGET_FLAGS)   \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                 $(TARGET-stageprofile-target-libgcc)
  
  maybe-clean-stageprofile-target-libgcc: clean-stageprofile-target-libgcc
@@ -39052,6 +39178,7 @@ all-stagefeedback-target-libgcc: configure-stagefeedback-target-libgcc
         $(NORMAL_TARGET_EXPORTS) \
           \
         cd $(TARGET_SUBDIR)/libgcc && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -39060,7 +39187,7 @@ all-stagefeedback-target-libgcc: configure-stagefeedback-target-libgcc
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_TARGET_FLAGS)   \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                 $(TARGET-stagefeedback-target-libgcc)
  
  maybe-clean-stagefeedback-target-libgcc: clean-stagefeedback-target-libgcc
@@ -43506,464 +43633,6 @@ maintainer-clean-target-libffi:
  
  
  
-.PHONY: configure-target-libjava maybe-configure-target-libjava
-maybe-configure-target-libjava:
-@if gcc-bootstrap
-configure-target-libjava: stage_current
-@endif gcc-bootstrap
-@if target-libjava
-maybe-configure-target-libjava: configure-target-libjava
-configure-target-libjava: 
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       echo "Checking multilib configuration for libjava..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libjava; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libjava/multilib.tmp 2> /dev/null; \
-       if test -r $(TARGET_SUBDIR)/libjava/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/libjava/multilib.tmp $(TARGET_SUBDIR)/libjava/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/libjava/multilib.tmp; \
-         else \
-           rm -f $(TARGET_SUBDIR)/libjava/Makefile; \
-           mv $(TARGET_SUBDIR)/libjava/multilib.tmp $(TARGET_SUBDIR)/libjava/multilib.out; \
-         fi; \
-       else \
-         mv $(TARGET_SUBDIR)/libjava/multilib.tmp $(TARGET_SUBDIR)/libjava/multilib.out; \
-       fi; \
-       test ! -f $(TARGET_SUBDIR)/libjava/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libjava; \
-       $(RAW_CXX_TARGET_EXPORTS)  \
-       echo Configuring in $(TARGET_SUBDIR)/libjava; \
-       cd "$(TARGET_SUBDIR)/libjava" || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/libjava/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       module_srcdir=libjava; \
-       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} $(EXTRA_CONFIGARGS_LIBJAVA) \
-         || exit 1
-@endif target-libjava
-
-
-
-
-
-.PHONY: all-target-libjava maybe-all-target-libjava
-maybe-all-target-libjava:
-@if gcc-bootstrap
-all-target-libjava: stage_current
-@endif gcc-bootstrap
-@if target-libjava
-TARGET-target-libjava=all
-maybe-all-target-libjava: all-target-libjava
-all-target-libjava: configure-target-libjava
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS)  \
-       (cd $(TARGET_SUBDIR)/libjava && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   \
-               $(TARGET-target-libjava))
-@endif target-libjava
-
-
-
-
-
-.PHONY: check-target-libjava maybe-check-target-libjava
-maybe-check-target-libjava:
-@if target-libjava
-maybe-check-target-libjava: check-target-libjava
-
-check-target-libjava:
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libjava && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'   check)
-
-@endif target-libjava
-
-.PHONY: install-target-libjava maybe-install-target-libjava
-maybe-install-target-libjava:
-@if target-libjava
-maybe-install-target-libjava: install-target-libjava
-
-install-target-libjava: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libjava && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
-
-@endif target-libjava
-
-.PHONY: install-strip-target-libjava maybe-install-strip-target-libjava
-maybe-install-strip-target-libjava:
-@if target-libjava
-maybe-install-strip-target-libjava: install-strip-target-libjava
-
-install-strip-target-libjava: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/libjava && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
-
-@endif target-libjava
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-target-libjava info-target-libjava
-maybe-info-target-libjava:
-@if target-libjava
-maybe-info-target-libjava: info-target-libjava
-
-info-target-libjava: \
-    configure-target-libjava 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing info in $(TARGET_SUBDIR)/libjava"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libjava && \
-         $(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-libjava
-
-.PHONY: maybe-dvi-target-libjava dvi-target-libjava
-maybe-dvi-target-libjava:
-@if target-libjava
-maybe-dvi-target-libjava: dvi-target-libjava
-
-dvi-target-libjava: \
-    configure-target-libjava 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing dvi in $(TARGET_SUBDIR)/libjava"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libjava && \
-         $(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-libjava
-
-.PHONY: maybe-pdf-target-libjava pdf-target-libjava
-maybe-pdf-target-libjava:
-@if target-libjava
-maybe-pdf-target-libjava: pdf-target-libjava
-
-pdf-target-libjava: \
-    configure-target-libjava 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing pdf in $(TARGET_SUBDIR)/libjava"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libjava && \
-         $(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-libjava
-
-.PHONY: maybe-html-target-libjava html-target-libjava
-maybe-html-target-libjava:
-@if target-libjava
-maybe-html-target-libjava: html-target-libjava
-
-html-target-libjava: \
-    configure-target-libjava 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing html in $(TARGET_SUBDIR)/libjava"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libjava && \
-         $(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-libjava
-
-.PHONY: maybe-TAGS-target-libjava TAGS-target-libjava
-maybe-TAGS-target-libjava:
-@if target-libjava
-maybe-TAGS-target-libjava: TAGS-target-libjava
-
-TAGS-target-libjava: \
-    configure-target-libjava 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing TAGS in $(TARGET_SUBDIR)/libjava"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libjava && \
-         $(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-libjava
-
-.PHONY: maybe-install-info-target-libjava install-info-target-libjava
-maybe-install-info-target-libjava:
-@if target-libjava
-maybe-install-info-target-libjava: install-info-target-libjava
-
-install-info-target-libjava: \
-    configure-target-libjava \
-    info-target-libjava 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing install-info in $(TARGET_SUBDIR)/libjava"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libjava && \
-         $(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-libjava
-
-.PHONY: maybe-install-pdf-target-libjava install-pdf-target-libjava
-maybe-install-pdf-target-libjava:
-@if target-libjava
-maybe-install-pdf-target-libjava: install-pdf-target-libjava
-
-install-pdf-target-libjava: \
-    configure-target-libjava \
-    pdf-target-libjava 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing install-pdf in $(TARGET_SUBDIR)/libjava"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libjava && \
-         $(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-libjava
-
-.PHONY: maybe-install-html-target-libjava install-html-target-libjava
-maybe-install-html-target-libjava:
-@if target-libjava
-maybe-install-html-target-libjava: install-html-target-libjava
-
-install-html-target-libjava: \
-    configure-target-libjava \
-    html-target-libjava 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing install-html in $(TARGET_SUBDIR)/libjava"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libjava && \
-         $(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-libjava
-
-.PHONY: maybe-installcheck-target-libjava installcheck-target-libjava
-maybe-installcheck-target-libjava:
-@if target-libjava
-maybe-installcheck-target-libjava: installcheck-target-libjava
-
-installcheck-target-libjava: \
-    configure-target-libjava 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing installcheck in $(TARGET_SUBDIR)/libjava"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libjava && \
-         $(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-libjava
-
-.PHONY: maybe-mostlyclean-target-libjava mostlyclean-target-libjava
-maybe-mostlyclean-target-libjava:
-@if target-libjava
-maybe-mostlyclean-target-libjava: mostlyclean-target-libjava
-
-mostlyclean-target-libjava: 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing mostlyclean in $(TARGET_SUBDIR)/libjava"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libjava && \
-         $(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-libjava
-
-.PHONY: maybe-clean-target-libjava clean-target-libjava
-maybe-clean-target-libjava:
-@if target-libjava
-maybe-clean-target-libjava: clean-target-libjava
-
-clean-target-libjava: 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing clean in $(TARGET_SUBDIR)/libjava"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libjava && \
-         $(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-libjava
-
-.PHONY: maybe-distclean-target-libjava distclean-target-libjava
-maybe-distclean-target-libjava:
-@if target-libjava
-maybe-distclean-target-libjava: distclean-target-libjava
-
-distclean-target-libjava: 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing distclean in $(TARGET_SUBDIR)/libjava"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libjava && \
-         $(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-libjava
-
-.PHONY: maybe-maintainer-clean-target-libjava maintainer-clean-target-libjava
-maybe-maintainer-clean-target-libjava:
-@if target-libjava
-maybe-maintainer-clean-target-libjava: maintainer-clean-target-libjava
-
-maintainer-clean-target-libjava: 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(RAW_CXX_TARGET_EXPORTS) \
-       echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libjava"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/libjava && \
-         $(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-libjava
-
-
-
-
-
  .PHONY: configure-target-zlib maybe-configure-target-zlib
  maybe-configure-target-zlib:
  @if gcc-bootstrap
@@ -44422,464 +44091,6 @@ maintainer-clean-target-zlib:
  
  
  
-.PHONY: configure-target-boehm-gc maybe-configure-target-boehm-gc
-maybe-configure-target-boehm-gc:
-@if gcc-bootstrap
-configure-target-boehm-gc: stage_current
-@endif gcc-bootstrap
-@if target-boehm-gc
-maybe-configure-target-boehm-gc: configure-target-boehm-gc
-configure-target-boehm-gc: 
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       echo "Checking multilib configuration for boehm-gc..."; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/boehm-gc; \
-       $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/boehm-gc/multilib.tmp 2> /dev/null; \
-       if test -r $(TARGET_SUBDIR)/boehm-gc/multilib.out; then \
-         if cmp -s $(TARGET_SUBDIR)/boehm-gc/multilib.tmp $(TARGET_SUBDIR)/boehm-gc/multilib.out; then \
-           rm -f $(TARGET_SUBDIR)/boehm-gc/multilib.tmp; \
-         else \
-           rm -f $(TARGET_SUBDIR)/boehm-gc/Makefile; \
-           mv $(TARGET_SUBDIR)/boehm-gc/multilib.tmp $(TARGET_SUBDIR)/boehm-gc/multilib.out; \
-         fi; \
-       else \
-         mv $(TARGET_SUBDIR)/boehm-gc/multilib.tmp $(TARGET_SUBDIR)/boehm-gc/multilib.out; \
-       fi; \
-       test ! -f $(TARGET_SUBDIR)/boehm-gc/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/boehm-gc; \
-       $(NORMAL_TARGET_EXPORTS)  \
-       echo Configuring in $(TARGET_SUBDIR)/boehm-gc; \
-       cd "$(TARGET_SUBDIR)/boehm-gc" || exit 1; \
-       case $(srcdir) in \
-         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-         *) topdir=`echo $(TARGET_SUBDIR)/boehm-gc/ | \
-               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-       esac; \
-       module_srcdir=boehm-gc; \
-       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-boehm-gc
-
-
-
-
-
-.PHONY: all-target-boehm-gc maybe-all-target-boehm-gc
-maybe-all-target-boehm-gc:
-@if gcc-bootstrap
-all-target-boehm-gc: stage_current
-@endif gcc-bootstrap
-@if target-boehm-gc
-TARGET-target-boehm-gc=all
-maybe-all-target-boehm-gc: all-target-boehm-gc
-all-target-boehm-gc: configure-target-boehm-gc
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS)  \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
-         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
-               $(TARGET-target-boehm-gc))
-@endif target-boehm-gc
-
-
-
-
-
-.PHONY: check-target-boehm-gc maybe-check-target-boehm-gc
-maybe-check-target-boehm-gc:
-@if target-boehm-gc
-maybe-check-target-boehm-gc: check-target-boehm-gc
-
-check-target-boehm-gc:
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
-
-@endif target-boehm-gc
-
-.PHONY: install-target-boehm-gc maybe-install-target-boehm-gc
-maybe-install-target-boehm-gc:
-@if target-boehm-gc
-maybe-install-target-boehm-gc: install-target-boehm-gc
-
-install-target-boehm-gc: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
-
-@endif target-boehm-gc
-
-.PHONY: install-strip-target-boehm-gc maybe-install-strip-target-boehm-gc
-maybe-install-strip-target-boehm-gc:
-@if target-boehm-gc
-maybe-install-strip-target-boehm-gc: install-strip-target-boehm-gc
-
-install-strip-target-boehm-gc: installdirs
-       @: $(MAKE); $(unstage)
-       @r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
-         $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
-
-@endif target-boehm-gc
-
-# Other targets (info, dvi, pdf, etc.)
-
-.PHONY: maybe-info-target-boehm-gc info-target-boehm-gc
-maybe-info-target-boehm-gc:
-@if target-boehm-gc
-maybe-info-target-boehm-gc: info-target-boehm-gc
-
-info-target-boehm-gc: \
-    configure-target-boehm-gc 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing info in $(TARGET_SUBDIR)/boehm-gc"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
-         $(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-boehm-gc
-
-.PHONY: maybe-dvi-target-boehm-gc dvi-target-boehm-gc
-maybe-dvi-target-boehm-gc:
-@if target-boehm-gc
-maybe-dvi-target-boehm-gc: dvi-target-boehm-gc
-
-dvi-target-boehm-gc: \
-    configure-target-boehm-gc 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing dvi in $(TARGET_SUBDIR)/boehm-gc"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
-         $(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-boehm-gc
-
-.PHONY: maybe-pdf-target-boehm-gc pdf-target-boehm-gc
-maybe-pdf-target-boehm-gc:
-@if target-boehm-gc
-maybe-pdf-target-boehm-gc: pdf-target-boehm-gc
-
-pdf-target-boehm-gc: \
-    configure-target-boehm-gc 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing pdf in $(TARGET_SUBDIR)/boehm-gc"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
-         $(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-boehm-gc
-
-.PHONY: maybe-html-target-boehm-gc html-target-boehm-gc
-maybe-html-target-boehm-gc:
-@if target-boehm-gc
-maybe-html-target-boehm-gc: html-target-boehm-gc
-
-html-target-boehm-gc: \
-    configure-target-boehm-gc 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing html in $(TARGET_SUBDIR)/boehm-gc"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
-         $(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-boehm-gc
-
-.PHONY: maybe-TAGS-target-boehm-gc TAGS-target-boehm-gc
-maybe-TAGS-target-boehm-gc:
-@if target-boehm-gc
-maybe-TAGS-target-boehm-gc: TAGS-target-boehm-gc
-
-TAGS-target-boehm-gc: \
-    configure-target-boehm-gc 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing TAGS in $(TARGET_SUBDIR)/boehm-gc"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
-         $(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-boehm-gc
-
-.PHONY: maybe-install-info-target-boehm-gc install-info-target-boehm-gc
-maybe-install-info-target-boehm-gc:
-@if target-boehm-gc
-maybe-install-info-target-boehm-gc: install-info-target-boehm-gc
-
-install-info-target-boehm-gc: \
-    configure-target-boehm-gc \
-    info-target-boehm-gc 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/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)/boehm-gc"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
-         $(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-boehm-gc
-
-.PHONY: maybe-install-pdf-target-boehm-gc install-pdf-target-boehm-gc
-maybe-install-pdf-target-boehm-gc:
-@if target-boehm-gc
-maybe-install-pdf-target-boehm-gc: install-pdf-target-boehm-gc
-
-install-pdf-target-boehm-gc: \
-    configure-target-boehm-gc \
-    pdf-target-boehm-gc 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/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)/boehm-gc"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
-         $(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-boehm-gc
-
-.PHONY: maybe-install-html-target-boehm-gc install-html-target-boehm-gc
-maybe-install-html-target-boehm-gc:
-@if target-boehm-gc
-maybe-install-html-target-boehm-gc: install-html-target-boehm-gc
-
-install-html-target-boehm-gc: \
-    configure-target-boehm-gc \
-    html-target-boehm-gc 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/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)/boehm-gc"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
-         $(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-boehm-gc
-
-.PHONY: maybe-installcheck-target-boehm-gc installcheck-target-boehm-gc
-maybe-installcheck-target-boehm-gc:
-@if target-boehm-gc
-maybe-installcheck-target-boehm-gc: installcheck-target-boehm-gc
-
-installcheck-target-boehm-gc: \
-    configure-target-boehm-gc 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing installcheck in $(TARGET_SUBDIR)/boehm-gc"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
-         $(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-boehm-gc
-
-.PHONY: maybe-mostlyclean-target-boehm-gc mostlyclean-target-boehm-gc
-maybe-mostlyclean-target-boehm-gc:
-@if target-boehm-gc
-maybe-mostlyclean-target-boehm-gc: mostlyclean-target-boehm-gc
-
-mostlyclean-target-boehm-gc: 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing mostlyclean in $(TARGET_SUBDIR)/boehm-gc"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
-         $(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-boehm-gc
-
-.PHONY: maybe-clean-target-boehm-gc clean-target-boehm-gc
-maybe-clean-target-boehm-gc:
-@if target-boehm-gc
-maybe-clean-target-boehm-gc: clean-target-boehm-gc
-
-clean-target-boehm-gc: 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing clean in $(TARGET_SUBDIR)/boehm-gc"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
-         $(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-boehm-gc
-
-.PHONY: maybe-distclean-target-boehm-gc distclean-target-boehm-gc
-maybe-distclean-target-boehm-gc:
-@if target-boehm-gc
-maybe-distclean-target-boehm-gc: distclean-target-boehm-gc
-
-distclean-target-boehm-gc: 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0; \
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(NORMAL_TARGET_EXPORTS) \
-       echo "Doing distclean in $(TARGET_SUBDIR)/boehm-gc"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
-         $(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-boehm-gc
-
-.PHONY: maybe-maintainer-clean-target-boehm-gc maintainer-clean-target-boehm-gc
-maybe-maintainer-clean-target-boehm-gc:
-@if target-boehm-gc
-maybe-maintainer-clean-target-boehm-gc: maintainer-clean-target-boehm-gc
-
-maintainer-clean-target-boehm-gc: 
-       @: $(MAKE); $(unstage)
-       @[ -f $(TARGET_SUBDIR)/boehm-gc/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)/boehm-gc"; \
-       for flag in $(EXTRA_TARGET_FLAGS); do \
-         eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-       done; \
-       (cd $(TARGET_SUBDIR)/boehm-gc && \
-         $(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-boehm-gc
-
-
-
-
-
  .PHONY: configure-target-rda maybe-configure-target-rda
  maybe-configure-target-rda:
  @if gcc-bootstrap
@@ -46148,6 +45359,7 @@ all-stage1-target-libgomp: configure-stage1-target-libgomp
         TFLAGS="$(STAGE1_TFLAGS)"; \
         $(NORMAL_TARGET_EXPORTS)  \
         cd $(TARGET_SUBDIR)/libgomp && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -46157,7 +45369,7 @@ all-stage1-target-libgomp: configure-stage1-target-libgomp
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_TARGET_FLAGS)  \
                   \
-               TFLAGS="$(STAGE1_TFLAGS)" \
+               TFLAGS="$(STAGE1_TFLAGS)"  \
                 $(TARGET-stage1-target-libgomp)
  
  maybe-clean-stage1-target-libgomp: clean-stage1-target-libgomp
@@ -46191,6 +45403,7 @@ all-stage2-target-libgomp: configure-stage2-target-libgomp
         $(NORMAL_TARGET_EXPORTS) \
           \
         cd $(TARGET_SUBDIR)/libgomp && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -46199,7 +45412,7 @@ all-stage2-target-libgomp: configure-stage2-target-libgomp
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_TARGET_FLAGS)   \
-               TFLAGS="$(STAGE2_TFLAGS)" \
+               TFLAGS="$(STAGE2_TFLAGS)"  \
                 $(TARGET-stage2-target-libgomp)
  
  maybe-clean-stage2-target-libgomp: clean-stage2-target-libgomp
@@ -46232,6 +45445,7 @@ all-stage3-target-libgomp: configure-stage3-target-libgomp
         $(NORMAL_TARGET_EXPORTS) \
           \
         cd $(TARGET_SUBDIR)/libgomp && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -46240,7 +45454,7 @@ all-stage3-target-libgomp: configure-stage3-target-libgomp
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_TARGET_FLAGS)   \
-               TFLAGS="$(STAGE3_TFLAGS)" \
+               TFLAGS="$(STAGE3_TFLAGS)"  \
                 $(TARGET-stage3-target-libgomp)
  
  maybe-clean-stage3-target-libgomp: clean-stage3-target-libgomp
@@ -46273,6 +45487,7 @@ all-stage4-target-libgomp: configure-stage4-target-libgomp
         $(NORMAL_TARGET_EXPORTS) \
           \
         cd $(TARGET_SUBDIR)/libgomp && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -46281,7 +45496,7 @@ all-stage4-target-libgomp: configure-stage4-target-libgomp
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_TARGET_FLAGS)   \
-               TFLAGS="$(STAGE4_TFLAGS)" \
+               TFLAGS="$(STAGE4_TFLAGS)"  \
                 $(TARGET-stage4-target-libgomp)
  
  maybe-clean-stage4-target-libgomp: clean-stage4-target-libgomp
@@ -46314,6 +45529,7 @@ all-stageprofile-target-libgomp: configure-stageprofile-target-libgomp
         $(NORMAL_TARGET_EXPORTS) \
           \
         cd $(TARGET_SUBDIR)/libgomp && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -46322,7 +45538,7 @@ all-stageprofile-target-libgomp: configure-stageprofile-target-libgomp
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_TARGET_FLAGS)   \
-               TFLAGS="$(STAGEprofile_TFLAGS)" \
+               TFLAGS="$(STAGEprofile_TFLAGS)"  \
                 $(TARGET-stageprofile-target-libgomp)
  
  maybe-clean-stageprofile-target-libgomp: clean-stageprofile-target-libgomp
@@ -46355,6 +45571,7 @@ all-stagefeedback-target-libgomp: configure-stagefeedback-target-libgomp
         $(NORMAL_TARGET_EXPORTS) \
           \
         cd $(TARGET_SUBDIR)/libgomp && \
+        \
         $(MAKE) $(BASE_FLAGS_TO_PASS) \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -46363,7 +45580,7 @@ all-stagefeedback-target-libgomp: configure-stagefeedback-target-libgomp
                 CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 $(EXTRA_TARGET_FLAGS)   \
-               TFLAGS="$(STAGEfeedback_TFLAGS)" \
+               TFLAGS="$(STAGEfeedback_TFLAGS)"  \
                 $(TARGET-stagefeedback-target-libgomp)
  
  maybe-clean-stagefeedback-target-libgomp: clean-stagefeedback-target-libgomp
@@ -47744,14 +46961,6 @@ check-gcc-fortran:
         (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-fortran);
  check-fortran: check-gcc-fortran check-target-libquadmath check-target-libgfortran
  
-.PHONY: check-gcc-java check-java
-check-gcc-java:
-       r=`${PWD_COMMAND}`; export r; \
-       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
-       (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-java);
-check-java: check-gcc-java check-target-libjava
-
  .PHONY: check-gcc-ada check-ada
  check-gcc-ada:
         r=`${PWD_COMMAND}`; export r; \
@@ -49994,9 +49203,7 @@ configure-target-libtermcap: stage_last
  configure-target-winsup: stage_last
  configure-target-libgloss: stage_last
  configure-target-libffi: stage_last
-configure-target-libjava: stage_last
  configure-target-zlib: stage_last
-configure-target-boehm-gc: stage_last
  configure-target-rda: stage_last
  configure-target-libada: stage_last
  configure-stage1-target-libgomp: maybe-all-stage1-gcc
@@ -50028,9 +49235,7 @@ configure-target-libtermcap: maybe-all-gcc
  configure-target-winsup: maybe-all-gcc
  configure-target-libgloss: maybe-all-gcc
  configure-target-libffi: maybe-all-gcc
-configure-target-libjava: maybe-all-gcc
  configure-target-zlib: maybe-all-gcc
-configure-target-boehm-gc: maybe-all-gcc
  configure-target-rda: maybe-all-gcc
  configure-target-libada: maybe-all-gcc
  configure-target-libgomp: maybe-all-gcc
@@ -50865,7 +50070,6 @@ all-flex: maybe-all-m4
  all-flex: maybe-all-build-texinfo
  all-m4: maybe-all-intl
  all-m4: maybe-all-build-texinfo
-configure-target-boehm-gc: maybe-all-target-libstdc++-v3
  configure-target-fastjar: maybe-configure-target-zlib
  all-target-fastjar: maybe-all-target-zlib
  configure-target-libgo: maybe-configure-target-libffi
@@ -50873,15 +50077,6 @@ configure-target-libgo: maybe-all-target-libstdc++-v3
  all-target-libgo: maybe-all-target-libbacktrace
  all-target-libgo: maybe-all-target-libffi
  all-target-libgo: maybe-all-target-libatomic
-configure-target-libjava: maybe-configure-target-zlib
-configure-target-libjava: maybe-configure-target-boehm-gc
-configure-target-libjava: maybe-configure-target-libffi
-all-target-libjava: maybe-all-fastjar
-all-target-libjava: maybe-all-target-zlib
-all-target-libjava: maybe-all-target-boehm-gc
-all-target-libjava: maybe-all-target-libffi
-configure-target-libobjc: maybe-configure-target-boehm-gc
-all-target-libobjc: maybe-all-target-boehm-gc
  configure-target-libstdc++-v3: maybe-configure-target-libgomp
  
  configure-stage1-target-libstdc++-v3: maybe-configure-stage1-target-libgomp
@@ -50927,7 +50122,6 @@ 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-libjava: maybe-install-target-libgcc
  install-target-libitm: maybe-install-target-libgcc
  install-target-libobjc: maybe-install-target-libgcc
  install-target-libstdc++-v3: maybe-install-target-libgcc
@@ -50995,9 +50189,7 @@ configure-target-libtermcap: maybe-all-target-libgcc
  configure-target-winsup: maybe-all-target-libgcc
  configure-target-libgloss: maybe-all-target-libgcc
  configure-target-libffi: maybe-all-target-libgcc
-configure-target-libjava: maybe-all-target-libgcc
  configure-target-zlib: maybe-all-target-libgcc
-configure-target-boehm-gc: maybe-all-target-libgcc
  configure-target-rda: maybe-all-target-libgcc
  configure-target-libada: maybe-all-target-libgcc
  configure-target-libgomp: maybe-all-target-libgcc
@@ -51042,13 +50234,8 @@ configure-target-winsup: maybe-all-target-newlib maybe-all-target-libgloss
  configure-target-libffi: maybe-all-target-newlib maybe-all-target-libgloss
  configure-target-libffi: maybe-all-target-libstdc++-v3
  
-configure-target-libjava: maybe-all-target-newlib maybe-all-target-libgloss
-configure-target-libjava: maybe-all-target-libstdc++-v3
-
  configure-target-zlib: maybe-all-target-newlib maybe-all-target-libgloss
  
-configure-target-boehm-gc: maybe-all-target-newlib maybe-all-target-libgloss
-
  configure-target-rda: maybe-all-target-newlib maybe-all-target-libgloss
  
  configure-target-libada: maybe-all-target-newlib maybe-all-target-libgloss
diff --git a/Makefile.tpl b/Makefile.tpl

index 19728d2659e49105ee39f6bbe95bed3419388393..147752188d938908767307fdae7f53065f1942fb 100644 (file)
--- 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
+#   2011, 2012, 2013, 2014, 2015, 2016, 2017
  #   Free Software Foundation
  #
  # This file is free software; you can redistribute it and/or modify
@@ -157,7 +157,6 @@ BUILD_EXPORTS = \
         CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX_FOR_BUILD)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS_FOR_BUILD)"; export CXXFLAGS; \
-       GCJ="$(GCJ_FOR_BUILD)"; export GCJ; \
         GFORTRAN="$(GFORTRAN_FOR_BUILD)"; export GFORTRAN; \
         GOC="$(GOC_FOR_BUILD)"; export GOC; \
         GOCFLAGS="$(GOCFLAGS_FOR_BUILD)"; export GOCFLAGS; \
@@ -195,7 +194,6 @@ HOST_EXPORTS = \
         CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CXX="$(CXX)"; export CXX; \
         CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
-       GCJ="$(GCJ)"; export GCJ; \
         GFORTRAN="$(GFORTRAN)"; export GFORTRAN; \
         GOC="$(GOC)"; export GOC; \
         AR="$(AR)"; export AR; \
@@ -283,7 +281,6 @@ BASE_TARGET_EXPORTS = \
         CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
         CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
         CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-       GCJ="$(GCJ_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GCJ; \
         GFORTRAN="$(GFORTRAN_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GFORTRAN; \
         GOC="$(GOC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GOC; \
         DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
@@ -326,8 +323,6 @@ HOST_ISLVER = @islver@
  HOST_LIBELFLIBS = @libelflibs@
  HOST_LIBELFINC = @libelfinc@
  
-EXTRA_CONFIGARGS_LIBJAVA = @EXTRA_CONFIGARGS_LIBJAVA@
-
  # ----------------------------------------------
  # Programs producing files for the BUILD machine
  # ----------------------------------------------
@@ -351,7 +346,6 @@ CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
  CXXFLAGS_FOR_BUILD = @CXXFLAGS_FOR_BUILD@
  CXX_FOR_BUILD = @CXX_FOR_BUILD@
  DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@
-GCJ_FOR_BUILD = @GCJ_FOR_BUILD@
  GFORTRAN_FOR_BUILD = @GFORTRAN_FOR_BUILD@
  GOC_FOR_BUILD = @GOC_FOR_BUILD@
  LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
@@ -383,6 +377,8 @@ MAKEINFO = @MAKEINFO@
  EXPECT = @EXPECT@
  RUNTEST = @RUNTEST@
  
+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
  # using the makeinfo from the object tree.
@@ -419,6 +415,8 @@ CXXFLAGS = @CXXFLAGS@
  LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
  GOCFLAGS = $(CFLAGS)
  
+CREATE_GCOV = create_gcov
+
  TFLAGS =
  
  # Defaults for all stages; some are overridden below.
@@ -463,6 +461,12 @@ STAGEprofile_TFLAGS = $(STAGE2_TFLAGS)
  STAGEfeedback_CFLAGS = $(STAGE3_CFLAGS) -fprofile-use
  STAGEfeedback_TFLAGS = $(STAGE3_TFLAGS)
  
+STAGEautoprofile_CFLAGS = $(STAGE2_CFLAGS) -g
+STAGEautoprofile_TFLAGS = $(STAGE2_TFLAGS)
+
+STAGEautofeedback_CFLAGS = $(STAGE3_CFLAGS)
+STAGEautofeedback_TFLAGS = $(STAGE3_TFLAGS)
+
  do-compare = @do_compare@
  do-compare3 = $(do-compare)
  
@@ -481,7 +485,6 @@ CC_FOR_TARGET=$(STAGE_CC_WRAPPER) @CC_FOR_TARGET@
  GCC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCC_FOR_TARGET@
  CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @CXX_FOR_TARGET@
  RAW_CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @RAW_CXX_FOR_TARGET@
-GCJ_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCJ_FOR_TARGET@
  GFORTRAN_FOR_TARGET=$(STAGE_CC_WRAPPER) @GFORTRAN_FOR_TARGET@
  GOC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GOC_FOR_TARGET@
  DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@
@@ -607,7 +610,6 @@ EXTRA_HOST_FLAGS = \
         'CC=$(CC)' \
         'CXX=$(CXX)' \
         'DLLTOOL=$(DLLTOOL)' \
-       'GCJ=$(GCJ)' \
         'GFORTRAN=$(GFORTRAN)' \
         'GOC=$(GOC)' \
         'LD=$(LD)' \
@@ -618,7 +620,8 @@ EXTRA_HOST_FLAGS = \
         'READELF=$(READELF)' \
         'STRIP=$(STRIP)' \
         'WINDRES=$(WINDRES)' \
-       'WINDMC=$(WINDMC)'
+       'WINDMC=$(WINDMC)' \
+       'CREATE_GCOV=$(CREATE_GCOV)'
  
  FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)
  
@@ -662,7 +665,6 @@ EXTRA_TARGET_FLAGS = \
          $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
         'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \
         'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
-       'GCJ=$$(GCJ_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
         'GFORTRAN=$$(GFORTRAN_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
         'GOC=$$(GOC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
         'GOCFLAGS=$$(GOCFLAGS_FOR_TARGET)' \
@@ -1148,6 +1150,7 @@ all-stage[+id+]-[+prefix+][+module+]: configure-stage[+id+]-[+prefix+][+module+]
         [+exports+][+ IF prev +] \
         [+poststage1_exports+][+ ENDIF prev +] [+extra_exports+] \
         cd [+subdir+]/[+module+] && \
+       [+autoprofile+] \
         $(MAKE) $(BASE_FLAGS_TO_PASS)[+ IF prefix +] \
                 CFLAGS="$(CFLAGS_FOR_TARGET)" \
                 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
@@ -1161,7 +1164,7 @@ all-stage[+id+]-[+prefix+][+module+]: configure-stage[+id+]-[+prefix+][+module+]
                 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
                 [+args+] [+IF prev +][+poststage1_args+][+ ELSE prev +] \
                 [+stage1_args+][+ ENDIF prev +] [+extra_make_flags+] \
-               TFLAGS="$(STAGE[+id+]_TFLAGS)" \
+               TFLAGS="$(STAGE[+id+]_TFLAGS)" [+profile_data+] \
                 $(TARGET-stage[+id+]-[+prefix+][+module+])
  
  maybe-clean-stage[+id+]-[+prefix+][+module+]: clean-stage[+id+]-[+prefix+][+module+]
diff --git a/configure b/configure

index f6d12b8721ca5dd18f9d8d75f887cae6e0050e87..be9dd89d9bf5355d42f6d40fa74415a2d866f429 100755 (executable)
--- a/configure
+++ b/configure
@@ -583,7 +583,6 @@ AS_FOR_TARGET
  AR_FOR_TARGET
  GOC_FOR_TARGET
  GFORTRAN_FOR_TARGET
-GCJ_FOR_TARGET
  GCC_FOR_TARGET
  CXX_FOR_TARGET
  CC_FOR_TARGET
@@ -616,7 +615,6 @@ LD_FOR_BUILD
  LDFLAGS_FOR_BUILD
  GOC_FOR_BUILD
  GFORTRAN_FOR_BUILD
-GCJ_FOR_BUILD
  DLLTOOL_FOR_BUILD
  CXX_FOR_BUILD
  CXXFLAGS_FOR_BUILD
@@ -674,7 +672,6 @@ CPPFLAGS
  LDFLAGS
  CFLAGS
  CC
-EXTRA_CONFIGARGS_LIBJAVA
  extra_liboffloadmic_configure_flags
  target_subdir
  host_subdir
@@ -761,7 +758,6 @@ enable_libada
  enable_libssp
  enable_libstdcxx
  enable_liboffloadmic
-enable_static_libjava
  enable_bootstrap
  with_mpc
  with_mpc_include
@@ -787,6 +783,9 @@ enable_linker_plugin_configure_flags
  enable_linker_plugin_flags
  enable_stage1_languages
  enable_objc_gc
+with_target_bdw_gc
+with_target_bdw_gc_include
+with_target_bdw_gc_lib
  with_build_sysroot
  with_debug_prefix_map
  with_build_config
@@ -828,7 +827,6 @@ READELF
  CC_FOR_TARGET
  CXX_FOR_TARGET
  GCC_FOR_TARGET
-GCJ_FOR_TARGET
  GFORTRAN_FOR_TARGET
  GOC_FOR_TARGET
  AR_FOR_TARGET
@@ -1489,8 +1487,6 @@ Optional Features:
    --disable-libstdcxx     do not build libstdc++-v3 directory
    --enable-liboffloadmic=ARG
                            build liboffloadmic [ARG={no,host,target}]
-  --enable-static-libjava[=ARG]
-                          build static libjava [default=no]
    --enable-bootstrap      enable bootstrapping [yes if native build]
    --disable-isl-version-check
                            disable check for isl version
@@ -1556,6 +1552,16 @@ Optional Packages:
                            --with-isl-lib=PATH/lib
    --with-isl-include=PATH Specify directory for installed isl include files
    --with-isl-lib=PATH     Specify the directory for the installed isl library
+  --with-target-bdw-gc=PATHLIST
+                          specify prefix directory for installed bdw-gc
+                          package. Equivalent to
+                          --with-target-bdw-gc-include=PATH/include plus
+                          --with-target-bdw-gc-lib=PATH/lib
+  --with-target-bdw-gc-include=PATHLIST
+                          specify directories for installed bdw-gc include
+                          files
+  --with-target-bdw-gc-lib=PATHLIST
+                          specify directories for installed bdw-gc library
    --with-build-sysroot=SYSROOT
                            use sysroot as the system root during the build
    --with-debug-prefix-map='A=B C=D ...'
@@ -1600,8 +1606,6 @@ Some influential environment variables:
                CXX for the target
    GCC_FOR_TARGET
                GCC for the target
-  GCJ_FOR_TARGET
-              GCJ for the target
    GFORTRAN_FOR_TARGET
                GFORTRAN for the target
    GOC_FOR_TARGET
@@ -2736,11 +2740,6 @@ host_libs="intl libiberty opcodes bfd readline tcl tk itcl libgui zlib libbacktr
  # If --enable-gold is used, "gold" may replace "ld".
  host_tools="texinfo flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof etc expect dejagnu m4 utils guile fastjar gnattools libcc1 gotools"
  
-# libgcj represents the runtime libraries only used by gcj.
-libgcj="target-libffi \
-       target-zlib \
-       target-libjava"
-
  # these libraries are built for the target environment, and are built after
  # the host libraries and the host tools (which may be a cross compiler)
  # Note that libiberty is not a target library.
@@ -2760,8 +2759,7 @@ target_libraries="target-libgcc \
                 target-libssp \
                 target-libquadmath \
                 target-libgfortran \
-               target-boehm-gc \
-               ${libgcj} \
+               target-libffi \
                 target-libobjc \
                 target-libada \
                 target-libgo"
@@ -3148,43 +3146,6 @@ fi
  
  
  
-# Save it here so that, even in case of --enable-libgcj, if the Java
-# front-end isn't enabled, we still get libgcj disabled.
-libgcj_saved=$libgcj
-case $enable_libgcj in
-yes)
-  # If we reset it here, it won't get added to noconfigdirs in the
-  # target-specific build rules, so it will be forcibly enabled
-  # (unless the Java language itself isn't enabled).
-  libgcj=
-  ;;
-no)
-  # Make sure we get it printed in the list of not supported target libs.
-  # Don't disable libffi, though, other languages use it.
-  noconfigdirs="$noconfigdirs `echo ${libgcj} | sed -e 's/target-libffi//'`"
-  # Clear libgcj_saved so that even if java is enabled libffi won't be
-  # built.
-  libgcj_saved=
-  ;;
-esac
-
-# Check whether --enable-static-libjava was given.
-if test "${enable_static_libjava+set}" = set; then :
-  enableval=$enable_static_libjava; ENABLE_STATIC_LIBJAVA=$enableval
-else
-  ENABLE_STATIC_LIBJAVA=no
-fi
-
-enable_static_libjava=
-if test "${ENABLE_STATIC_LIBJAVA}" = "yes" ; then
-  enable_static_libjava=yes
-fi
-
-if test x$enable_static_libjava != xyes ; then
-  EXTRA_CONFIGARGS_LIBJAVA=--disable-static
-fi
-
-
  # Enable libgomp by default on hosted POSIX systems, and a few others.
  if test x$enable_libgomp = x ; then
      case "${target}" in
@@ -3402,62 +3363,7 @@ case "${target}" in
      ;;
  esac
  
-# Disable Java if libffi is not supported.
-case "${target}" in
-  aarch64-*-*)
-    ;;
-  alpha*-*-*)
-    ;;
-  arm*-*-*)
-    ;;
-  cris-*-*)
-    ;;
-  frv-*-*)
-    ;;
-  hppa*-*-linux*)
-    ;;
-  hppa*-*-hpux*)
-    ;;
-  i?86-*-*)
-    ;;
-  ia64*-*-*)
-    ;;
-  m32r*-*-*)
-    ;;
-  m68k-*-*)
-    ;;
-  mips*-*-rtems*)
-    ;;
-  mips*-*-linux*)
-    ;;
-  powerpc*-*-linux*)
-    ;;
-  powerpc-*-darwin*)
-    ;;
-  powerpc-*-aix* | rs6000-*-aix*)
-    ;;
-  powerpc-*-freebsd*)
-    ;;
-  powerpc64-*-freebsd*)
-    ;;
-  powerpc*-*-rtems*)
-    ;;
-  s390-*-* | s390x-*-*)
-    ;;
-  sh-*-* | sh[34]*-*-*)
-    ;;
-  sh64-*-* | sh5*-*-*)
-    ;;
-  sparc*-*-*)
-    ;;
-  x86_64-*-*)
-    ;;
-  *-*-*)
-    unsupported_languages="$unsupported_languages java"
-    ;;
-esac
-
-# Disable Java, libgcj or related libraries for some systems.
+# Disable libffi for some systems.
  case "${target}" in
    powerpc-*-darwin*)
      ;;
@@ -3466,90 +3372,84 @@ case "${target}" in
    x86_64-*-darwin[912]*)
      ;;
    *-*-darwin*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libffi"
      ;;
    *-*-netware*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libffi"
+    ;;
+  *-*-phoenix*)
+    noconfigdirs="$noconfigdirs target-libffi"
      ;;
    *-*-rtems*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libffi"
      ;;
    *-*-tpf*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libffi"
      ;;
    *-*-uclinux*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libffi"
      ;;
    *-*-vxworks*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libffi"
+    ;;
+  aarch64*-*-freebsd*)
+    noconfigdirs="$noconfigdirs target-libffi"
      ;;
    alpha*-*-*vms*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libffi"
      ;;
    arm*-*-freebsd*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libffi"
      ;;
    arm-wince-pe)
-    noconfigdirs="$noconfigdirs ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libffi"
      ;;
    arm*-*-symbianelf*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
-    ;;
-  bfin-*-*)
-    noconfigdirs="$noconfigdirs target-boehm-gc"
+    noconfigdirs="$noconfigdirs target-libffi"
      ;;
    cris-*-* | crisv32-*-*)
-    unsupported_languages="$unsupported_languages java"
      case "${target}" in
        *-*-linux*)
         ;;
        *) # See PR46792 regarding target-libffi.
-       noconfigdirs="$noconfigdirs target-libffi target-boehm-gc";;
+       noconfigdirs="$noconfigdirs target-libffi";;
      esac
      ;;
-  hppa*64*-*-linux*)
-    # In this case, it's because the hppa64-linux target is for
-    # the kernel only at this point and has no libc, and thus no
-    # headers, crt*.o, etc., all of which are needed by these.
-    unsupported_languages="$unsupported_languages java"
-    ;;
    hppa*64*-*-hpux*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libffi"
      ;;
    hppa*-hp-hpux11*)
      ;;
    hppa*-*-hpux*)
-    # According to Alexandre Oliva <aoliva@redhat.com>, libjava won't
-    # build on HP-UX 10.20.
-    noconfigdirs="$noconfigdirs ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libffi"
      ;;
    ia64*-*-*vms*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libffi"
      ;;
    i[3456789]86-w64-mingw*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libffi"
      ;;
    i[3456789]86-*-mingw*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libffi"
      ;;
    x86_64-*-mingw*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libffi"
      ;;
    mmix-*-*)
-    noconfigdirs="$noconfigdirs target-libffi target-boehm-gc"
+    noconfigdirs="$noconfigdirs target-libffi"
      ;;
    powerpc-*-aix*)
      # copied from rs6000-*-* entry
-    noconfigdirs="$noconfigdirs ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libffi"
      ;;
    rs6000-*-aix*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libffi"
      ;;
    ft32-*-*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libffi"
      ;;
    *-*-lynxos*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libffi"
      ;;
  esac
  
@@ -3727,6 +3627,9 @@ case "${target}" in
      ;;
    *-*-netware*)
      ;;
+  *-*-phoenix*)
+    noconfigdirs="$noconfigdirs target-libgloss"
+    ;;
    *-*-rtems*)
      noconfigdirs="$noconfigdirs target-libgloss"
      # this is not caught below because this stanza matches earlier
@@ -3758,8 +3661,8 @@ case "${target}" in
    sh*-*-pe|mips*-*-pe|*arm-wince-pe)
      noconfigdirs="$noconfigdirs tcl tk itcl libgui sim"
      ;;
-  arc-*-*|arceb-*-*)
-    noconfigdirs="$noconfigdirs target-libgloss"
+  arc*-*-*)
+    noconfigdirs="$noconfigdirs sim"
      ;;
    arm-*-pe*)
      noconfigdirs="$noconfigdirs target-libgloss"
@@ -3767,8 +3670,6 @@ case "${target}" in
    arm-*-riscix*)
      noconfigdirs="$noconfigdirs ld target-libgloss"
      ;;
-  avr-*-rtems*)
-    ;;
    avr-*-*)
      if test x${with_avrlibc} != xno; then
        noconfigdirs="$noconfigdirs target-newlib target-libgloss"
@@ -3943,7 +3844,7 @@ case "${target}" in
    or1k*-*-*)
      noconfigdirs="$noconfigdirs gdb"
      ;;
-  sh-*-* | sh64-*-*)
+  sh-*-*)
      case "${target}" in
        sh*-*-elf)
           ;;
@@ -3959,12 +3860,9 @@ case "${target}" in
    tic6x-*-*)
      noconfigdirs="$noconfigdirs sim"
      ;;
-  tilegx*-*-*)
+  tilepro*-*-* | tilegx*-*-*)
      noconfigdirs="$noconfigdirs sim"
      ;;
-  tilepro*-*-*)
-    noconfigdirs="$noconfigdirs gdb sim"
-    ;;
    v810-*-*)
      noconfigdirs="$noconfigdirs bfd binutils gas gdb ld opcodes target-libgloss"
      ;;
@@ -4042,7 +3940,6 @@ if test "${build}" != "${host}" ; then
    AS_FOR_BUILD=${AS_FOR_BUILD-as}
    CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
    CXX_FOR_BUILD=${CXX_FOR_BUILD-g++}
-  GCJ_FOR_BUILD=${GCJ_FOR_BUILD-gcj}
    GFORTRAN_FOR_BUILD=${GFORTRAN_FOR_BUILD-gfortran}
    GOC_FOR_BUILD=${GOC_FOR_BUILD-gccgo}
    DLLTOOL_FOR_BUILD=${DLLTOOL_FOR_BUILD-dlltool}
@@ -4056,7 +3953,6 @@ else
    AS_FOR_BUILD="\$(AS)"
    CC_FOR_BUILD="\$(CC)"
    CXX_FOR_BUILD="\$(CXX)"
-  GCJ_FOR_BUILD="\$(GCJ)"
    GFORTRAN_FOR_BUILD="\$(GFORTRAN)"
    GOC_FOR_BUILD="\$(GOC)"
    DLLTOOL_FOR_BUILD="\$(DLLTOOL)"
@@ -5571,15 +5467,12 @@ if test "x$with_mpfr_lib" != x; then
  fi
  if test "x$with_mpfr$with_mpfr_include$with_mpfr_lib" = x && test -d ${srcdir}/mpfr; then
    # MPFR v3.1.0 moved the sources into a src sub-directory.
-  if test -d ${srcdir}/mpfr/src; then
-    gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/src/'"$lt_cv_objdir $gmplibs"
-    gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr/src -I$$s/mpfr/src '"$gmpinc"
-    extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr/src --with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr/src/'"$lt_cv_objdir"
-  else
-    gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir $gmplibs"
-    gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr -I$$s/mpfr '"$gmpinc"
-    extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr --with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir"
+  if ! test -d ${srcdir}/mpfr/src; then
+    as_fn_error "Building GCC with MPFR in the source tree is only handled for MPFR 3.1.0+." "$LINENO" 5
    fi
+  gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/src/'"$lt_cv_objdir $gmplibs"
+  gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr/src -I$$s/mpfr/src '"$gmpinc"
+  extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr/src --with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr/src/'"$lt_cv_objdir"
    # Do not test the mpfr version.  Assume that it is sufficient, since
    # it is in the source tree, and the library has not been built yet
    # but it would be included on the link line in the version check below
@@ -6511,25 +6404,44 @@ done
  # Check for Boehm's garbage collector
  # Check whether --enable-objc-gc was given.
  if test "${enable_objc_gc+set}" = set; then :
-  enableval=$enable_objc_gc; case ,${enable_languages},:${enable_objc_gc}:${noconfigdirs} in
-  *,objc,*:*:yes:*target-boehm-gc*)
-    as_fn_error "Boehm's garbage collector was requested yet not supported in this configuration" "$LINENO" 5
-    ;;
-esac
+  enableval=$enable_objc_gc;
  fi
  
  
-# Make sure we only build Boehm's garbage collector if required.
-case ,${enable_languages},:${enable_objc_gc} in
-  *,objc,*:yes)
-    # Keep target-boehm-gc if requested for Objective-C.
-    ;;
-  *)
-    # Otherwise remove target-boehm-gc depending on target-libjava.
-    if echo " ${noconfigdirs} " | grep "target-libjava" >/dev/null 2>&1; then
-      noconfigdirs="$noconfigdirs target-boehm-gc"
+# Check whether --with-target-bdw-gc was given.
+if test "${with_target_bdw_gc+set}" = set; then :
+  withval=$with_target_bdw_gc;
+fi
+
+
+# Check whether --with-target-bdw-gc-include was given.
+if test "${with_target_bdw_gc_include+set}" = set; then :
+  withval=$with_target_bdw_gc_include;
+fi
+
+
+# Check whether --with-target-bdw-gc-lib was given.
+if test "${with_target_bdw_gc_lib+set}" = set; then :
+  withval=$with_target_bdw_gc_lib;
+fi
+
+
+case ,${enable_languages},:${enable_objc_gc} in *,objc,*:yes|*,objc,*:auto)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bdw garbage collector" >&5
+$as_echo_n "checking for bdw garbage collector... " >&6; }
+  if test "x$with_target_bdw_gc$with_target_bdw_gc_include$with_target_bdw_gc_lib" = x; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: using bdw-gc in default locations" >&5
+$as_echo "using bdw-gc in default locations" >&6; }
+  else
+        if test "x$with_target_bdw_gc_include" = x && test "x$with_target_bdw_gc_lib" != x; then
+      as_fn_error "found --with-target-bdw-gc-lib but --with-target-bdw-gc-include missing" "$LINENO" 5
+    elif test "x$with_target_bdw_gc_include" != x && test "x$with_target_bdw_gc_lib" = x; then
+      as_fn_error "found --with-target-bdw-gc-include but --with-target-bdw-gc-lib missing" "$LINENO" 5
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: using paths configured with --with-target-bdw-gc options" >&5
+$as_echo "using paths configured with --with-target-bdw-gc options" >&6; }
      fi
-    ;;
+  fi
  esac
  
  # Disable libcilkrts, libitm, libsanitizer, libvtv, liboffloadmic if we're not building C++
@@ -6616,15 +6528,6 @@ for i in ${target_configdirs_all} ; do
    fi
  done
  
-# Exclude target-zlib if target-libjava isn't built.
-case ${target_configdirs} in
-*target-libjava*)
-  ;;
-*)
-  target_configdirs="`echo ${target_configdirs} | sed -e 's/target-zlib//'`"
-  ;;
-esac
-
  # libiberty-linker-plugin is special: it doesn't have its own source directory,
  # so we have to add it after the preceding checks.
  if test x"$extra_linker_plugin_flags$extra_linker_plugin_configure_flags" != x
@@ -7154,9 +7057,14 @@ if echo " ${target_configdirs} " | grep " libvtv " > /dev/null 2>&1 &&
    bootstrap_target_libs=${bootstrap_target_libs}target-libvtv,
  fi
  
-# If we are building libmpx, bootstrap it.
+# If we are building libmpx and $BUILD_CONFIG contains bootstrap-mpx,
+# bootstrap it.
  if echo " ${target_configdirs} " | grep " libmpx " > /dev/null 2>&1; then
-  bootstrap_target_libs=${bootstrap_target_libs}target-libmpx,
+  case "$BUILD_CONFIG" in
+    *bootstrap-mpx* )
+      bootstrap_target_libs=${bootstrap_target_libs}target-libmpx,
+      ;;
+  esac
  fi
  
  # Determine whether gdb needs tk/tcl or not.
@@ -7709,7 +7617,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.
@@ -10442,167 +10349,6 @@ fi
  
  
  
-if test -n "$GCJ_FOR_TARGET"; then
-  ac_cv_prog_GCJ_FOR_TARGET=$GCJ_FOR_TARGET
-elif test -n "$ac_cv_prog_GCJ_FOR_TARGET"; then
-  GCJ_FOR_TARGET=$ac_cv_prog_GCJ_FOR_TARGET
-fi
-
-if test -n "$ac_cv_prog_GCJ_FOR_TARGET"; then
-  for ncn_progname in gcj; 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 test "${ac_cv_prog_GCJ_FOR_TARGET+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$GCJ_FOR_TARGET"; then
-  ac_cv_prog_GCJ_FOR_TARGET="$GCJ_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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_GCJ_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
-GCJ_FOR_TARGET=$ac_cv_prog_GCJ_FOR_TARGET
-if test -n "$GCJ_FOR_TARGET"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCJ_FOR_TARGET" >&5
-$as_echo "$GCJ_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_GCJ_FOR_TARGET" && test -n "$with_build_time_tools"; then
-  for ncn_progname in gcj; 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_GCJ_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_GCJ_FOR_TARGET"; then
-  for ncn_progname in gcj; 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 test "${ac_cv_prog_GCJ_FOR_TARGET+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$GCJ_FOR_TARGET"; then
-  ac_cv_prog_GCJ_FOR_TARGET="$GCJ_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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_GCJ_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
-GCJ_FOR_TARGET=$ac_cv_prog_GCJ_FOR_TARGET
-if test -n "$GCJ_FOR_TARGET"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCJ_FOR_TARGET" >&5
-$as_echo "$GCJ_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_GCJ_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 test "${ac_cv_prog_GCJ_FOR_TARGET+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$GCJ_FOR_TARGET"; then
-  ac_cv_prog_GCJ_FOR_TARGET="$GCJ_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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_GCJ_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
-GCJ_FOR_TARGET=$ac_cv_prog_GCJ_FOR_TARGET
-if test -n "$GCJ_FOR_TARGET"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCJ_FOR_TARGET" >&5
-$as_echo "$GCJ_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_GCJ_FOR_TARGET" && break
-  done
-fi
-
-if test -z "$ac_cv_prog_GCJ_FOR_TARGET" ; then
-  set dummy gcj
-  if test $build = $target ; then
-    GCJ_FOR_TARGET="$2"
-  else
-    GCJ_FOR_TARGET="${ncn_target_tool_prefix}$2"
-  fi
-else
-  GCJ_FOR_TARGET="$ac_cv_prog_GCJ_FOR_TARGET"
-fi
-
-
-
  if test -n "$GFORTRAN_FOR_TARGET"; then
    ac_cv_prog_GFORTRAN_FOR_TARGET=$GFORTRAN_FOR_TARGET
  elif test -n "$ac_cv_prog_GFORTRAN_FOR_TARGET"; then
@@ -14231,51 +13977,6 @@ $as_echo "pre-installed" >&6; }
    fi
  fi
  
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking where to find the target gcj" >&5
-$as_echo_n "checking where to find the target gcj... " >&6; }
-if test "x${build}" != "x${host}" ; then
-  if expr "x$GCJ_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    ac_dir=`dirname $GCJ_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
-    *,java,*) ;;
-    *) ok=no ;;
-  esac
-  if test $ok = yes; then
-    # An in-tree tool is available and we can use it
-    GCJ_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/gcj -B$$r/$(HOST_SUBDIR)/gcc/'
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: just compiled" >&5
-$as_echo "just compiled" >&6; }
-  elif expr "x$GCJ_FOR_TARGET" : "x/" > /dev/null; then
-    # We already found the complete path
-    ac_dir=`dirname $GCJ_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
-    GCJ_FOR_TARGET='$(GCJ)'
-    { $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 gfortran" >&5
  $as_echo_n "checking where to find the target gfortran... " >&6; }
  if test "x${build}" != "x${host}" ; then
@@ -14850,16 +14551,17 @@ else
    # For --disable-checking or implicit --enable-checking=release, avoid
    # setting --enable-checking=gc in the default stage1 checking for LTO
    # bootstraps.  See PR62077.
-  stage1_checking=--enable-checking=release,misc,gimple,rtlflag,tree,types
    case $BUILD_CONFIG in
      *lto*)
-      if test "x$enable_checking" = x && \
-        test -d ${srcdir}/gcc && \
-        test x"`cat ${srcdir}/gcc/DEV-PHASE`" = xexperimental; then
-       stage1_checking=--enable-checking=yes,types
-      fi;;
-    *) stage1_checking=--enable-checking=yes,types;;
+      stage1_checking=--enable-checking=release,misc,gimple,rtlflag,tree,types;;
+    *)
+      stage1_checking=--enable-checking=yes,types;;
    esac
+  if test "x$enable_checking" = x && \
+     test -d ${srcdir}/gcc && \
+     test x"`cat ${srcdir}/gcc/DEV-PHASE`" = xexperimental; then
+    stage1_checking=--enable-checking=yes,types,extra
+  fi
  else
    stage1_checking=--enable-checking=$enable_checking,types
  fi
diff --git a/configure.ac b/configure.ac

index 3ec86c19df7d8d8cb64b557018ea3fc77b822436..532c5c27f9b9e3c0adc9bbb1eea50164f68bb730 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
  #   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
-#   2014, 2015, 2016 Free Software Foundation, Inc.
+#   2014, 2015, 2016, 2017 Free Software Foundation, Inc.
  #
  # 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
@@ -142,11 +142,6 @@ host_libs="intl libiberty opcodes bfd readline tcl tk itcl libgui zlib libbacktr
  # If --enable-gold is used, "gold" may replace "ld".
  host_tools="texinfo flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof etc expect dejagnu m4 utils guile fastjar gnattools libcc1 gotools"
  
-# libgcj represents the runtime libraries only used by gcj.
-libgcj="target-libffi \
-       target-zlib \
-       target-libjava"
-
  # these libraries are built for the target environment, and are built after
  # the host libraries and the host tools (which may be a cross compiler)
  # Note that libiberty is not a target library.
@@ -166,8 +161,7 @@ target_libraries="target-libgcc \
                 target-libssp \
                 target-libquadmath \
                 target-libgfortran \
-               target-boehm-gc \
-               ${libgcj} \
+               target-libffi \
                 target-libobjc \
                 target-libada \
                 target-libgo"
@@ -507,41 +501,6 @@ else
  fi])
  AC_SUBST(extra_liboffloadmic_configure_flags)
  
-# Save it here so that, even in case of --enable-libgcj, if the Java
-# front-end isn't enabled, we still get libgcj disabled.
-libgcj_saved=$libgcj
-case $enable_libgcj in
-yes)
-  # If we reset it here, it won't get added to noconfigdirs in the
-  # target-specific build rules, so it will be forcibly enabled
-  # (unless the Java language itself isn't enabled).
-  libgcj=
-  ;;
-no)
-  # Make sure we get it printed in the list of not supported target libs.
-  # Don't disable libffi, though, other languages use it.
-  noconfigdirs="$noconfigdirs `echo ${libgcj} | sed -e 's/target-libffi//'`"
-  # Clear libgcj_saved so that even if java is enabled libffi won't be
-  # built.
-  libgcj_saved=
-  ;;
-esac
-
-AC_ARG_ENABLE(static-libjava,
-[AS_HELP_STRING([[--enable-static-libjava[=ARG]]],
-               [build static libjava @<:@default=no@:>@])],
-ENABLE_STATIC_LIBJAVA=$enableval,
-ENABLE_STATIC_LIBJAVA=no)
-enable_static_libjava=
-if test "${ENABLE_STATIC_LIBJAVA}" = "yes" ; then
-  enable_static_libjava=yes
-fi
-
-if test x$enable_static_libjava != xyes ; then
-  EXTRA_CONFIGARGS_LIBJAVA=--disable-static
-fi
-AC_SUBST(EXTRA_CONFIGARGS_LIBJAVA)
-
  # Enable libgomp by default on hosted POSIX systems, and a few others.
  if test x$enable_libgomp = x ; then
      case "${target}" in
@@ -738,62 +697,7 @@ case "${target}" in
      ;;
  esac
  
-# Disable Java if libffi is not supported.
-case "${target}" in
-  aarch64-*-*)
-    ;;
-  alpha*-*-*)
-    ;;
-  arm*-*-*)
-    ;;
-  cris-*-*)
-    ;;
-  frv-*-*)
-    ;;
-  hppa*-*-linux*)
-    ;;
-  hppa*-*-hpux*)
-    ;;
-  i?86-*-*)
-    ;;
-  ia64*-*-*)
-    ;;
-  m32r*-*-*)
-    ;;
-  m68k-*-*)
-    ;;
-  mips*-*-rtems*)
-    ;;
-  mips*-*-linux*)
-    ;;
-  powerpc*-*-linux*)
-    ;;
-  powerpc-*-darwin*)
-    ;;
-  powerpc-*-aix* | rs6000-*-aix*)
-    ;;
-  powerpc-*-freebsd*)
-    ;;
-  powerpc64-*-freebsd*)
-    ;;
-  powerpc*-*-rtems*)
-    ;;
-  s390-*-* | s390x-*-*)
-    ;;
-  sh-*-* | sh[[34]]*-*-*)
-    ;;
-  sh64-*-* | sh5*-*-*)
-    ;;
-  sparc*-*-*)
-    ;;
-  x86_64-*-*)
-    ;;
-  *-*-*)
-    unsupported_languages="$unsupported_languages java"
-    ;;
-esac
-
-# Disable Java, libgcj or related libraries for some systems.
+# Disable libffi for some systems.
  case "${target}" in
    powerpc-*-darwin*)
      ;;
@@ -802,90 +706,84 @@ case "${target}" in
    x86_64-*-darwin[[912]]*)
      ;;
    *-*-darwin*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libffi"
      ;;
    *-*-netware*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libffi"
+    ;;
+  *-*-phoenix*)
+    noconfigdirs="$noconfigdirs target-libffi"
      ;;
    *-*-rtems*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libffi"
      ;;
    *-*-tpf*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libffi"
      ;;
    *-*-uclinux*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libffi"
      ;;
    *-*-vxworks*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libffi"
+    ;;
+  aarch64*-*-freebsd*)
+    noconfigdirs="$noconfigdirs target-libffi"
      ;;
    alpha*-*-*vms*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libffi"
      ;;
    arm*-*-freebsd*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libffi"
      ;;
    arm-wince-pe)
-    noconfigdirs="$noconfigdirs ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libffi"
      ;;
    arm*-*-symbianelf*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
-    ;;
-  bfin-*-*)
-    noconfigdirs="$noconfigdirs target-boehm-gc"
+    noconfigdirs="$noconfigdirs target-libffi"
      ;;
    cris-*-* | crisv32-*-*)
-    unsupported_languages="$unsupported_languages java"
      case "${target}" in
        *-*-linux*)
         ;;
        *) # See PR46792 regarding target-libffi.
-       noconfigdirs="$noconfigdirs target-libffi target-boehm-gc";;
+       noconfigdirs="$noconfigdirs target-libffi";;
      esac
      ;;
-  hppa*64*-*-linux*)
-    # In this case, it's because the hppa64-linux target is for
-    # the kernel only at this point and has no libc, and thus no
-    # headers, crt*.o, etc., all of which are needed by these.
-    unsupported_languages="$unsupported_languages java"
-    ;;
    hppa*64*-*-hpux*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libffi"
      ;;
    hppa*-hp-hpux11*)
      ;;
    hppa*-*-hpux*)
-    # According to Alexandre Oliva <aoliva@redhat.com>, libjava won't
-    # build on HP-UX 10.20.
-    noconfigdirs="$noconfigdirs ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libffi"
      ;;
    ia64*-*-*vms*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libffi"
      ;;
    i[[3456789]]86-w64-mingw*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libffi"
      ;;
    i[[3456789]]86-*-mingw*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libffi"
      ;;
    x86_64-*-mingw*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libffi"
      ;;
    mmix-*-*)
-    noconfigdirs="$noconfigdirs target-libffi target-boehm-gc"
+    noconfigdirs="$noconfigdirs target-libffi"
      ;;
    powerpc-*-aix*)
      # copied from rs6000-*-* entry
-    noconfigdirs="$noconfigdirs ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libffi"
      ;;
    rs6000-*-aix*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libffi"
      ;;
    ft32-*-*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libffi"
      ;;
    *-*-lynxos*)
-    noconfigdirs="$noconfigdirs ${libgcj}"
+    noconfigdirs="$noconfigdirs target-libffi"
      ;;
  esac
  
@@ -1063,6 +961,9 @@ case "${target}" in
      ;;
    *-*-netware*)
      ;;
+  *-*-phoenix*)
+    noconfigdirs="$noconfigdirs target-libgloss"
+    ;;
    *-*-rtems*)
      noconfigdirs="$noconfigdirs target-libgloss"
      # this is not caught below because this stanza matches earlier
@@ -1094,8 +995,8 @@ case "${target}" in
    sh*-*-pe|mips*-*-pe|*arm-wince-pe)
      noconfigdirs="$noconfigdirs tcl tk itcl libgui sim"
      ;;
-  arc-*-*|arceb-*-*)
-    noconfigdirs="$noconfigdirs target-libgloss"
+  arc*-*-*)
+    noconfigdirs="$noconfigdirs sim"
      ;;
    arm-*-pe*)
      noconfigdirs="$noconfigdirs target-libgloss"
@@ -1103,8 +1004,6 @@ case "${target}" in
    arm-*-riscix*)
      noconfigdirs="$noconfigdirs ld target-libgloss"
      ;;
-  avr-*-rtems*)
-    ;;
    avr-*-*)
      if test x${with_avrlibc} != xno; then
        noconfigdirs="$noconfigdirs target-newlib target-libgloss"
@@ -1279,7 +1178,7 @@ case "${target}" in
    or1k*-*-*)
      noconfigdirs="$noconfigdirs gdb"
      ;;
-  sh-*-* | sh64-*-*)
+  sh-*-*)
      case "${target}" in
        sh*-*-elf)
           ;;
@@ -1295,12 +1194,9 @@ case "${target}" in
    tic6x-*-*)
      noconfigdirs="$noconfigdirs sim"
      ;;
-  tilegx*-*-*)
+  tilepro*-*-* | tilegx*-*-*)
      noconfigdirs="$noconfigdirs sim"
      ;;
-  tilepro*-*-*)
-    noconfigdirs="$noconfigdirs gdb sim"
-    ;;
    v810-*-*)
      noconfigdirs="$noconfigdirs bfd binutils gas gdb ld opcodes target-libgloss"
      ;;
@@ -1359,7 +1255,6 @@ if test "${build}" != "${host}" ; then
    AS_FOR_BUILD=${AS_FOR_BUILD-as}
    CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
    CXX_FOR_BUILD=${CXX_FOR_BUILD-g++}
-  GCJ_FOR_BUILD=${GCJ_FOR_BUILD-gcj}
    GFORTRAN_FOR_BUILD=${GFORTRAN_FOR_BUILD-gfortran}
    GOC_FOR_BUILD=${GOC_FOR_BUILD-gccgo}
    DLLTOOL_FOR_BUILD=${DLLTOOL_FOR_BUILD-dlltool}
@@ -1373,7 +1268,6 @@ else
    AS_FOR_BUILD="\$(AS)"
    CC_FOR_BUILD="\$(CC)"
    CXX_FOR_BUILD="\$(CXX)"
-  GCJ_FOR_BUILD="\$(GCJ)"
    GFORTRAN_FOR_BUILD="\$(GFORTRAN)"
    GOC_FOR_BUILD="\$(GOC)"
    DLLTOOL_FOR_BUILD="\$(DLLTOOL)"
@@ -1551,15 +1445,13 @@ if test "x$with_mpfr_lib" != x; then
  fi
  if test "x$with_mpfr$with_mpfr_include$with_mpfr_lib" = x && test -d ${srcdir}/mpfr; then
    # MPFR v3.1.0 moved the sources into a src sub-directory.
-  if test -d ${srcdir}/mpfr/src; then
-    gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/src/'"$lt_cv_objdir $gmplibs"
-    gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr/src -I$$s/mpfr/src '"$gmpinc"
-    extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr/src --with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr/src/'"$lt_cv_objdir"
-  else
-    gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir $gmplibs"
-    gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr -I$$s/mpfr '"$gmpinc"
-    extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr --with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr/'"$lt_cv_objdir"
+  if ! test -d ${srcdir}/mpfr/src; then
+    AC_MSG_ERROR([dnl
+Building GCC with MPFR in the source tree is only handled for MPFR 3.1.0+.])
    fi
+  gmplibs='-L$$r/$(HOST_SUBDIR)/mpfr/src/'"$lt_cv_objdir $gmplibs"
+  gmpinc='-I$$r/$(HOST_SUBDIR)/mpfr/src -I$$s/mpfr/src '"$gmpinc"
+  extra_mpc_mpfr_configure_flags='--with-mpfr-include=$$s/mpfr/src --with-mpfr-lib=$$r/$(HOST_SUBDIR)/mpfr/src/'"$lt_cv_objdir"
    # Do not test the mpfr version.  Assume that it is sufficient, since
    # it is in the source tree, and the library has not been built yet
    # but it would be included on the link line in the version check below
@@ -2167,24 +2059,34 @@ done
  AC_ARG_ENABLE(objc-gc,
  [AS_HELP_STRING([--enable-objc-gc],
                 [enable use of Boehm's garbage collector with the
-                GNU Objective-C runtime])],
-[case ,${enable_languages},:${enable_objc_gc}:${noconfigdirs} in
-  *,objc,*:*:yes:*target-boehm-gc*)
-    AC_MSG_ERROR([Boehm's garbage collector was requested yet not supported in this configuration])
-    ;;
-esac])
-
-# Make sure we only build Boehm's garbage collector if required.
-case ,${enable_languages},:${enable_objc_gc} in
-  *,objc,*:yes)
-    # Keep target-boehm-gc if requested for Objective-C.
-    ;;
-  *)
-    # Otherwise remove target-boehm-gc depending on target-libjava.
-    if echo " ${noconfigdirs} " | grep "target-libjava" >/dev/null 2>&1; then
-      noconfigdirs="$noconfigdirs target-boehm-gc"
+                GNU Objective-C runtime])])
+AC_ARG_WITH([target-bdw-gc],
+[AS_HELP_STRING([--with-target-bdw-gc=PATHLIST],
+               [specify prefix directory for installed bdw-gc package.
+                Equivalent to --with-target-bdw-gc-include=PATH/include
+                plus --with-target-bdw-gc-lib=PATH/lib])])
+AC_ARG_WITH([target-bdw-gc-include],
+[AS_HELP_STRING([--with-target-bdw-gc-include=PATHLIST],
+               [specify directories for installed bdw-gc include files])])
+AC_ARG_WITH([target-bdw-gc-lib],
+[AS_HELP_STRING([--with-target-bdw-gc-lib=PATHLIST],
+               [specify directories for installed bdw-gc library])])
+                 
+case ,${enable_languages},:${enable_objc_gc} in *,objc,*:yes|*,objc,*:auto)
+  AC_MSG_CHECKING([for bdw garbage collector])
+  if test "x$with_target_bdw_gc$with_target_bdw_gc_include$with_target_bdw_gc_lib" = x; then
+    dnl no bdw-gw options, assume default locations
+    AC_MSG_RESULT([using bdw-gc in default locations])
+  else
+    dnl bdw-gw options, first error checking, complete checking in libobjc
+    if test "x$with_target_bdw_gc_include" = x && test "x$with_target_bdw_gc_lib" != x; then
+      AC_MSG_ERROR([found --with-target-bdw-gc-lib but --with-target-bdw-gc-include missing])
+    elif test "x$with_target_bdw_gc_include" != x && test "x$with_target_bdw_gc_lib" = x; then
+      AC_MSG_ERROR([found --with-target-bdw-gc-include but --with-target-bdw-gc-lib missing])
+    else
+      AC_MSG_RESULT([using paths configured with --with-target-bdw-gc options])
      fi
-    ;;
+  fi
  esac
  
  # Disable libcilkrts, libitm, libsanitizer, libvtv, liboffloadmic if we're not building C++
@@ -2271,15 +2173,6 @@ for i in ${target_configdirs_all} ; do
    fi
  done
  
-# Exclude target-zlib if target-libjava isn't built.
-case ${target_configdirs} in
-*target-libjava*)
-  ;;
-*)
-  target_configdirs="`echo ${target_configdirs} | sed -e 's/target-zlib//'`"
-  ;;
-esac
-
  # libiberty-linker-plugin is special: it doesn't have its own source directory,
  # so we have to add it after the preceding checks.
  if test x"$extra_linker_plugin_flags$extra_linker_plugin_configure_flags" != x
@@ -2750,9 +2643,14 @@ if echo " ${target_configdirs} " | grep " libvtv " > /dev/null 2>&1 &&
    bootstrap_target_libs=${bootstrap_target_libs}target-libvtv,
  fi
  
-# If we are building libmpx, bootstrap it.
+# If we are building libmpx and $BUILD_CONFIG contains bootstrap-mpx,
+# bootstrap it.
  if echo " ${target_configdirs} " | grep " libmpx " > /dev/null 2>&1; then
-  bootstrap_target_libs=${bootstrap_target_libs}target-libmpx,
+  case "$BUILD_CONFIG" in
+    *bootstrap-mpx* )
+      bootstrap_target_libs=${bootstrap_target_libs}target-libmpx,
+      ;;
+  esac
  fi
  
  # Determine whether gdb needs tk/tcl or not.
@@ -3299,7 +3197,6 @@ AC_SUBST(CFLAGS_FOR_BUILD)
  AC_SUBST(CXXFLAGS_FOR_BUILD)
  AC_SUBST(CXX_FOR_BUILD)
  AC_SUBST(DLLTOOL_FOR_BUILD)
-AC_SUBST(GCJ_FOR_BUILD)
  AC_SUBST(GFORTRAN_FOR_BUILD)
  AC_SUBST(GOC_FOR_BUILD)
  AC_SUBST(LDFLAGS_FOR_BUILD)
@@ -3409,7 +3306,6 @@ AC_ARG_WITH([build-time-tools],
  NCN_STRICT_CHECK_TARGET_TOOLS(CC_FOR_TARGET, cc gcc)
  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(GCJ_FOR_TARGET, gcj)
  NCN_STRICT_CHECK_TARGET_TOOLS(GFORTRAN_FOR_TARGET, gfortran)
  NCN_STRICT_CHECK_TARGET_TOOLS(GOC_FOR_TARGET, gccgo)
  
@@ -3441,8 +3337,6 @@ GCC_TARGET_TOOL(c++ for libstdc++, RAW_CXX_FOR_TARGET, CXX,
                 c++)
  GCC_TARGET_TOOL(dlltool, DLLTOOL_FOR_TARGET, DLLTOOL, [binutils/dlltool])
  GCC_TARGET_TOOL(gcc, GCC_FOR_TARGET, , [gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/])
-GCC_TARGET_TOOL(gcj, GCJ_FOR_TARGET, GCJ,
-               [gcc/gcj -B$$r/$(HOST_SUBDIR)/gcc/], java)
  GCC_TARGET_TOOL(gfortran, GFORTRAN_FOR_TARGET, GFORTRAN,
                 [gcc/gfortran -B$$r/$(HOST_SUBDIR)/gcc/], fortran)
  GCC_TARGET_TOOL(gccgo, GOC_FOR_TARGET, GOC,
@@ -3530,16 +3424,17 @@ AC_ARG_ENABLE(stage1-checking,
    # For --disable-checking or implicit --enable-checking=release, avoid
    # setting --enable-checking=gc in the default stage1 checking for LTO
    # bootstraps.  See PR62077.
-  stage1_checking=--enable-checking=release,misc,gimple,rtlflag,tree,types
    case $BUILD_CONFIG in
      *lto*)
-      if test "x$enable_checking" = x && \
-        test -d ${srcdir}/gcc && \
-        test x"`cat ${srcdir}/gcc/DEV-PHASE`" = xexperimental; then
-       stage1_checking=--enable-checking=yes,types
-      fi;;
-    *) stage1_checking=--enable-checking=yes,types;;
+      stage1_checking=--enable-checking=release,misc,gimple,rtlflag,tree,types;;
+    *)
+      stage1_checking=--enable-checking=yes,types;;
    esac
+  if test "x$enable_checking" = x && \
+     test -d ${srcdir}/gcc && \
+     test x"`cat ${srcdir}/gcc/DEV-PHASE`" = xexperimental; then
+    stage1_checking=--enable-checking=yes,types,extra
+  fi
  else
    stage1_checking=--enable-checking=$enable_checking,types
  fi])
author	Nick Clifton <nickc@redhat.com>
	Mon, 23 Jan 2017 11:55:48 +0000 (11:55 +0000)
committer	Nick Clifton <nickc@redhat.com>
	Mon, 23 Jan 2017 11:55:48 +0000 (11:55 +0000)
ChangeLog		patch \| blob \| history
Makefile.def		patch \| blob \| history
Makefile.in		patch \| blob \| history
Makefile.tpl		patch \| blob \| history
configure		patch \| blob \| history
configure.ac		patch \| blob \| history