[haiku-commits] buildtools: btrev43113 - in binutils: opcodes gas/po gas zlib bfd

  • From: jerome.duval@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sun, 28 Feb 2016 16:18:36 +0100 (CET)

btrev43113 adds 3 changesets to branch 'master'
old head: 7af7a81a60786a061b021097f55ca1d585bee801
new head: 661fb7cf18b38506538acdb9288c71dbf1e50ea4
overview: 
http://cgit.haiku-os.org/buildtools/log/?qt=range&q=661fb7cf18b3+%5E7af7a81a6078

----------------------------------------------------------------------------

69285d07c664: import binutils 2.26

b9cfe212c186: Merge binutils 2.26

661fb7cf18b3: gcc4: revert partially 419211519c79edc7af6fca9c6a3233129ec54d7d.
  
  "* LINK_SPEC: Pass "-shared" to the linker only if it was passed to gcc; 
output
        position-independent executables by default;" is reverted to workaround 
a
  link failure on gcc4 with binutils 2.26: add-ons objects would fail to link
  against an executable (being no more a shared object). This is possibly 
temporary
  until the need for executable as shared objects is fully reviewed.

                                   [ Jérôme Duval <jerome.duval@xxxxxxxxx> ]

----------------------------------------------------------------------------

4802 files changed, 384277 insertions(+), 121255 deletions(-)
binutils/ChangeLog                               |   275 +-
binutils/MAINTAINERS                             |     5 +-
binutils/Makefile.def                            |    69 +-
binutils/Makefile.in                             | 20758 ++++++++++-------
binutils/Makefile.tpl                            |   183 +-
binutils/bfd/ChangeLog                           |  6519 +++---
binutils/bfd/ChangeLog-2006                      |     2 +-
binutils/bfd/ChangeLog-2014                      |  3430 +++
binutils/bfd/ChangeLog-9193                      |    16 +-
binutils/bfd/ChangeLog-9495                      |   134 +-
binutils/bfd/MAINTAINERS                         |     2 +-
binutils/bfd/Makefile.am                         |    76 +-
binutils/bfd/Makefile.in                         |   100 +-
binutils/bfd/PORTING                             |     2 +-
binutils/bfd/README                              |     2 +-
binutils/bfd/TODO                                |     2 +-
binutils/bfd/acinclude.m4                        |     8 +-
binutils/bfd/aclocal.m4                          |     1 +
binutils/bfd/aix386-core.c                       |     2 +-
binutils/bfd/aix5ppc-core.c                      |     2 +-
binutils/bfd/aout-adobe.c                        |     3 +-
binutils/bfd/aout-arm.c                          |     2 +-
binutils/bfd/aout-cris.c                         |     2 +-
binutils/bfd/aout-ns32k.c                        |     2 +-
binutils/bfd/aout-sparcle.c                      |     2 +-
binutils/bfd/aout-target.h                       |     6 +-
binutils/bfd/aout-tic30.c                        |     6 +-
binutils/bfd/aout0.c                             |     2 +-
binutils/bfd/aout32.c                            |     2 +-
binutils/bfd/aout64.c                            |     2 +-
binutils/bfd/aoutf1.h                            |     2 +-
binutils/bfd/aoutx.h                             |    18 +-
binutils/bfd/archive.c                           |   116 +-
binutils/bfd/archive64.c                         |     2 +-
binutils/bfd/archures.c                          |    33 +-
binutils/bfd/armnetbsd.c                         |     2 +-
binutils/bfd/bfd-in.h                            |    66 +-
binutils/bfd/bfd-in2.h                           |   405 +-
binutils/bfd/bfd.c                               |   359 +-
binutils/bfd/bfd.m4                              |     6 +-
binutils/bfd/bfdio.c                             |     2 +-
binutils/bfd/bfdwin.c                            |     2 +-
binutils/bfd/binary.c                            |     4 +-
binutils/bfd/bout.c                              |     9 +-
binutils/bfd/cache.c                             |    26 +-
binutils/bfd/cf-i386lynx.c                       |     2 +-
binutils/bfd/cf-sparclynx.c                      |     2 +-
binutils/bfd/cisco-core.c                        |     2 +-
binutils/bfd/coff-alpha.c                        |    26 +-
binutils/bfd/coff-apollo.c                       |     2 +-
binutils/bfd/coff-arm.c                          |    22 +-
binutils/bfd/coff-aux.c                          |     2 +-
binutils/bfd/coff-bfd.c                          |    99 +
binutils/bfd/coff-bfd.h                          |    86 +
binutils/bfd/coff-go32.c                         |     2 +-
binutils/bfd/coff-h8300.c                        |     2 +-
binutils/bfd/coff-h8500.c                        |     2 +-
binutils/bfd/coff-i386.c                         |    13 +-
binutils/bfd/coff-i860.c                         |     2 +-
binutils/bfd/coff-i960.c                         |    40 +-
binutils/bfd/coff-ia64.c                         |     4 +-
binutils/bfd/coff-m68k.c                         |     6 +-
binutils/bfd/coff-m88k.c                         |     2 +-
binutils/bfd/coff-mcore.c                        |     4 +-
binutils/bfd/coff-mips.c                         |     6 +-
binutils/bfd/coff-ppc.c                          |    18 +-
binutils/bfd/coff-rs6000.c                       |    38 +-
binutils/bfd/coff-sh.c                           |    40 +-
binutils/bfd/coff-sparc.c                        |     2 +-
binutils/bfd/coff-stgo32.c                       |     2 +-
binutils/bfd/coff-svm68k.c                       |     2 +-
binutils/bfd/coff-tic30.c                        |     2 +-
binutils/bfd/coff-tic4x.c                        |     2 +-
binutils/bfd/coff-tic54x.c                       |     2 +-
binutils/bfd/coff-tic80.c                        |     4 +-
binutils/bfd/coff-u68k.c                         |     2 +-
binutils/bfd/coff-w65.c                          |    22 +-
binutils/bfd/coff-we32k.c                        |     2 +-
binutils/bfd/coff-x86_64.c                       |     6 +-
binutils/bfd/coff-z80.c                          |     2 +-
binutils/bfd/coff-z8k.c                          |     2 +-
binutils/bfd/coff64-rs6000.c                     |     6 +-
binutils/bfd/coffcode.h                          |    20 +-
binutils/bfd/coffgen.c                           |   588 +-
binutils/bfd/cofflink.c                          |    68 +-
binutils/bfd/coffswap.h                          |     2 +-
binutils/bfd/compress.c                          |   433 +-
binutils/bfd/config.bfd                          |   113 +-
binutils/bfd/config.in                           |    14 +-
binutils/bfd/configure                           |   408 +-
binutils/bfd/configure.ac                        |   273 +-
binutils/bfd/configure.com                       |     6 +-
binutils/bfd/configure.host                      |     6 +-
binutils/bfd/corefile.c                          |     2 +-
binutils/bfd/cpu-aarch64.c                       |     2 +-
binutils/bfd/cpu-alpha.c                         |     2 +-
binutils/bfd/cpu-arc.c                           |    20 +-
binutils/bfd/cpu-arm.c                           |     2 +-
binutils/bfd/cpu-avr.c                           |    12 +-
[ *** stats truncated: 4703 lines dropped *** ]

############################################################################

Commit:      69285d07c6641ce11ca2ee7f8457361b311f15c0
URL:         http://cgit.haiku-os.org/buildtools/commit/?id=69285d07c664
Author:      Jérôme Duval <jerome.duval@xxxxxxxxx>
Date:        Wed Feb 10 17:58:24 2016 UTC

import binutils 2.26

----------------------------------------------------------------------------

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 32b3c15..514c873 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,276 @@
+2015-10-21  Nick Clifton  <nickc@xxxxxxxxxx>
+
+       PR gas/19109
+       * configure.ac: Note the 'none' is an acceptable argument to
+       --enable-compressed-debug-sections.
+       * configure: Regenerate.
+
+2015-10-20  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+       PR gas/19109
+       * configure.ac: Add
+       --enable-compressed-debug-sections={all,gas,gold,ld}.
+       * configure: Regenerated.
+
+2015-09-30  Nick Clifton  <nickc@xxxxxxxxxx>
+
+       Import the following patches from the GCC mainline:
+
+       2015-08-23  Francois-Xavier Coudert  <fxcoudert@xxxxxxxxxxx>
+
+       PR libfortran/54572
+       * Makefile.def: Make libgfortran depend on libbacktrace.
+       * Makefile.in: Regenerate.
+
+       2015-08-12  Tom de Vries  <tom@xxxxxxxxxxxxxxxx>
+
+       PR other/67092
+       PR other/67098
+       * configure.ac: Remove --with_host_libstdcxx support.
+       * configure: Regenerate.
+
+       2015-08-10  Thomas Schwinge  <thomas@xxxxxxxxxxxxxxxx>
+           Jakub Jelinek  <jakub@xxxxxxxxxx>
+
+       * configure.ac (noconfigdirs): Don't add "target-libgomp" for target
+       nvptx*-*-*.
+       * configure: Regenerate.
+
+2015-08-07  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+       Sync with GCC
+       2015-07-28  Ben Elliston  <bje@xxxxxxx>
+
+       * config.sub, config.guess: Import from upstream.
+
+2015-08-06  Yaakov Selkowitz  <yselkowi@xxxxxxxxxx>
+
+       * Makefile.def (libiconv): Define bootstrap=true.
+       Mark pdf/html/info as missing.
+       (configure-gcc): Depend on all-libiconv.
+       (all-gcc): Ditto.
+       (configure-libcpp): Ditto.
+       (all-libcpp): Ditto.
+       (configure-intl): Ditto.
+       (all-intl): Ditto.
+       * Makefile.in: Regenerate.
+
+2015-07-27  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+       Sync with GCC
+       2015-07-24  Michael Darling  <darlingm@xxxxxxxxx>
+
+       PR other/66259
+       * config-ml.in: Reflects renaming of configure.in to configure.ac
+       * configure: Likewise
+       * configure.ac: Likewise
+
+2015-07-14  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+       * Makefile.in: Regenerated.
+
+       Sync with GCC
+       2015-05-21  Jason Merrill  <jason@xxxxxxxxxx>
+
+       * Makefile.tpl: Update comments.
+
+       2015-04-22  Bernhard Reutner-Fischer  <aldot@xxxxxxxxxxx>
+
+       * Makefile.tpl: Remove surplus whitespace throughout.
+
+       2015-03-25  Martin Liska  <mliska@xxxxxxx>
+                   Yury Gribov  <y.gribov@xxxxxxxxxxx>
+
+       * Makefile.tpl: Fix ln source location for vimrc file.
+
+2015-07-14  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+       Sync with GCC
+       2015-05-16  James Bowman  <james.bowman@xxxxxxxxxxxx>
+
+       * configure.ac: FT32 target added.
+       * configure: Regenerate.
+
+2015-07-14  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+       Sync with GCC
+       2015-06-02  Jason Merrill  <jason@xxxxxxxxxx>
+
+       PR bootstrap/66319
+       * configure.ac: Use -std=gnu++98.
+
+       2015-05-28  Mike Frysinger  <vapier@xxxxxxxxxx>
+
+       * configure.ac (--vtable-verify): Use AS_HELP_STRING for help.
+       * configure: Regenerate.
+
+       2015-05-11  Paulo Matos  <paulo@xxxxxxxxxxxxxxx>
+
+       * configure.ac: Fix typo.
+       * configure: Regenerate.
+
+       2015-05-03  Matthias Klose  <doko@xxxxxxxxxx>
+
+       * configure.ac: Match $host configured with triplets.
+       * configure: Regenerate.
+
+       2015-04-17  Jakub Jelinek  <jakub@xxxxxxxxxx>
+
+       PR bootstrap/62077
+       * configure.ac (--enable-stage1-checking): Default to
+       release,misc,gimple,rtlflag,tree,types if --disable-checking
+       or --enable-checking is not specified and DEV-PHASE is not
+       experimental.
+       * configure: Regenerated.
+
+       2015-03-27  Uros Bizjak  <ubizjak@xxxxxxxxx>
+
+       Install back PR target/47230 fix (Revert the revert).
+
+2015-06-30  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+       * configure.ac (ospace_frag): Enable for i?86*-*-elfiamcu
+       target.
+       * configure: Regenerate.
+
+2015-05-13  John David Anglin  <dave.anglin@xxxxxxxx>
+
+       * configure.ac: Disable configuration of GDB for HPUX targets.
+       * configure: Regenerate.
+
+2015-05-01  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+       PR ld/18355
+       * Makefile.def: Add extra_configure_flags to host zlib.
+       * configure.ac (extra_host_zlib_configure_flags): New.  Set
+       to --enable-host-shared When bfd is to be built as shared
+       library.  AC_SUBST.
+       * Makefile.in: Regenerated.
+
+2015-04-15  Mike Frysinger  <vapier@xxxxxxxxxx>
+           Hans-Peter Nilsson  <hp@xxxxxxxx>
+
+       Adjust src-release.sh for sim using the gdb create-version.sh.
+       * src-release.sh (tar_compress): If there's a fifth parameter,
+       use that in the getver call instead of $tool.
+       (sim_release): Pass gdb as fifth parameter to tar_compress.
+       (SIM_SUPPORT_DIRS): Add gdb/common/create-version.sh.
+
+2015-04-14  Max Ostapenko  <m.ostapenko@xxxxxxxxxxxxxxxxxxx>
+
+       * Makefile.tpl (EXTRA_HOST_EXPORTS): New variables.
+       (EXTRA_BOOTSTRAP_FLAGS): Likewise.
+       (check-[+module+]): Add EXTRA_HOST_EXPORTS and EXTRA_BOOTSTRAP_FLAGS.
+       * Makefile.in: Regenerate.
+
+2015-04-01  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+       * configure.ac: Add --with-system-zlib.
+       * configure: Regenerated.
+
+2015-03-31  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+       * src-release.sh: Don't configure with  --with-target-subdir=.
+       --disable-multilib.
+
+2015-03-31  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+       * src-release.sh (DEVO_SUPPORT): Replace src-release with
+       src-release.sh.
+
+2015-03-30  Ed Schouten  <ed@xxxxxxx>
+
+       * config.sub: Update from upstream, to 2015-03-04 version.
+       * config.guess: Likewise.
+
+2015-03-30  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+       * Makefile.def (dependencies): Add all-zlib to all-bfd.
+       * Makefile.in: Regenerated.
+
+2015-03-28  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+       * src-release.sh (do_proto_toplev): Configure with --target
+       --with-target-subdir and --disable-multilib.
+       (BINUTILS_SUPPORT_DIRS): Add zlib.
+       (GAS_SUPPORT_DIRS): Likewise.
+       (GDB_SUPPORT_DIRS): Likewise.
+       (SIM_SUPPORT_DIRS): Likewise.
+
+2015-03-17  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+       * configure.ac (target_configdirs): Exclude target-zlib if
+       target-libjava isn't built.
+       * configure: Regenerated.
+
+2015-03-17  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+       Sync with GCC
+       2014-06-13  Thomas Schwinge  <thomas@xxxxxxxxxxxxxxxx>
+
+       * config-ml.in: Robustify ac_configure_args parsing.
+
+2015-03-16  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+       * Makefile.def: Updated from GCC trunk.
+       * Makefile.tpl: Likewise.
+       * configure.ac: Likewise.
+       * Makefile.in: Regenerated.
+       * configure: Likewise.
+
+2015-01-28  James Bowman  <james.bowman@xxxxxxxxxxxx>
+
+       * configure.ac: Add FT32 support.
+       * configure: Regenerate.
+
+2015-01-12  Anthony Green  <green@xxxxxxxxxxxxxx>
+
+       * configure.ac: Don't disable gprof for moxie.
+       * configure: Rebuild.
+
+2015-01-03  Andrew Pinski  <apinski@xxxxxxxxxx>
+
+       * Makefile.def (flags_to_pass): Pass OBJCOPY_FOR_TARGET also.
+       * Makefile.tpl (HOST_EXPORTS): Add OBJCOPY_FOR_TARGET.
+       (BASE_TARGET_EXPORTS): Add OBJCOPY.
+       (OBJCOPY_FOR_TARGET): New variable.
+       (EXTRA_TARGET_FLAGS): Add OBJCOPY.
+       * Makefile.in: Regenerate.
+       * configure.ac: Check for already installed target objcopy.
+       Also GCC_TARGET_TOOL on objcopy.
+       * configure: Regenerate.
+
+2015-01-02  Hans-Peter Nilsson  <hp@xxxxxxxxxxxx>
+
+       * config.sub: Update from upstream, to 2015-01-01 version.
+       * config.guess: Ditto.
+
+2014-12-06  Eric Botcazou  <ebotcazou@xxxxxxxxxxx>
+
+       * config.sub: Update from upstream config repo.
+
+2014-11-24  H.J. Lu  <hongjiu.lu@xxxxxxxxx>
+
+       * libtool.m4: Updated from GCC trunk.
+
+2014-11-16  Jan-Benedict Glaw  <jbglaw@xxxxxxxxxx>
+
+       * config.guess: Update from upstream config repo.
+       * config.sub: Ditto.
+
+2014-11-16  Jan-Benedict Glaw  <jbglaw@xxxxxxxxxx>
+
+       * move-if-change: Update from upstream gnulib.
+
+2014-11-16  Jan-Benedict Glaw  <jbglaw@xxxxxxxxxx>
+
+       * compile: Sync with upstream Automake.
+       * depcomp: Ditto.
+       * install-sh: Ditto.
+       * missing: Ditto.
+       * mkinstalldirs: Ditto.
+       * ylwrap: Ditto.
+
 2014-10-15  Tristan Gingold  <gingold@xxxxxxxxxxx>
 
        * src-release.sh (do_proto_toplev): Configure with --target.
@@ -86,7 +359,7 @@
 2014-04-04  Eric Botcazou  <ebotcazou@xxxxxxxxxxx>
 
        PR bootstrap/60620
-       * Makefile.def (dependencies): Make gnattools depend on libstdc++-v3. 
+       * Makefile.def (dependencies): Make gnattools depend on libstdc++-v3.
        * Makefile.in: Regenerate.
 
 2014-03-28  Yaakov Selkowitz  <yselkowitz@xxxxxxxxxxxxxxxxxxxxx>
diff --git a/binutils/MAINTAINERS b/binutils/MAINTAINERS
index dd8601b..b09fbc0 100644
--- a/binutils/MAINTAINERS
+++ b/binutils/MAINTAINERS
@@ -47,7 +47,10 @@ gdb/; readline/; sim/; GDB's part of include/
        See also gdb/MAINTAINERS and sim/MAINTAINERS.
 
 include/
-       See binutils/, gdb/, sid/, gcc/, libiberty/ etc.
+       The rule is that if the file exists in the gcc tree
+       then gcc owns it.  Thus you have to look at the gcc tree
+       to know whether any particular file is owned by gcc.
+       See also binutils/, gdb/, sid/, gcc/, libiberty/ etc.
 
 intl/; config.rhost; libiberty/; libiberty's part of include/;
 compile; depcomp; install-sh; missing; ylwrap; config/
diff --git a/binutils/Makefile.def b/binutils/Makefile.def
index ec2b0f2..8b4dad9 100644
--- a/binutils/Makefile.def
+++ b/binutils/Makefile.def
@@ -30,6 +30,8 @@ build_modules= { module= flex; };
 build_modules= { module= m4; };
 build_modules= { module= texinfo; };
 build_modules= { module= fixincludes; };
+build_modules= { module= libcpp;
+                 extra_configure_flags='--disable-nls am_cv_func_iconv=no';};
 
 host_modules= { module= bfd; bootstrap=true; };
 host_modules= { module= opcodes; bootstrap=true; };
@@ -46,7 +48,8 @@ host_modules= { module= gas; bootstrap=true; };
 host_modules= { module= gcc; bootstrap=true; 
                extra_make_flags="$(EXTRA_GCC_FLAGS)"; };
 host_modules= { module= gmp; lib_path=.libs; bootstrap=true;
-               extra_configure_flags='--disable-shared';
+               // Work around in-tree gmp configure bug with missing flex.
+               extra_configure_flags='--disable-shared LEX="touch lex.yy.c"';
                no_install= true;
                // none-*-* disables asm optimizations, bootstrap-testing
                // the compiler more thoroughly.
@@ -64,11 +67,6 @@ host_modules= { module= isl; lib_path=.libs; bootstrap=true;
                extra_configure_flags='--disable-shared 
@extra_isl_gmp_configure_flags@';
                extra_make_flags='V=1';
                no_install= true; };
-host_modules= { module= cloog; lib_path=.libs; bootstrap=true;
-               extra_configure_flags='--disable-shared --with-gmp=system 
--with-bits=gmp --with-isl=system';
-               extra_exports='CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) 
$$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs 
-L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS; ';
-               extra_make_flags='CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" 
V=1';
-               no_install= true; };
 host_modules= { module= libelf; lib_path=.libs; bootstrap=true;
                extra_configure_flags='--disable-shared';
                no_install= true; };
@@ -85,11 +83,22 @@ host_modules= { module= libdecnumber; bootstrap=true; };
 host_modules= { module= libgui; };
 host_modules= { module= libiberty; bootstrap=true;
                
extra_configure_flags='@extra_host_libiberty_configure_flags@';};
+// Linker plugins may need their own build of libiberty; see
+// gcc/doc/install.texi.  We take care that this build of libiberty doesn't get
+// installed.  It's a helper library for linker plugins, so we pay attention to
+// @extra_linker_plugin_flags@ and @extra_linker_plugin_configure_flags@.
+host_modules= { module= libiberty-linker-plugin; bootstrap=true;
+               module_srcdir=libiberty;
+               extra_configure_flags='@extra_host_libiberty_configure_flags@ 
--disable-install-libiberty @extra_linker_plugin_flags@ 
@extra_linker_plugin_configure_flags@';
+               extra_make_flags='@extra_linker_plugin_flags@'; };
 // We abuse missing to avoid installing anything for libiconv.
 host_modules= { module= libiconv;
+               bootstrap=true;
                extra_configure_flags='--disable-shared';
                no_install= true;
-               missing= install-info;
+               missing= pdf;
+               missing= html;
+               missing= info;
                missing= install-pdf;
                missing= install-html;
                missing= install-info; };
@@ -98,7 +107,9 @@ host_modules= { module= readline; };
 host_modules= { module= sid; };
 host_modules= { module= sim; };
 host_modules= { module= texinfo; no_install= true; };
-host_modules= { module= zlib; no_install=true; no_check=true; bootstrap=true; 
};
+host_modules= { module= zlib; no_install=true; no_check=true;
+               bootstrap=true;
+               extra_configure_flags='@extra_host_zlib_configure_flags@';};
 host_modules= { module= gdb; };
 host_modules= { module= expect; };
 host_modules= { module= guile; };
@@ -111,7 +122,10 @@ host_modules= { module= libtermcap; no_check=true;
 host_modules= { module= utils; no_check=true; };
 host_modules= { module= gnattools; };
 host_modules= { module= lto-plugin; bootstrap=true;
-               extra_configure_flags=--enable-shared; };
+               extra_configure_flags='--enable-shared 
@extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@';
+               extra_make_flags='@extra_linker_plugin_flags@'; };
+host_modules= { module= libcc1; extra_configure_flags=--enable-shared; };
+host_modules= { module= gotools; };
 
 target_modules = { module= libstdc++-v3;
                   bootstrap=true;
@@ -121,12 +135,18 @@ target_modules = { module= libsanitizer;
                   bootstrap=true;
                   lib_path=.libs;
                   raw_cxx=true; };
+target_modules = { module= libmpx;
+                  bootstrap=true;
+                  lib_path=.libs; };
 target_modules = { module= libvtv;
                   bootstrap=true;
                   lib_path=.libs;
                   raw_cxx=true; };
 target_modules = { module= libcilkrts;
                   lib_path=.libs; };
+target_modules = { module= liboffloadmic;
+                  lib_path=.libs;
+                  
extra_configure_flags='@extra_liboffloadmic_configure_flags@'; };
 target_modules = { module= libssp; lib_path=.libs; };
 target_modules = { module= newlib; };
 target_modules = { module= libgcc; bootstrap=true; no_check=true; };
@@ -271,6 +291,7 @@ flags_to_pass = { flag= LIBCFLAGS_FOR_TARGET ; };
 flags_to_pass = { flag= LIBCXXFLAGS_FOR_TARGET ; };
 flags_to_pass = { flag= NM_FOR_TARGET ; };
 flags_to_pass = { flag= OBJDUMP_FOR_TARGET ; };
+flags_to_pass = { flag= OBJCOPY_FOR_TARGET ; };
 flags_to_pass = { flag= RANLIB_FOR_TARGET ; };
 flags_to_pass = { flag= READELF_FOR_TARGET ; };
 flags_to_pass = { flag= STRIP_FOR_TARGET ; };
@@ -292,26 +313,32 @@ dependencies = { module=all-build-flex; on=all-build-m4; 
};
 dependencies = { module=all-build-libiberty; on=all-build-texinfo; };
 dependencies = { module=all-build-m4; on=all-build-texinfo; };
 dependencies = { module=all-build-fixincludes; on=all-build-libiberty; };
+dependencies = { module=all-build-libcpp; on=all-build-libiberty; };
 
 // Host modules specific to gcc.
 dependencies = { module=configure-gcc; on=configure-intl; };
 dependencies = { module=configure-gcc; on=all-gmp; };
+dependencies = { module=configure-gcc; on=all-mpfr; };
+dependencies = { module=configure-gcc; on=all-mpc; };
+dependencies = { module=configure-gcc; on=all-isl; };
 dependencies = { module=configure-gcc; on=all-lto-plugin; };
 dependencies = { module=configure-gcc; on=all-binutils; };
 dependencies = { module=configure-gcc; on=all-gas; };
 dependencies = { module=configure-gcc; on=all-ld; };
 dependencies = { module=configure-gcc; on=all-gold; };
 dependencies = { module=configure-gcc; on=all-libelf; };
+dependencies = { module=configure-gcc; on=all-libiconv; };
 dependencies = { module=all-gcc; on=all-libiberty; hard=true; };
 dependencies = { module=all-gcc; on=all-intl; };
 dependencies = { module=all-gcc; on=all-mpfr; };
 dependencies = { module=all-gcc; on=all-mpc; };
-dependencies = { module=all-gcc; on=all-cloog; };
+dependencies = { module=all-gcc; on=all-isl; };
 dependencies = { module=all-gcc; on=all-build-texinfo; };
 dependencies = { module=all-gcc; on=all-build-bison; };
 dependencies = { module=all-gcc; on=all-build-flex; };
 dependencies = { module=all-gcc; on=all-build-libiberty; };
 dependencies = { module=all-gcc; on=all-build-fixincludes; };
+dependencies = { module=all-gcc; on=all-build-libcpp; };
 dependencies = { module=all-gcc; on=all-zlib; };
 dependencies = { module=all-gcc; on=all-libbacktrace; hard=true; };
 dependencies = { module=all-gcc; on=all-libcpp; hard=true; };
@@ -319,6 +346,7 @@ dependencies = { module=all-gcc; on=all-libdecnumber; 
hard=true; };
 dependencies = { module=all-gcc; on=all-libiberty; };
 dependencies = { module=all-gcc; on=all-fixincludes; };
 dependencies = { module=all-gcc; on=all-lto-plugin; };
+dependencies = { module=all-gcc; on=all-libiconv; };
 dependencies = { module=info-gcc; on=all-build-libiberty; };
 dependencies = { module=dvi-gcc; on=all-build-libiberty; };
 dependencies = { module=pdf-gcc; on=all-build-libiberty; };
@@ -330,23 +358,33 @@ dependencies = { module=install-strip-gcc ; 
on=install-strip-lto-plugin; };
 
 dependencies = { module=configure-libcpp; on=configure-libiberty; hard=true; };
 dependencies = { module=configure-libcpp; on=configure-intl; };
+dependencies = { module=configure-libcpp; on=all-libiconv; };
 dependencies = { module=all-libcpp; on=all-libiberty; hard=true; };
 dependencies = { module=all-libcpp; on=all-intl; };
+dependencies = { module=all-libcpp; on=all-libiconv; };
 
 dependencies = { module=all-fixincludes; on=all-libiberty; };
 
 dependencies = { module=all-gnattools; on=all-target-libada; };
 dependencies = { module=all-gnattools; on=all-target-libstdc++-v3; };
 
+// Depending on the specific configuration, the LTO plugin will either use the
+// generic libiberty build or the specific build for linker plugins.
 dependencies = { module=all-lto-plugin; on=all-libiberty; };
+dependencies = { module=all-lto-plugin; on=all-libiberty-linker-plugin; };
+
+dependencies = { module=configure-libcc1; on=configure-gcc; };
+dependencies = { module=all-libcc1; on=all-gcc; };
+
+dependencies = { module=all-gotools; on=all-target-libgo; };
 
 dependencies = { module=all-utils; on=all-libiberty; };
 
+dependencies = { module=configure-intl; on=all-libiconv; };
 dependencies = { module=configure-mpfr; on=all-gmp; };
 dependencies = { module=configure-mpc; on=all-mpfr; };
 dependencies = { module=configure-isl; on=all-gmp; };
-dependencies = { module=configure-cloog; on=all-isl; };
-dependencies = { module=configure-cloog; on=all-gmp; };
+dependencies = { module=all-intl; on=all-libiconv; };
 
 // Host modules specific to gdb.
 dependencies = { module=configure-gdb; on=all-intl; };
@@ -375,6 +413,7 @@ dependencies = { module=configure-bfd; 
on=configure-libiberty; hard=true; };
 dependencies = { module=configure-bfd; on=configure-intl; };
 dependencies = { module=all-bfd; on=all-libiberty; };
 dependencies = { module=all-bfd; on=all-intl; };
+dependencies = { module=all-bfd; on=all-zlib; };
 dependencies = { module=configure-opcodes; on=configure-libiberty; hard=true; 
};
 dependencies = { module=all-opcodes; on=all-libiberty; };
 
@@ -496,6 +535,7 @@ dependencies = { module=all-m4; on=all-build-texinfo; };
 lang_env_dependencies = { module=libjava; cxx=true; };
 lang_env_dependencies = { module=libitm; cxx=true; };
 lang_env_dependencies = { module=libcilkrts; cxx=true; };
+lang_env_dependencies = { module=liboffloadmic; cxx=true; };
 lang_env_dependencies = { module=newlib; no_c=true; };
 lang_env_dependencies = { module=libgloss; no_c=true; };
 lang_env_dependencies = { module=libgcc; no_gcc=true; no_c=true; };
@@ -522,12 +562,14 @@ 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; };
 dependencies = { module=configure-target-libvtv; on=all-target-libstdc++-v3; };
 // parallel_list.o and parallel_settings.o depend on omp.h, which is
 // generated by the libgomp configure.  Unfortunately, due to the use of
 //  recursive make, we can't be that specific.
 dependencies = { module=all-target-libstdc++-v3; on=configure-target-libgomp; 
};
+dependencies = { module=all-target-liboffloadmic; on=all-target-libgomp; };
 
 dependencies = { module=install-target-libgo; on=install-target-libatomic; };
 dependencies = { module=install-target-libgfortran; 
on=install-target-libquadmath; };
@@ -538,6 +580,8 @@ dependencies = { module=install-target-libvtv; 
on=install-target-libstdc++-v3; }
 dependencies = { module=install-target-libvtv; on=install-target-libgcc; };
 dependencies = { module=install-target-libcilkrts; 
on=install-target-libstdc++-v3; };
 dependencies = { module=install-target-libcilkrts; on=install-target-libgcc; };
+dependencies = { module=install-target-liboffloadmic; 
on=install-target-libstdc++-v3; };
+dependencies = { module=install-target-liboffloadmic; 
on=install-target-libgcc; };
 dependencies = { module=install-target-libjava; on=install-target-libgcc; };
 dependencies = { module=install-target-libitm; on=install-target-libgcc; };
 dependencies = { module=install-target-libobjc; on=install-target-libgcc; };
@@ -553,6 +597,7 @@ dependencies = { module=all-target-winsup; 
on=all-target-libtermcap; };
 dependencies = { module=configure-target-newlib; on=all-binutils; };
 dependencies = { module=configure-target-newlib; on=all-ld; };
 dependencies = { module=configure-target-libgfortran; 
on=all-target-libquadmath; };
+dependencies = { module=configure-target-libgfortran; 
on=all-target-libbacktrace; };
 
 languages = { language=c;      gcc-check-target=check-gcc; };
 languages = { language=c++;    gcc-check-target=check-c++;
diff --git a/binutils/Makefile.in b/binutils/Makefile.in
index bf06dce..bc2bae6 100644
--- a/binutils/Makefile.in
+++ b/binutils/Makefile.in
@@ -213,17 +213,17 @@ HOST_EXPORTS = \
        LD_FOR_TARGET="$(LD_FOR_TARGET)"; export LD_FOR_TARGET; \
        NM_FOR_TARGET="$(NM_FOR_TARGET)"; export NM_FOR_TARGET; \
        OBJDUMP_FOR_TARGET="$(OBJDUMP_FOR_TARGET)"; export OBJDUMP_FOR_TARGET; \
+       OBJCOPY_FOR_TARGET="$(OBJCOPY_FOR_TARGET)"; export OBJCOPY_FOR_TARGET; \
        RANLIB_FOR_TARGET="$(RANLIB_FOR_TARGET)"; export RANLIB_FOR_TARGET; \
        READELF_FOR_TARGET="$(READELF_FOR_TARGET)"; export READELF_FOR_TARGET; \
        TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export 
TOPLEVEL_CONFIGURE_ARGUMENTS; \
        HOST_LIBS="$(STAGE1_LIBS)"; export HOST_LIBS; \
        GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \
        GMPINC="$(HOST_GMPINC)"; export GMPINC; \
+       ISLLIBS="$(HOST_ISLLIBS)"; export ISLLIBS; \
        ISLINC="$(HOST_ISLINC)"; export ISLINC; \
-       CLOOGLIBS="$(HOST_CLOOGLIBS)"; export CLOOGLIBS; \
-       CLOOGINC="$(HOST_CLOOGINC)"; export CLOOGINC; \
-       LIBELFLIBS="$(HOST_LIBELFLIBS)" ; export LIBELFLIBS; \
-       LIBELFINC="$(HOST_LIBELFINC)" ; export LIBELFINC; \
+       LIBELFLIBS="$(HOST_LIBELFLIBS)"; export LIBELFLIBS; \
+       LIBELFINC="$(HOST_LIBELFINC)"; export LIBELFINC; \
 @if gcc-bootstrap
        $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 
's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
 @endif gcc-bootstrap
@@ -256,6 +256,7 @@ POSTSTAGE1_HOST_EXPORTS = \
          $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CC; \
        CC_FOR_BUILD="$$CC"; export CC_FOR_BUILD; \
        $(POSTSTAGE1_CXX_EXPORT) \
+       $(LTO_EXPORTS) \
        GNATBIND="$$r/$(HOST_SUBDIR)/prev-gcc/gnatbind"; export GNATBIND; \
        LDFLAGS="$(POSTSTAGE1_LDFLAGS) $(BOOT_LDFLAGS)"; export LDFLAGS; \
        HOST_LIBS="$(POSTSTAGE1_LIBS)"; export HOST_LIBS;
@@ -285,6 +286,7 @@ BASE_TARGET_EXPORTS = \
        LIPO="$(LIPO_FOR_TARGET)"; export LIPO; \
        NM="$(COMPILER_NM_FOR_TARGET)"; export NM; \
        OBJDUMP="$(OBJDUMP_FOR_TARGET)"; export OBJDUMP; \
+       OBJCOPY="$(OBJCOPY_FOR_TARGET)"; export OBJCOPY; \
        RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
        READELF="$(READELF_FOR_TARGET)"; export READELF; \
        STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
@@ -310,12 +312,9 @@ HOST_GMPLIBS = @gmplibs@
 HOST_GMPINC = @gmpinc@
 
 # Where to find ISL
+HOST_ISLLIBS = @isllibs@
 HOST_ISLINC = @islinc@
 
-# Where to find CLOOG
-HOST_CLOOGLIBS = @clooglibs@
-HOST_CLOOGINC = @clooginc@
-
 # Where to find libelf
 HOST_LIBELFLIBS = @libelflibs@
 HOST_LIBELFINC = @libelfinc@
@@ -483,11 +482,9 @@ STAGEfeedback_TFLAGS = $(STAGE_TFLAGS)
 STAGEfeedback_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS)
 
 
-# Only build the C compiler for stage1, because that is the only one that
-# we can guarantee will build with the native compiler, and also it is the
-# only thing useful for building stage2. STAGE1_CFLAGS (via CFLAGS),
-# MAKEINFO and MAKEINFOFLAGS are explicitly passed here to make them
-# overrideable (for a bootstrap build stage1 also builds gcc.info).
+# By default, C and C++ are the only stage1 languages, because they are the
+# only ones we require to build with the bootstrap compiler, and also the
+# only ones useful for building stage2.
 
 STAGE1_CFLAGS = @stage1_cflags@
 STAGE1_CHECKING = @stage1_checking@
@@ -536,6 +533,7 @@ LD_FOR_TARGET=@LD_FOR_TARGET@
 LIPO_FOR_TARGET=@LIPO_FOR_TARGET@
 NM_FOR_TARGET=@NM_FOR_TARGET@
 OBJDUMP_FOR_TARGET=@OBJDUMP_FOR_TARGET@
+OBJCOPY_FOR_TARGET=@OBJCOPY_FOR_TARGET@
 RANLIB_FOR_TARGET=@RANLIB_FOR_TARGET@
 READELF_FOR_TARGET=@READELF_FOR_TARGET@
 STRIP_FOR_TARGET=@STRIP_FOR_TARGET@
@@ -577,7 +575,7 @@ all:
 
 # This is the list of directories that may be needed in RPATH_ENVVAR
 # so that programs built for the target machine work.
-TARGET_LIB_PATH = 
$(TARGET_LIB_PATH_libstdc++-v3)$(TARGET_LIB_PATH_libsanitizer)$(TARGET_LIB_PATH_libvtv)$(TARGET_LIB_PATH_libcilkrts)$(TARGET_LIB_PATH_libssp)$(TARGET_LIB_PATH_libgomp)$(TARGET_LIB_PATH_libitm)$(TARGET_LIB_PATH_libatomic)$(HOST_LIB_PATH_gcc)
+TARGET_LIB_PATH = 
$(TARGET_LIB_PATH_libstdc++-v3)$(TARGET_LIB_PATH_libsanitizer)$(TARGET_LIB_PATH_libmpx)$(TARGET_LIB_PATH_libvtv)$(TARGET_LIB_PATH_libcilkrts)$(TARGET_LIB_PATH_liboffloadmic)$(TARGET_LIB_PATH_libssp)$(TARGET_LIB_PATH_libgomp)$(TARGET_LIB_PATH_libitm)$(TARGET_LIB_PATH_libatomic)$(HOST_LIB_PATH_gcc)
 
 @if target-libstdc++-v3
 TARGET_LIB_PATH_libstdc++-v3 = $$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs:
@@ -587,6 +585,10 @@ TARGET_LIB_PATH_libstdc++-v3 = 
$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs:
 TARGET_LIB_PATH_libsanitizer = $$r/$(TARGET_SUBDIR)/libsanitizer/.libs:
 @endif target-libsanitizer
 
+@if target-libmpx
+TARGET_LIB_PATH_libmpx = $$r/$(TARGET_SUBDIR)/libmpx/.libs:
+@endif target-libmpx
+
 @if target-libvtv
 TARGET_LIB_PATH_libvtv = $$r/$(TARGET_SUBDIR)/libvtv/.libs:
 @endif target-libvtv
@@ -595,6 +597,10 @@ TARGET_LIB_PATH_libvtv = $$r/$(TARGET_SUBDIR)/libvtv/.libs:
 TARGET_LIB_PATH_libcilkrts = $$r/$(TARGET_SUBDIR)/libcilkrts/.libs:
 @endif target-libcilkrts
 
+@if target-liboffloadmic
+TARGET_LIB_PATH_liboffloadmic = $$r/$(TARGET_SUBDIR)/liboffloadmic/.libs:
+@endif target-liboffloadmic
+
 @if target-libssp
 TARGET_LIB_PATH_libssp = $$r/$(TARGET_SUBDIR)/libssp/.libs:
 @endif target-libssp
@@ -615,7 +621,7 @@ TARGET_LIB_PATH_libatomic = 
$$r/$(TARGET_SUBDIR)/libatomic/.libs:
 
 # This is the list of directories that may be needed in RPATH_ENVVAR
 # so that programs built for the host machine work.
-HOST_LIB_PATH = 
$(HOST_LIB_PATH_gmp)$(HOST_LIB_PATH_mpfr)$(HOST_LIB_PATH_mpc)$(HOST_LIB_PATH_isl)$(HOST_LIB_PATH_cloog)$(HOST_LIB_PATH_libelf)
+HOST_LIB_PATH = 
$(HOST_LIB_PATH_gmp)$(HOST_LIB_PATH_mpfr)$(HOST_LIB_PATH_mpc)$(HOST_LIB_PATH_isl)$(HOST_LIB_PATH_libelf)
 
 # Define HOST_LIB_PATH_gcc here, for the sake of TARGET_LIB_PATH, ouch
 @if gcc
@@ -643,11 +649,6 @@ HOST_LIB_PATH_isl = \
   $$r/$(HOST_SUBDIR)/isl/.libs:$$r/$(HOST_SUBDIR)/prev-isl/.libs:
 @endif isl
 
-@if cloog
-HOST_LIB_PATH_cloog = \
-  $$r/$(HOST_SUBDIR)/cloog/.libs:$$r/$(HOST_SUBDIR)/prev-cloog/.libs:
-@endif cloog
-
 @if libelf
 HOST_LIB_PATH_libelf = \
   $$r/$(HOST_SUBDIR)/libelf/.libs:$$r/$(HOST_SUBDIR)/prev-libelf/.libs:
@@ -674,7 +675,9 @@ CXX_FOR_TARGET_FLAG_TO_PASS = \
        $(shell if echo "$(CXX_FOR_TARGET)" | grep " -funconfigured-" > 
/dev/null; then :; else echo '"CXX_FOR_TARGET=$(CXX_FOR_TARGET)"'; fi)
 @endif target-libstdc++-v3
 
-# Flags to pass down to all sub-makes.
+# Flags to pass down to all sub-makes. STAGE*FLAGS,
+# MAKEINFO and MAKEINFOFLAGS are explicitly passed here to make them
+# overrideable (for a bootstrap build stage1 also builds gcc.info).
 BASE_FLAGS_TO_PASS = \
        "DESTDIR=$(DESTDIR)" \
        "RPATH_ENVVAR=$(RPATH_ENVVAR)" \
@@ -755,6 +758,7 @@ BASE_FLAGS_TO_PASS = \
        "LIBCXXFLAGS_FOR_TARGET=$(LIBCXXFLAGS_FOR_TARGET)" \
        "NM_FOR_TARGET=$(NM_FOR_TARGET)" \
        "OBJDUMP_FOR_TARGET=$(OBJDUMP_FOR_TARGET)" \
+       "OBJCOPY_FOR_TARGET=$(OBJCOPY_FOR_TARGET)" \
        "RANLIB_FOR_TARGET=$(RANLIB_FOR_TARGET)" \
        "READELF_FOR_TARGET=$(READELF_FOR_TARGET)" \
        "STRIP_FOR_TARGET=$(STRIP_FOR_TARGET)" \
@@ -826,8 +830,17 @@ POSTSTAGE1_FLAGS_TO_PASS = \
        GNATBIND="$${GNATBIND}" \
        LDFLAGS="$${LDFLAGS}" \
        HOST_LIBS="$${HOST_LIBS}" \
+       $(LTO_FLAGS_TO_PASS) \
        "`echo 'ADAFLAGS=$(BOOT_ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`"
 
+@if gcc-bootstrap
+EXTRA_HOST_EXPORTS = if [ $(current_stage) != stage1 ]; then \
+                      $(POSTSTAGE1_HOST_EXPORTS) \
+                    fi;
+
+EXTRA_BOOTSTRAP_FLAGS = CC="$$CC" CXX="$$CXX" LDFLAGS="$$LDFLAGS"
+@endif gcc-bootstrap
+
 # Flags to pass down to makes which are built with the target environment.
 # The double $ decreases the length of the command line; those variables
 # are set in BASE_FLAGS_TO_PASS, and the sub-make will expand them.  The
@@ -838,7 +851,9 @@ EXTRA_TARGET_FLAGS = \
        'AS=$(COMPILER_AS_FOR_TARGET)' \
        'CC=$$(CC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
        'CFLAGS=$$(CFLAGS_FOR_TARGET)' \
-       'CXX=$$(CXX_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
+       'CXX=$$(CXX_FOR_TARGET) -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \
+        -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \
+        $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
        'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \
        'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
        'GCJ=$$(GCJ_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
@@ -851,11 +866,14 @@ EXTRA_TARGET_FLAGS = \
        'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \
        'NM=$(COMPILER_NM_FOR_TARGET)' \
        'OBJDUMP=$$(OBJDUMP_FOR_TARGET)' \
+       'OBJCOPY=$$(OBJCOPY_FOR_TARGET)' \
        'RANLIB=$$(RANLIB_FOR_TARGET)' \
        'READELF=$$(READELF_FOR_TARGET)' \
        'WINDRES=$$(WINDRES_FOR_TARGET)' \
        'WINDMC=$$(WINDMC_FOR_TARGET)' \
        'XGCC_FLAGS_FOR_TARGET=$(XGCC_FLAGS_FOR_TARGET)' \
+       'STAGE1_LDFLAGS=$$(POSTSTAGE1_LDFLAGS)' \
+       'STAGE1_LIBS=$$(POSTSTAGE1_LIBS)' \
        "TFLAGS=$$TFLAGS"
 
 TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)
@@ -898,7 +916,6 @@ configure-host:  \
     maybe-configure-mpfr \
     maybe-configure-mpc \
     maybe-configure-isl \
-    maybe-configure-cloog \
     maybe-configure-libelf \
     maybe-configure-gold \
     maybe-configure-gprof \
@@ -911,6 +928,7 @@ configure-host:  \
     maybe-configure-libdecnumber \
     maybe-configure-libgui \
     maybe-configure-libiberty \
+    maybe-configure-libiberty-linker-plugin \
     maybe-configure-libiconv \
     maybe-configure-m4 \
     maybe-configure-readline \
@@ -925,13 +943,17 @@ configure-host:  \
     maybe-configure-libtermcap \
     maybe-configure-utils \
     maybe-configure-gnattools \
-    maybe-configure-lto-plugin
+    maybe-configure-lto-plugin \
+    maybe-configure-libcc1 \
+    maybe-configure-gotools
 .PHONY: configure-target
 configure-target:  \
     maybe-configure-target-libstdc++-v3 \
     maybe-configure-target-libsanitizer \
+    maybe-configure-target-libmpx \
     maybe-configure-target-libvtv \
     maybe-configure-target-libcilkrts \
+    maybe-configure-target-liboffloadmic \
     maybe-configure-target-libssp \
     maybe-configure-target-newlib \
     maybe-configure-target-libgcc \
@@ -986,6 +1008,7 @@ all-build: maybe-all-build-flex
 all-build: maybe-all-build-m4
 all-build: maybe-all-build-texinfo
 all-build: maybe-all-build-fixincludes
+all-build: maybe-all-build-libcpp
 
 .PHONY: all-host
 
@@ -1025,9 +1048,6 @@ all-host: maybe-all-mpc
 @if isl-no-bootstrap
 all-host: maybe-all-isl
 @endif isl-no-bootstrap
-@if cloog-no-bootstrap
-all-host: maybe-all-cloog
-@endif cloog-no-bootstrap
 @if libelf-no-bootstrap
 all-host: maybe-all-libelf
 @endif libelf-no-bootstrap
@@ -1056,7 +1076,12 @@ all-host: maybe-all-libgui
 @if libiberty-no-bootstrap
 all-host: maybe-all-libiberty
 @endif libiberty-no-bootstrap
+@if libiberty-linker-plugin-no-bootstrap
+all-host: maybe-all-libiberty-linker-plugin
+@endif libiberty-linker-plugin-no-bootstrap
+@if libiconv-no-bootstrap
 all-host: maybe-all-libiconv
+@endif libiconv-no-bootstrap
 all-host: maybe-all-m4
 all-host: maybe-all-readline
 all-host: maybe-all-sid
@@ -1075,6 +1100,8 @@ all-host: maybe-all-gnattools
 @if lto-plugin-no-bootstrap
 all-host: maybe-all-lto-plugin
 @endif lto-plugin-no-bootstrap
+all-host: maybe-all-libcc1
+all-host: maybe-all-gotools
 
 .PHONY: all-target
 
@@ -1084,10 +1111,14 @@ all-target: maybe-all-target-libstdc++-v3
 @if target-libsanitizer-no-bootstrap
 all-target: maybe-all-target-libsanitizer
 @endif target-libsanitizer-no-bootstrap
+@if target-libmpx-no-bootstrap
+all-target: maybe-all-target-libmpx
+@endif target-libmpx-no-bootstrap
 @if target-libvtv-no-bootstrap
 all-target: maybe-all-target-libvtv
 @endif target-libvtv-no-bootstrap
 all-target: maybe-all-target-libcilkrts
+all-target: maybe-all-target-liboffloadmic
 all-target: maybe-all-target-libssp
 all-target: maybe-all-target-newlib
 @if target-libgcc-no-bootstrap
@@ -1145,7 +1176,6 @@ info-host: maybe-info-gmp
 info-host: maybe-info-mpfr
 info-host: maybe-info-mpc
 info-host: maybe-info-isl
-info-host: maybe-info-cloog
 info-host: maybe-info-libelf
 info-host: maybe-info-gold
 info-host: maybe-info-gprof
@@ -1158,6 +1188,7 @@ info-host: maybe-info-libcpp
 info-host: maybe-info-libdecnumber
 info-host: maybe-info-libgui
 info-host: maybe-info-libiberty
+info-host: maybe-info-libiberty-linker-plugin
 info-host: maybe-info-libiconv
 info-host: maybe-info-m4
 info-host: maybe-info-readline
@@ -1173,13 +1204,17 @@ info-host: maybe-info-libtermcap
 info-host: maybe-info-utils
 info-host: maybe-info-gnattools
 info-host: maybe-info-lto-plugin
+info-host: maybe-info-libcc1
+info-host: maybe-info-gotools
 
 .PHONY: info-target
 
 info-target: maybe-info-target-libstdc++-v3
 info-target: maybe-info-target-libsanitizer
+info-target: maybe-info-target-libmpx
 info-target: maybe-info-target-libvtv
 info-target: maybe-info-target-libcilkrts
+info-target: maybe-info-target-liboffloadmic
 info-target: maybe-info-target-libssp
 info-target: maybe-info-target-newlib
 info-target: maybe-info-target-libgcc
@@ -1228,7 +1263,6 @@ dvi-host: maybe-dvi-gmp
 dvi-host: maybe-dvi-mpfr
 dvi-host: maybe-dvi-mpc
 dvi-host: maybe-dvi-isl
-dvi-host: maybe-dvi-cloog
 dvi-host: maybe-dvi-libelf
 dvi-host: maybe-dvi-gold
 dvi-host: maybe-dvi-gprof
@@ -1241,6 +1275,7 @@ dvi-host: maybe-dvi-libcpp
 dvi-host: maybe-dvi-libdecnumber
 dvi-host: maybe-dvi-libgui
 dvi-host: maybe-dvi-libiberty
+dvi-host: maybe-dvi-libiberty-linker-plugin
 dvi-host: maybe-dvi-libiconv
 dvi-host: maybe-dvi-m4
 dvi-host: maybe-dvi-readline
@@ -1256,13 +1291,17 @@ dvi-host: maybe-dvi-libtermcap
 dvi-host: maybe-dvi-utils
 dvi-host: maybe-dvi-gnattools
 dvi-host: maybe-dvi-lto-plugin
+dvi-host: maybe-dvi-libcc1
+dvi-host: maybe-dvi-gotools
 
 .PHONY: dvi-target
 
 dvi-target: maybe-dvi-target-libstdc++-v3
 dvi-target: maybe-dvi-target-libsanitizer
+dvi-target: maybe-dvi-target-libmpx
 dvi-target: maybe-dvi-target-libvtv
 dvi-target: maybe-dvi-target-libcilkrts
+dvi-target: maybe-dvi-target-liboffloadmic
 dvi-target: maybe-dvi-target-libssp
 dvi-target: maybe-dvi-target-newlib
 dvi-target: maybe-dvi-target-libgcc
@@ -1311,7 +1350,6 @@ pdf-host: maybe-pdf-gmp
 pdf-host: maybe-pdf-mpfr
 pdf-host: maybe-pdf-mpc
 pdf-host: maybe-pdf-isl
-pdf-host: maybe-pdf-cloog
 pdf-host: maybe-pdf-libelf
 pdf-host: maybe-pdf-gold
 pdf-host: maybe-pdf-gprof
@@ -1324,6 +1362,7 @@ pdf-host: maybe-pdf-libcpp
 pdf-host: maybe-pdf-libdecnumber
 pdf-host: maybe-pdf-libgui
 pdf-host: maybe-pdf-libiberty
+pdf-host: maybe-pdf-libiberty-linker-plugin
 pdf-host: maybe-pdf-libiconv
 pdf-host: maybe-pdf-m4
 pdf-host: maybe-pdf-readline
@@ -1339,13 +1378,17 @@ pdf-host: maybe-pdf-libtermcap
 pdf-host: maybe-pdf-utils
 pdf-host: maybe-pdf-gnattools
 pdf-host: maybe-pdf-lto-plugin
+pdf-host: maybe-pdf-libcc1
+pdf-host: maybe-pdf-gotools
 
 .PHONY: pdf-target
 
 pdf-target: maybe-pdf-target-libstdc++-v3
 pdf-target: maybe-pdf-target-libsanitizer
+pdf-target: maybe-pdf-target-libmpx
 pdf-target: maybe-pdf-target-libvtv
 pdf-target: maybe-pdf-target-libcilkrts
+pdf-target: maybe-pdf-target-liboffloadmic
 pdf-target: maybe-pdf-target-libssp
 pdf-target: maybe-pdf-target-newlib
 pdf-target: maybe-pdf-target-libgcc
@@ -1394,7 +1437,6 @@ html-host: maybe-html-gmp
 html-host: maybe-html-mpfr
 html-host: maybe-html-mpc
 html-host: maybe-html-isl
-html-host: maybe-html-cloog
 html-host: maybe-html-libelf
 html-host: maybe-html-gold
 html-host: maybe-html-gprof
@@ -1407,6 +1449,7 @@ html-host: maybe-html-libcpp
 html-host: maybe-html-libdecnumber
 html-host: maybe-html-libgui
 html-host: maybe-html-libiberty
+html-host: maybe-html-libiberty-linker-plugin
 html-host: maybe-html-libiconv
 html-host: maybe-html-m4
 html-host: maybe-html-readline
@@ -1422,13 +1465,17 @@ html-host: maybe-html-libtermcap
 html-host: maybe-html-utils
 html-host: maybe-html-gnattools
 html-host: maybe-html-lto-plugin
+html-host: maybe-html-libcc1
+html-host: maybe-html-gotools
 
 .PHONY: html-target
 
 html-target: maybe-html-target-libstdc++-v3
 html-target: maybe-html-target-libsanitizer
+html-target: maybe-html-target-libmpx
 html-target: maybe-html-target-libvtv
 html-target: maybe-html-target-libcilkrts
+html-target: maybe-html-target-liboffloadmic
 html-target: maybe-html-target-libssp
 html-target: maybe-html-target-newlib
 html-target: maybe-html-target-libgcc
@@ -1477,7 +1524,6 @@ TAGS-host: maybe-TAGS-gmp
 TAGS-host: maybe-TAGS-mpfr
 TAGS-host: maybe-TAGS-mpc
 TAGS-host: maybe-TAGS-isl
-TAGS-host: maybe-TAGS-cloog
 TAGS-host: maybe-TAGS-libelf
 TAGS-host: maybe-TAGS-gold
 TAGS-host: maybe-TAGS-gprof
@@ -1490,6 +1536,7 @@ TAGS-host: maybe-TAGS-libcpp
 TAGS-host: maybe-TAGS-libdecnumber
 TAGS-host: maybe-TAGS-libgui
 TAGS-host: maybe-TAGS-libiberty
+TAGS-host: maybe-TAGS-libiberty-linker-plugin
 TAGS-host: maybe-TAGS-libiconv
 TAGS-host: maybe-TAGS-m4
 TAGS-host: maybe-TAGS-readline
@@ -1505,13 +1552,17 @@ TAGS-host: maybe-TAGS-libtermcap
 TAGS-host: maybe-TAGS-utils
 TAGS-host: maybe-TAGS-gnattools
 TAGS-host: maybe-TAGS-lto-plugin
+TAGS-host: maybe-TAGS-libcc1
+TAGS-host: maybe-TAGS-gotools
 
 .PHONY: TAGS-target
 
 TAGS-target: maybe-TAGS-target-libstdc++-v3
 TAGS-target: maybe-TAGS-target-libsanitizer
+TAGS-target: maybe-TAGS-target-libmpx
 TAGS-target: maybe-TAGS-target-libvtv
 TAGS-target: maybe-TAGS-target-libcilkrts
+TAGS-target: maybe-TAGS-target-liboffloadmic
 TAGS-target: maybe-TAGS-target-libssp
 TAGS-target: maybe-TAGS-target-newlib
 TAGS-target: maybe-TAGS-target-libgcc
@@ -1560,7 +1611,6 @@ install-info-host: maybe-install-info-gmp
 install-info-host: maybe-install-info-mpfr
 install-info-host: maybe-install-info-mpc
 install-info-host: maybe-install-info-isl
-install-info-host: maybe-install-info-cloog
 install-info-host: maybe-install-info-libelf
 install-info-host: maybe-install-info-gold
 install-info-host: maybe-install-info-gprof
@@ -1573,6 +1623,7 @@ install-info-host: maybe-install-info-libcpp
 install-info-host: maybe-install-info-libdecnumber
 install-info-host: maybe-install-info-libgui
 install-info-host: maybe-install-info-libiberty
+install-info-host: maybe-install-info-libiberty-linker-plugin
 install-info-host: maybe-install-info-libiconv
 install-info-host: maybe-install-info-m4
 install-info-host: maybe-install-info-readline
@@ -1588,13 +1639,17 @@ install-info-host: maybe-install-info-libtermcap
 install-info-host: maybe-install-info-utils
 install-info-host: maybe-install-info-gnattools
 install-info-host: maybe-install-info-lto-plugin
+install-info-host: maybe-install-info-libcc1
+install-info-host: maybe-install-info-gotools
 
 .PHONY: install-info-target
 
 install-info-target: maybe-install-info-target-libstdc++-v3
 install-info-target: maybe-install-info-target-libsanitizer
+install-info-target: maybe-install-info-target-libmpx
 install-info-target: maybe-install-info-target-libvtv
 install-info-target: maybe-install-info-target-libcilkrts
+install-info-target: maybe-install-info-target-liboffloadmic
 install-info-target: maybe-install-info-target-libssp
 install-info-target: maybe-install-info-target-newlib
 install-info-target: maybe-install-info-target-libgcc
@@ -1643,7 +1698,6 @@ install-pdf-host: maybe-install-pdf-gmp
 install-pdf-host: maybe-install-pdf-mpfr
 install-pdf-host: maybe-install-pdf-mpc
 install-pdf-host: maybe-install-pdf-isl
-install-pdf-host: maybe-install-pdf-cloog
 install-pdf-host: maybe-install-pdf-libelf
 install-pdf-host: maybe-install-pdf-gold
 install-pdf-host: maybe-install-pdf-gprof
@@ -1656,6 +1710,7 @@ install-pdf-host: maybe-install-pdf-libcpp
 install-pdf-host: maybe-install-pdf-libdecnumber
 install-pdf-host: maybe-install-pdf-libgui
 install-pdf-host: maybe-install-pdf-libiberty
+install-pdf-host: maybe-install-pdf-libiberty-linker-plugin
 install-pdf-host: maybe-install-pdf-libiconv
 install-pdf-host: maybe-install-pdf-m4
 install-pdf-host: maybe-install-pdf-readline
@@ -1671,13 +1726,17 @@ install-pdf-host: maybe-install-pdf-libtermcap
 install-pdf-host: maybe-install-pdf-utils
 install-pdf-host: maybe-install-pdf-gnattools
 install-pdf-host: maybe-install-pdf-lto-plugin
+install-pdf-host: maybe-install-pdf-libcc1
+install-pdf-host: maybe-install-pdf-gotools
 
 .PHONY: install-pdf-target
 
 install-pdf-target: maybe-install-pdf-target-libstdc++-v3
 install-pdf-target: maybe-install-pdf-target-libsanitizer
+install-pdf-target: maybe-install-pdf-target-libmpx
 install-pdf-target: maybe-install-pdf-target-libvtv
 install-pdf-target: maybe-install-pdf-target-libcilkrts
+install-pdf-target: maybe-install-pdf-target-liboffloadmic
 install-pdf-target: maybe-install-pdf-target-libssp
 install-pdf-target: maybe-install-pdf-target-newlib
 install-pdf-target: maybe-install-pdf-target-libgcc
@@ -1726,7 +1785,6 @@ install-html-host: maybe-install-html-gmp
 install-html-host: maybe-install-html-mpfr
 install-html-host: maybe-install-html-mpc
 install-html-host: maybe-install-html-isl
-install-html-host: maybe-install-html-cloog
 install-html-host: maybe-install-html-libelf
 install-html-host: maybe-install-html-gold
 install-html-host: maybe-install-html-gprof
@@ -1739,6 +1797,7 @@ install-html-host: maybe-install-html-libcpp
 install-html-host: maybe-install-html-libdecnumber
 install-html-host: maybe-install-html-libgui
 install-html-host: maybe-install-html-libiberty
+install-html-host: maybe-install-html-libiberty-linker-plugin
 install-html-host: maybe-install-html-libiconv
 install-html-host: maybe-install-html-m4
 install-html-host: maybe-install-html-readline
@@ -1754,13 +1813,17 @@ install-html-host: maybe-install-html-libtermcap
 install-html-host: maybe-install-html-utils
 install-html-host: maybe-install-html-gnattools
 install-html-host: maybe-install-html-lto-plugin
+install-html-host: maybe-install-html-libcc1
+install-html-host: maybe-install-html-gotools
 
 .PHONY: install-html-target
 
 install-html-target: maybe-install-html-target-libstdc++-v3
 install-html-target: maybe-install-html-target-libsanitizer
+install-html-target: maybe-install-html-target-libmpx
 install-html-target: maybe-install-html-target-libvtv
 install-html-target: maybe-install-html-target-libcilkrts
+install-html-target: maybe-install-html-target-liboffloadmic
 install-html-target: maybe-install-html-target-libssp
 install-html-target: maybe-install-html-target-newlib
 install-html-target: maybe-install-html-target-libgcc
@@ -1809,7 +1872,6 @@ installcheck-host: maybe-installcheck-gmp
 installcheck-host: maybe-installcheck-mpfr
 installcheck-host: maybe-installcheck-mpc
 installcheck-host: maybe-installcheck-isl
-installcheck-host: maybe-installcheck-cloog
 installcheck-host: maybe-installcheck-libelf
 installcheck-host: maybe-installcheck-gold
 installcheck-host: maybe-installcheck-gprof
@@ -1822,6 +1884,7 @@ installcheck-host: maybe-installcheck-libcpp
 installcheck-host: maybe-installcheck-libdecnumber
 installcheck-host: maybe-installcheck-libgui
 installcheck-host: maybe-installcheck-libiberty
+installcheck-host: maybe-installcheck-libiberty-linker-plugin
 installcheck-host: maybe-installcheck-libiconv
 installcheck-host: maybe-installcheck-m4
 installcheck-host: maybe-installcheck-readline
@@ -1837,13 +1900,17 @@ installcheck-host: maybe-installcheck-libtermcap
 installcheck-host: maybe-installcheck-utils
 installcheck-host: maybe-installcheck-gnattools
 installcheck-host: maybe-installcheck-lto-plugin
+installcheck-host: maybe-installcheck-libcc1
+installcheck-host: maybe-installcheck-gotools
 
 .PHONY: installcheck-target
 
 installcheck-target: maybe-installcheck-target-libstdc++-v3
 installcheck-target: maybe-installcheck-target-libsanitizer
+installcheck-target: maybe-installcheck-target-libmpx
 installcheck-target: maybe-installcheck-target-libvtv
 installcheck-target: maybe-installcheck-target-libcilkrts
+installcheck-target: maybe-installcheck-target-liboffloadmic
 installcheck-target: maybe-installcheck-target-libssp
 installcheck-target: maybe-installcheck-target-newlib
 installcheck-target: maybe-installcheck-target-libgcc
@@ -1892,7 +1959,6 @@ mostlyclean-host: maybe-mostlyclean-gmp
 mostlyclean-host: maybe-mostlyclean-mpfr
 mostlyclean-host: maybe-mostlyclean-mpc
 mostlyclean-host: maybe-mostlyclean-isl
-mostlyclean-host: maybe-mostlyclean-cloog
 mostlyclean-host: maybe-mostlyclean-libelf
 mostlyclean-host: maybe-mostlyclean-gold
 mostlyclean-host: maybe-mostlyclean-gprof
@@ -1905,6 +1971,7 @@ mostlyclean-host: maybe-mostlyclean-libcpp
 mostlyclean-host: maybe-mostlyclean-libdecnumber
 mostlyclean-host: maybe-mostlyclean-libgui
 mostlyclean-host: maybe-mostlyclean-libiberty
+mostlyclean-host: maybe-mostlyclean-libiberty-linker-plugin
 mostlyclean-host: maybe-mostlyclean-libiconv
 mostlyclean-host: maybe-mostlyclean-m4
 mostlyclean-host: maybe-mostlyclean-readline
@@ -1920,13 +1987,17 @@ mostlyclean-host: maybe-mostlyclean-libtermcap
 mostlyclean-host: maybe-mostlyclean-utils
 mostlyclean-host: maybe-mostlyclean-gnattools
 mostlyclean-host: maybe-mostlyclean-lto-plugin
+mostlyclean-host: maybe-mostlyclean-libcc1
+mostlyclean-host: maybe-mostlyclean-gotools
 
 .PHONY: mostlyclean-target
 
 mostlyclean-target: maybe-mostlyclean-target-libstdc++-v3
 mostlyclean-target: maybe-mostlyclean-target-libsanitizer
+mostlyclean-target: maybe-mostlyclean-target-libmpx
 mostlyclean-target: maybe-mostlyclean-target-libvtv
 mostlyclean-target: maybe-mostlyclean-target-libcilkrts
+mostlyclean-target: maybe-mostlyclean-target-liboffloadmic
 mostlyclean-target: maybe-mostlyclean-target-libssp
 mostlyclean-target: maybe-mostlyclean-target-newlib
 mostlyclean-target: maybe-mostlyclean-target-libgcc
@@ -1975,7 +2046,6 @@ clean-host: maybe-clean-gmp
 clean-host: maybe-clean-mpfr
 clean-host: maybe-clean-mpc
 clean-host: maybe-clean-isl
-clean-host: maybe-clean-cloog
 clean-host: maybe-clean-libelf
 clean-host: maybe-clean-gold
 clean-host: maybe-clean-gprof
@@ -1988,6 +2058,7 @@ clean-host: maybe-clean-libcpp
 clean-host: maybe-clean-libdecnumber
 clean-host: maybe-clean-libgui
 clean-host: maybe-clean-libiberty
+clean-host: maybe-clean-libiberty-linker-plugin
 clean-host: maybe-clean-libiconv
 clean-host: maybe-clean-m4
 clean-host: maybe-clean-readline
@@ -2003,13 +2074,17 @@ clean-host: maybe-clean-libtermcap
 clean-host: maybe-clean-utils
 clean-host: maybe-clean-gnattools
 clean-host: maybe-clean-lto-plugin
+clean-host: maybe-clean-libcc1
+clean-host: maybe-clean-gotools
 
 .PHONY: clean-target
 
 clean-target: maybe-clean-target-libstdc++-v3
 clean-target: maybe-clean-target-libsanitizer
+clean-target: maybe-clean-target-libmpx
 clean-target: maybe-clean-target-libvtv
 clean-target: maybe-clean-target-libcilkrts
+clean-target: maybe-clean-target-liboffloadmic
 clean-target: maybe-clean-target-libssp
 clean-target: maybe-clean-target-newlib
 clean-target: maybe-clean-target-libgcc
@@ -2058,7 +2133,6 @@ distclean-host: maybe-distclean-gmp
 distclean-host: maybe-distclean-mpfr
 distclean-host: maybe-distclean-mpc
 distclean-host: maybe-distclean-isl
-distclean-host: maybe-distclean-cloog
 distclean-host: maybe-distclean-libelf
 distclean-host: maybe-distclean-gold
 distclean-host: maybe-distclean-gprof
@@ -2071,6 +2145,7 @@ distclean-host: maybe-distclean-libcpp
 distclean-host: maybe-distclean-libdecnumber
 distclean-host: maybe-distclean-libgui
 distclean-host: maybe-distclean-libiberty
+distclean-host: maybe-distclean-libiberty-linker-plugin
 distclean-host: maybe-distclean-libiconv
 distclean-host: maybe-distclean-m4
 distclean-host: maybe-distclean-readline
@@ -2086,13 +2161,17 @@ distclean-host: maybe-distclean-libtermcap
 distclean-host: maybe-distclean-utils
 distclean-host: maybe-distclean-gnattools
 distclean-host: maybe-distclean-lto-plugin
+distclean-host: maybe-distclean-libcc1
+distclean-host: maybe-distclean-gotools
 
 .PHONY: distclean-target
 
 distclean-target: maybe-distclean-target-libstdc++-v3
 distclean-target: maybe-distclean-target-libsanitizer
+distclean-target: maybe-distclean-target-libmpx
 distclean-target: maybe-distclean-target-libvtv
 distclean-target: maybe-distclean-target-libcilkrts
+distclean-target: maybe-distclean-target-liboffloadmic
 distclean-target: maybe-distclean-target-libssp
 distclean-target: maybe-distclean-target-newlib
 distclean-target: maybe-distclean-target-libgcc
@@ -2141,7 +2220,6 @@ maintainer-clean-host: maybe-maintainer-clean-gmp
 maintainer-clean-host: maybe-maintainer-clean-mpfr
 maintainer-clean-host: maybe-maintainer-clean-mpc
 maintainer-clean-host: maybe-maintainer-clean-isl
-maintainer-clean-host: maybe-maintainer-clean-cloog
 maintainer-clean-host: maybe-maintainer-clean-libelf
 maintainer-clean-host: maybe-maintainer-clean-gold
 maintainer-clean-host: maybe-maintainer-clean-gprof
@@ -2154,6 +2232,7 @@ maintainer-clean-host: maybe-maintainer-clean-libcpp
 maintainer-clean-host: maybe-maintainer-clean-libdecnumber
 maintainer-clean-host: maybe-maintainer-clean-libgui
 maintainer-clean-host: maybe-maintainer-clean-libiberty
+maintainer-clean-host: maybe-maintainer-clean-libiberty-linker-plugin
 maintainer-clean-host: maybe-maintainer-clean-libiconv
 maintainer-clean-host: maybe-maintainer-clean-m4
 maintainer-clean-host: maybe-maintainer-clean-readline
@@ -2169,13 +2248,17 @@ maintainer-clean-host: maybe-maintainer-clean-libtermcap
 maintainer-clean-host: maybe-maintainer-clean-utils
 maintainer-clean-host: maybe-maintainer-clean-gnattools
 maintainer-clean-host: maybe-maintainer-clean-lto-plugin
+maintainer-clean-host: maybe-maintainer-clean-libcc1
+maintainer-clean-host: maybe-maintainer-clean-gotools
 
 .PHONY: maintainer-clean-target
 
 maintainer-clean-target: maybe-maintainer-clean-target-libstdc++-v3
 maintainer-clean-target: maybe-maintainer-clean-target-libsanitizer
+maintainer-clean-target: maybe-maintainer-clean-target-libmpx
 maintainer-clean-target: maybe-maintainer-clean-target-libvtv
 maintainer-clean-target: maybe-maintainer-clean-target-libcilkrts
+maintainer-clean-target: maybe-maintainer-clean-target-liboffloadmic
 maintainer-clean-target: maybe-maintainer-clean-target-libssp
 maintainer-clean-target: maybe-maintainer-clean-target-newlib
 maintainer-clean-target: maybe-maintainer-clean-target-libgcc
@@ -2216,9 +2299,9 @@ do-info: maybe-all-texinfo
 
 install-info: do-install-info dir.info
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       if [ -f dir.info ] ; then \
-         $(INSTALL_DATA) dir.info $(DESTDIR)$(infodir)/dir.info ; \
-       else true ; fi
+       if [ -f dir.info ]; then \
+         $(INSTALL_DATA) dir.info $(DESTDIR)$(infodir)/dir.info; \
+       else true; fi
 
 install-pdf: do-install-pdf
 
@@ -2279,7 +2362,6 @@ check-host:  \
     maybe-check-mpfr \
     maybe-check-mpc \
     maybe-check-isl \
-    maybe-check-cloog \
     maybe-check-libelf \
     maybe-check-gold \
     maybe-check-gprof \
@@ -2292,6 +2374,7 @@ check-host:  \
     maybe-check-libdecnumber \
     maybe-check-libgui \
     maybe-check-libiberty \
+    maybe-check-libiberty-linker-plugin \
     maybe-check-libiconv \
     maybe-check-m4 \
     maybe-check-readline \
@@ -2306,14 +2389,18 @@ check-host:  \
     maybe-check-libtermcap \
     maybe-check-utils \
     maybe-check-gnattools \
-    maybe-check-lto-plugin
+    maybe-check-lto-plugin \
+    maybe-check-libcc1 \
+    maybe-check-gotools
 
 .PHONY: check-target
 check-target:  \
     maybe-check-target-libstdc++-v3 \
     maybe-check-target-libsanitizer \
+    maybe-check-target-libmpx \
     maybe-check-target-libvtv \
     maybe-check-target-libcilkrts \
+    maybe-check-target-liboffloadmic \
     maybe-check-target-libssp \
     maybe-check-target-newlib \
     maybe-check-target-libgcc \
@@ -2362,6 +2449,18 @@ mail-report-with-warnings.log: warning.log
        chmod +x $@
        echo If you really want to send e-mail, run ./$@ now
 
+# Local Vim config
+
+$(srcdir)/.local.vimrc:
+       $(LN_S) contrib/vimrc $@
+
+$(srcdir)/.lvimrc:
+       $(LN_S) contrib/vimrc $@
+
+vimrc: $(srcdir)/.local.vimrc $(srcdir)/.lvimrc
+
+.PHONY: vimrc
+
 # Installation targets.
 
 .PHONY: install uninstall
@@ -2388,7 +2487,6 @@ install-host-nogcc:  \
     maybe-install-mpfr \
     maybe-install-mpc \
     maybe-install-isl \
-    maybe-install-cloog \
     maybe-install-libelf \
     maybe-install-gold \
     maybe-install-gprof \
@@ -2401,6 +2499,7 @@ install-host-nogcc:  \
     maybe-install-libdecnumber \
     maybe-install-libgui \
     maybe-install-libiberty \
+    maybe-install-libiberty-linker-plugin \
     maybe-install-libiconv \
     maybe-install-m4 \
     maybe-install-readline \
@@ -2415,7 +2514,9 @@ install-host-nogcc:  \
     maybe-install-libtermcap \
     maybe-install-utils \
     maybe-install-gnattools \
-    maybe-install-lto-plugin
+    maybe-install-lto-plugin \
+    maybe-install-libcc1 \
+    maybe-install-gotools
 
 .PHONY: install-host
 install-host:  \
@@ -2435,7 +2536,6 @@ install-host:  \
     maybe-install-mpfr \
     maybe-install-mpc \
     maybe-install-isl \
-    maybe-install-cloog \
     maybe-install-libelf \
     maybe-install-gold \
     maybe-install-gprof \
@@ -2448,6 +2548,7 @@ install-host:  \
     maybe-install-libdecnumber \
     maybe-install-libgui \
     maybe-install-libiberty \
+    maybe-install-libiberty-linker-plugin \
     maybe-install-libiconv \
     maybe-install-m4 \
     maybe-install-readline \
@@ -2462,14 +2563,18 @@ install-host:  \
     maybe-install-libtermcap \
     maybe-install-utils \
     maybe-install-gnattools \
-    maybe-install-lto-plugin
+    maybe-install-lto-plugin \
+    maybe-install-libcc1 \
+    maybe-install-gotools
 
 .PHONY: install-target
 install-target:  \
     maybe-install-target-libstdc++-v3 \
     maybe-install-target-libsanitizer \
+    maybe-install-target-libmpx \
     maybe-install-target-libvtv \
     maybe-install-target-libcilkrts \
+    maybe-install-target-liboffloadmic \
     maybe-install-target-libssp \
     maybe-install-target-newlib \
     maybe-install-target-libgcc \
@@ -2496,14 +2601,14 @@ uninstall:
 
 .PHONY: install.all
 install.all: install-no-fixedincludes
-       @if [ -f ./gcc/Makefile ] ; then \
-               r=`${PWD_COMMAND}` ; export r ; \
+       @if [ -f ./gcc/Makefile ]; then \
+               r=`${PWD_COMMAND}`; export r; \
                s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
                $(HOST_EXPORTS) \
                (cd ./gcc && \
-               $(MAKE) $(FLAGS_TO_PASS) install-headers) ; \
+               $(MAKE) $(FLAGS_TO_PASS) install-headers); \
        else \
-               true ; \
+               true; \
        fi
 
 # install-no-fixedincludes is used to allow the elaboration of binary packages
@@ -2538,7 +2643,6 @@ install-strip-host:  \
     maybe-install-strip-mpfr \
     maybe-install-strip-mpc \
     maybe-install-strip-isl \
-    maybe-install-strip-cloog \
     maybe-install-strip-libelf \
     maybe-install-strip-gold \
     maybe-install-strip-gprof \
@@ -2551,6 +2655,7 @@ install-strip-host:  \
     maybe-install-strip-libdecnumber \
     maybe-install-strip-libgui \
     maybe-install-strip-libiberty \
+    maybe-install-strip-libiberty-linker-plugin \
     maybe-install-strip-libiconv \
     maybe-install-strip-m4 \
     maybe-install-strip-readline \
@@ -2565,14 +2670,18 @@ install-strip-host:  \
     maybe-install-strip-libtermcap \
     maybe-install-strip-utils \
     maybe-install-strip-gnattools \
-    maybe-install-strip-lto-plugin
+    maybe-install-strip-lto-plugin \
+    maybe-install-strip-libcc1 \
+    maybe-install-strip-gotools
 
 .PHONY: install-strip-target
 install-strip-target:  \
     maybe-install-strip-target-libstdc++-v3 \
     maybe-install-strip-target-libsanitizer \
+    maybe-install-strip-target-libmpx \
     maybe-install-strip-target-libvtv \
     maybe-install-strip-target-libcilkrts \
+    maybe-install-strip-target-liboffloadmic \
     maybe-install-strip-target-libssp \
     maybe-install-strip-target-newlib \
     maybe-install-strip-target-libgcc \
@@ -2605,10 +2714,10 @@ installdirs: mkinstalldirs
        $(SHELL) $(srcdir)/mkinstalldirs $(MAKEDIRS)
 
 dir.info: do-install-info
-       if [ -f $(srcdir)/texinfo/gen-info-dir ] ; then \
-         $(srcdir)/texinfo/gen-info-dir $(DESTDIR)$(infodir) 
$(srcdir)/texinfo/dir.info-template > dir.info.new ; \
-         mv -f dir.info.new dir.info ; \
-       else true ; \
+       if [ -f $(srcdir)/texinfo/gen-info-dir ]; then \
+         $(srcdir)/texinfo/gen-info-dir $(DESTDIR)$(infodir) 
$(srcdir)/texinfo/dir.info-template > dir.info.new; \
+         mv -f dir.info.new dir.info; \
+       else true; \
        fi
 
 dist:
@@ -2650,7 +2759,7 @@ configure-build-libiberty:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(BUILD_SUBDIR)/libiberty/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/libiberty ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/libiberty; \
        $(BUILD_EXPORTS)  \
        echo Configuring in $(BUILD_SUBDIR)/libiberty; \
        cd "$(BUILD_SUBDIR)/libiberty" || exit 1; \
@@ -2659,12 +2768,13 @@ configure-build-libiberty:
          *) topdir=`echo $(BUILD_SUBDIR)/libiberty/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/libiberty"; \
-       libsrcdir="$$s/libiberty"; \
+       module_srcdir=libiberty; \
        rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif build-libiberty
 
@@ -2706,7 +2816,7 @@ configure-build-bison:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(BUILD_SUBDIR)/bison/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/bison ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/bison; \
        $(BUILD_EXPORTS)  \
        echo Configuring in $(BUILD_SUBDIR)/bison; \
        cd "$(BUILD_SUBDIR)/bison" || exit 1; \
@@ -2715,12 +2825,13 @@ configure-build-bison:
          *) topdir=`echo $(BUILD_SUBDIR)/bison/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/bison"; \
-       libsrcdir="$$s/bison"; \
+       module_srcdir=bison; \
        rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif build-bison
 
@@ -2762,7 +2873,7 @@ configure-build-flex:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(BUILD_SUBDIR)/flex/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/flex ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/flex; \
        $(BUILD_EXPORTS)  \
        echo Configuring in $(BUILD_SUBDIR)/flex; \
        cd "$(BUILD_SUBDIR)/flex" || exit 1; \
@@ -2771,12 +2882,13 @@ configure-build-flex:
          *) topdir=`echo $(BUILD_SUBDIR)/flex/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/flex"; \
-       libsrcdir="$$s/flex"; \
+       module_srcdir=flex; \
        rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif build-flex
 
@@ -2818,7 +2930,7 @@ configure-build-m4:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(BUILD_SUBDIR)/m4/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/m4 ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/m4; \
        $(BUILD_EXPORTS)  \
        echo Configuring in $(BUILD_SUBDIR)/m4; \
        cd "$(BUILD_SUBDIR)/m4" || exit 1; \
@@ -2827,12 +2939,13 @@ configure-build-m4:
          *) topdir=`echo $(BUILD_SUBDIR)/m4/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/m4"; \
-       libsrcdir="$$s/m4"; \
+       module_srcdir=m4; \
        rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif build-m4
 
@@ -2874,7 +2987,7 @@ configure-build-texinfo:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(BUILD_SUBDIR)/texinfo/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/texinfo ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/texinfo; \
        $(BUILD_EXPORTS)  \
        echo Configuring in $(BUILD_SUBDIR)/texinfo; \
        cd "$(BUILD_SUBDIR)/texinfo" || exit 1; \
@@ -2883,12 +2996,13 @@ configure-build-texinfo:
          *) topdir=`echo $(BUILD_SUBDIR)/texinfo/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/texinfo"; \
-       libsrcdir="$$s/texinfo"; \
+       module_srcdir=texinfo; \
        rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif build-texinfo
 
@@ -2930,7 +3044,7 @@ configure-build-fixincludes:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(BUILD_SUBDIR)/fixincludes/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/fixincludes ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/fixincludes; \
        $(BUILD_EXPORTS)  \
        echo Configuring in $(BUILD_SUBDIR)/fixincludes; \
        cd "$(BUILD_SUBDIR)/fixincludes" || exit 1; \
@@ -2939,12 +3053,13 @@ configure-build-fixincludes:
          *) topdir=`echo $(BUILD_SUBDIR)/fixincludes/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/fixincludes"; \
-       libsrcdir="$$s/fixincludes"; \
+       module_srcdir=fixincludes; \
        rm -f no-such-file || : ; \
-       CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif build-fixincludes
 
@@ -2974,6 +3089,63 @@ all-build-fixincludes: configure-build-fixincludes
 
 
 
+.PHONY: configure-build-libcpp maybe-configure-build-libcpp
+maybe-configure-build-libcpp:
+@if gcc-bootstrap
+configure-build-libcpp: stage_current
+@endif gcc-bootstrap
+@if build-libcpp
+maybe-configure-build-libcpp: configure-build-libcpp
+configure-build-libcpp: 
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       test ! -f $(BUILD_SUBDIR)/libcpp/Makefile || exit 0; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/libcpp; \
+       $(BUILD_EXPORTS)  \
+       echo Configuring in $(BUILD_SUBDIR)/libcpp; \
+       cd "$(BUILD_SUBDIR)/libcpp" || exit 1; \
+       case $(srcdir) in \
+         /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+         *) topdir=`echo $(BUILD_SUBDIR)/libcpp/ | \
+               sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+       esac; \
+       module_srcdir=libcpp; \
+       rm -f no-such-file || : ; \
+       CONFIG_SITE=no-such-file $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
+         $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
+         --target=${target_alias} --disable-nls am_cv_func_iconv=no \
+         || exit 1
+@endif build-libcpp
+
+
+
+
+
+.PHONY: all-build-libcpp maybe-all-build-libcpp
+maybe-all-build-libcpp:
+@if gcc-bootstrap
+all-build-libcpp: stage_current
+@endif gcc-bootstrap
+@if build-libcpp
+TARGET-build-libcpp=all
+maybe-all-build-libcpp: all-build-libcpp
+all-build-libcpp: configure-build-libcpp
+       @: $(MAKE); $(unstage)
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+       $(BUILD_EXPORTS)  \
+       (cd $(BUILD_SUBDIR)/libcpp && \
+         $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS)   \
+               $(TARGET-build-libcpp))
+@endif build-libcpp
+
+
+
+
+
 # --------------------------------------
 # Modules which run on the host machine
 # --------------------------------------
@@ -2990,7 +3162,7 @@ configure-bfd:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd; \
        $(HOST_EXPORTS)  \
        echo Configuring in $(HOST_SUBDIR)/bfd; \
        cd "$(HOST_SUBDIR)/bfd" || exit 1; \
@@ -2999,11 +3171,12 @@ configure-bfd:
          *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/bfd"; \
-       libsrcdir="$$s/bfd"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=bfd; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif bfd
 
@@ -3024,19 +3197,20 @@ configure-stage1-bfd:
        CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 1 in $(HOST_SUBDIR)/bfd ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/bfd; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd; \
        cd $(HOST_SUBDIR)/bfd || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/bfd"; \
-       libsrcdir="$$s/bfd"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=bfd; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
+          \
          $(STAGE1_CONFIGURE_FLAGS)
 @endif bfd-bootstrap
 
@@ -3056,19 +3230,19 @@ configure-stage2-bfd:
        CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 2 in $(HOST_SUBDIR)/bfd ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
+       echo Configuring stage 2 in $(HOST_SUBDIR)/bfd; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd; \
        cd $(HOST_SUBDIR)/bfd || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/bfd"; \
-       libsrcdir="$$s/bfd"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=bfd; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE2_CONFIGURE_FLAGS)
 @endif bfd-bootstrap
@@ -3089,19 +3263,19 @@ configure-stage3-bfd:
        CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 3 in $(HOST_SUBDIR)/bfd ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
+       echo Configuring stage 3 in $(HOST_SUBDIR)/bfd; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd; \
        cd $(HOST_SUBDIR)/bfd || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/bfd"; \
-       libsrcdir="$$s/bfd"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=bfd; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE3_CONFIGURE_FLAGS)
 @endif bfd-bootstrap
@@ -3122,19 +3296,19 @@ configure-stage4-bfd:
        CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 4 in $(HOST_SUBDIR)/bfd ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
+       echo Configuring stage 4 in $(HOST_SUBDIR)/bfd; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd; \
        cd $(HOST_SUBDIR)/bfd || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/bfd"; \
-       libsrcdir="$$s/bfd"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=bfd; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE4_CONFIGURE_FLAGS)
 @endif bfd-bootstrap
@@ -3155,19 +3329,19 @@ configure-stageprofile-bfd:
        CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage profile in $(HOST_SUBDIR)/bfd ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
+       echo Configuring stage profile in $(HOST_SUBDIR)/bfd; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd; \
        cd $(HOST_SUBDIR)/bfd || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/bfd"; \
-       libsrcdir="$$s/bfd"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=bfd; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEprofile_CONFIGURE_FLAGS)
 @endif bfd-bootstrap
@@ -3188,19 +3362,19 @@ configure-stagefeedback-bfd:
        CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage feedback in $(HOST_SUBDIR)/bfd ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/bfd; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd; \
        cd $(HOST_SUBDIR)/bfd || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/bfd"; \
-       libsrcdir="$$s/bfd"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=bfd; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif bfd-bootstrap
@@ -3487,9 +3661,9 @@ check-bfd:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/bfd && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  $(EXTRA_BOOTSTRAP_FLAGS) check)
 
 @endif bfd
 
@@ -3539,7 +3713,7 @@ info-bfd: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export 
\1|"`; \
        done; \
-       echo "Doing info in bfd" ; \
+       echo "Doing info in bfd"; \
        (cd $(HOST_SUBDIR)/bfd && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -3564,7 +3738,7 @@ dvi-bfd: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export 
\1|"`; \
        done; \
-       echo "Doing dvi in bfd" ; \
+       echo "Doing dvi in bfd"; \
        (cd $(HOST_SUBDIR)/bfd && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -3589,7 +3763,7 @@ pdf-bfd: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export 
\1|"`; \
        done; \
-       echo "Doing pdf in bfd" ; \
+       echo "Doing pdf in bfd"; \
        (cd $(HOST_SUBDIR)/bfd && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -3614,7 +3788,7 @@ html-bfd: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export 
\1|"`; \
        done; \
-       echo "Doing html in bfd" ; \
+       echo "Doing html in bfd"; \
        (cd $(HOST_SUBDIR)/bfd && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -3639,7 +3813,7 @@ TAGS-bfd: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export 
\1|"`; \
        done; \
-       echo "Doing TAGS in bfd" ; \
+       echo "Doing TAGS in bfd"; \
        (cd $(HOST_SUBDIR)/bfd && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -3665,7 +3839,7 @@ install-info-bfd: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export 
\1|"`; \
        done; \
-       echo "Doing install-info in bfd" ; \
+       echo "Doing install-info in bfd"; \
        (cd $(HOST_SUBDIR)/bfd && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -3691,7 +3865,7 @@ install-pdf-bfd: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export 
\1|"`; \
        done; \
-       echo "Doing install-pdf in bfd" ; \
+       echo "Doing install-pdf in bfd"; \
        (cd $(HOST_SUBDIR)/bfd && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -3717,7 +3891,7 @@ install-html-bfd: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export 
\1|"`; \
        done; \
-       echo "Doing install-html in bfd" ; \
+       echo "Doing install-html in bfd"; \
        (cd $(HOST_SUBDIR)/bfd && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -3742,7 +3916,7 @@ installcheck-bfd: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export 
\1|"`; \
        done; \
-       echo "Doing installcheck in bfd" ; \
+       echo "Doing installcheck in bfd"; \
        (cd $(HOST_SUBDIR)/bfd && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -3766,7 +3940,7 @@ mostlyclean-bfd:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export 
\1|"`; \
        done; \
-       echo "Doing mostlyclean in bfd" ; \
+       echo "Doing mostlyclean in bfd"; \
        (cd $(HOST_SUBDIR)/bfd && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -3790,7 +3964,7 @@ clean-bfd:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export 
\1|"`; \
        done; \
-       echo "Doing clean in bfd" ; \
+       echo "Doing clean in bfd"; \
        (cd $(HOST_SUBDIR)/bfd && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -3814,7 +3988,7 @@ distclean-bfd:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export 
\1|"`; \
        done; \
-       echo "Doing distclean in bfd" ; \
+       echo "Doing distclean in bfd"; \
        (cd $(HOST_SUBDIR)/bfd && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -3838,7 +4012,7 @@ maintainer-clean-bfd:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export 
\1|"`; \
        done; \
-       echo "Doing maintainer-clean in bfd" ; \
+       echo "Doing maintainer-clean in bfd"; \
        (cd $(HOST_SUBDIR)/bfd && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -3862,7 +4036,7 @@ configure-opcodes:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes; \
        $(HOST_EXPORTS)  \
        echo Configuring in $(HOST_SUBDIR)/opcodes; \
        cd "$(HOST_SUBDIR)/opcodes" || exit 1; \
@@ -3871,11 +4045,12 @@ configure-opcodes:
          *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/opcodes"; \
-       libsrcdir="$$s/opcodes"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=opcodes; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif opcodes
 
@@ -3896,19 +4071,20 @@ configure-stage1-opcodes:
        CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 1 in $(HOST_SUBDIR)/opcodes ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/opcodes; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes; \
        cd $(HOST_SUBDIR)/opcodes || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/opcodes"; \
-       libsrcdir="$$s/opcodes"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=opcodes; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
+          \
          $(STAGE1_CONFIGURE_FLAGS)
 @endif opcodes-bootstrap
 
@@ -3928,19 +4104,19 @@ configure-stage2-opcodes:
        CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 2 in $(HOST_SUBDIR)/opcodes ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
+       echo Configuring stage 2 in $(HOST_SUBDIR)/opcodes; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes; \
        cd $(HOST_SUBDIR)/opcodes || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/opcodes"; \
-       libsrcdir="$$s/opcodes"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=opcodes; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE2_CONFIGURE_FLAGS)
 @endif opcodes-bootstrap
@@ -3961,19 +4137,19 @@ configure-stage3-opcodes:
        CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 3 in $(HOST_SUBDIR)/opcodes ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
+       echo Configuring stage 3 in $(HOST_SUBDIR)/opcodes; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes; \
        cd $(HOST_SUBDIR)/opcodes || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/opcodes"; \
-       libsrcdir="$$s/opcodes"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=opcodes; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE3_CONFIGURE_FLAGS)
 @endif opcodes-bootstrap
@@ -3994,19 +4170,19 @@ configure-stage4-opcodes:
        CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 4 in $(HOST_SUBDIR)/opcodes ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
+       echo Configuring stage 4 in $(HOST_SUBDIR)/opcodes; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes; \
        cd $(HOST_SUBDIR)/opcodes || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/opcodes"; \
-       libsrcdir="$$s/opcodes"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=opcodes; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE4_CONFIGURE_FLAGS)
 @endif opcodes-bootstrap
@@ -4027,19 +4203,19 @@ configure-stageprofile-opcodes:
        CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage profile in $(HOST_SUBDIR)/opcodes ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
+       echo Configuring stage profile in $(HOST_SUBDIR)/opcodes; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes; \
        cd $(HOST_SUBDIR)/opcodes || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/opcodes"; \
-       libsrcdir="$$s/opcodes"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=opcodes; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEprofile_CONFIGURE_FLAGS)
 @endif opcodes-bootstrap
@@ -4060,19 +4236,19 @@ configure-stagefeedback-opcodes:
        CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage feedback in $(HOST_SUBDIR)/opcodes ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/opcodes; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes; \
        cd $(HOST_SUBDIR)/opcodes || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/opcodes"; \
-       libsrcdir="$$s/opcodes"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=opcodes; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEfeedback_CONFIGURE_FLAGS)
 @endif opcodes-bootstrap
@@ -4359,9 +4535,9 @@ check-opcodes:
        @: $(MAKE); $(unstage)
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-       $(HOST_EXPORTS) \
+       $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \
        (cd $(HOST_SUBDIR)/opcodes && \
-         $(MAKE) $(FLAGS_TO_PASS)  check)
+         $(MAKE) $(FLAGS_TO_PASS)  $(EXTRA_BOOTSTRAP_FLAGS) check)
 
 @endif opcodes
 
@@ -4411,7 +4587,7 @@ info-opcodes: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export 
\1|"`; \
        done; \
-       echo "Doing info in opcodes" ; \
+       echo "Doing info in opcodes"; \
        (cd $(HOST_SUBDIR)/opcodes && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -4436,7 +4612,7 @@ dvi-opcodes: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export 
\1|"`; \
        done; \
-       echo "Doing dvi in opcodes" ; \
+       echo "Doing dvi in opcodes"; \
        (cd $(HOST_SUBDIR)/opcodes && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -4461,7 +4637,7 @@ pdf-opcodes: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export 
\1|"`; \
        done; \
-       echo "Doing pdf in opcodes" ; \
+       echo "Doing pdf in opcodes"; \
        (cd $(HOST_SUBDIR)/opcodes && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -4486,7 +4662,7 @@ html-opcodes: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export 
\1|"`; \
        done; \
-       echo "Doing html in opcodes" ; \
+       echo "Doing html in opcodes"; \
        (cd $(HOST_SUBDIR)/opcodes && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -4511,7 +4687,7 @@ TAGS-opcodes: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export 
\1|"`; \
        done; \
-       echo "Doing TAGS in opcodes" ; \
+       echo "Doing TAGS in opcodes"; \
        (cd $(HOST_SUBDIR)/opcodes && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -4537,7 +4713,7 @@ install-info-opcodes: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export 
\1|"`; \
        done; \
-       echo "Doing install-info in opcodes" ; \
+       echo "Doing install-info in opcodes"; \
        (cd $(HOST_SUBDIR)/opcodes && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -4563,7 +4739,7 @@ install-pdf-opcodes: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export 
\1|"`; \
        done; \
-       echo "Doing install-pdf in opcodes" ; \
+       echo "Doing install-pdf in opcodes"; \
        (cd $(HOST_SUBDIR)/opcodes && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -4589,7 +4765,7 @@ install-html-opcodes: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export 
\1|"`; \
        done; \
-       echo "Doing install-html in opcodes" ; \
+       echo "Doing install-html in opcodes"; \
        (cd $(HOST_SUBDIR)/opcodes && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -4614,7 +4790,7 @@ installcheck-opcodes: \
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export 
\1|"`; \
        done; \
-       echo "Doing installcheck in opcodes" ; \
+       echo "Doing installcheck in opcodes"; \
        (cd $(HOST_SUBDIR)/opcodes && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -4638,7 +4814,7 @@ mostlyclean-opcodes:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export 
\1|"`; \
        done; \
-       echo "Doing mostlyclean in opcodes" ; \
+       echo "Doing mostlyclean in opcodes"; \
        (cd $(HOST_SUBDIR)/opcodes && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -4662,7 +4838,7 @@ clean-opcodes:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export 
\1|"`; \
        done; \
-       echo "Doing clean in opcodes" ; \
+       echo "Doing clean in opcodes"; \
        (cd $(HOST_SUBDIR)/opcodes && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -4686,7 +4862,7 @@ distclean-opcodes:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export 
\1|"`; \
        done; \
-       echo "Doing distclean in opcodes" ; \
+       echo "Doing distclean in opcodes"; \
        (cd $(HOST_SUBDIR)/opcodes && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -4710,7 +4886,7 @@ maintainer-clean-opcodes:
        for flag in $(EXTRA_HOST_FLAGS) ; do \
          eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export 
\1|"`; \
        done; \
-       echo "Doing maintainer-clean in opcodes" ; \
+       echo "Doing maintainer-clean in opcodes"; \
        (cd $(HOST_SUBDIR)/opcodes && \
          $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
                  "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
@@ -4734,7 +4910,7 @@ configure-binutils:
        @r=`${PWD_COMMAND}`; export r; \
        s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils; \
        $(HOST_EXPORTS)  \
        echo Configuring in $(HOST_SUBDIR)/binutils; \
        cd "$(HOST_SUBDIR)/binutils" || exit 1; \
@@ -4743,11 +4919,12 @@ configure-binutils:
          *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/binutils"; \
-       libsrcdir="$$s/binutils"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=binutils; \
+       $(SHELL) \
+         $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption}  \
+         --target=${target_alias}  \
          || exit 1
 @endif binutils
 
@@ -4768,19 +4945,20 @@ configure-stage1-binutils:
        CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 1 in $(HOST_SUBDIR)/binutils ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
+       echo Configuring stage 1 in $(HOST_SUBDIR)/binutils; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils; \
        cd $(HOST_SUBDIR)/binutils || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/binutils"; \
-       libsrcdir="$$s/binutils"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=binutils; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
+          \
          $(STAGE1_CONFIGURE_FLAGS)
 @endif binutils-bootstrap
 
@@ -4800,19 +4978,19 @@ configure-stage2-binutils:
        CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 2 in $(HOST_SUBDIR)/binutils ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
+       echo Configuring stage 2 in $(HOST_SUBDIR)/binutils; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils; \
        cd $(HOST_SUBDIR)/binutils || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/binutils"; \
-       libsrcdir="$$s/binutils"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=binutils; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE2_CONFIGURE_FLAGS)
 @endif binutils-bootstrap
@@ -4833,19 +5011,19 @@ configure-stage3-binutils:
        CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 3 in $(HOST_SUBDIR)/binutils ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
+       echo Configuring stage 3 in $(HOST_SUBDIR)/binutils; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils; \
        cd $(HOST_SUBDIR)/binutils || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/binutils"; \
-       libsrcdir="$$s/binutils"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=binutils; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE3_CONFIGURE_FLAGS)
 @endif binutils-bootstrap
@@ -4866,19 +5044,19 @@ configure-stage4-binutils:
        CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage 4 in $(HOST_SUBDIR)/binutils ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
+       echo Configuring stage 4 in $(HOST_SUBDIR)/binutils; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils; \
        cd $(HOST_SUBDIR)/binutils || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/binutils"; \
-       libsrcdir="$$s/binutils"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=binutils; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGE4_CONFIGURE_FLAGS)
 @endif binutils-bootstrap
@@ -4899,19 +5077,19 @@ configure-stageprofile-binutils:
        CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage profile in $(HOST_SUBDIR)/binutils ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
+       echo Configuring stage profile in $(HOST_SUBDIR)/binutils; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils; \
        cd $(HOST_SUBDIR)/binutils || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/binutils"; \
-       libsrcdir="$$s/binutils"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=binutils; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEprofile_CONFIGURE_FLAGS)
 @endif binutils-bootstrap
@@ -4932,19 +5110,19 @@ configure-stagefeedback-binutils:
        CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \
        CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \
        LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS;  \
-       echo Configuring stage feedback in $(HOST_SUBDIR)/binutils ; \
-       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
+       echo Configuring stage feedback in $(HOST_SUBDIR)/binutils; \
+       $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils; \
        cd $(HOST_SUBDIR)/binutils || exit 1; \
        case $(srcdir) in \
          /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
          *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \
                sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
        esac; \
-       srcdiroption="--srcdir=$${topdir}/binutils"; \
-       libsrcdir="$$s/binutils"; \
-       $(SHELL) $${libsrcdir}/configure \
+       module_srcdir=binutils; \
+       $(SHELL) $$s/$$module_srcdir/configure \
+         --srcdir=$${topdir}/$$module_srcdir \
          $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
-         --target=${target_alias} $${srcdiroption} \
+         --target=${target_alias} \
          --with-build-libsubdir=$(HOST_SUBDIR) \
          $(STAGEfeedback_CONFIGURE_FLAGS)

[ *** diff truncated: 771473 lines dropped *** ]


############################################################################

Commit:      b9cfe212c1860d9ddfa479850013ad400f7c359d
URL:         http://cgit.haiku-os.org/buildtools/commit/?id=b9cfe212c186
Author:      Jérôme Duval <jerome.duval@xxxxxxxxx>
Date:        Wed Feb 10 18:02:55 2016 UTC

Merge binutils 2.26

----------------------------------------------------------------------------

############################################################################

Revision:    btrev43113
Commit:      661fb7cf18b38506538acdb9288c71dbf1e50ea4
URL:         http://cgit.haiku-os.org/buildtools/commit/?id=661fb7cf18b3
Author:      Jérôme Duval <jerome.duval@xxxxxxxxx>
Date:        Sun Feb 28 10:51:22 2016 UTC

gcc4: revert partially 419211519c79edc7af6fca9c6a3233129ec54d7d.

"* LINK_SPEC: Pass "-shared" to the linker only if it was passed to gcc; output
      position-independent executables by default;" is reverted to workaround a
link failure on gcc4 with binutils 2.26: add-ons objects would fail to link
against an executable (being no more a shared object). This is possibly 
temporary
until the need for executable as shared objects is fully reviewed.

----------------------------------------------------------------------------


Other related posts:

  • » [haiku-commits] buildtools: btrev43113 - in binutils: opcodes gas/po gas zlib bfd - jerome . duval