Remove.

4 files changed, 0 insertions, 6813 deletions

diff --git a/contrib/crossrpms/patches/gdb-6.7.1-gdb-6.7.90-config.diff b/contrib/crossrpms/patches/gdb-6.7.1-gdb-6.7.90-config.diff
deleted file mode 100644
index 7797738922..0000000000
--- a/contrib/crossrpms/patches/gdb-6.7.1-gdb-6.7.90-config.diff
+++ /dev/null
@@ -1,6436 +0,0 @@
---- gdb-6.7.1/configure	2007-10-12 16:05:09.000000000 +0200
-+++ gdb-6.7.90/configure	2008-02-20 15:26:58.000000000 +0100
-@@ -272,7 +272,7 @@
- PACKAGE_BUGREPORT=
- 
- ac_unique_file="move-if-change"
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_noncanonical host_noncanonical target_noncanonical host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN LN_S TOPLEVEL_CONFIGURE_ARGUMENTS build_libsubdir build_subdir host_subdir target_subdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GNATBIND ac_ct_GNATBIND GNATMAKE ac_ct_GNATMAKE do_compare gmplibs gmpinc stage1_languages SYSROOT_CFLAGS_FOR_TARGET DEBUG_PREFIX_CFLAGS_FOR_TARGET RPATH_ENVVAR tooldir build_tooldir CONFIGURE_GDB_TK GDB_TK INSTALL_GDB_TK build_configargs build_configdirs host_configargs configdirs target_configargs CC_FOR_BUILD config_shell YACC BISON M4 LEX FLEX MAKEINFO EXPECT RUNTEST AR AS DLLTOOL LD LIPO NM RANLIB STRIP WINDRES WINDMC OBJCOPY OBJDUMP CFLAGS_FOR_BUILD CC_FOR_TARGET CXX_FOR_TARGET GCC_FOR_TARGET GCJ_FOR_TARGET GFORTRAN_FOR_TARGET AR_FOR_TARGET AS_FOR_TARGET DLLTOOL_FOR_TARGET LD_FOR_TARGET LIPO_FOR_TARGET NM_FOR_TARGET OBJDUMP_FOR_TARGET RANLIB_FOR_TARGET STRIP_FOR_TARGET WINDRES_FOR_TARGET WINDMC_FOR_TARGET RAW_CXX_FOR_TARGET FLAGS_FOR_TARGET COMPILER_AS_FOR_TARGET COMPILER_LD_FOR_TARGET COMPILER_NM_FOR_TARGET MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT stage1_cflags stage1_checking stage2_werror_flag datarootdir docdir pdfdir htmldir LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_noncanonical host_noncanonical target_noncanonical host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN LN_S TOPLEVEL_CONFIGURE_ARGUMENTS build_libsubdir build_subdir host_subdir target_subdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GNATBIND ac_ct_GNATBIND GNATMAKE ac_ct_GNATMAKE do_compare gmplibs gmpinc stage1_languages SYSROOT_CFLAGS_FOR_TARGET DEBUG_PREFIX_CFLAGS_FOR_TARGET CFLAGS_FOR_TARGET CXXFLAGS_FOR_TARGET RPATH_ENVVAR tooldir build_tooldir CONFIGURE_GDB_TK GDB_TK INSTALL_GDB_TK build_configargs build_configdirs host_configargs configdirs target_configargs AR_FOR_BUILD AS_FOR_BUILD CC_FOR_BUILD CFLAGS_FOR_BUILD CXXFLAGS_FOR_BUILD CXX_FOR_BUILD DLLTOOL_FOR_BUILD GCJ_FOR_BUILD GFORTRAN_FOR_BUILD LDFLAGS_FOR_BUILD LD_FOR_BUILD NM_FOR_BUILD RANLIB_FOR_BUILD WINDMC_FOR_BUILD WINDRES_FOR_BUILD config_shell YACC BISON M4 LEX FLEX MAKEINFO EXPECT RUNTEST AR AS DLLTOOL LD LIPO NM RANLIB STRIP WINDRES WINDMC OBJCOPY OBJDUMP CC_FOR_TARGET CXX_FOR_TARGET GCC_FOR_TARGET GCJ_FOR_TARGET GFORTRAN_FOR_TARGET AR_FOR_TARGET AS_FOR_TARGET DLLTOOL_FOR_TARGET LD_FOR_TARGET LIPO_FOR_TARGET NM_FOR_TARGET OBJDUMP_FOR_TARGET RANLIB_FOR_TARGET STRIP_FOR_TARGET WINDRES_FOR_TARGET WINDMC_FOR_TARGET RAW_CXX_FOR_TARGET FLAGS_FOR_TARGET COMPILER_AS_FOR_TARGET COMPILER_LD_FOR_TARGET COMPILER_NM_FOR_TARGET MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT stage1_cflags stage1_checking stage2_werror_flag datarootdir docdir pdfdir htmldir LIBOBJS LTLIBOBJS'
- ac_subst_files='serialization_dependencies host_makefile_frag target_makefile_frag alphaieee_frag ospace_frag'
- 
- # Initialize some variables set by options.
-@@ -713,6 +713,8 @@
- ac_env_target_alias_value=$target_alias
- ac_cv_env_target_alias_set=${target_alias+set}
- ac_cv_env_target_alias_value=$target_alias
-+ac_subdirs_all=`cd $srcdir && echo */configure | sed 's,/configure,,g'`
-+
- ac_env_CC_set=${CC+set}
- ac_env_CC_value=$CC
- ac_cv_env_CC_set=${CC+set}
-@@ -1865,6 +1867,7 @@
- 		target-libiberty \
- 		target-libgloss \
- 		target-newlib \
-+		target-libgomp \
- 		target-libstdc++-v3 \
- 		target-libmudflap \
- 		target-libssp \
-@@ -1872,8 +1875,7 @@
- 		target-boehm-gc \
- 		${libgcj} \
- 		target-libobjc \
--		target-libada \
--		target-libgomp"
-+		target-libada"
- 
- # these tools are built using the target libraries, and are intended to
- # run only in the target environment
-@@ -1895,6 +1897,8 @@
- target_configdirs=`echo ${target_libraries} ${target_tools}`
- build_configdirs=`echo ${build_libs} ${build_tools}`
- 
-+
-+
- ################################################################################
- 
- srcname="gnu development package"
-@@ -2122,12 +2126,14 @@
-     esac
- fi
- 
-+# Default libgloss CPU subdirectory.
-+libgloss_dir="$target_cpu"
- 
- case "${target}" in
-   *-*-chorusos)
-     noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
-     ;;
--  powerpc-*-darwin* | i[3456789]86-*-darwin*)
-+  powerpc-*-darwin* | i[3456789]86-*-darwin* | x86_64-*-darwin9*)
-     noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes gdb gprof"
-     noconfigdirs="$noconfigdirs sim target-rda"
-     ;;
-@@ -2228,6 +2234,7 @@
-       *) noconfigdirs="$noconfigdirs gdb readline"
- 	 ;;
-     esac
-+    libgloss_dir=wince
-     ;;
-   arc-*-*)
-     noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
-@@ -2236,19 +2243,23 @@
-     ;;
-   arm-*-coff | strongarm-*-coff | xscale-*-coff)
-     noconfigdirs="$noconfigdirs ${libgcj}"
-+    libgloss_dir=arm
-     ;;
-   arm-*-elf* | strongarm-*-elf* | xscale-*-elf* | arm*-*-eabi* )
-     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
-+    libgloss_dir=arm
-     ;;
-   arm*-*-linux-gnueabi)
--    noconfigdirs="$noconfigdirs target-libffi target-qthreads"
--    noconfigdirs="$noconfigdirs target-libjava target-libobjc"
-+    noconfigdirs="$noconfigdirs target-qthreads"
-+    noconfigdirs="$noconfigdirs target-libobjc"
-     case ${with_newlib} in
-       no) noconfigdirs="$noconfigdirs target-newlib target-libgloss"
-     esac
-+    libgloss_dir=arm
-     ;;
-   arm*-*-symbianelf*)
-     noconfigdirs="$noconfigdirs ${libgcj} target-libiberty"
-+    libgloss_dir=arm
-     ;;
-   arm-*-pe*)
-     noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
-@@ -2287,7 +2298,6 @@
- 	unsupported_languages="$unsupported_languages fortran"
- 	noconfigdirs="$noconfigdirs target-libffi target-boehm-gc";;
-       *-*-elf)
--	unsupported_languages="$unsupported_languages fortran"
- 	noconfigdirs="$noconfigdirs target-boehm-gc";;
-       *-*-linux*)
- 	noconfigdirs="$noconfigdirs target-newlib target-libgloss";;
-@@ -2295,6 +2305,7 @@
- 	unsupported_languages="$unsupported_languages fortran"
- 	noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss";;
-     esac
-+    libgloss_dir=cris
-     ;;
-   crx-*-*)
-     noconfigdirs="$noconfigdirs target-libstdc++-v3 target-mudflap ${libgcj}"
-@@ -2305,6 +2316,9 @@
-   d30v-*-*)
-     noconfigdirs="$noconfigdirs ${libgcj} gdb"
-     ;;
-+  ep9312-*-elf | ep9312-*-coff)
-+    libgloss_dir=arm
-+    ;;
-   fr30-*-elf*)
-     noconfigdirs="$noconfigdirs ${libgcj} gdb"
-     ;;
-@@ -2336,6 +2350,9 @@
-   hppa*-hp-hpux11*)
-     noconfigdirs="$noconfigdirs ld shellutils"
-     ;;
-+  hppa*-*-pro*)
-+    libgloss_dir=pa
-+    ;;
-   hppa*-*-*)
-     # According to Alexandre Oliva <aoliva@redhat.com>, libjava won't
-     # build on HP-UX 10.20.
-@@ -2356,6 +2373,7 @@
-     ;;
-   i[3456789]86-*-coff | i[3456789]86-*-elf)
-     noconfigdirs="$noconfigdirs ${libgcj}"
-+    libgloss_dir=i386
-     ;;
-   i[3456789]86-*-linux*)
-     # The GCC port for glibc1 has no MD_FALLBACK_FRAME_STATE_FOR, so let's
-@@ -2425,6 +2443,7 @@
-     ;;
-   m68hc11-*-*|m6811-*-*|m68hc12-*-*|m6812-*-*)
-     noconfigdirs="$noconfigdirs target-libiberty target-libstdc++-v3 ${libgcj}"
-+    libgloss_dir=m68hc11
-     ;;
-   m68k-*-elf*)
-     noconfigdirs="$noconfigdirs ${libgcj}"
-@@ -2432,6 +2451,9 @@
-   m68k-*-coff*)
-     noconfigdirs="$noconfigdirs ${libgcj}"
-     ;;
-+  m68*-*-* | fido-*-*)
-+    libgloss_dir=m68k
-+    ;;
-   mcore-*-pe*)
-   # The EPOC C++ environment does not support exceptions or rtti,
-   # and so building libstdc++-v3 tends not to always work.
-@@ -2463,14 +2485,17 @@
-     # This is temporary until we can link against shared libraries
-   powerpcle-*-solaris*)
-     noconfigdirs="$noconfigdirs gdb sim make tcl tk expect itcl gnuserv ${libgcj}"
-+    libgloss_dir=rs6000
-     ;;
-   powerpc-*-beos*)
-     noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss ${libgcj}"
-     ;;
-   powerpc-*-eabi)
-     noconfigdirs="$noconfigdirs ${libgcj}"
-+    libgloss_dir=rs6000
-     ;;
-   powerpc-*-eabi* | powerpcle-*-eabi* | powerpc-*-rtems* )
-+    libgloss_dir=rs6000
-     ;;
-   rs6000-*-lynxos*)
-     noconfigdirs="$noconfigdirs target-newlib gprof ${libgcj}"
-@@ -2484,6 +2509,14 @@
-   m68k-apollo-*)
-     noconfigdirs="$noconfigdirs ld binutils gprof target-libgloss ${libgcj}"
-     ;;
-+  mips*-sde-elf*)
-+    skipdirs="$skipdirs target-libiberty"
-+    noconfigdirs="$noconfigdirs ${libgcj}"
-+    if test x$with_newlib = xyes; then
-+      noconfigdirs="$noconfigdirs gprof"
-+    fi
-+    libgloss_dir=mips
-+    ;;
-   mips*-*-irix5*)
-     noconfigdirs="$noconfigdirs gprof target-libgloss ${libgcj}"
-     ;;
-@@ -2497,14 +2530,12 @@
-   mips*-*-bsd*)
-     noconfigdirs="$noconfigdirs gprof target-libgloss ${libgcj}"
-     ;;
--  mips64*-*-linux*)
--    noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
--    ;;
-   mips*-*-linux*)
-     noconfigdirs="$noconfigdirs target-newlib target-libgloss"
-     ;;
-   mips*-*-*)
-     noconfigdirs="$noconfigdirs gprof ${libgcj}"
-+    libgloss_dir=mips
-     ;;
-   romp-*-*)
-     noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}"
-@@ -2518,14 +2549,19 @@
-     esac
-     noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
-     ;;
-+  sparclet-*-aout* | sparc86x-*-*)
-+    libgloss_dir=sparc
-+    ;;
-   sparc-*-elf*)
-     noconfigdirs="$noconfigdirs ${libgcj}"
-     ;;
-   sparc64-*-elf*)
-     noconfigdirs="$noconfigdirs ${libgcj}"
-+    libgloss_dir=sparc
-     ;;
-   sparclite-*-*)
-     noconfigdirs="$noconfigdirs ${libgcj}"
-+    libgloss_dir=sparc
-     ;;
-   sparc-*-sunos4*)
-     noconfigdirs="$noconfigdirs ${libgcj}"
-@@ -2561,7 +2597,7 @@
-   vax-*-*)
-     noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
-     ;;
--  xtensa-*-*)
-+  xtensa*-*-*)
-     noconfigdirs="$noconfigdirs ${libgcj}"
-     ;;
-   ip2k-*-*)
-@@ -2698,8 +2734,10 @@
-     host_makefile_frag="config/mh-cygwin"
-     ;;
-   *-mingw32*)
-+    host_makefile_frag="config/mh-mingw"
-     ;;
-   *-mingw64*)
-+    host_makefile_frag="config/mh-mingw"
-     ;;
-   *-interix*)
-     host_makefile_frag="config/mh-interix"
-@@ -2771,9 +2809,31 @@
- fi
- 
- if test "${build}" != "${host}" ; then
-+  AR_FOR_BUILD=${AR_FOR_BUILD-ar}
-+  AS_FOR_BUILD=${AS_FOR_BUILD-as}
-   CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
-+  CXX_FOR_BUILD=${CXX_FOR_BUILD-g++}
-+  GCJ_FOR_BUILD=${GCJ_FOR_BUILD-gcj}
-+  GFORTRAN_FOR_BUILD=${GFORTRAN_FOR_BUILD-gfortran}
-+  DLLTOOL_FOR_BUILD=${DLLTOOL_FOR_BUILD-dlltool}
-+  LD_FOR_BUILD=${LD_FOR_BUILD-ld}
-+  NM_FOR_BUILD=${NM_FOR_BUILD-nm}
-+  RANLIB_FOR_BUILD=${RANLIB_FOR_BUILD-ranlib}
-+  WINDRES_FOR_BUILD=${WINDRES_FOR_BUILD-windres}
-+  WINDMC_FOR_BUILD=${WINDMC_FOR_BUILD-windmc}
- else
-+  AR_FOR_BUILD="\$(AR)"
-+  AS_FOR_BUILD="\$(AS)"
-   CC_FOR_BUILD="\$(CC)"
-+  CXX_FOR_BUILD="\$(CXX)"
-+  GCJ_FOR_BUILD="\$(GCJ)"
-+  GFORTRAN_FOR_BUILD="\$(GFORTRAN)"
-+  DLLTOOL_FOR_BUILD="\$(DLLTOOL)"
-+  LD_FOR_BUILD="\$(LD)"
-+  NM_FOR_BUILD="\$(NM)"
-+  RANLIB_FOR_BUILD="\$(RANLIB)"
-+  WINDRES_FOR_BUILD="\$(WINDRES)"
-+  WINDMC_FOR_BUILD="\$(WINDMC)"
- fi
- 
- ac_ext=c
-@@ -4493,7 +4553,7 @@
- main ()
- {
- 
--    #if MPFR_VERSION < MPFR_VERSION_NUM(2,2,0)
-+    #if MPFR_VERSION < MPFR_VERSION_NUM(2,2,1)
-     choke me
-     #endif
-     mpfr_t n;
-@@ -4543,7 +4603,7 @@
- main ()
- {
- 
--    #if MPFR_VERSION < MPFR_VERSION_NUM(2,2,1)
-+    #if MPFR_VERSION < MPFR_VERSION_NUM(2,3,0)
-     choke me
-     #endif
-     mpfr_t n; mpfr_init(n);
-@@ -4599,7 +4659,7 @@
-   CFLAGS="$saved_CFLAGS"
- 
-   if test x$have_gmp != xyes; then
--    { { echo "$as_me:$LINENO: error: Building GCC requires GMP 4.1+ and MPFR 2.2.1+.
-+    { { echo "$as_me:$LINENO: error: Building GCC requires GMP 4.1+ and MPFR 2.3.0+.
- Try the --with-gmp and/or --with-mpfr options to specify their locations.
- Copies of these libraries' source code can be found at their respective
- hosting sites as well as at ftp://gcc.gnu.org/pub/gcc/infrastructure/.
-@@ -4607,7 +4667,7 @@
- If you obtained GMP and/or MPFR from a vendor distribution package, make
- sure that you have installed both the libraries and the header files.
- They may be located in separate packages." >&5
--echo "$as_me: error: Building GCC requires GMP 4.1+ and MPFR 2.2.1+.
-+echo "$as_me: error: Building GCC requires GMP 4.1+ and MPFR 2.3.0+.
- Try the --with-gmp and/or --with-mpfr options to specify their locations.
- Copies of these libraries' source code can be found at their respective
- hosting sites as well as at ftp://gcc.gnu.org/pub/gcc/infrastructure/.
-@@ -4849,7 +4909,8 @@
- # Handle --disable-<component> generically.
- for dir in $configdirs $build_configdirs $target_configdirs ; do
-   dirname=`echo $dir | sed -e s/target-//g -e s/build-//g -e s/-/_/g`
--  if eval test x\${enable_${dirname}} "=" xno ; then
-+  varname=`echo $dirname | sed -e s/+/_/g`
-+  if eval test x\${enable_${varname}} "=" xno ; then
-     noconfigdirs="$noconfigdirs $dir"
-   fi
- done
-@@ -5086,6 +5147,38 @@
- fi;
- 
- 
-+# During gcc bootstrap, if we use some random cc for stage1 then CFLAGS
-+# might be empty or "-g".  We don't require a C++ compiler, so CXXFLAGS
-+# might also be empty (or "-g", if a non-GCC C++ compiler is in the path).
-+# We want to ensure that TARGET libraries (which we know are built with
-+# gcc) are built with "-O2 -g", so include those options when setting
-+# CFLAGS_FOR_TARGET and CXXFLAGS_FOR_TARGET.
-+if test "x$CFLAGS_FOR_TARGET" = x; then
-+  CFLAGS_FOR_TARGET=$CFLAGS
-+  case " $CFLAGS " in
-+    *" -O2 "*) ;;
-+    *) CFLAGS_FOR_TARGET="-O2 $CFLAGS" ;;
-+  esac
-+  case " $CFLAGS " in
-+    *" -g "* | *" -g3 "*) ;;
-+    *) CFLAGS_FOR_TARGET="-g $CFLAGS" ;;
-+  esac
-+fi
-+
-+
-+if test "x$CXXFLAGS_FOR_TARGET" = x; then
-+  CXXFLAGS_FOR_TARGET=$CXXFLAGS
-+  case " $CXXFLAGS " in
-+    *" -O2 "*) ;;
-+    *) CXXFLAGS_FOR_TARGET="-O2 $CXXFLAGS" ;;
-+  esac
-+  case " $CXXFLAGS " in
-+    *" -g "* | *" -g3 "*) ;;
-+    *) CXXFLAGS_FOR_TARGET="-g $CXXFLAGS" ;;
-+  esac
-+fi
-+
-+
- # Handle --with-headers=XXX.  If the value is not "yes", the contents of
- # the named directory are copied to $(tooldir)/sys-include.
- if test x"${with_headers}" != x && test x"${with_headers}" != xno ; then
-@@ -5213,7 +5306,7 @@
-   v850*-*-*)
-     md_exec_prefix=/usr/ccs/bin
-     ;;
--  xtensa-*-elf*)
-+  xtensa*-*-elf*)
-     ;;
- 
-   *-*-beos* | \
-@@ -5244,6 +5337,9 @@
-   mips*-sde-elf*)
-     target_makefile_frag="config/mt-sde"
-     ;;
-+  mipsisa*-*-elfoabi*)
-+    target_makefile_frag="config/mt-mips-elfoabi"
-+    ;;
-   *-*-netware*)
-     target_makefile_frag="config/mt-netware"
-     ;;
-@@ -5789,6 +5885,19 @@
-       # for any libc-related directories first (so make it the last -B
-       # switch).
-       FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -B$$r/$(TARGET_SUBDIR)/newlib/ -isystem $$r/$(TARGET_SUBDIR)/newlib/targ-include -isystem $$s/newlib/libc/include'
-+
-+      # If we're building libgloss, find the startup file, simulator library
-+      # and linker script.
-+      case " $target_configdirs " in
-+	*" libgloss "*)
-+	# Look for startup file, simulator library and maybe linker script.
-+	FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -B$$r/$(TARGET_SUBDIR)/libgloss/'"$libgloss_dir"
-+	# Look for libnosys.a in case the target needs it.
-+	FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(TARGET_SUBDIR)/libgloss/libnosys'
-+	# Most targets have the linker script in the source directory.
-+	FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$s/libgloss/'"$libgloss_dir"
-+	;;
-+      esac
-       ;;
-    esac
-    ;;
-@@ -5803,7 +5912,11 @@
- 
- # Allow the user to override the flags for
- # our build compiler if desired.
--CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-${CFLAGS}}
-+if test x"${build}" = x"${host}" ; then
-+  CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-${CFLAGS}}
-+  CXXFLAGS_FOR_BUILD=${CXXFLAGS_FOR_BUILD-${CXXFLAGS}}
-+  LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-${LDFLAGS}}
-+fi
- 
- # On Canadian crosses, we'll be searching the right directories for
- # the previously-installed cross compiler, so don't bother to add
-@@ -5822,16 +5935,6 @@
- 
- # Search for other target-specific linker scripts and such.
- case "${target}" in
--  m32c-*-* )
--    if test -d ${srcdir}/libgloss/m32c; then
--      # This is for crt0.o
--      FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -B$$r/$(TARGET_SUBDIR)/libgloss/m32c'
--      # This is for r8c.ld
--      FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(TARGET_SUBDIR)/libgloss/m32c'
--      # This is for libnosys.a
--      FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(TARGET_SUBDIR)/libgloss/libnosys'
--    fi
--    ;;
-   mep*)
-     FLAGS_FOR_TARGET="$FLAGS_FOR_TARGET -mlibrary"
-     ;;
-@@ -5874,6 +5977,20 @@
- 
- 
- 
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
- # Generate default definitions for YACC, M4, LEX and other programs that run
- # on the build machine.  These are used if the Makefile can't locate these
- # programs in objdir.
-@@ -6151,10 +6268,10 @@
-   *" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;;
-   *)
- 
--    # For an installed makeinfo, we require it to be from texinfo 4.4 or
-+    # For an installed makeinfo, we require it to be from texinfo 4.6 or
-     # higher, else we use the "missing" dummy.
-     if ${MAKEINFO} --version \
--       | egrep 'texinfo[^0-9]*(4\.([4-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
-+       | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
-       :
-     else
-       MAKEINFO="$MISSING makeinfo"
-@@ -7881,7 +7998,6 @@
- 
- 
- 
--
- # Target tools.
- 
- # Check whether --with-build-time-tools or --without-build-time-tools was given.
-@@ -11992,10 +12108,10 @@
-   enableval="$enable_stage1_checking"
-   stage1_checking=--enable-checking=${enable_stage1_checking}
- else
--  if test "x$enable_checking" = xno; then
-+  if test "x$enable_checking" = xno || test "x$enable_checking" = x; then
-   stage1_checking=--enable-checking=yes,types
- else
--  stage1_checking=--enable-checking=types${enable_checking+,}$enable_checking
-+  stage1_checking=--enable-checking=$enable_checking,types
- fi
- fi;
- 
-@@ -12741,6 +12857,8 @@
- s,@stage1_languages@,$stage1_languages,;t t
- s,@SYSROOT_CFLAGS_FOR_TARGET@,$SYSROOT_CFLAGS_FOR_TARGET,;t t
- s,@DEBUG_PREFIX_CFLAGS_FOR_TARGET@,$DEBUG_PREFIX_CFLAGS_FOR_TARGET,;t t
-+s,@CFLAGS_FOR_TARGET@,$CFLAGS_FOR_TARGET,;t t
-+s,@CXXFLAGS_FOR_TARGET@,$CXXFLAGS_FOR_TARGET,;t t
- s,@RPATH_ENVVAR@,$RPATH_ENVVAR,;t t
- s,@tooldir@,$tooldir,;t t
- s,@build_tooldir@,$build_tooldir,;t t
-@@ -12752,7 +12870,21 @@
- s,@host_configargs@,$host_configargs,;t t
- s,@configdirs@,$configdirs,;t t
- s,@target_configargs@,$target_configargs,;t t
-+s,@AR_FOR_BUILD@,$AR_FOR_BUILD,;t t
-+s,@AS_FOR_BUILD@,$AS_FOR_BUILD,;t t
- s,@CC_FOR_BUILD@,$CC_FOR_BUILD,;t t
-+s,@CFLAGS_FOR_BUILD@,$CFLAGS_FOR_BUILD,;t t
-+s,@CXXFLAGS_FOR_BUILD@,$CXXFLAGS_FOR_BUILD,;t t
-+s,@CXX_FOR_BUILD@,$CXX_FOR_BUILD,;t t
-+s,@DLLTOOL_FOR_BUILD@,$DLLTOOL_FOR_BUILD,;t t
-+s,@GCJ_FOR_BUILD@,$GCJ_FOR_BUILD,;t t
-+s,@GFORTRAN_FOR_BUILD@,$GFORTRAN_FOR_BUILD,;t t
-+s,@LDFLAGS_FOR_BUILD@,$LDFLAGS_FOR_BUILD,;t t
-+s,@LD_FOR_BUILD@,$LD_FOR_BUILD,;t t
-+s,@NM_FOR_BUILD@,$NM_FOR_BUILD,;t t
-+s,@RANLIB_FOR_BUILD@,$RANLIB_FOR_BUILD,;t t
-+s,@WINDMC_FOR_BUILD@,$WINDMC_FOR_BUILD,;t t
-+s,@WINDRES_FOR_BUILD@,$WINDRES_FOR_BUILD,;t t
- s,@config_shell@,$config_shell,;t t
- s,@YACC@,$YACC,;t t
- s,@BISON@,$BISON,;t t
-@@ -12774,7 +12906,6 @@
- s,@WINDMC@,$WINDMC,;t t
- s,@OBJCOPY@,$OBJCOPY,;t t
- s,@OBJDUMP@,$OBJDUMP,;t t
--s,@CFLAGS_FOR_BUILD@,$CFLAGS_FOR_BUILD,;t t
- s,@CC_FOR_TARGET@,$CC_FOR_TARGET,;t t
- s,@CXX_FOR_TARGET@,$CXX_FOR_TARGET,;t t
- s,@GCC_FOR_TARGET@,$GCC_FOR_TARGET,;t t
---- gdb-6.7.1/configure.ac	2007-10-29 18:55:14.000000000 +0100
-+++ gdb-6.7.90/configure.ac	2008-03-13 18:57:04.000000000 +0100
-@@ -41,6 +41,7 @@
- AC_ARG_PROGRAM
- 
- m4_pattern_allow([^AS_FOR_TARGET$])dnl
-+m4_pattern_allow([^AS_FOR_BUILD$])dnl
- 
- # Get 'install' or 'install-sh' and its variants.
- AC_PROG_INSTALL
-@@ -176,6 +177,7 @@
- 		target-libiberty \
- 		target-libgloss \
- 		target-newlib \
-+		target-libgomp \
- 		target-libstdc++-v3 \
- 		target-libmudflap \
- 		target-libssp \
-@@ -183,8 +185,7 @@
- 		target-boehm-gc \
- 		${libgcj} \
- 		target-libobjc \
--		target-libada \
--		target-libgomp"
-+		target-libada"
- 
- # these tools are built using the target libraries, and are intended to
- # run only in the target environment
-@@ -206,6 +207,10 @@
- target_configdirs=`echo ${target_libraries} ${target_tools}`
- build_configdirs=`echo ${build_libs} ${build_tools}`
- 
-+m4_divert_text([PARSE_ARGS],
-+[ac_subdirs_all=`cd $srcdir && echo */configure | sed 's,/configure,,g'`
-+])
-+
- ################################################################################
- 
- srcname="gnu development package"
-@@ -398,12 +403,14 @@
-     esac
- fi
- 
-+# Default libgloss CPU subdirectory.
-+libgloss_dir="$target_cpu"
- 
- case "${target}" in
-   *-*-chorusos)
-     noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
-     ;;
--  powerpc-*-darwin* | i[[3456789]]86-*-darwin*)
-+  powerpc-*-darwin* | i[[3456789]]86-*-darwin* | x86_64-*-darwin9*)
-     noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes gdb gprof"
-     noconfigdirs="$noconfigdirs sim target-rda"
-     ;;
-@@ -504,6 +511,7 @@
-       *) noconfigdirs="$noconfigdirs gdb readline"
- 	 ;;
-     esac
-+    libgloss_dir=wince
-     ;;
-   arc-*-*)
-     noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
-@@ -512,19 +520,23 @@
-     ;;
-   arm-*-coff | strongarm-*-coff | xscale-*-coff)
-     noconfigdirs="$noconfigdirs ${libgcj}"
-+    libgloss_dir=arm
-     ;;
-   arm-*-elf* | strongarm-*-elf* | xscale-*-elf* | arm*-*-eabi* )
-     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
-+    libgloss_dir=arm
-     ;;
-   arm*-*-linux-gnueabi)
--    noconfigdirs="$noconfigdirs target-libffi target-qthreads"
--    noconfigdirs="$noconfigdirs target-libjava target-libobjc"
-+    noconfigdirs="$noconfigdirs target-qthreads"
-+    noconfigdirs="$noconfigdirs target-libobjc"
-     case ${with_newlib} in
-       no) noconfigdirs="$noconfigdirs target-newlib target-libgloss"
-     esac
-+    libgloss_dir=arm
-     ;;
-   arm*-*-symbianelf*)
-     noconfigdirs="$noconfigdirs ${libgcj} target-libiberty"
-+    libgloss_dir=arm
-     ;;
-   arm-*-pe*)
-     noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
-@@ -563,7 +575,6 @@
- 	unsupported_languages="$unsupported_languages fortran"
- 	noconfigdirs="$noconfigdirs target-libffi target-boehm-gc";;
-       *-*-elf)
--	unsupported_languages="$unsupported_languages fortran"
- 	noconfigdirs="$noconfigdirs target-boehm-gc";;
-       *-*-linux*)
- 	noconfigdirs="$noconfigdirs target-newlib target-libgloss";;
-@@ -571,6 +582,7 @@
- 	unsupported_languages="$unsupported_languages fortran"
- 	noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss";;
-     esac
-+    libgloss_dir=cris
-     ;;
-   crx-*-*)
-     noconfigdirs="$noconfigdirs target-libstdc++-v3 target-mudflap ${libgcj}"
-@@ -581,6 +593,9 @@
-   d30v-*-*)
-     noconfigdirs="$noconfigdirs ${libgcj} gdb"
-     ;;
-+  ep9312-*-elf | ep9312-*-coff)
-+    libgloss_dir=arm
-+    ;;
-   fr30-*-elf*)
-     noconfigdirs="$noconfigdirs ${libgcj} gdb"
-     ;;
-@@ -612,6 +627,9 @@
-   hppa*-hp-hpux11*)
-     noconfigdirs="$noconfigdirs ld shellutils"
-     ;;
-+  hppa*-*-pro*)
-+    libgloss_dir=pa
-+    ;;
-   hppa*-*-*)
-     # According to Alexandre Oliva <aoliva@redhat.com>, libjava won't
-     # build on HP-UX 10.20.
-@@ -632,6 +650,7 @@
-     ;;
-   i[[3456789]]86-*-coff | i[[3456789]]86-*-elf)
-     noconfigdirs="$noconfigdirs ${libgcj}"
-+    libgloss_dir=i386
-     ;;
-   i[[3456789]]86-*-linux*)
-     # The GCC port for glibc1 has no MD_FALLBACK_FRAME_STATE_FOR, so let's
-@@ -701,6 +720,7 @@
-     ;;
-   m68hc11-*-*|m6811-*-*|m68hc12-*-*|m6812-*-*)
-     noconfigdirs="$noconfigdirs target-libiberty target-libstdc++-v3 ${libgcj}"
-+    libgloss_dir=m68hc11
-     ;;
-   m68k-*-elf*)
-     noconfigdirs="$noconfigdirs ${libgcj}"
-@@ -708,6 +728,9 @@
-   m68k-*-coff*)
-     noconfigdirs="$noconfigdirs ${libgcj}"
-     ;;
-+  m68*-*-* | fido-*-*)
-+    libgloss_dir=m68k
-+    ;;
-   mcore-*-pe*)
-   # The EPOC C++ environment does not support exceptions or rtti,
-   # and so building libstdc++-v3 tends not to always work.
-@@ -739,14 +762,17 @@
-     # This is temporary until we can link against shared libraries
-   powerpcle-*-solaris*)
-     noconfigdirs="$noconfigdirs gdb sim make tcl tk expect itcl gnuserv ${libgcj}"
-+    libgloss_dir=rs6000
-     ;;
-   powerpc-*-beos*)
-     noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss ${libgcj}"
-     ;;
-   powerpc-*-eabi)
-     noconfigdirs="$noconfigdirs ${libgcj}"
-+    libgloss_dir=rs6000
-     ;;
-   powerpc-*-eabi* | powerpcle-*-eabi* | powerpc-*-rtems* )
-+    libgloss_dir=rs6000
-     ;;
-   rs6000-*-lynxos*)
-     noconfigdirs="$noconfigdirs target-newlib gprof ${libgcj}"
-@@ -760,6 +786,14 @@
-   m68k-apollo-*)
-     noconfigdirs="$noconfigdirs ld binutils gprof target-libgloss ${libgcj}"
-     ;;
-+  mips*-sde-elf*)
-+    skipdirs="$skipdirs target-libiberty"
-+    noconfigdirs="$noconfigdirs ${libgcj}"
-+    if test x$with_newlib = xyes; then
-+      noconfigdirs="$noconfigdirs gprof"
-+    fi
-+    libgloss_dir=mips
-+    ;;
-   mips*-*-irix5*)
-     noconfigdirs="$noconfigdirs gprof target-libgloss ${libgcj}"
-     ;;
-@@ -773,14 +807,12 @@
-   mips*-*-bsd*)
-     noconfigdirs="$noconfigdirs gprof target-libgloss ${libgcj}"
-     ;;
--  mips64*-*-linux*)
--    noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
--    ;;
-   mips*-*-linux*)
-     noconfigdirs="$noconfigdirs target-newlib target-libgloss"
-     ;;
-   mips*-*-*)
-     noconfigdirs="$noconfigdirs gprof ${libgcj}"
-+    libgloss_dir=mips
-     ;;
-   romp-*-*)
-     noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}"
-@@ -794,14 +826,19 @@
-     esac
-     noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
-     ;;
-+  sparclet-*-aout* | sparc86x-*-*)
-+    libgloss_dir=sparc
-+    ;;
-   sparc-*-elf*)
-     noconfigdirs="$noconfigdirs ${libgcj}"
-     ;;
-   sparc64-*-elf*)
-     noconfigdirs="$noconfigdirs ${libgcj}"
-+    libgloss_dir=sparc
-     ;;
-   sparclite-*-*)
-     noconfigdirs="$noconfigdirs ${libgcj}"
-+    libgloss_dir=sparc
-     ;;
-   sparc-*-sunos4*)
-     noconfigdirs="$noconfigdirs ${libgcj}"
-@@ -837,7 +874,7 @@
-   vax-*-*)
-     noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
-     ;;
--  xtensa-*-*)
-+  xtensa*-*-*)
-     noconfigdirs="$noconfigdirs ${libgcj}"
-     ;;
-   ip2k-*-*)
-@@ -974,8 +1011,10 @@
-     host_makefile_frag="config/mh-cygwin"
-     ;;
-   *-mingw32*)
-+    host_makefile_frag="config/mh-mingw"
-     ;;
-   *-mingw64*)
-+    host_makefile_frag="config/mh-mingw"
-     ;;
-   *-interix*)
-     host_makefile_frag="config/mh-interix"
-@@ -1047,9 +1086,31 @@
- fi
- 
- if test "${build}" != "${host}" ; then
-+  AR_FOR_BUILD=${AR_FOR_BUILD-ar}
-+  AS_FOR_BUILD=${AS_FOR_BUILD-as}
-   CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
-+  CXX_FOR_BUILD=${CXX_FOR_BUILD-g++}
-+  GCJ_FOR_BUILD=${GCJ_FOR_BUILD-gcj}
-+  GFORTRAN_FOR_BUILD=${GFORTRAN_FOR_BUILD-gfortran}
-+  DLLTOOL_FOR_BUILD=${DLLTOOL_FOR_BUILD-dlltool}
-+  LD_FOR_BUILD=${LD_FOR_BUILD-ld}
-+  NM_FOR_BUILD=${NM_FOR_BUILD-nm}
-+  RANLIB_FOR_BUILD=${RANLIB_FOR_BUILD-ranlib}
-+  WINDRES_FOR_BUILD=${WINDRES_FOR_BUILD-windres}
-+  WINDMC_FOR_BUILD=${WINDMC_FOR_BUILD-windmc}
- else
-+  AR_FOR_BUILD="\$(AR)"
-+  AS_FOR_BUILD="\$(AS)"
-   CC_FOR_BUILD="\$(CC)"
-+  CXX_FOR_BUILD="\$(CXX)"
-+  GCJ_FOR_BUILD="\$(GCJ)"
-+  GFORTRAN_FOR_BUILD="\$(GFORTRAN)"
-+  DLLTOOL_FOR_BUILD="\$(DLLTOOL)"
-+  LD_FOR_BUILD="\$(LD)"
-+  NM_FOR_BUILD="\$(NM)"
-+  RANLIB_FOR_BUILD="\$(RANLIB)"
-+  WINDRES_FOR_BUILD="\$(WINDRES)"
-+  WINDMC_FOR_BUILD="\$(WINDMC)"
- fi
- 
- AC_PROG_CC
-@@ -1162,11 +1223,11 @@
-   if test x"$have_gmp" = xyes; then
-     saved_LIBS="$LIBS"
-     LIBS="$LIBS $gmplibs"
--    dnl MPFR 2.2.0 is acceptable but buggy, MPFR 2.2.1 is better.
-+    dnl MPFR 2.2.1 is acceptable, but MPFR 2.3.0 is better.
-     AC_MSG_CHECKING([for correct version of mpfr.h])
-     AC_TRY_LINK([#include <gmp.h>
-     #include <mpfr.h>],[
--    #if MPFR_VERSION < MPFR_VERSION_NUM(2,2,0)
-+    #if MPFR_VERSION < MPFR_VERSION_NUM(2,2,1)
-     choke me
-     #endif
-     mpfr_t n;
-@@ -1179,7 +1240,7 @@
-     mpfr_subnormalize (x, t, GMP_RNDN);
-     ], [AC_TRY_LINK([#include <gmp.h>
-     #include <mpfr.h>],[
--    #if MPFR_VERSION < MPFR_VERSION_NUM(2,2,1)
-+    #if MPFR_VERSION < MPFR_VERSION_NUM(2,3,0)
-     choke me
-     #endif
-     mpfr_t n; mpfr_init(n);
-@@ -1190,7 +1251,7 @@
-   CFLAGS="$saved_CFLAGS"
- 
-   if test x$have_gmp != xyes; then
--    AC_MSG_ERROR([Building GCC requires GMP 4.1+ and MPFR 2.2.1+.
-+    AC_MSG_ERROR([Building GCC requires GMP 4.1+ and MPFR 2.3.0+.
- Try the --with-gmp and/or --with-mpfr options to specify their locations.
- Copies of these libraries' source code can be found at their respective
- hosting sites as well as at ftp://gcc.gnu.org/pub/gcc/infrastructure/.
-@@ -1422,7 +1483,8 @@
- # Handle --disable-<component> generically.
- for dir in $configdirs $build_configdirs $target_configdirs ; do
-   dirname=`echo $dir | sed -e s/target-//g -e s/build-//g -e s/-/_/g`
--  if eval test x\${enable_${dirname}} "=" xno ; then
-+  varname=`echo $dirname | sed -e s/+/_/g`
-+  if eval test x\${enable_${varname}} "=" xno ; then
-     noconfigdirs="$noconfigdirs $dir"
-   fi
- done
-@@ -1605,6 +1667,38 @@
-   [DEBUG_PREFIX_CFLAGS_FOR_TARGET=])
- AC_SUBST(DEBUG_PREFIX_CFLAGS_FOR_TARGET)
- 
-+# During gcc bootstrap, if we use some random cc for stage1 then CFLAGS
-+# might be empty or "-g".  We don't require a C++ compiler, so CXXFLAGS
-+# might also be empty (or "-g", if a non-GCC C++ compiler is in the path).
-+# We want to ensure that TARGET libraries (which we know are built with
-+# gcc) are built with "-O2 -g", so include those options when setting
-+# CFLAGS_FOR_TARGET and CXXFLAGS_FOR_TARGET.
-+if test "x$CFLAGS_FOR_TARGET" = x; then
-+  CFLAGS_FOR_TARGET=$CFLAGS
-+  case " $CFLAGS " in
-+    *" -O2 "*) ;;
-+    *) CFLAGS_FOR_TARGET="-O2 $CFLAGS" ;;
-+  esac
-+  case " $CFLAGS " in
-+    *" -g "* | *" -g3 "*) ;;
-+    *) CFLAGS_FOR_TARGET="-g $CFLAGS" ;;
-+  esac
-+fi
-+AC_SUBST(CFLAGS_FOR_TARGET)
-+
-+if test "x$CXXFLAGS_FOR_TARGET" = x; then
-+  CXXFLAGS_FOR_TARGET=$CXXFLAGS
-+  case " $CXXFLAGS " in
-+    *" -O2 "*) ;;
-+    *) CXXFLAGS_FOR_TARGET="-O2 $CXXFLAGS" ;;
-+  esac
-+  case " $CXXFLAGS " in
-+    *" -g "* | *" -g3 "*) ;;
-+    *) CXXFLAGS_FOR_TARGET="-g $CXXFLAGS" ;;
-+  esac
-+fi
-+AC_SUBST(CXXFLAGS_FOR_TARGET)
-+
- # Handle --with-headers=XXX.  If the value is not "yes", the contents of
- # the named directory are copied to $(tooldir)/sys-include.
- if test x"${with_headers}" != x && test x"${with_headers}" != xno ; then
-@@ -1732,7 +1826,7 @@
-   v850*-*-*)
-     md_exec_prefix=/usr/ccs/bin
-     ;;
--  xtensa-*-elf*)
-+  xtensa*-*-elf*)
-     ;;
- 
-   *-*-beos* | \
-@@ -1763,6 +1857,9 @@
-   mips*-sde-elf*)
-     target_makefile_frag="config/mt-sde"
-     ;;
-+  mipsisa*-*-elfoabi*)
-+    target_makefile_frag="config/mt-mips-elfoabi"
-+    ;;
-   *-*-netware*)
-     target_makefile_frag="config/mt-netware"
-     ;;
-@@ -2299,6 +2396,19 @@
-       # for any libc-related directories first (so make it the last -B
-       # switch).
-       FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -B$$r/$(TARGET_SUBDIR)/newlib/ -isystem $$r/$(TARGET_SUBDIR)/newlib/targ-include -isystem $$s/newlib/libc/include'
-+
-+      # If we're building libgloss, find the startup file, simulator library
-+      # and linker script.
-+      case " $target_configdirs " in
-+	*" libgloss "*)
-+	# Look for startup file, simulator library and maybe linker script.
-+	FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -B$$r/$(TARGET_SUBDIR)/libgloss/'"$libgloss_dir"
-+	# Look for libnosys.a in case the target needs it.
-+	FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(TARGET_SUBDIR)/libgloss/libnosys'
-+	# Most targets have the linker script in the source directory.
-+	FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$s/libgloss/'"$libgloss_dir"
-+	;;
-+      esac
-       ;;
-    esac
-    ;;
-@@ -2313,7 +2423,11 @@
- 
- # Allow the user to override the flags for
- # our build compiler if desired.
--CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-${CFLAGS}}
-+if test x"${build}" = x"${host}" ; then
-+  CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-${CFLAGS}}
-+  CXXFLAGS_FOR_BUILD=${CXXFLAGS_FOR_BUILD-${CXXFLAGS}}
-+  LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-${LDFLAGS}}
-+fi
- 
- # On Canadian crosses, we'll be searching the right directories for
- # the previously-installed cross compiler, so don't bother to add
-@@ -2332,16 +2446,6 @@
- 
- # Search for other target-specific linker scripts and such.
- case "${target}" in
--  m32c-*-* )
--    if test -d ${srcdir}/libgloss/m32c; then
--      # This is for crt0.o
--      FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -B$$r/$(TARGET_SUBDIR)/libgloss/m32c'
--      # This is for r8c.ld
--      FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(TARGET_SUBDIR)/libgloss/m32c'
--      # This is for libnosys.a
--      FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(TARGET_SUBDIR)/libgloss/libnosys'
--    fi
--    ;;
-   mep*)
-     FLAGS_FOR_TARGET="$FLAGS_FOR_TARGET -mlibrary"
-     ;;
-@@ -2381,7 +2485,21 @@
- 
- 
- # Build tools.
-+AC_SUBST(AR_FOR_BUILD)
-+AC_SUBST(AS_FOR_BUILD)
- AC_SUBST(CC_FOR_BUILD)
-+AC_SUBST(CFLAGS_FOR_BUILD)
-+AC_SUBST(CXXFLAGS_FOR_BUILD)
-+AC_SUBST(CXX_FOR_BUILD)
-+AC_SUBST(DLLTOOL_FOR_BUILD)
-+AC_SUBST(GCJ_FOR_BUILD)
-+AC_SUBST(GFORTRAN_FOR_BUILD)
-+AC_SUBST(LDFLAGS_FOR_BUILD)
-+AC_SUBST(LD_FOR_BUILD)
-+AC_SUBST(NM_FOR_BUILD)
-+AC_SUBST(RANLIB_FOR_BUILD)
-+AC_SUBST(WINDMC_FOR_BUILD)
-+AC_SUBST(WINDRES_FOR_BUILD)
- AC_SUBST(config_shell)
- 
- # Generate default definitions for YACC, M4, LEX and other programs that run
-@@ -2421,10 +2539,10 @@
-   *" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;;
-   *)
- changequote(,)
--    # For an installed makeinfo, we require it to be from texinfo 4.4 or
-+    # For an installed makeinfo, we require it to be from texinfo 4.6 or
-     # higher, else we use the "missing" dummy.
-     if ${MAKEINFO} --version \
--       | egrep 'texinfo[^0-9]*(4\.([4-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
-+       | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
-       :
-     else
-       MAKEINFO="$MISSING makeinfo"
-@@ -2466,7 +2584,6 @@
- AC_SUBST(CC)
- AC_SUBST(CXX)
- AC_SUBST(CFLAGS)
--AC_SUBST(CFLAGS_FOR_BUILD)
- AC_SUBST(CXXFLAGS)
- 
- # Target tools.
-@@ -2613,10 +2730,10 @@
- [  --enable-stage1-checking@<:@=all@:>@   choose additional checking for stage1
-                           of the compiler],
- [stage1_checking=--enable-checking=${enable_stage1_checking}],
--[if test "x$enable_checking" = xno; then
-+[if test "x$enable_checking" = xno || test "x$enable_checking" = x; then
-   stage1_checking=--enable-checking=yes,types
- else
--  stage1_checking=--enable-checking=types${enable_checking+,}$enable_checking
-+  stage1_checking=--enable-checking=$enable_checking,types
- fi])
- AC_SUBST(stage1_checking)
- 
---- gdb-6.7.1/libtool.m4	2007-06-01 13:33:01.000000000 +0200
-+++ gdb-6.7.90/libtool.m4	2008-02-16 16:26:46.000000000 +0100
-@@ -1993,7 +1993,7 @@
-   soname_spec='${libname}${release}${shared_ext}$major'
-   ;;
- 
--aix4* | aix5*)
-+aix[[4-9]]*)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-@@ -2834,7 +2834,7 @@
- # whether `pass_all' will *always* work, you probably want this one.
- 
- case $host_os in
--aix4* | aix5*)
-+aix[[4-9]]*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
-@@ -3419,7 +3419,8 @@
-       # built for inclusion in a dll (and should export symbols for example).
-       # Although the cygwin gcc ignores -fPIC, still need this for old-style
-       # (--disable-auto-import) libraries
--      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-+      m4_if([$1], [GCJ], [],
-+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-       ;;
-     darwin* | rhapsody*)
-       # PIC is the default on this platform
-@@ -3461,7 +3462,7 @@
-     esac
-   else
-     case $host_os in
--      aix4* | aix5*)
-+      aix[[4-9]]*)
- 	# All AIX code is PIC.
- 	if test "$host_cpu" = ia64; then
- 	  # AIX 5 now supports IA64 processor
-@@ -3715,7 +3716,8 @@
-       # built for inclusion in a dll (and should export symbols for example).
-       # Although the cygwin gcc ignores -fPIC, still need this for old-style
-       # (--disable-auto-import) libraries
--      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-+      m4_if([$1], [GCJ], [],
-+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-       ;;
- 
-     darwin* | rhapsody*)
-@@ -3791,7 +3793,8 @@
-     mingw* | cygwin* | pw32* | os2*)
-       # This hack is so that the source file can tell whether it is being
-       # built for inclusion in a dll (and should export symbols for example).
--      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-+      m4_if([$1], [GCJ], [],
-+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-       ;;
- 
-     hpux9* | hpux10* | hpux11*)
-@@ -3986,7 +3989,7 @@
- m4_if([$1], [CXX], [
-   _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-   case $host_os in
--  aix4* | aix5*)
-+  aix[[4-9]]*)
-     # If we're using GNU nm, then we don't want the "-C" option.
-     # -C means demangle to AIX nm, but means don't demangle with GNU nm
-     if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-@@ -4092,7 +4095,7 @@
- 
-     # See if GNU ld supports shared libraries.
-     case $host_os in
--    aix3* | aix4* | aix5*)
-+    aix[[3-9]]*)
-       # On AIX/PPC, the GNU linker is very broken
-       if test "$host_cpu" != ia64; then
- 	_LT_TAGVAR(ld_shlibs, $1)=no
-@@ -4326,7 +4329,7 @@
-       fi
-       ;;
- 
--    aix4* | aix5*)
-+    aix[[4-9]]*)
-       if test "$host_cpu" = ia64; then
- 	# On IA64, the linker does run time linking by default, so we don't
- 	# have to do anything special.
-@@ -4346,7 +4349,7 @@
- 	# Test if we are trying to use run time linking or normal
- 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
- 	# need to do runtime linking.
--	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
-+	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
- 	  for ld_flag in $LDFLAGS; do
- 	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
- 	    aix_use_runtimelinking=yes
-@@ -5138,7 +5141,7 @@
-     fi
-     ;;
- 
--  aix4* | aix5*)
-+  aix[[4-9]]*)
-     if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-       test "$enable_shared" = yes && enable_static=no
-     fi
-@@ -5328,7 +5331,7 @@
-         # FIXME: insert proper C++ library support
-         _LT_TAGVAR(ld_shlibs, $1)=no
-         ;;
--      aix4* | aix5*)
-+      aix[[4-9]]*)
-         if test "$host_cpu" = ia64; then
-           # On IA64, the linker does run time linking by default, so we don't
-           # have to do anything special.
-@@ -5341,7 +5344,7 @@
-           # Test if we are trying to use run time linking or normal
-           # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-           # need to do runtime linking.
--          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
-+          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
- 	    for ld_flag in $LDFLAGS; do
- 	      case $ld_flag in
- 	      *-brtl*)
-@@ -6555,7 +6558,7 @@
-           postinstall_cmds='$RANLIB $lib'
-         fi
-         ;;
--      aix4* | aix5*)
-+      aix[[4-9]]*)
- 	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- 	  test "$enable_shared" = yes && enable_static=no
- 	fi
-@@ -6696,7 +6699,7 @@
-           postinstall_cmds='$RANLIB $lib'
-         fi
-         ;;
--      aix4* | aix5*)
-+      aix[[4-9]]*)
- 	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- 	  test "$enable_shared" = yes && enable_static=no
- 	fi
---- gdb-6.7.1/Makefile.def	2007-10-23 14:36:47.000000000 +0200
-+++ gdb-6.7.90/Makefile.def	2008-02-20 15:26:58.000000000 +0100
-@@ -325,6 +325,7 @@
- dependencies = { module=all-gdb; on=all-build-bison; };
- dependencies = { module=all-gdb; on=all-build-byacc; };
- dependencies = { module=all-gdb; on=all-sim; };
-+dependencies = { module=all-gdb; on=all-libdecnumber; };
- 
- dependencies = { module=configure-libgui; on=configure-tcl; };
- dependencies = { module=configure-libgui; on=configure-tk; };
-@@ -485,6 +486,7 @@
- dependencies = { module=all-target-libobjc; on=all-target-libiberty; };
- dependencies = { module=all-target-libobjc; on=all-target-boehm-gc; };
- dependencies = { module=all-target-libstdc++-v3; on=all-target-libiberty; };
-+dependencies = { module=configure-target-libstdc++-v3; on=configure-target-libgomp; };
- 
- // Target modules in the 'src' repository.
- lang_env_dependencies = { module=examples; };
-@@ -493,7 +495,7 @@
- lang_env_dependencies = { module=winsup; };
- lang_env_dependencies = { module=qthreads; };
- 
--dependencies = { module=all-target-libgloss; on=configure-target-newlib; };
-+dependencies = { module=all-target-libgloss; on=all-target-newlib; };
- dependencies = { module=all-target-winsup; on=all-target-libiberty; };
- dependencies = { module=all-target-winsup; on=all-target-libtermcap; };
- 
-@@ -509,43 +511,51 @@
- 	//   compiler probably has never heard of them.
- 	stage_configure_flags='--disable-intermodule $(STAGE1_CHECKING) \
- 	  --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"' ;
--	stage_cflags='$(STAGE1_CFLAGS)' ; };
-+	stage_cflags='$(STAGE1_CFLAGS)' ;
-+	stage_libcflags='$(STAGE1_LIBCFLAGS)' ; };
- bootstrap_stage = {
- 	id=2 ; prev=1 ;
- 	bootstrap_target=bootstrap2 ;
- 	stage_configure_flags="@stage2_werror_flag@" ;
--	stage_cflags="$(STAGE2_CFLAGS)" ; };
-+	stage_cflags="$(STAGE2_CFLAGS)" ;
-+	stage_libcflags="$(STAGE2_LIBCFLAGS)" ; };
- bootstrap_stage = {
- 	id=b2g0 ; prev=1 ;
- 	bootstrap_target=bootstrap2-debug ;
- 	stage_configure_flags="@stage2_werror_flag@" ;
--	stage_cflags="$(STAGE2_CFLAGS) -g0" ; };
-+	stage_cflags="$(STAGE2_CFLAGS) -g0" ;
-+	stage_libcflags="$(STAGE2_LIBCFLAGS) -g0" ; };
- bootstrap_stage = {
- 	id=3 ; prev=2 ; lean=1 ;
- 	compare_target=compare ;
- 	bootstrap_target=bootstrap ;
- 	cleanstrap_target=cleanstrap ;
- 	stage_configure_flags="@stage2_werror_flag@" ;
--	stage_cflags="$(STAGE3_CFLAGS)" ; };
-+	stage_cflags="$(STAGE3_CFLAGS)" ;
-+	stage_libcflags="$(STAGE3_LIBCFLAGS)" ; };
- bootstrap_stage = {
- 	id=b3g2 ; prev=b2g0 ; lean=1 ;
- 	compare_target=compare-debug ;
- 	bootstrap_target=bootstrap-debug ;
- 	cleanstrap_target=cleanstrap-debug ;
- 	stage_configure_flags="@stage2_werror_flag@" ;
--	stage_cflags="$(STAGE3_CFLAGS) -g2" ; };
-+	stage_cflags="$(STAGE3_CFLAGS) -g2" ;
-+	stage_libcflags="$(STAGE3_LIBCFLAGS) -g2" ; };
- bootstrap_stage = {
- 	id=4 ; prev=3 ; lean=2 ;
- 	compare_target=compare3 ;
- 	bootstrap_target=bootstrap4 ;
- 	stage_configure_flags="@stage2_werror_flag@" ;
--	stage_cflags="$(STAGE4_CFLAGS)" ; };
-+	stage_cflags="$(STAGE4_CFLAGS)" ;
-+	stage_libcflags="$(STAGE4_CFLAGS)" ; };
- bootstrap_stage = {
- 	id=profile ; prev=1 ;
- 	stage_configure_flags="@stage2_werror_flag@" ;
--	stage_cflags='$(STAGE2_CFLAGS) -fprofile-generate' ; };
-+	stage_cflags='$(STAGE2_CFLAGS) -fprofile-generate' ;
-+	stage_libcflags='$(STAGE2_LIBCFLAGS) -fprofile-generate' ; };
- bootstrap_stage = {
- 	id=feedback ; prev=profile ;
- 	bootstrap_target=profiledbootstrap ;
- 	stage_configure_flags="@stage2_werror_flag@" ;
--	stage_cflags='$(STAGE3_CFLAGS) -fprofile-use' ; };
-+	stage_cflags='$(STAGE3_CFLAGS) -fprofile-use' ;
-+	stage_libcflags='$(STAGE3_LIBCFLAGS) -fprofile-use' ; };
---- gdb-6.7.1/Makefile.in	2007-10-29 18:52:21.000000000 +0100
-+++ gdb-6.7.90/Makefile.in	2008-03-13 18:54:03.000000000 +0100
-@@ -204,10 +204,10 @@
- 	AR="$(AR_FOR_TARGET)"; export AR; \
- 	AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
- 	CC="$(CC_FOR_TARGET)"; export CC; \
--	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-+	CFLAGS="$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
- 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
- 	CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
--	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-+	CXXFLAGS="$(CXXFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS; \
- 	GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
- 	GFORTRAN="$(GFORTRAN_FOR_TARGET)"; export GFORTRAN; \
- 	DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
-@@ -251,10 +251,21 @@
- 
- # compilers to use to create programs which must be run in the build
- # environment.
-+AR_FOR_BUILD = @AR_FOR_BUILD@
-+AS_FOR_BUILD = @AS_FOR_BUILD@
- CC_FOR_BUILD = @CC_FOR_BUILD@
- CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
--
--CXX_FOR_BUILD = $(CXX)
-+CXXFLAGS_FOR_BUILD = @CXXFLAGS_FOR_BUILD@
-+CXX_FOR_BUILD = @CXX_FOR_BUILD@
-+DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@
-+GCJ_FOR_BUILD = @GCJ_FOR_BUILD@
-+GFORTRAN_FOR_BUILD = @GFORTRAN_FOR_BUILD@
-+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
-+LD_FOR_BUILD = @LD_FOR_BUILD@
-+NM_FOR_BUILD = @NM_FOR_BUILD@
-+RANLIB_FOR_BUILD = @RANLIB_FOR_BUILD@
-+WINDMC_FOR_BUILD = @WINDMC_FOR_BUILD@
-+WINDRES_FOR_BUILD = @WINDRES_FOR_BUILD@
- 
- # Special variables passed down in EXTRA_GCC_FLAGS.  They are defined
- # here so that they can be overridden by Makefile fragments.
-@@ -316,14 +327,19 @@
- # MAKEINFO and MAKEINFOFLAGS are explicitly passed here to make them
- # overrideable (for a bootstrap build stage1 also builds gcc.info).
- 
--STAGE1_CFLAGS=@stage1_cflags@
- STAGE1_CHECKING=@stage1_checking@
- STAGE1_LANGUAGES=@stage1_languages@
- 
-+STAGE1_CFLAGS=@stage1_cflags@
- STAGE2_CFLAGS=$(BOOT_CFLAGS)
- STAGE3_CFLAGS=$(BOOT_CFLAGS)
- STAGE4_CFLAGS=$(BOOT_CFLAGS)
- 
-+STAGE1_LIBCFLAGS=@stage1_cflags@
-+STAGE2_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
-+STAGE3_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
-+STAGE4_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
-+
- do-compare = @do_compare@
- do-compare3 = $(do-compare)
- do-compare-debug = $(SHELL) $(srcdir)/contrib/compare-debug $$f1 $$f2
-@@ -362,16 +378,11 @@
- COMPILER_LD_FOR_TARGET=@COMPILER_LD_FOR_TARGET@
- COMPILER_NM_FOR_TARGET=@COMPILER_NM_FOR_TARGET@
- 
--# During gcc bootstrap, if we use some random cc for stage1 then
--# CFLAGS will be just -g.  We want to ensure that TARGET libraries
--# (which we know are built with gcc) are built with optimizations so
--# prepend -O2 when setting CFLAGS_FOR_TARGET.
--CFLAGS_FOR_TARGET = -O2 $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) \
--	$(DEBUG_PREFIX_CFLAGS_FOR_TARGET)
-+CFLAGS_FOR_TARGET = @CFLAGS_FOR_TARGET@
-+CXXFLAGS_FOR_TARGET = @CXXFLAGS_FOR_TARGET@
- SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
- DEBUG_PREFIX_CFLAGS_FOR_TARGET = @DEBUG_PREFIX_CFLAGS_FOR_TARGET@
--CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) \
--	$(DEBUG_PREFIX_CFLAGS_FOR_TARGET)
-+
- LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
- LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
- LDFLAGS_FOR_TARGET = 
-@@ -578,19 +589,20 @@
- # 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
--# COMPILER_ prefixed variables are not passed down so we expand them here.
-+# *_CFLAGS_FOR_TARGET variables are not passed down and most often empty,
-+# so we expand them here.
- EXTRA_TARGET_FLAGS = \
- 	'AR=$$(AR_FOR_TARGET)' \
- 	'AS=$(COMPILER_AS_FOR_TARGET)' \
- 	'CC=$$(CC_FOR_TARGET)' \
--	'CFLAGS=$$(CFLAGS_FOR_TARGET)' \
-+	'CFLAGS=$$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \
- 	'CXX=$$(CXX_FOR_TARGET)' \
--	'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \
-+	'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \
- 	'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
- 	'LD=$(COMPILER_LD_FOR_TARGET)' \
- 	'LDFLAGS=$$(LDFLAGS_FOR_TARGET)' \
--	'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \
--	'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \
-+	'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \
-+	'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \
- 	'NM=$(COMPILER_NM_FOR_TARGET)' \
- 	'OBJDUMP=$$(OBJDUMP_FOR_TARGET)' \
- 	'RANLIB=$$(RANLIB_FOR_TARGET)' \
-@@ -2724,7 +2736,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(BUILD_EXPORTS) \
- 	(cd $(BUILD_SUBDIR)/libiberty && \
--	  $(MAKE)   $(TARGET-build-libiberty))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS)   \
-+		$(TARGET-build-libiberty))
- @endif build-libiberty
- 
- 
-@@ -2779,7 +2792,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(BUILD_EXPORTS) \
- 	(cd $(BUILD_SUBDIR)/bison && \
--	  $(MAKE)   $(TARGET-build-bison))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS)   \
-+		$(TARGET-build-bison))
- @endif build-bison
- 
- 
-@@ -2834,7 +2848,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(BUILD_EXPORTS) \
- 	(cd $(BUILD_SUBDIR)/byacc && \
--	  $(MAKE)   $(TARGET-build-byacc))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS)   \
-+		$(TARGET-build-byacc))
- @endif build-byacc
- 
- 
-@@ -2889,7 +2904,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(BUILD_EXPORTS) \
- 	(cd $(BUILD_SUBDIR)/flex && \
--	  $(MAKE)   $(TARGET-build-flex))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS)   \
-+		$(TARGET-build-flex))
- @endif build-flex
- 
- 
-@@ -2944,7 +2960,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(BUILD_EXPORTS) \
- 	(cd $(BUILD_SUBDIR)/m4 && \
--	  $(MAKE)   $(TARGET-build-m4))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS)   \
-+		$(TARGET-build-m4))
- @endif build-m4
- 
- 
-@@ -2999,7 +3016,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(BUILD_EXPORTS) \
- 	(cd $(BUILD_SUBDIR)/texinfo && \
--	  $(MAKE)   $(TARGET-build-texinfo))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS)   \
-+		$(TARGET-build-texinfo))
- @endif build-texinfo
- 
- 
-@@ -3054,7 +3072,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(BUILD_EXPORTS) \
- 	(cd $(BUILD_SUBDIR)/fixincludes && \
--	  $(MAKE)   $(TARGET-build-fixincludes))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS)   \
-+		$(TARGET-build-fixincludes))
- @endif build-fixincludes
- 
- 
-@@ -3113,7 +3132,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/ash && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-ash))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-ash))
- @endif ash
- 
- 
-@@ -3537,7 +3557,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/autoconf && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-autoconf))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-autoconf))
- @endif autoconf
- 
- 
-@@ -3961,7 +3982,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/automake && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-automake))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-automake))
- @endif automake
- 
- 
-@@ -4385,7 +4407,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/bash && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-bash))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-bash))
- @endif bash
- 
- 
-@@ -4802,9 +4825,9 @@
- 	@r=`${PWD_COMMAND}`; export r; \
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
--	$(HOST_EXPORTS) \
-+	$(HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 1 in $(HOST_SUBDIR)/bfd ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
- 	cd $(HOST_SUBDIR)/bfd || exit 1; \
-@@ -4833,9 +4856,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 2 in $(HOST_SUBDIR)/bfd ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
- 	cd $(HOST_SUBDIR)/bfd || exit 1; \
-@@ -4864,9 +4887,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS;  \
- 	echo Configuring stage b2g0 in $(HOST_SUBDIR)/bfd ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
- 	cd $(HOST_SUBDIR)/bfd || exit 1; \
-@@ -4895,9 +4918,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 3 in $(HOST_SUBDIR)/bfd ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
- 	cd $(HOST_SUBDIR)/bfd || exit 1; \
-@@ -4926,9 +4949,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS;  \
- 	echo Configuring stage b3g2 in $(HOST_SUBDIR)/bfd ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
- 	cd $(HOST_SUBDIR)/bfd || exit 1; \
-@@ -4957,9 +4980,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 4 in $(HOST_SUBDIR)/bfd ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
- 	cd $(HOST_SUBDIR)/bfd || exit 1; \
-@@ -4988,9 +5011,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
- 	echo Configuring stage profile in $(HOST_SUBDIR)/bfd ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
- 	cd $(HOST_SUBDIR)/bfd || exit 1; \
-@@ -5019,9 +5042,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
- 	echo Configuring stage feedback in $(HOST_SUBDIR)/bfd ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
- 	cd $(HOST_SUBDIR)/bfd || exit 1; \
-@@ -5056,7 +5079,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/bfd && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-bfd))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-bfd))
- @endif bfd
- 
- 
-@@ -5075,8 +5099,11 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/bfd && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"   \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS)   \
- 		$(TARGET-stage1-bfd)
- 
- maybe-clean-stage1-bfd: clean-stage1-bfd
-@@ -5089,7 +5116,7 @@
- 	  $(MAKE) stage1-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/bfd && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		 clean
- @endif bfd-bootstrap
- 
-@@ -5109,8 +5136,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/bfd && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage2-bfd)
- 
- maybe-clean-stage2-bfd: clean-stage2-bfd
-@@ -5123,7 +5153,7 @@
- 	  $(MAKE) stage2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/bfd && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif bfd-bootstrap
-@@ -5144,8 +5174,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/bfd && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb2g0-bfd)
- 
- maybe-clean-stageb2g0-bfd: clean-stageb2g0-bfd
-@@ -5158,7 +5191,7 @@
- 	  $(MAKE) stageb2g0-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/bfd && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif bfd-bootstrap
-@@ -5179,8 +5212,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/bfd && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage3-bfd)
- 
- maybe-clean-stage3-bfd: clean-stage3-bfd
-@@ -5193,7 +5229,7 @@
- 	  $(MAKE) stage3-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/bfd && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif bfd-bootstrap
-@@ -5214,8 +5250,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/bfd && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb3g2-bfd)
- 
- maybe-clean-stageb3g2-bfd: clean-stageb3g2-bfd
-@@ -5228,7 +5267,7 @@
- 	  $(MAKE) stageb3g2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/bfd && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif bfd-bootstrap
-@@ -5249,8 +5288,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/bfd && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage4-bfd)
- 
- maybe-clean-stage4-bfd: clean-stage4-bfd
-@@ -5263,7 +5305,7 @@
- 	  $(MAKE) stage4-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/bfd && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif bfd-bootstrap
-@@ -5284,8 +5326,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/bfd && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageprofile-bfd)
- 
- maybe-clean-stageprofile-bfd: clean-stageprofile-bfd
-@@ -5298,7 +5343,7 @@
- 	  $(MAKE) stageprofile-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/bfd && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif bfd-bootstrap
-@@ -5319,8 +5364,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/bfd && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stagefeedback-bfd)
- 
- maybe-clean-stagefeedback-bfd: clean-stagefeedback-bfd
-@@ -5333,7 +5381,7 @@
- 	  $(MAKE) stagefeedback-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/bfd && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif bfd-bootstrap
-@@ -5740,9 +5788,9 @@
- 	@r=`${PWD_COMMAND}`; export r; \
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
--	$(HOST_EXPORTS) \
-+	$(HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 1 in $(HOST_SUBDIR)/opcodes ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
- 	cd $(HOST_SUBDIR)/opcodes || exit 1; \
-@@ -5771,9 +5819,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 2 in $(HOST_SUBDIR)/opcodes ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
- 	cd $(HOST_SUBDIR)/opcodes || exit 1; \
-@@ -5802,9 +5850,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS;  \
- 	echo Configuring stage b2g0 in $(HOST_SUBDIR)/opcodes ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
- 	cd $(HOST_SUBDIR)/opcodes || exit 1; \
-@@ -5833,9 +5881,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 3 in $(HOST_SUBDIR)/opcodes ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
- 	cd $(HOST_SUBDIR)/opcodes || exit 1; \
-@@ -5864,9 +5912,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS;  \
- 	echo Configuring stage b3g2 in $(HOST_SUBDIR)/opcodes ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
- 	cd $(HOST_SUBDIR)/opcodes || exit 1; \
-@@ -5895,9 +5943,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 4 in $(HOST_SUBDIR)/opcodes ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
- 	cd $(HOST_SUBDIR)/opcodes || exit 1; \
-@@ -5926,9 +5974,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
- 	echo Configuring stage profile in $(HOST_SUBDIR)/opcodes ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
- 	cd $(HOST_SUBDIR)/opcodes || exit 1; \
-@@ -5957,9 +6005,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
- 	echo Configuring stage feedback in $(HOST_SUBDIR)/opcodes ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
- 	cd $(HOST_SUBDIR)/opcodes || exit 1; \
-@@ -5994,7 +6042,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/opcodes && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-opcodes))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-opcodes))
- @endif opcodes
- 
- 
-@@ -6013,8 +6062,11 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/opcodes && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"   \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS)   \
- 		$(TARGET-stage1-opcodes)
- 
- maybe-clean-stage1-opcodes: clean-stage1-opcodes
-@@ -6027,7 +6079,7 @@
- 	  $(MAKE) stage1-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/opcodes && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		 clean
- @endif opcodes-bootstrap
- 
-@@ -6047,8 +6099,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/opcodes && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage2-opcodes)
- 
- maybe-clean-stage2-opcodes: clean-stage2-opcodes
-@@ -6061,7 +6116,7 @@
- 	  $(MAKE) stage2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/opcodes && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif opcodes-bootstrap
-@@ -6082,8 +6137,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/opcodes && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb2g0-opcodes)
- 
- maybe-clean-stageb2g0-opcodes: clean-stageb2g0-opcodes
-@@ -6096,7 +6154,7 @@
- 	  $(MAKE) stageb2g0-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/opcodes && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif opcodes-bootstrap
-@@ -6117,8 +6175,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/opcodes && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage3-opcodes)
- 
- maybe-clean-stage3-opcodes: clean-stage3-opcodes
-@@ -6131,7 +6192,7 @@
- 	  $(MAKE) stage3-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/opcodes && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif opcodes-bootstrap
-@@ -6152,8 +6213,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/opcodes && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb3g2-opcodes)
- 
- maybe-clean-stageb3g2-opcodes: clean-stageb3g2-opcodes
-@@ -6166,7 +6230,7 @@
- 	  $(MAKE) stageb3g2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/opcodes && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif opcodes-bootstrap
-@@ -6187,8 +6251,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/opcodes && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage4-opcodes)
- 
- maybe-clean-stage4-opcodes: clean-stage4-opcodes
-@@ -6201,7 +6268,7 @@
- 	  $(MAKE) stage4-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/opcodes && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif opcodes-bootstrap
-@@ -6222,8 +6289,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/opcodes && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageprofile-opcodes)
- 
- maybe-clean-stageprofile-opcodes: clean-stageprofile-opcodes
-@@ -6236,7 +6306,7 @@
- 	  $(MAKE) stageprofile-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/opcodes && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif opcodes-bootstrap
-@@ -6257,8 +6327,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/opcodes && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stagefeedback-opcodes)
- 
- maybe-clean-stagefeedback-opcodes: clean-stagefeedback-opcodes
-@@ -6271,7 +6344,7 @@
- 	  $(MAKE) stagefeedback-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/opcodes && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif opcodes-bootstrap
-@@ -6678,9 +6751,9 @@
- 	@r=`${PWD_COMMAND}`; export r; \
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
--	$(HOST_EXPORTS) \
-+	$(HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 1 in $(HOST_SUBDIR)/binutils ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
- 	cd $(HOST_SUBDIR)/binutils || exit 1; \
-@@ -6709,9 +6782,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 2 in $(HOST_SUBDIR)/binutils ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
- 	cd $(HOST_SUBDIR)/binutils || exit 1; \
-@@ -6740,9 +6813,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS;  \
- 	echo Configuring stage b2g0 in $(HOST_SUBDIR)/binutils ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
- 	cd $(HOST_SUBDIR)/binutils || exit 1; \
-@@ -6771,9 +6844,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 3 in $(HOST_SUBDIR)/binutils ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
- 	cd $(HOST_SUBDIR)/binutils || exit 1; \
-@@ -6802,9 +6875,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS;  \
- 	echo Configuring stage b3g2 in $(HOST_SUBDIR)/binutils ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
- 	cd $(HOST_SUBDIR)/binutils || exit 1; \
-@@ -6833,9 +6906,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 4 in $(HOST_SUBDIR)/binutils ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
- 	cd $(HOST_SUBDIR)/binutils || exit 1; \
-@@ -6864,9 +6937,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
- 	echo Configuring stage profile in $(HOST_SUBDIR)/binutils ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
- 	cd $(HOST_SUBDIR)/binutils || exit 1; \
-@@ -6895,9 +6968,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
- 	echo Configuring stage feedback in $(HOST_SUBDIR)/binutils ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
- 	cd $(HOST_SUBDIR)/binutils || exit 1; \
-@@ -6932,7 +7005,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/binutils && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-binutils))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-binutils))
- @endif binutils
- 
- 
-@@ -6951,8 +7025,11 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/binutils && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"   \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS)   \
- 		$(TARGET-stage1-binutils)
- 
- maybe-clean-stage1-binutils: clean-stage1-binutils
-@@ -6965,7 +7042,7 @@
- 	  $(MAKE) stage1-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/binutils && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		 clean
- @endif binutils-bootstrap
- 
-@@ -6985,8 +7062,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/binutils && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage2-binutils)
- 
- maybe-clean-stage2-binutils: clean-stage2-binutils
-@@ -6999,7 +7079,7 @@
- 	  $(MAKE) stage2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/binutils && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif binutils-bootstrap
-@@ -7020,8 +7100,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/binutils && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb2g0-binutils)
- 
- maybe-clean-stageb2g0-binutils: clean-stageb2g0-binutils
-@@ -7034,7 +7117,7 @@
- 	  $(MAKE) stageb2g0-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/binutils && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif binutils-bootstrap
-@@ -7055,8 +7138,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/binutils && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage3-binutils)
- 
- maybe-clean-stage3-binutils: clean-stage3-binutils
-@@ -7069,7 +7155,7 @@
- 	  $(MAKE) stage3-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/binutils && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif binutils-bootstrap
-@@ -7090,8 +7176,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/binutils && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb3g2-binutils)
- 
- maybe-clean-stageb3g2-binutils: clean-stageb3g2-binutils
-@@ -7104,7 +7193,7 @@
- 	  $(MAKE) stageb3g2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/binutils && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif binutils-bootstrap
-@@ -7125,8 +7214,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/binutils && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage4-binutils)
- 
- maybe-clean-stage4-binutils: clean-stage4-binutils
-@@ -7139,7 +7231,7 @@
- 	  $(MAKE) stage4-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/binutils && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif binutils-bootstrap
-@@ -7160,8 +7252,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/binutils && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageprofile-binutils)
- 
- maybe-clean-stageprofile-binutils: clean-stageprofile-binutils
-@@ -7174,7 +7269,7 @@
- 	  $(MAKE) stageprofile-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/binutils && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif binutils-bootstrap
-@@ -7195,8 +7290,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/binutils && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stagefeedback-binutils)
- 
- maybe-clean-stagefeedback-binutils: clean-stagefeedback-binutils
-@@ -7209,7 +7307,7 @@
- 	  $(MAKE) stagefeedback-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/binutils && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif binutils-bootstrap
-@@ -7623,7 +7721,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/bison && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-bison))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-bison))
- @endif bison
- 
- 
-@@ -8050,7 +8149,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/byacc && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-byacc))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-byacc))
- @endif byacc
- 
- 
-@@ -8477,7 +8577,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/bzip2 && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-bzip2))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-bzip2))
- @endif bzip2
- 
- 
-@@ -8901,7 +9002,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/dejagnu && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-dejagnu))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-dejagnu))
- @endif dejagnu
- 
- 
-@@ -9325,7 +9427,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/diff && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-diff))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-diff))
- @endif diff
- 
- 
-@@ -9749,7 +9852,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/dosutils && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-dosutils))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-dosutils))
- @endif dosutils
- 
- 
-@@ -10167,7 +10271,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/etc && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-etc))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-etc))
- @endif etc
- 
- 
-@@ -10591,7 +10696,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/fastjar && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-fastjar))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-fastjar))
- @endif fastjar
- 
- 
-@@ -11018,7 +11124,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/fileutils && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-fileutils))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-fileutils))
- @endif fileutils
- 
- 
-@@ -11442,7 +11549,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/findutils && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-findutils))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-findutils))
- @endif findutils
- 
- 
-@@ -11866,7 +11974,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/find && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-find))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-find))
- @endif find
- 
- 
-@@ -12290,7 +12399,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/fixincludes && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-fixincludes))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-fixincludes))
- @endif fixincludes
- 
- 
-@@ -12698,7 +12808,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/flex && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-flex))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-flex))
- @endif flex
- 
- 
-@@ -13118,9 +13229,9 @@
- 	@r=`${PWD_COMMAND}`; export r; \
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
--	$(HOST_EXPORTS) \
-+	$(HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 1 in $(HOST_SUBDIR)/gas ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
- 	cd $(HOST_SUBDIR)/gas || exit 1; \
-@@ -13149,9 +13260,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 2 in $(HOST_SUBDIR)/gas ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
- 	cd $(HOST_SUBDIR)/gas || exit 1; \
-@@ -13180,9 +13291,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS;  \
- 	echo Configuring stage b2g0 in $(HOST_SUBDIR)/gas ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
- 	cd $(HOST_SUBDIR)/gas || exit 1; \
-@@ -13211,9 +13322,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 3 in $(HOST_SUBDIR)/gas ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
- 	cd $(HOST_SUBDIR)/gas || exit 1; \
-@@ -13242,9 +13353,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS;  \
- 	echo Configuring stage b3g2 in $(HOST_SUBDIR)/gas ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
- 	cd $(HOST_SUBDIR)/gas || exit 1; \
-@@ -13273,9 +13384,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 4 in $(HOST_SUBDIR)/gas ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
- 	cd $(HOST_SUBDIR)/gas || exit 1; \
-@@ -13304,9 +13415,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
- 	echo Configuring stage profile in $(HOST_SUBDIR)/gas ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
- 	cd $(HOST_SUBDIR)/gas || exit 1; \
-@@ -13335,9 +13446,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
- 	echo Configuring stage feedback in $(HOST_SUBDIR)/gas ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
- 	cd $(HOST_SUBDIR)/gas || exit 1; \
-@@ -13372,7 +13483,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/gas && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gas))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-gas))
- @endif gas
- 
- 
-@@ -13391,8 +13503,11 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gas && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"   \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS)   \
- 		$(TARGET-stage1-gas)
- 
- maybe-clean-stage1-gas: clean-stage1-gas
-@@ -13405,7 +13520,7 @@
- 	  $(MAKE) stage1-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gas && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		 clean
- @endif gas-bootstrap
- 
-@@ -13425,8 +13540,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gas && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage2-gas)
- 
- maybe-clean-stage2-gas: clean-stage2-gas
-@@ -13439,7 +13557,7 @@
- 	  $(MAKE) stage2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gas && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif gas-bootstrap
-@@ -13460,8 +13578,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gas && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb2g0-gas)
- 
- maybe-clean-stageb2g0-gas: clean-stageb2g0-gas
-@@ -13474,7 +13595,7 @@
- 	  $(MAKE) stageb2g0-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gas && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif gas-bootstrap
-@@ -13495,8 +13616,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gas && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage3-gas)
- 
- maybe-clean-stage3-gas: clean-stage3-gas
-@@ -13509,7 +13633,7 @@
- 	  $(MAKE) stage3-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gas && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif gas-bootstrap
-@@ -13530,8 +13654,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gas && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb3g2-gas)
- 
- maybe-clean-stageb3g2-gas: clean-stageb3g2-gas
-@@ -13544,7 +13671,7 @@
- 	  $(MAKE) stageb3g2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gas && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif gas-bootstrap
-@@ -13565,8 +13692,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gas && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage4-gas)
- 
- maybe-clean-stage4-gas: clean-stage4-gas
-@@ -13579,7 +13709,7 @@
- 	  $(MAKE) stage4-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gas && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif gas-bootstrap
-@@ -13600,8 +13730,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gas && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageprofile-gas)
- 
- maybe-clean-stageprofile-gas: clean-stageprofile-gas
-@@ -13614,7 +13747,7 @@
- 	  $(MAKE) stageprofile-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gas && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif gas-bootstrap
-@@ -13635,8 +13768,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gas && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stagefeedback-gas)
- 
- maybe-clean-stagefeedback-gas: clean-stagefeedback-gas
-@@ -13649,7 +13785,7 @@
- 	  $(MAKE) stagefeedback-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gas && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif gas-bootstrap
-@@ -14056,9 +14192,9 @@
- 	@r=`${PWD_COMMAND}`; export r; \
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
--	$(HOST_EXPORTS) \
-+	$(HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 1 in $(HOST_SUBDIR)/gcc ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
- 	cd $(HOST_SUBDIR)/gcc || exit 1; \
-@@ -14087,9 +14223,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 2 in $(HOST_SUBDIR)/gcc ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
- 	cd $(HOST_SUBDIR)/gcc || exit 1; \
-@@ -14118,9 +14254,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS;  \
- 	echo Configuring stage b2g0 in $(HOST_SUBDIR)/gcc ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
- 	cd $(HOST_SUBDIR)/gcc || exit 1; \
-@@ -14149,9 +14285,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 3 in $(HOST_SUBDIR)/gcc ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
- 	cd $(HOST_SUBDIR)/gcc || exit 1; \
-@@ -14180,9 +14316,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS;  \
- 	echo Configuring stage b3g2 in $(HOST_SUBDIR)/gcc ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
- 	cd $(HOST_SUBDIR)/gcc || exit 1; \
-@@ -14211,9 +14347,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 4 in $(HOST_SUBDIR)/gcc ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
- 	cd $(HOST_SUBDIR)/gcc || exit 1; \
-@@ -14242,9 +14378,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
- 	echo Configuring stage profile in $(HOST_SUBDIR)/gcc ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
- 	cd $(HOST_SUBDIR)/gcc || exit 1; \
-@@ -14273,9 +14409,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
- 	echo Configuring stage feedback in $(HOST_SUBDIR)/gcc ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
- 	cd $(HOST_SUBDIR)/gcc || exit 1; \
-@@ -14310,7 +14446,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/gcc && \
--	  $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) $(TARGET-gcc))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS) \
-+		$(TARGET-gcc))
- @endif gcc
- 
- 
-@@ -14329,8 +14466,11 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gcc && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"  $(EXTRA_GCC_FLAGS) \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS)  $(EXTRA_GCC_FLAGS) \
- 		$(TARGET-stage1-gcc)
- 
- maybe-clean-stage1-gcc: clean-stage1-gcc
-@@ -14343,7 +14483,7 @@
- 	  $(MAKE) stage1-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gcc && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(EXTRA_GCC_FLAGS) clean
- @endif gcc-bootstrap
- 
-@@ -14363,8 +14503,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gcc && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
- 		$(TARGET-stage2-gcc)
- 
- maybe-clean-stage2-gcc: clean-stage2-gcc
-@@ -14377,7 +14520,7 @@
- 	  $(MAKE) stage2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gcc && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(EXTRA_GCC_FLAGS) clean
- @endif gcc-bootstrap
-@@ -14398,8 +14541,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gcc && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
- 		$(TARGET-stageb2g0-gcc)
- 
- maybe-clean-stageb2g0-gcc: clean-stageb2g0-gcc
-@@ -14412,7 +14558,7 @@
- 	  $(MAKE) stageb2g0-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gcc && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(EXTRA_GCC_FLAGS) clean
- @endif gcc-bootstrap
-@@ -14433,8 +14579,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gcc && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
- 		$(TARGET-stage3-gcc)
- 
- maybe-clean-stage3-gcc: clean-stage3-gcc
-@@ -14447,7 +14596,7 @@
- 	  $(MAKE) stage3-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gcc && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(EXTRA_GCC_FLAGS) clean
- @endif gcc-bootstrap
-@@ -14468,8 +14617,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gcc && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
- 		$(TARGET-stageb3g2-gcc)
- 
- maybe-clean-stageb3g2-gcc: clean-stageb3g2-gcc
-@@ -14482,7 +14634,7 @@
- 	  $(MAKE) stageb3g2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gcc && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(EXTRA_GCC_FLAGS) clean
- @endif gcc-bootstrap
-@@ -14503,8 +14655,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gcc && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
- 		$(TARGET-stage4-gcc)
- 
- maybe-clean-stage4-gcc: clean-stage4-gcc
-@@ -14517,7 +14672,7 @@
- 	  $(MAKE) stage4-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gcc && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(EXTRA_GCC_FLAGS) clean
- @endif gcc-bootstrap
-@@ -14538,8 +14693,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gcc && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
- 		$(TARGET-stageprofile-gcc)
- 
- maybe-clean-stageprofile-gcc: clean-stageprofile-gcc
-@@ -14552,7 +14710,7 @@
- 	  $(MAKE) stageprofile-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gcc && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(EXTRA_GCC_FLAGS) clean
- @endif gcc-bootstrap
-@@ -14573,8 +14731,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gcc && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
- 		$(TARGET-stagefeedback-gcc)
- 
- maybe-clean-stagefeedback-gcc: clean-stagefeedback-gcc
-@@ -14587,7 +14748,7 @@
- 	  $(MAKE) stagefeedback-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gcc && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(EXTRA_GCC_FLAGS) clean
- @endif gcc-bootstrap
-@@ -15001,7 +15162,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/gawk && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gawk))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-gawk))
- @endif gawk
- 
- 
-@@ -15425,7 +15587,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/gettext && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gettext))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-gettext))
- @endif gettext
- 
- 
-@@ -15842,9 +16005,9 @@
- 	@r=`${PWD_COMMAND}`; export r; \
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
--	$(HOST_EXPORTS) \
-+	$(HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 1 in $(HOST_SUBDIR)/gmp ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
- 	cd $(HOST_SUBDIR)/gmp || exit 1; \
-@@ -15873,9 +16036,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 2 in $(HOST_SUBDIR)/gmp ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
- 	cd $(HOST_SUBDIR)/gmp || exit 1; \
-@@ -15904,9 +16067,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS;  \
- 	echo Configuring stage b2g0 in $(HOST_SUBDIR)/gmp ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
- 	cd $(HOST_SUBDIR)/gmp || exit 1; \
-@@ -15935,9 +16098,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 3 in $(HOST_SUBDIR)/gmp ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
- 	cd $(HOST_SUBDIR)/gmp || exit 1; \
-@@ -15966,9 +16129,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS;  \
- 	echo Configuring stage b3g2 in $(HOST_SUBDIR)/gmp ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
- 	cd $(HOST_SUBDIR)/gmp || exit 1; \
-@@ -15997,9 +16160,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 4 in $(HOST_SUBDIR)/gmp ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
- 	cd $(HOST_SUBDIR)/gmp || exit 1; \
-@@ -16028,9 +16191,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
- 	echo Configuring stage profile in $(HOST_SUBDIR)/gmp ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
- 	cd $(HOST_SUBDIR)/gmp || exit 1; \
-@@ -16059,9 +16222,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
- 	echo Configuring stage feedback in $(HOST_SUBDIR)/gmp ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
- 	cd $(HOST_SUBDIR)/gmp || exit 1; \
-@@ -16096,7 +16259,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/gmp && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gmp))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-gmp))
- @endif gmp
- 
- 
-@@ -16115,8 +16279,11 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gmp && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"   \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS)   \
- 		$(TARGET-stage1-gmp)
- 
- maybe-clean-stage1-gmp: clean-stage1-gmp
-@@ -16129,7 +16296,7 @@
- 	  $(MAKE) stage1-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gmp && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		 clean
- @endif gmp-bootstrap
- 
-@@ -16149,8 +16316,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gmp && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage2-gmp)
- 
- maybe-clean-stage2-gmp: clean-stage2-gmp
-@@ -16163,7 +16333,7 @@
- 	  $(MAKE) stage2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gmp && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif gmp-bootstrap
-@@ -16184,8 +16354,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gmp && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb2g0-gmp)
- 
- maybe-clean-stageb2g0-gmp: clean-stageb2g0-gmp
-@@ -16198,7 +16371,7 @@
- 	  $(MAKE) stageb2g0-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gmp && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif gmp-bootstrap
-@@ -16219,8 +16392,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gmp && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage3-gmp)
- 
- maybe-clean-stage3-gmp: clean-stage3-gmp
-@@ -16233,7 +16409,7 @@
- 	  $(MAKE) stage3-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gmp && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif gmp-bootstrap
-@@ -16254,8 +16430,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gmp && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb3g2-gmp)
- 
- maybe-clean-stageb3g2-gmp: clean-stageb3g2-gmp
-@@ -16268,7 +16447,7 @@
- 	  $(MAKE) stageb3g2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gmp && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif gmp-bootstrap
-@@ -16289,8 +16468,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gmp && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage4-gmp)
- 
- maybe-clean-stage4-gmp: clean-stage4-gmp
-@@ -16303,7 +16485,7 @@
- 	  $(MAKE) stage4-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gmp && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif gmp-bootstrap
-@@ -16324,8 +16506,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gmp && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageprofile-gmp)
- 
- maybe-clean-stageprofile-gmp: clean-stageprofile-gmp
-@@ -16338,7 +16523,7 @@
- 	  $(MAKE) stageprofile-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gmp && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif gmp-bootstrap
-@@ -16359,8 +16544,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/gmp && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stagefeedback-gmp)
- 
- maybe-clean-stagefeedback-gmp: clean-stagefeedback-gmp
-@@ -16373,7 +16561,7 @@
- 	  $(MAKE) stagefeedback-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/gmp && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif gmp-bootstrap
-@@ -16774,9 +16962,9 @@
- 	@r=`${PWD_COMMAND}`; export r; \
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
--	$(HOST_EXPORTS) \
-+	$(HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 1 in $(HOST_SUBDIR)/mpfr ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
- 	cd $(HOST_SUBDIR)/mpfr || exit 1; \
-@@ -16805,9 +16993,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 2 in $(HOST_SUBDIR)/mpfr ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
- 	cd $(HOST_SUBDIR)/mpfr || exit 1; \
-@@ -16836,9 +17024,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS;  \
- 	echo Configuring stage b2g0 in $(HOST_SUBDIR)/mpfr ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
- 	cd $(HOST_SUBDIR)/mpfr || exit 1; \
-@@ -16867,9 +17055,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 3 in $(HOST_SUBDIR)/mpfr ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
- 	cd $(HOST_SUBDIR)/mpfr || exit 1; \
-@@ -16898,9 +17086,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS;  \
- 	echo Configuring stage b3g2 in $(HOST_SUBDIR)/mpfr ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
- 	cd $(HOST_SUBDIR)/mpfr || exit 1; \
-@@ -16929,9 +17117,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 4 in $(HOST_SUBDIR)/mpfr ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
- 	cd $(HOST_SUBDIR)/mpfr || exit 1; \
-@@ -16960,9 +17148,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
- 	echo Configuring stage profile in $(HOST_SUBDIR)/mpfr ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
- 	cd $(HOST_SUBDIR)/mpfr || exit 1; \
-@@ -16991,9 +17179,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
- 	echo Configuring stage feedback in $(HOST_SUBDIR)/mpfr ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
- 	cd $(HOST_SUBDIR)/mpfr || exit 1; \
-@@ -17028,7 +17216,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/mpfr && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-mpfr))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-mpfr))
- @endif mpfr
- 
- 
-@@ -17047,8 +17236,11 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/mpfr && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"   \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS)   \
- 		$(TARGET-stage1-mpfr)
- 
- maybe-clean-stage1-mpfr: clean-stage1-mpfr
-@@ -17061,7 +17253,7 @@
- 	  $(MAKE) stage1-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/mpfr && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		 clean
- @endif mpfr-bootstrap
- 
-@@ -17081,8 +17273,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/mpfr && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage2-mpfr)
- 
- maybe-clean-stage2-mpfr: clean-stage2-mpfr
-@@ -17095,7 +17290,7 @@
- 	  $(MAKE) stage2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/mpfr && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif mpfr-bootstrap
-@@ -17116,8 +17311,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/mpfr && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb2g0-mpfr)
- 
- maybe-clean-stageb2g0-mpfr: clean-stageb2g0-mpfr
-@@ -17130,7 +17328,7 @@
- 	  $(MAKE) stageb2g0-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/mpfr && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif mpfr-bootstrap
-@@ -17151,8 +17349,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/mpfr && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage3-mpfr)
- 
- maybe-clean-stage3-mpfr: clean-stage3-mpfr
-@@ -17165,7 +17366,7 @@
- 	  $(MAKE) stage3-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/mpfr && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif mpfr-bootstrap
-@@ -17186,8 +17387,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/mpfr && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb3g2-mpfr)
- 
- maybe-clean-stageb3g2-mpfr: clean-stageb3g2-mpfr
-@@ -17200,7 +17404,7 @@
- 	  $(MAKE) stageb3g2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/mpfr && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif mpfr-bootstrap
-@@ -17221,8 +17425,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/mpfr && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage4-mpfr)
- 
- maybe-clean-stage4-mpfr: clean-stage4-mpfr
-@@ -17235,7 +17442,7 @@
- 	  $(MAKE) stage4-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/mpfr && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif mpfr-bootstrap
-@@ -17256,8 +17463,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/mpfr && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageprofile-mpfr)
- 
- maybe-clean-stageprofile-mpfr: clean-stageprofile-mpfr
-@@ -17270,7 +17480,7 @@
- 	  $(MAKE) stageprofile-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/mpfr && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif mpfr-bootstrap
-@@ -17291,8 +17501,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/mpfr && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stagefeedback-mpfr)
- 
- maybe-clean-stagefeedback-mpfr: clean-stagefeedback-mpfr
-@@ -17305,7 +17518,7 @@
- 	  $(MAKE) stagefeedback-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/mpfr && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif mpfr-bootstrap
-@@ -17713,7 +17926,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/gnuserv && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gnuserv))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-gnuserv))
- @endif gnuserv
- 
- 
-@@ -18137,7 +18351,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/gprof && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gprof))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-gprof))
- @endif gprof
- 
- 
-@@ -18561,7 +18776,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/gzip && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gzip))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-gzip))
- @endif gzip
- 
- 
-@@ -18985,7 +19201,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/hello && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-hello))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-hello))
- @endif hello
- 
- 
-@@ -19409,7 +19626,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/indent && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-indent))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-indent))
- @endif indent
- 
- 
-@@ -19826,9 +20044,9 @@
- 	@r=`${PWD_COMMAND}`; export r; \
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
--	$(HOST_EXPORTS) \
-+	$(HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 1 in $(HOST_SUBDIR)/intl ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
- 	cd $(HOST_SUBDIR)/intl || exit 1; \
-@@ -19857,9 +20075,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 2 in $(HOST_SUBDIR)/intl ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
- 	cd $(HOST_SUBDIR)/intl || exit 1; \
-@@ -19888,9 +20106,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS;  \
- 	echo Configuring stage b2g0 in $(HOST_SUBDIR)/intl ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
- 	cd $(HOST_SUBDIR)/intl || exit 1; \
-@@ -19919,9 +20137,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 3 in $(HOST_SUBDIR)/intl ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
- 	cd $(HOST_SUBDIR)/intl || exit 1; \
-@@ -19950,9 +20168,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS;  \
- 	echo Configuring stage b3g2 in $(HOST_SUBDIR)/intl ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
- 	cd $(HOST_SUBDIR)/intl || exit 1; \
-@@ -19981,9 +20199,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 4 in $(HOST_SUBDIR)/intl ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
- 	cd $(HOST_SUBDIR)/intl || exit 1; \
-@@ -20012,9 +20230,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
- 	echo Configuring stage profile in $(HOST_SUBDIR)/intl ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
- 	cd $(HOST_SUBDIR)/intl || exit 1; \
-@@ -20043,9 +20261,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
- 	echo Configuring stage feedback in $(HOST_SUBDIR)/intl ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
- 	cd $(HOST_SUBDIR)/intl || exit 1; \
-@@ -20080,7 +20298,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/intl && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-intl))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-intl))
- @endif intl
- 
- 
-@@ -20099,8 +20318,11 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/intl && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"   \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS)   \
- 		$(TARGET-stage1-intl)
- 
- maybe-clean-stage1-intl: clean-stage1-intl
-@@ -20113,7 +20335,7 @@
- 	  $(MAKE) stage1-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/intl && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		 clean
- @endif intl-bootstrap
- 
-@@ -20133,8 +20355,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/intl && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage2-intl)
- 
- maybe-clean-stage2-intl: clean-stage2-intl
-@@ -20147,7 +20372,7 @@
- 	  $(MAKE) stage2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/intl && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif intl-bootstrap
-@@ -20168,8 +20393,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/intl && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb2g0-intl)
- 
- maybe-clean-stageb2g0-intl: clean-stageb2g0-intl
-@@ -20182,7 +20410,7 @@
- 	  $(MAKE) stageb2g0-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/intl && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif intl-bootstrap
-@@ -20203,8 +20431,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/intl && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage3-intl)
- 
- maybe-clean-stage3-intl: clean-stage3-intl
-@@ -20217,7 +20448,7 @@
- 	  $(MAKE) stage3-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/intl && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif intl-bootstrap
-@@ -20238,8 +20469,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/intl && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb3g2-intl)
- 
- maybe-clean-stageb3g2-intl: clean-stageb3g2-intl
-@@ -20252,7 +20486,7 @@
- 	  $(MAKE) stageb3g2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/intl && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif intl-bootstrap
-@@ -20273,8 +20507,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/intl && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage4-intl)
- 
- maybe-clean-stage4-intl: clean-stage4-intl
-@@ -20287,7 +20524,7 @@
- 	  $(MAKE) stage4-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/intl && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif intl-bootstrap
-@@ -20308,8 +20545,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/intl && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageprofile-intl)
- 
- maybe-clean-stageprofile-intl: clean-stageprofile-intl
-@@ -20322,7 +20562,7 @@
- 	  $(MAKE) stageprofile-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/intl && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif intl-bootstrap
-@@ -20343,8 +20583,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/intl && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stagefeedback-intl)
- 
- maybe-clean-stagefeedback-intl: clean-stagefeedback-intl
-@@ -20357,7 +20600,7 @@
- 	  $(MAKE) stagefeedback-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/intl && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif intl-bootstrap
-@@ -20771,7 +21014,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/tcl && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-tcl))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-tcl))
- @endif tcl
- 
- 
-@@ -21180,7 +21424,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/itcl && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-itcl))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-itcl))
- @endif itcl
- 
- 
-@@ -21597,9 +21842,9 @@
- 	@r=`${PWD_COMMAND}`; export r; \
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
--	$(HOST_EXPORTS) \
-+	$(HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 1 in $(HOST_SUBDIR)/ld ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
- 	cd $(HOST_SUBDIR)/ld || exit 1; \
-@@ -21628,9 +21873,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 2 in $(HOST_SUBDIR)/ld ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
- 	cd $(HOST_SUBDIR)/ld || exit 1; \
-@@ -21659,9 +21904,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS;  \
- 	echo Configuring stage b2g0 in $(HOST_SUBDIR)/ld ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
- 	cd $(HOST_SUBDIR)/ld || exit 1; \
-@@ -21690,9 +21935,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 3 in $(HOST_SUBDIR)/ld ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
- 	cd $(HOST_SUBDIR)/ld || exit 1; \
-@@ -21721,9 +21966,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS;  \
- 	echo Configuring stage b3g2 in $(HOST_SUBDIR)/ld ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
- 	cd $(HOST_SUBDIR)/ld || exit 1; \
-@@ -21752,9 +21997,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 4 in $(HOST_SUBDIR)/ld ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
- 	cd $(HOST_SUBDIR)/ld || exit 1; \
-@@ -21783,9 +22028,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
- 	echo Configuring stage profile in $(HOST_SUBDIR)/ld ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
- 	cd $(HOST_SUBDIR)/ld || exit 1; \
-@@ -21814,9 +22059,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
- 	echo Configuring stage feedback in $(HOST_SUBDIR)/ld ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
- 	cd $(HOST_SUBDIR)/ld || exit 1; \
-@@ -21851,7 +22096,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/ld && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-ld))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-ld))
- @endif ld
- 
- 
-@@ -21870,8 +22116,11 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/ld && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"   \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS)   \
- 		$(TARGET-stage1-ld)
- 
- maybe-clean-stage1-ld: clean-stage1-ld
-@@ -21884,7 +22133,7 @@
- 	  $(MAKE) stage1-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/ld && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		 clean
- @endif ld-bootstrap
- 
-@@ -21904,8 +22153,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/ld && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage2-ld)
- 
- maybe-clean-stage2-ld: clean-stage2-ld
-@@ -21918,7 +22170,7 @@
- 	  $(MAKE) stage2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/ld && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif ld-bootstrap
-@@ -21939,8 +22191,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/ld && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb2g0-ld)
- 
- maybe-clean-stageb2g0-ld: clean-stageb2g0-ld
-@@ -21953,7 +22208,7 @@
- 	  $(MAKE) stageb2g0-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/ld && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif ld-bootstrap
-@@ -21974,8 +22229,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/ld && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage3-ld)
- 
- maybe-clean-stage3-ld: clean-stage3-ld
-@@ -21988,7 +22246,7 @@
- 	  $(MAKE) stage3-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/ld && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif ld-bootstrap
-@@ -22009,8 +22267,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/ld && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb3g2-ld)
- 
- maybe-clean-stageb3g2-ld: clean-stageb3g2-ld
-@@ -22023,7 +22284,7 @@
- 	  $(MAKE) stageb3g2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/ld && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif ld-bootstrap
-@@ -22044,8 +22305,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/ld && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage4-ld)
- 
- maybe-clean-stage4-ld: clean-stage4-ld
-@@ -22058,7 +22322,7 @@
- 	  $(MAKE) stage4-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/ld && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif ld-bootstrap
-@@ -22079,8 +22343,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/ld && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageprofile-ld)
- 
- maybe-clean-stageprofile-ld: clean-stageprofile-ld
-@@ -22093,7 +22360,7 @@
- 	  $(MAKE) stageprofile-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/ld && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif ld-bootstrap
-@@ -22114,8 +22381,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/ld && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stagefeedback-ld)
- 
- maybe-clean-stagefeedback-ld: clean-stagefeedback-ld
-@@ -22128,7 +22398,7 @@
- 	  $(MAKE) stagefeedback-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/ld && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif ld-bootstrap
-@@ -22535,9 +22805,9 @@
- 	@r=`${PWD_COMMAND}`; export r; \
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
--	$(HOST_EXPORTS) \
-+	$(HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 1 in $(HOST_SUBDIR)/libcpp ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
- 	cd $(HOST_SUBDIR)/libcpp || exit 1; \
-@@ -22566,9 +22836,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 2 in $(HOST_SUBDIR)/libcpp ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
- 	cd $(HOST_SUBDIR)/libcpp || exit 1; \
-@@ -22597,9 +22867,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS;  \
- 	echo Configuring stage b2g0 in $(HOST_SUBDIR)/libcpp ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
- 	cd $(HOST_SUBDIR)/libcpp || exit 1; \
-@@ -22628,9 +22898,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 3 in $(HOST_SUBDIR)/libcpp ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
- 	cd $(HOST_SUBDIR)/libcpp || exit 1; \
-@@ -22659,9 +22929,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS;  \
- 	echo Configuring stage b3g2 in $(HOST_SUBDIR)/libcpp ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
- 	cd $(HOST_SUBDIR)/libcpp || exit 1; \
-@@ -22690,9 +22960,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 4 in $(HOST_SUBDIR)/libcpp ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
- 	cd $(HOST_SUBDIR)/libcpp || exit 1; \
-@@ -22721,9 +22991,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
- 	echo Configuring stage profile in $(HOST_SUBDIR)/libcpp ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
- 	cd $(HOST_SUBDIR)/libcpp || exit 1; \
-@@ -22752,9 +23022,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
- 	echo Configuring stage feedback in $(HOST_SUBDIR)/libcpp ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
- 	cd $(HOST_SUBDIR)/libcpp || exit 1; \
-@@ -22789,7 +23059,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/libcpp && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-libcpp))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-libcpp))
- @endif libcpp
- 
- 
-@@ -22808,8 +23079,11 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libcpp && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"   \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS)   \
- 		$(TARGET-stage1-libcpp)
- 
- maybe-clean-stage1-libcpp: clean-stage1-libcpp
-@@ -22822,7 +23096,7 @@
- 	  $(MAKE) stage1-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libcpp && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		 clean
- @endif libcpp-bootstrap
- 
-@@ -22842,8 +23116,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libcpp && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage2-libcpp)
- 
- maybe-clean-stage2-libcpp: clean-stage2-libcpp
-@@ -22856,7 +23133,7 @@
- 	  $(MAKE) stage2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libcpp && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif libcpp-bootstrap
-@@ -22877,8 +23154,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libcpp && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb2g0-libcpp)
- 
- maybe-clean-stageb2g0-libcpp: clean-stageb2g0-libcpp
-@@ -22891,7 +23171,7 @@
- 	  $(MAKE) stageb2g0-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libcpp && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif libcpp-bootstrap
-@@ -22912,8 +23192,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libcpp && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage3-libcpp)
- 
- maybe-clean-stage3-libcpp: clean-stage3-libcpp
-@@ -22926,7 +23209,7 @@
- 	  $(MAKE) stage3-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libcpp && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif libcpp-bootstrap
-@@ -22947,8 +23230,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libcpp && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb3g2-libcpp)
- 
- maybe-clean-stageb3g2-libcpp: clean-stageb3g2-libcpp
-@@ -22961,7 +23247,7 @@
- 	  $(MAKE) stageb3g2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libcpp && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif libcpp-bootstrap
-@@ -22982,8 +23268,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libcpp && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage4-libcpp)
- 
- maybe-clean-stage4-libcpp: clean-stage4-libcpp
-@@ -22996,7 +23285,7 @@
- 	  $(MAKE) stage4-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libcpp && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif libcpp-bootstrap
-@@ -23017,8 +23306,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libcpp && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageprofile-libcpp)
- 
- maybe-clean-stageprofile-libcpp: clean-stageprofile-libcpp
-@@ -23031,7 +23323,7 @@
- 	  $(MAKE) stageprofile-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libcpp && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif libcpp-bootstrap
-@@ -23052,8 +23344,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libcpp && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stagefeedback-libcpp)
- 
- maybe-clean-stagefeedback-libcpp: clean-stagefeedback-libcpp
-@@ -23066,7 +23361,7 @@
- 	  $(MAKE) stagefeedback-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libcpp && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif libcpp-bootstrap
-@@ -23473,9 +23768,9 @@
- 	@r=`${PWD_COMMAND}`; export r; \
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
--	$(HOST_EXPORTS) \
-+	$(HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 1 in $(HOST_SUBDIR)/libdecnumber ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
- 	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-@@ -23504,9 +23799,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 2 in $(HOST_SUBDIR)/libdecnumber ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
- 	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-@@ -23535,9 +23830,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS;  \
- 	echo Configuring stage b2g0 in $(HOST_SUBDIR)/libdecnumber ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
- 	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-@@ -23566,9 +23861,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 3 in $(HOST_SUBDIR)/libdecnumber ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
- 	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-@@ -23597,9 +23892,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS;  \
- 	echo Configuring stage b3g2 in $(HOST_SUBDIR)/libdecnumber ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
- 	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-@@ -23628,9 +23923,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 4 in $(HOST_SUBDIR)/libdecnumber ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
- 	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-@@ -23659,9 +23954,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
- 	echo Configuring stage profile in $(HOST_SUBDIR)/libdecnumber ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
- 	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-@@ -23690,9 +23985,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
- 	echo Configuring stage feedback in $(HOST_SUBDIR)/libdecnumber ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
- 	cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-@@ -23727,7 +24022,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/libdecnumber && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-libdecnumber))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-libdecnumber))
- @endif libdecnumber
- 
- 
-@@ -23746,8 +24042,11 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libdecnumber && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"   \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS)   \
- 		$(TARGET-stage1-libdecnumber)
- 
- maybe-clean-stage1-libdecnumber: clean-stage1-libdecnumber
-@@ -23760,7 +24059,7 @@
- 	  $(MAKE) stage1-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libdecnumber && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		 clean
- @endif libdecnumber-bootstrap
- 
-@@ -23780,8 +24079,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libdecnumber && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage2-libdecnumber)
- 
- maybe-clean-stage2-libdecnumber: clean-stage2-libdecnumber
-@@ -23794,7 +24096,7 @@
- 	  $(MAKE) stage2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libdecnumber && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif libdecnumber-bootstrap
-@@ -23815,8 +24117,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libdecnumber && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb2g0-libdecnumber)
- 
- maybe-clean-stageb2g0-libdecnumber: clean-stageb2g0-libdecnumber
-@@ -23829,7 +24134,7 @@
- 	  $(MAKE) stageb2g0-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libdecnumber && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif libdecnumber-bootstrap
-@@ -23850,8 +24155,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libdecnumber && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage3-libdecnumber)
- 
- maybe-clean-stage3-libdecnumber: clean-stage3-libdecnumber
-@@ -23864,7 +24172,7 @@
- 	  $(MAKE) stage3-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libdecnumber && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif libdecnumber-bootstrap
-@@ -23885,8 +24193,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libdecnumber && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb3g2-libdecnumber)
- 
- maybe-clean-stageb3g2-libdecnumber: clean-stageb3g2-libdecnumber
-@@ -23899,7 +24210,7 @@
- 	  $(MAKE) stageb3g2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libdecnumber && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif libdecnumber-bootstrap
-@@ -23920,8 +24231,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libdecnumber && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage4-libdecnumber)
- 
- maybe-clean-stage4-libdecnumber: clean-stage4-libdecnumber
-@@ -23934,7 +24248,7 @@
- 	  $(MAKE) stage4-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libdecnumber && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif libdecnumber-bootstrap
-@@ -23955,8 +24269,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libdecnumber && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageprofile-libdecnumber)
- 
- maybe-clean-stageprofile-libdecnumber: clean-stageprofile-libdecnumber
-@@ -23969,7 +24286,7 @@
- 	  $(MAKE) stageprofile-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libdecnumber && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif libdecnumber-bootstrap
-@@ -23990,8 +24307,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libdecnumber && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stagefeedback-libdecnumber)
- 
- maybe-clean-stagefeedback-libdecnumber: clean-stagefeedback-libdecnumber
-@@ -24004,7 +24324,7 @@
- 	  $(MAKE) stagefeedback-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libdecnumber && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif libdecnumber-bootstrap
-@@ -24418,7 +24738,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/libgui && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-libgui))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-libgui))
- @endif libgui
- 
- 
-@@ -24835,9 +25156,9 @@
- 	@r=`${PWD_COMMAND}`; export r; \
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
--	$(HOST_EXPORTS) \
-+	$(HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 1 in $(HOST_SUBDIR)/libiberty ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
- 	cd $(HOST_SUBDIR)/libiberty || exit 1; \
-@@ -24866,9 +25187,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 2 in $(HOST_SUBDIR)/libiberty ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
- 	cd $(HOST_SUBDIR)/libiberty || exit 1; \
-@@ -24897,9 +25218,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS;  \
- 	echo Configuring stage b2g0 in $(HOST_SUBDIR)/libiberty ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
- 	cd $(HOST_SUBDIR)/libiberty || exit 1; \
-@@ -24928,9 +25249,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 3 in $(HOST_SUBDIR)/libiberty ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
- 	cd $(HOST_SUBDIR)/libiberty || exit 1; \
-@@ -24959,9 +25280,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS;  \
- 	echo Configuring stage b3g2 in $(HOST_SUBDIR)/libiberty ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
- 	cd $(HOST_SUBDIR)/libiberty || exit 1; \
-@@ -24990,9 +25311,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 4 in $(HOST_SUBDIR)/libiberty ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
- 	cd $(HOST_SUBDIR)/libiberty || exit 1; \
-@@ -25021,9 +25342,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
- 	echo Configuring stage profile in $(HOST_SUBDIR)/libiberty ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
- 	cd $(HOST_SUBDIR)/libiberty || exit 1; \
-@@ -25052,9 +25373,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
- 	echo Configuring stage feedback in $(HOST_SUBDIR)/libiberty ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
- 	cd $(HOST_SUBDIR)/libiberty || exit 1; \
-@@ -25089,7 +25410,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/libiberty && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-libiberty))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-libiberty))
- @endif libiberty
- 
- 
-@@ -25108,8 +25430,11 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libiberty && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"   \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS)   \
- 		$(TARGET-stage1-libiberty)
- 
- maybe-clean-stage1-libiberty: clean-stage1-libiberty
-@@ -25122,7 +25447,7 @@
- 	  $(MAKE) stage1-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libiberty && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		 clean
- @endif libiberty-bootstrap
- 
-@@ -25142,8 +25467,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libiberty && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage2-libiberty)
- 
- maybe-clean-stage2-libiberty: clean-stage2-libiberty
-@@ -25156,7 +25484,7 @@
- 	  $(MAKE) stage2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libiberty && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif libiberty-bootstrap
-@@ -25177,8 +25505,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libiberty && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb2g0-libiberty)
- 
- maybe-clean-stageb2g0-libiberty: clean-stageb2g0-libiberty
-@@ -25191,7 +25522,7 @@
- 	  $(MAKE) stageb2g0-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libiberty && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif libiberty-bootstrap
-@@ -25212,8 +25543,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libiberty && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage3-libiberty)
- 
- maybe-clean-stage3-libiberty: clean-stage3-libiberty
-@@ -25226,7 +25560,7 @@
- 	  $(MAKE) stage3-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libiberty && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif libiberty-bootstrap
-@@ -25247,8 +25581,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libiberty && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb3g2-libiberty)
- 
- maybe-clean-stageb3g2-libiberty: clean-stageb3g2-libiberty
-@@ -25261,7 +25598,7 @@
- 	  $(MAKE) stageb3g2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libiberty && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif libiberty-bootstrap
-@@ -25282,8 +25619,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libiberty && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage4-libiberty)
- 
- maybe-clean-stage4-libiberty: clean-stage4-libiberty
-@@ -25296,7 +25636,7 @@
- 	  $(MAKE) stage4-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libiberty && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif libiberty-bootstrap
-@@ -25317,8 +25657,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libiberty && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageprofile-libiberty)
- 
- maybe-clean-stageprofile-libiberty: clean-stageprofile-libiberty
-@@ -25331,7 +25674,7 @@
- 	  $(MAKE) stageprofile-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libiberty && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif libiberty-bootstrap
-@@ -25352,8 +25695,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/libiberty && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stagefeedback-libiberty)
- 
- maybe-clean-stagefeedback-libiberty: clean-stagefeedback-libiberty
-@@ -25366,7 +25712,7 @@
- 	  $(MAKE) stagefeedback-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/libiberty && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif libiberty-bootstrap
-@@ -25780,7 +26126,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/libtool && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-libtool))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-libtool))
- @endif libtool
- 
- 
-@@ -26204,7 +26551,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/m4 && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-m4))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-m4))
- @endif m4
- 
- 
-@@ -26628,7 +26976,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/make && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-make))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-make))
- @endif make
- 
- 
-@@ -27052,7 +27401,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/mmalloc && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-mmalloc))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-mmalloc))
- @endif mmalloc
- 
- 
-@@ -27470,7 +27820,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/patch && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-patch))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-patch))
- @endif patch
- 
- 
-@@ -27894,7 +28245,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/perl && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-perl))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-perl))
- @endif perl
- 
- 
-@@ -28318,7 +28670,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/prms && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-prms))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-prms))
- @endif prms
- 
- 
-@@ -28742,7 +29095,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/rcs && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-rcs))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-rcs))
- @endif rcs
- 
- 
-@@ -29166,7 +29520,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/readline && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-readline))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-readline))
- @endif readline
- 
- 
-@@ -29590,7 +29945,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/release && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-release))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-release))
- @endif release
- 
- 
-@@ -30002,7 +30358,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/recode && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-recode))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-recode))
- @endif recode
- 
- 
-@@ -30426,7 +30783,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/sed && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-sed))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-sed))
- @endif sed
- 
- 
-@@ -30850,7 +31208,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/send-pr && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-send-pr))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-send-pr))
- @endif send-pr
- 
- 
-@@ -31274,7 +31633,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/shellutils && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-shellutils))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-shellutils))
- @endif shellutils
- 
- 
-@@ -31698,7 +32058,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/sid && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-sid))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-sid))
- @endif sid
- 
- 
-@@ -32122,7 +32483,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/sim && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-sim))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-sim))
- @endif sim
- 
- 
-@@ -32546,7 +32908,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/tar && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-tar))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-tar))
- @endif tar
- 
- 
-@@ -32970,7 +33333,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/texinfo && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-texinfo))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-texinfo))
- @endif texinfo
- 
- 
-@@ -33388,7 +33752,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/textutils && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-textutils))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-textutils))
- @endif textutils
- 
- 
-@@ -33812,7 +34177,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/time && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-time))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-time))
- @endif time
- 
- 
-@@ -34236,7 +34602,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/uudecode && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-uudecode))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-uudecode))
- @endif uudecode
- 
- 
-@@ -34660,7 +35027,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/wdiff && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-wdiff))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-wdiff))
- @endif wdiff
- 
- 
-@@ -35084,7 +35452,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/zip && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-zip))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-zip))
- @endif zip
- 
- 
-@@ -35504,9 +35873,9 @@
- 	@r=`${PWD_COMMAND}`; export r; \
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
--	$(HOST_EXPORTS) \
-+	$(HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 1 in $(HOST_SUBDIR)/zlib ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
- 	cd $(HOST_SUBDIR)/zlib || exit 1; \
-@@ -35535,9 +35904,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 2 in $(HOST_SUBDIR)/zlib ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
- 	cd $(HOST_SUBDIR)/zlib || exit 1; \
-@@ -35566,9 +35935,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS;  \
- 	echo Configuring stage b2g0 in $(HOST_SUBDIR)/zlib ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
- 	cd $(HOST_SUBDIR)/zlib || exit 1; \
-@@ -35597,9 +35966,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 3 in $(HOST_SUBDIR)/zlib ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
- 	cd $(HOST_SUBDIR)/zlib || exit 1; \
-@@ -35628,9 +35997,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS;  \
- 	echo Configuring stage b3g2 in $(HOST_SUBDIR)/zlib ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
- 	cd $(HOST_SUBDIR)/zlib || exit 1; \
-@@ -35659,9 +36028,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS;  \
- 	echo Configuring stage 4 in $(HOST_SUBDIR)/zlib ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
- 	cd $(HOST_SUBDIR)/zlib || exit 1; \
-@@ -35690,9 +36059,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS;  \
- 	echo Configuring stage profile in $(HOST_SUBDIR)/zlib ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
- 	cd $(HOST_SUBDIR)/zlib || exit 1; \
-@@ -35721,9 +36090,9 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
- 	$(HOST_EXPORTS) \
--	$(POSTSTAGE1_HOST_EXPORTS) \
-+	$(POSTSTAGE1_HOST_EXPORTS)  \
- 	CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
-+	CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS;  \
- 	echo Configuring stage feedback in $(HOST_SUBDIR)/zlib ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
- 	cd $(HOST_SUBDIR)/zlib || exit 1; \
-@@ -35758,7 +36127,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/zlib && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-zlib))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-zlib))
- @endif zlib
- 
- 
-@@ -35777,8 +36147,11 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/zlib && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"   \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS)   \
- 		$(TARGET-stage1-zlib)
- 
- maybe-clean-stage1-zlib: clean-stage1-zlib
-@@ -35791,7 +36164,7 @@
- 	  $(MAKE) stage1-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/zlib && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		 clean
- @endif zlib-bootstrap
- 
-@@ -35811,8 +36184,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/zlib && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage2-zlib)
- 
- maybe-clean-stage2-zlib: clean-stage2-zlib
-@@ -35825,7 +36201,7 @@
- 	  $(MAKE) stage2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/zlib && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif zlib-bootstrap
-@@ -35846,8 +36222,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/zlib && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb2g0-zlib)
- 
- maybe-clean-stageb2g0-zlib: clean-stageb2g0-zlib
-@@ -35860,7 +36239,7 @@
- 	  $(MAKE) stageb2g0-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/zlib && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif zlib-bootstrap
-@@ -35881,8 +36260,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/zlib && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage3-zlib)
- 
- maybe-clean-stage3-zlib: clean-stage3-zlib
-@@ -35895,7 +36277,7 @@
- 	  $(MAKE) stage3-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/zlib && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif zlib-bootstrap
-@@ -35916,8 +36298,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/zlib && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageb3g2-zlib)
- 
- maybe-clean-stageb3g2-zlib: clean-stageb3g2-zlib
-@@ -35930,7 +36315,7 @@
- 	  $(MAKE) stageb3g2-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/zlib && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif zlib-bootstrap
-@@ -35951,8 +36336,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/zlib && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stage4-zlib)
- 
- maybe-clean-stage4-zlib: clean-stage4-zlib
-@@ -35965,7 +36353,7 @@
- 	  $(MAKE) stage4-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/zlib && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif zlib-bootstrap
-@@ -35986,8 +36374,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/zlib && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stageprofile-zlib)
- 
- maybe-clean-stageprofile-zlib: clean-stageprofile-zlib
-@@ -36000,7 +36391,7 @@
- 	  $(MAKE) stageprofile-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/zlib && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif zlib-bootstrap
-@@ -36021,8 +36412,11 @@
- 	$(HOST_EXPORTS) \
- 	$(POSTSTAGE1_HOST_EXPORTS) \
- 	cd $(HOST_SUBDIR)/zlib && \
--	$(MAKE) $(FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS)  \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		$(TARGET-stagefeedback-zlib)
- 
- maybe-clean-stagefeedback-zlib: clean-stagefeedback-zlib
-@@ -36035,7 +36429,7 @@
- 	  $(MAKE) stagefeedback-start; \
- 	fi; \
- 	cd $(HOST_SUBDIR)/zlib && \
--	$(MAKE) $(FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_HOST_FLAGS)  \
- 		$(POSTSTAGE1_FLAGS_TO_PASS)  \
- 		 clean
- @endif zlib-bootstrap
-@@ -36437,7 +36831,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/gdb && \
--	  $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) $(TARGET-gdb))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS) \
-+		$(TARGET-gdb))
- @endif gdb
- 
- 
-@@ -36861,7 +37256,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/expect && \
--	  $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) $(TARGET-expect))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS) \
-+		$(TARGET-expect))
- @endif expect
- 
- 
-@@ -37285,7 +37681,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/guile && \
--	  $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) $(TARGET-guile))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS) \
-+		$(TARGET-guile))
- @endif guile
- 
- 
-@@ -37709,7 +38106,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/tk && \
--	  $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) $(TARGET-tk))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS) \
-+		$(TARGET-tk))
- @endif tk
- 
- 
-@@ -38133,7 +38531,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/libtermcap && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-libtermcap))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-libtermcap))
- @endif libtermcap
- 
- 
-@@ -38491,7 +38890,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/utils && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-utils))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-utils))
- @endif utils
- 
- 
-@@ -38909,7 +39309,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(HOST_EXPORTS) \
- 	(cd $(HOST_SUBDIR)/gnattools && \
--	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-gnattools))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)  \
-+		$(TARGET-gnattools))
- @endif gnattools
- 
- 
-@@ -39354,7 +39755,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(RAW_CXX_TARGET_EXPORTS) \
- 	(cd $(TARGET_SUBDIR)/libstdc++-v3 && \
--	  $(MAKE) $(TARGET_FLAGS_TO_PASS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  $(TARGET-target-libstdc++-v3))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  \
-+		$(TARGET-target-libstdc++-v3))
- @endif target-libstdc++-v3
- 
- 
-@@ -39795,7 +40197,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(NORMAL_TARGET_EXPORTS) \
- 	(cd $(TARGET_SUBDIR)/libmudflap && \
--	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libmudflap))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-+		$(TARGET-target-libmudflap))
- @endif target-libmudflap
- 
- 
-@@ -40236,7 +40639,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(NORMAL_TARGET_EXPORTS) \
- 	(cd $(TARGET_SUBDIR)/libssp && \
--	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libssp))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-+		$(TARGET-target-libssp))
- @endif target-libssp
- 
- 
-@@ -40677,7 +41081,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(NORMAL_TARGET_EXPORTS) \
- 	(cd $(TARGET_SUBDIR)/newlib && \
--	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-newlib))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-+		$(TARGET-target-newlib))
- @endif target-newlib
- 
- 
-@@ -41123,9 +41528,9 @@
- 	  mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
- 	fi; \
- 	test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
--	$(NORMAL_TARGET_EXPORTS) \
--	CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
-+	$(NORMAL_TARGET_EXPORTS)  \
-+	CFLAGS="$(STAGE1_LIBCFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
-+	CXXFLAGS="$(STAGE1_LIBCFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS;  \
- 	echo Configuring stage 1 in $(TARGET_SUBDIR)/libgcc ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
- 	cd $(TARGET_SUBDIR)/libgcc || exit 1; \
-@@ -41166,9 +41571,9 @@
- 	fi; \
- 	test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
- 	$(NORMAL_TARGET_EXPORTS) \
--	 \
--	CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
-+	  \
-+	CFLAGS="$(STAGE2_LIBCFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
-+	CXXFLAGS="$(STAGE2_LIBCFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS;  \
- 	echo Configuring stage 2 in $(TARGET_SUBDIR)/libgcc ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
- 	cd $(TARGET_SUBDIR)/libgcc || exit 1; \
-@@ -41209,9 +41614,9 @@
- 	fi; \
- 	test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
- 	$(NORMAL_TARGET_EXPORTS) \
--	 \
--	CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
-+	  \
-+	CFLAGS="$(STAGE2_LIBCFLAGS) -g0 $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
-+	CXXFLAGS="$(STAGE2_LIBCFLAGS) -g0 $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS;  \
- 	echo Configuring stage b2g0 in $(TARGET_SUBDIR)/libgcc ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
- 	cd $(TARGET_SUBDIR)/libgcc || exit 1; \
-@@ -41252,9 +41657,9 @@
- 	fi; \
- 	test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
- 	$(NORMAL_TARGET_EXPORTS) \
--	 \
--	CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
-+	  \
-+	CFLAGS="$(STAGE3_LIBCFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
-+	CXXFLAGS="$(STAGE3_LIBCFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS;  \
- 	echo Configuring stage 3 in $(TARGET_SUBDIR)/libgcc ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
- 	cd $(TARGET_SUBDIR)/libgcc || exit 1; \
-@@ -41295,9 +41700,9 @@
- 	fi; \
- 	test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
- 	$(NORMAL_TARGET_EXPORTS) \
--	 \
--	CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
-+	  \
-+	CFLAGS="$(STAGE3_LIBCFLAGS) -g2 $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
-+	CXXFLAGS="$(STAGE3_LIBCFLAGS) -g2 $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS;  \
- 	echo Configuring stage b3g2 in $(TARGET_SUBDIR)/libgcc ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
- 	cd $(TARGET_SUBDIR)/libgcc || exit 1; \
-@@ -41338,9 +41743,9 @@
- 	fi; \
- 	test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
- 	$(NORMAL_TARGET_EXPORTS) \
--	 \
--	CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
-+	  \
-+	CFLAGS="$(STAGE4_CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
-+	CXXFLAGS="$(STAGE4_CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS;  \
- 	echo Configuring stage 4 in $(TARGET_SUBDIR)/libgcc ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
- 	cd $(TARGET_SUBDIR)/libgcc || exit 1; \
-@@ -41381,9 +41786,9 @@
- 	fi; \
- 	test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
- 	$(NORMAL_TARGET_EXPORTS) \
--	 \
--	CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
-+	  \
-+	CFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
-+	CXXFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS;  \
- 	echo Configuring stage profile in $(TARGET_SUBDIR)/libgcc ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
- 	cd $(TARGET_SUBDIR)/libgcc || exit 1; \
-@@ -41424,9 +41829,9 @@
- 	fi; \
- 	test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
- 	$(NORMAL_TARGET_EXPORTS) \
--	 \
--	CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
--	LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
-+	  \
-+	CFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
-+	CXXFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS;  \
- 	echo Configuring stage feedback in $(TARGET_SUBDIR)/libgcc ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
- 	cd $(TARGET_SUBDIR)/libgcc || exit 1; \
-@@ -41461,7 +41866,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(NORMAL_TARGET_EXPORTS) \
- 	(cd $(TARGET_SUBDIR)/libgcc && \
--	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libgcc))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-+		$(TARGET-target-libgcc))
- @endif target-libgcc
- 
- 
-@@ -41480,8 +41886,11 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(NORMAL_TARGET_EXPORTS) \
- 	cd $(TARGET_SUBDIR)/libgcc && \
--	$(MAKE) $(TARGET_FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)"   \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_TARGET_FLAGS)   \
- 		$(TARGET-stage1-target-libgcc)
- 
- maybe-clean-stage1-target-libgcc: clean-stage1-target-libgcc
-@@ -41494,7 +41903,7 @@
- 	  $(MAKE) stage1-start; \
- 	fi; \
- 	cd $(TARGET_SUBDIR)/libgcc && \
--	$(MAKE) $(TARGET_FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_TARGET_FLAGS)  \
- 		 clean
- @endif target-libgcc-bootstrap
- 
-@@ -41514,8 +41923,11 @@
- 	$(NORMAL_TARGET_EXPORTS) \
- 	 \
- 	cd $(TARGET_SUBDIR)/libgcc && \
--	$(MAKE) $(TARGET_FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)"   \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_TARGET_FLAGS)   \
- 		$(TARGET-stage2-target-libgcc)
- 
- maybe-clean-stage2-target-libgcc: clean-stage2-target-libgcc
-@@ -41528,7 +41940,7 @@
- 	  $(MAKE) stage2-start; \
- 	fi; \
- 	cd $(TARGET_SUBDIR)/libgcc && \
--	$(MAKE) $(TARGET_FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_TARGET_FLAGS)  \
- 		  \
- 		 clean
- @endif target-libgcc-bootstrap
-@@ -41549,8 +41961,11 @@
- 	$(NORMAL_TARGET_EXPORTS) \
- 	 \
- 	cd $(TARGET_SUBDIR)/libgcc && \
--	$(MAKE) $(TARGET_FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0"   \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_TARGET_FLAGS)   \
- 		$(TARGET-stageb2g0-target-libgcc)
- 
- maybe-clean-stageb2g0-target-libgcc: clean-stageb2g0-target-libgcc
-@@ -41563,7 +41978,7 @@
- 	  $(MAKE) stageb2g0-start; \
- 	fi; \
- 	cd $(TARGET_SUBDIR)/libgcc && \
--	$(MAKE) $(TARGET_FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_TARGET_FLAGS)  \
- 		  \
- 		 clean
- @endif target-libgcc-bootstrap
-@@ -41584,8 +41999,11 @@
- 	$(NORMAL_TARGET_EXPORTS) \
- 	 \
- 	cd $(TARGET_SUBDIR)/libgcc && \
--	$(MAKE) $(TARGET_FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)"   \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_TARGET_FLAGS)   \
- 		$(TARGET-stage3-target-libgcc)
- 
- maybe-clean-stage3-target-libgcc: clean-stage3-target-libgcc
-@@ -41598,7 +42016,7 @@
- 	  $(MAKE) stage3-start; \
- 	fi; \
- 	cd $(TARGET_SUBDIR)/libgcc && \
--	$(MAKE) $(TARGET_FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_TARGET_FLAGS)  \
- 		  \
- 		 clean
- @endif target-libgcc-bootstrap
-@@ -41619,8 +42037,11 @@
- 	$(NORMAL_TARGET_EXPORTS) \
- 	 \
- 	cd $(TARGET_SUBDIR)/libgcc && \
--	$(MAKE) $(TARGET_FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2"   \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_TARGET_FLAGS)   \
- 		$(TARGET-stageb3g2-target-libgcc)
- 
- maybe-clean-stageb3g2-target-libgcc: clean-stageb3g2-target-libgcc
-@@ -41633,7 +42054,7 @@
- 	  $(MAKE) stageb3g2-start; \
- 	fi; \
- 	cd $(TARGET_SUBDIR)/libgcc && \
--	$(MAKE) $(TARGET_FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_TARGET_FLAGS)  \
- 		  \
- 		 clean
- @endif target-libgcc-bootstrap
-@@ -41654,8 +42075,11 @@
- 	$(NORMAL_TARGET_EXPORTS) \
- 	 \
- 	cd $(TARGET_SUBDIR)/libgcc && \
--	$(MAKE) $(TARGET_FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)"   \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
-+		LIBCFLAGS="$(STAGE4_CFLAGS)" \
-+		CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_TARGET_FLAGS)   \
- 		$(TARGET-stage4-target-libgcc)
- 
- maybe-clean-stage4-target-libgcc: clean-stage4-target-libgcc
-@@ -41668,7 +42092,7 @@
- 	  $(MAKE) stage4-start; \
- 	fi; \
- 	cd $(TARGET_SUBDIR)/libgcc && \
--	$(MAKE) $(TARGET_FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_TARGET_FLAGS)  \
- 		  \
- 		 clean
- @endif target-libgcc-bootstrap
-@@ -41689,8 +42113,11 @@
- 	$(NORMAL_TARGET_EXPORTS) \
- 	 \
- 	cd $(TARGET_SUBDIR)/libgcc && \
--	$(MAKE) $(TARGET_FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"   \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
-+		LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_TARGET_FLAGS)   \
- 		$(TARGET-stageprofile-target-libgcc)
- 
- maybe-clean-stageprofile-target-libgcc: clean-stageprofile-target-libgcc
-@@ -41703,7 +42130,7 @@
- 	  $(MAKE) stageprofile-start; \
- 	fi; \
- 	cd $(TARGET_SUBDIR)/libgcc && \
--	$(MAKE) $(TARGET_FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_TARGET_FLAGS)  \
- 		  \
- 		 clean
- @endif target-libgcc-bootstrap
-@@ -41724,8 +42151,11 @@
- 	$(NORMAL_TARGET_EXPORTS) \
- 	 \
- 	cd $(TARGET_SUBDIR)/libgcc && \
--	$(MAKE) $(TARGET_FLAGS_TO_PASS) \
--		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"   \
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
-+		LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
-+		CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_TARGET_FLAGS)   \
- 		$(TARGET-stagefeedback-target-libgcc)
- 
- maybe-clean-stagefeedback-target-libgcc: clean-stagefeedback-target-libgcc
-@@ -41738,7 +42168,7 @@
- 	  $(MAKE) stagefeedback-start; \
- 	fi; \
- 	cd $(TARGET_SUBDIR)/libgcc && \
--	$(MAKE) $(TARGET_FLAGS_TO_PASS)  \
-+	$(MAKE) $(EXTRA_TARGET_FLAGS)  \
- 		  \
- 		 clean
- @endif target-libgcc-bootstrap
-@@ -42177,7 +42607,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(NORMAL_TARGET_EXPORTS) \
- 	(cd $(TARGET_SUBDIR)/libgfortran && \
--	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libgfortran))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-+		$(TARGET-target-libgfortran))
- @endif target-libgfortran
- 
- 
-@@ -42618,7 +43049,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(NORMAL_TARGET_EXPORTS) \
- 	(cd $(TARGET_SUBDIR)/libobjc && \
--	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libobjc))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-+		$(TARGET-target-libobjc))
- @endif target-libobjc
- 
- 
-@@ -43059,7 +43491,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(NORMAL_TARGET_EXPORTS) \
- 	(cd $(TARGET_SUBDIR)/libtermcap && \
--	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libtermcap))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-+		$(TARGET-target-libtermcap))
- @endif target-libtermcap
- 
- 
-@@ -43435,7 +43868,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(NORMAL_TARGET_EXPORTS) \
- 	(cd $(TARGET_SUBDIR)/winsup && \
--	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-winsup))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-+		$(TARGET-target-winsup))
- @endif target-winsup
- 
- 
-@@ -43876,7 +44310,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(NORMAL_TARGET_EXPORTS) \
- 	(cd $(TARGET_SUBDIR)/libgloss && \
--	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libgloss))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-+		$(TARGET-target-libgloss))
- @endif target-libgloss
- 
- 
-@@ -44312,7 +44747,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(NORMAL_TARGET_EXPORTS) \
- 	(cd $(TARGET_SUBDIR)/libiberty && \
--	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libiberty))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-+		$(TARGET-target-libiberty))
- @endif target-libiberty
- 
- 
-@@ -44753,7 +45189,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(NORMAL_TARGET_EXPORTS) \
- 	(cd $(TARGET_SUBDIR)/gperf && \
--	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-gperf))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-+		$(TARGET-target-gperf))
- @endif target-gperf
- 
- 
-@@ -45194,7 +45631,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(NORMAL_TARGET_EXPORTS) \
- 	(cd $(TARGET_SUBDIR)/examples && \
--	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-examples))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-+		$(TARGET-target-examples))
- @endif target-examples
- 
- 
-@@ -45625,7 +46063,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(NORMAL_TARGET_EXPORTS) \
- 	(cd $(TARGET_SUBDIR)/libffi && \
--	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libffi))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-+		$(TARGET-target-libffi))
- @endif target-libffi
- 
- 
-@@ -46066,7 +46505,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(RAW_CXX_TARGET_EXPORTS) \
- 	(cd $(TARGET_SUBDIR)/libjava && \
--	  $(MAKE) $(TARGET_FLAGS_TO_PASS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  $(TARGET-target-libjava))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'  \
-+		$(TARGET-target-libjava))
- @endif target-libjava
- 
- 
-@@ -46507,7 +46947,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(NORMAL_TARGET_EXPORTS) \
- 	(cd $(TARGET_SUBDIR)/zlib && \
--	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-zlib))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-+		$(TARGET-target-zlib))
- @endif target-zlib
- 
- 
-@@ -46948,7 +47389,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(NORMAL_TARGET_EXPORTS) \
- 	(cd $(TARGET_SUBDIR)/boehm-gc && \
--	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-boehm-gc))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-+		$(TARGET-target-boehm-gc))
- @endif target-boehm-gc
- 
- 
-@@ -47389,7 +47831,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(NORMAL_TARGET_EXPORTS) \
- 	(cd $(TARGET_SUBDIR)/qthreads && \
--	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-qthreads))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-+		$(TARGET-target-qthreads))
- @endif target-qthreads
- 
- 
-@@ -47830,7 +48273,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(NORMAL_TARGET_EXPORTS) \
- 	(cd $(TARGET_SUBDIR)/rda && \
--	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-rda))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-+		$(TARGET-target-rda))
- @endif target-rda
- 
- 
-@@ -48271,7 +48715,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(NORMAL_TARGET_EXPORTS) \
- 	(cd $(TARGET_SUBDIR)/libada && \
--	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libada))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-+		$(TARGET-target-libada))
- @endif target-libada
- 
- 
-@@ -48712,7 +49157,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	$(NORMAL_TARGET_EXPORTS) \
- 	(cd $(TARGET_SUBDIR)/libgomp && \
--	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libgomp))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)  \
-+		$(TARGET-target-libgomp))
- @endif target-libgomp
- 
- 
-@@ -51497,6 +51943,7 @@
- all-gdb: maybe-all-build-bison
- all-gdb: maybe-all-build-byacc
- all-gdb: maybe-all-sim
-+all-gdb: maybe-all-libdecnumber
- configure-libgui: maybe-configure-tcl
- configure-libgui: maybe-configure-tk
- all-libgui: maybe-all-tcl
-@@ -51880,7 +52327,8 @@
- all-target-libobjc: maybe-all-target-libiberty
- all-target-libobjc: maybe-all-target-boehm-gc
- all-target-libstdc++-v3: maybe-all-target-libiberty
--all-target-libgloss: maybe-configure-target-newlib
-+configure-target-libstdc++-v3: maybe-configure-target-libgomp
-+all-target-libgloss: maybe-all-target-newlib
- all-target-winsup: maybe-all-target-libiberty
- all-target-winsup: maybe-all-target-libtermcap
- 
---- gdb-6.7.1/Makefile.tpl	2007-08-18 17:19:09.000000000 +0200
-+++ gdb-6.7.90/Makefile.tpl	2008-02-20 15:26:58.000000000 +0100
-@@ -207,10 +207,10 @@
- 	AR="$(AR_FOR_TARGET)"; export AR; \
- 	AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
- 	CC="$(CC_FOR_TARGET)"; export CC; \
--	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-+	CFLAGS="$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
- 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
- 	CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
--	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-+	CXXFLAGS="$(CXXFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS; \
- 	GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
- 	GFORTRAN="$(GFORTRAN_FOR_TARGET)"; export GFORTRAN; \
- 	DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
-@@ -254,10 +254,21 @@
- 
- # compilers to use to create programs which must be run in the build
- # environment.
-+AR_FOR_BUILD = @AR_FOR_BUILD@
-+AS_FOR_BUILD = @AS_FOR_BUILD@
- CC_FOR_BUILD = @CC_FOR_BUILD@
- CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
--
--CXX_FOR_BUILD = $(CXX)
-+CXXFLAGS_FOR_BUILD = @CXXFLAGS_FOR_BUILD@
-+CXX_FOR_BUILD = @CXX_FOR_BUILD@
-+DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@
-+GCJ_FOR_BUILD = @GCJ_FOR_BUILD@
-+GFORTRAN_FOR_BUILD = @GFORTRAN_FOR_BUILD@
-+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
-+LD_FOR_BUILD = @LD_FOR_BUILD@
-+NM_FOR_BUILD = @NM_FOR_BUILD@
-+RANLIB_FOR_BUILD = @RANLIB_FOR_BUILD@
-+WINDMC_FOR_BUILD = @WINDMC_FOR_BUILD@
-+WINDRES_FOR_BUILD = @WINDRES_FOR_BUILD@
- 
- # Special variables passed down in EXTRA_GCC_FLAGS.  They are defined
- # here so that they can be overridden by Makefile fragments.
-@@ -319,14 +330,19 @@
- # MAKEINFO and MAKEINFOFLAGS are explicitly passed here to make them
- # overrideable (for a bootstrap build stage1 also builds gcc.info).
- 
--STAGE1_CFLAGS=@stage1_cflags@
- STAGE1_CHECKING=@stage1_checking@
- STAGE1_LANGUAGES=@stage1_languages@
- 
-+STAGE1_CFLAGS=@stage1_cflags@
- STAGE2_CFLAGS=$(BOOT_CFLAGS)
- STAGE3_CFLAGS=$(BOOT_CFLAGS)
- STAGE4_CFLAGS=$(BOOT_CFLAGS)
- 
-+STAGE1_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
-+STAGE2_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
-+STAGE3_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
-+STAGE4_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
-+
- do-compare = @do_compare@
- do-compare3 = $(do-compare)
- do-compare-debug = $(SHELL) $(srcdir)/contrib/compare-debug $$f1 $$f2
-@@ -365,16 +381,11 @@
- COMPILER_LD_FOR_TARGET=@COMPILER_LD_FOR_TARGET@
- COMPILER_NM_FOR_TARGET=@COMPILER_NM_FOR_TARGET@
- 
--# During gcc bootstrap, if we use some random cc for stage1 then
--# CFLAGS will be just -g.  We want to ensure that TARGET libraries
--# (which we know are built with gcc) are built with optimizations so
--# prepend -O2 when setting CFLAGS_FOR_TARGET.
--CFLAGS_FOR_TARGET = -O2 $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) \
--	$(DEBUG_PREFIX_CFLAGS_FOR_TARGET)
-+CFLAGS_FOR_TARGET = @CFLAGS_FOR_TARGET@
-+CXXFLAGS_FOR_TARGET = @CXXFLAGS_FOR_TARGET@
- SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
- DEBUG_PREFIX_CFLAGS_FOR_TARGET = @DEBUG_PREFIX_CFLAGS_FOR_TARGET@
--CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) \
--	$(DEBUG_PREFIX_CFLAGS_FOR_TARGET)
-+
- LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
- LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
- LDFLAGS_FOR_TARGET = 
-@@ -478,19 +489,20 @@
- # 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
--# COMPILER_ prefixed variables are not passed down so we expand them here.
-+# *_CFLAGS_FOR_TARGET variables are not passed down and most often empty,
-+# so we expand them here.
- EXTRA_TARGET_FLAGS = \
- 	'AR=$$(AR_FOR_TARGET)' \
- 	'AS=$(COMPILER_AS_FOR_TARGET)' \
- 	'CC=$$(CC_FOR_TARGET)' \
--	'CFLAGS=$$(CFLAGS_FOR_TARGET)' \
-+	'CFLAGS=$$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \
- 	'CXX=$$(CXX_FOR_TARGET)' \
--	'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \
-+	'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \
- 	'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
- 	'LD=$(COMPILER_LD_FOR_TARGET)' \
- 	'LDFLAGS=$$(LDFLAGS_FOR_TARGET)' \
--	'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \
--	'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \
-+	'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \
-+	'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \
- 	'NM=$(COMPILER_NM_FOR_TARGET)' \
- 	'OBJDUMP=$$(OBJDUMP_FOR_TARGET)' \
- 	'RANLIB=$$(RANLIB_FOR_TARGET)' \
-@@ -838,9 +850,11 @@
- 	fi; \
- 	[+ ENDIF check_multilibs +]test ! -f [+subdir+]/[+module+]/Makefile || exit 0; \
- 	[+exports+][+ IF prev +] \
--	[+poststage1_exports+][+ ENDIF prev +] \
-+	[+poststage1_exports+][+ ENDIF prev +] [+ IF prefix +] \
-+	CFLAGS="[+stage_libcflags+] $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
-+	CXXFLAGS="[+stage_libcflags+] $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS; [+ ELSE +] \
- 	CFLAGS="[+stage_cflags+]"; export CFLAGS; \
--	LIBCFLAGS="[+stage_cflags+]"; export LIBCFLAGS; \
-+	CXXFLAGS="[+stage_cflags+]"; export CXXFLAGS; [+ ENDIF +] \
- 	echo Configuring stage [+id+] in [+subdir+]/[+module+] ; \
- 	$(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+] ; \
- 	cd [+subdir+]/[+module+] || exit 1; \
-@@ -877,7 +891,8 @@
- 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
- 	[+exports+] \
- 	(cd [+subdir+]/[+module+] && \
--	  $(MAKE) [+args+] [+extra_make_flags+] $(TARGET-[+prefix+][+module+]))
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) [+args+] [+extra_make_flags+] \
-+		$(TARGET-[+prefix+][+module+]))
- @endif [+prefix+][+module+]
- 
- [+ IF bootstrap +]
-@@ -897,8 +912,11 @@
- 	[+exports+][+ IF prev +] \
- 	[+poststage1_exports+][+ ENDIF prev +] \
- 	cd [+subdir+]/[+module+] && \
--	$(MAKE) [+args+] \
--		CFLAGS="[+stage_cflags+]" LIBCFLAGS="[+stage_cflags+]" [+
-+	$(MAKE) $(BASE_FLAGS_TO_PASS) \
-+		CFLAGS="[+stage_cflags+]" CXXFLAGS="[+stage_cflags+]" \
-+		LIBCFLAGS="[+stage_libcflags+]" \
-+		CFLAGS_FOR_TARGET="[+stage_libcflags+]" \
-+		CXXFLAGS_FOR_TARGET="[+stage_libcflags+]" [+args+] [+
- 		IF prev +][+poststage1_args+][+ ENDIF prev
- 		+] [+extra_make_flags+] \
- 		$(TARGET-stage[+id+]-[+prefix+][+module+])
-@@ -948,7 +966,7 @@
- [+ all prefix="" subdir="$(HOST_SUBDIR)"
-        exports="$(HOST_EXPORTS)"
-        poststage1_exports="$(POSTSTAGE1_HOST_EXPORTS)"
--       args="$(FLAGS_TO_PASS)"
-+       args="$(EXTRA_HOST_FLAGS)"
-        poststage1_args="$(POSTSTAGE1_FLAGS_TO_PASS)" +]
- 
- .PHONY: check-[+module+] maybe-check-[+module+]
-@@ -1046,7 +1064,7 @@
- 
- [+ all prefix="target-" subdir="$(TARGET_SUBDIR)"
-        exports="$(RAW_CXX_TARGET_EXPORTS)"
--       args="$(TARGET_FLAGS_TO_PASS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'" +]
-+       args="$(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'" +]
- [+ ELSE +]
- [+ configure prefix="target-" subdir="$(TARGET_SUBDIR)"
- 	     check_multilibs=true
-@@ -1057,7 +1075,7 @@
- 
- [+ all prefix="target-" subdir="$(TARGET_SUBDIR)"
-        exports="$(NORMAL_TARGET_EXPORTS)"
--       args="$(TARGET_FLAGS_TO_PASS)" +]
-+       args="$(EXTRA_TARGET_FLAGS)" +]
- [+ ENDIF +]
- 
- .PHONY: check-target-[+module+] maybe-check-target-[+module+]
diff --git a/contrib/crossrpms/patches/gdb-6.7.1-rtems4.9-20071216.diff b/contrib/crossrpms/patches/gdb-6.7.1-rtems4.9-20071216.diff
deleted file mode 100644
index d96872e76b..0000000000
--- a/contrib/crossrpms/patches/gdb-6.7.1-rtems4.9-20071216.diff
+++ /dev/null
@@ -1,105 +0,0 @@
-diff -uNr gdb-6.7.1.orig/sim/erc32/erc32.c gdb-6.7.1/sim/erc32/erc32.c
---- gdb-6.7.1.orig/sim/erc32/erc32.c	1999-04-16 03:35:00.000000000 +0200
-+++ gdb-6.7.1/sim/erc32/erc32.c	2007-12-16 09:11:43.000000000 +0100
-@@ -24,6 +24,7 @@
- 
- #include <sys/types.h>
- #include <stdio.h>
-+#include <string.h>
- #include <termios.h>
- #include <sys/fcntl.h>
- #include <sys/file.h>
-@@ -413,7 +414,7 @@
-     if (rom8) mec_memcfg &= ~0x20000;
-     else mec_memcfg |= 0x20000;
- 
--    mem_ramsz = (256 * 1024) << ((mec_memcfg >> 10) & 7);
-+    mem_ramsz = (512 * 1024) << ((mec_memcfg >> 10) & 7);
-     mem_romsz = (128 * 1024) << ((mec_memcfg >> 18) & 7);
- 
-     if (sparclite_board) {
-@@ -1659,7 +1660,7 @@
- 	errmec = 0;
- 	return(1);
-     }
--#endif;
-+#endif
- 
-     if ((addr >= mem_ramstart) && (addr < (mem_ramstart + mem_ramsz))) {
- 	fetch_bytes (asi, &ramb[addr & mem_rammask], data, sz);
-@@ -1736,7 +1737,7 @@
- 	errmec = 0;
- 	return(1);
-     }
--#endif;
-+#endif
- 
-     if ((addr >= mem_ramstart) && (addr < (mem_ramstart + mem_ramsz))) {
- 	if (mem_accprot) {
-diff -uNr gdb-6.7.1.orig/sim/erc32/exec.c gdb-6.7.1/sim/erc32/exec.c
---- gdb-6.7.1.orig/sim/erc32/exec.c	2005-03-07 12:09:05.000000000 +0100
-+++ gdb-6.7.1/sim/erc32/exec.c	2007-12-16 09:11:43.000000000 +0100
-@@ -1713,7 +1713,7 @@
-     	    sregs->fdp[rs2 | 1] = sregs->fs[rs2 & ~1];
-     	    sregs->fdp[rs2 & ~1] = sregs->fs[rs2 | 1];
-     default:
--      ;
-+      break;
-     }
- #endif
- 
-@@ -1886,7 +1886,7 @@
- 	sregs->fs[rd & ~1] = sregs->fdp[rd | 1];
- 	sregs->fs[rd | 1] = sregs->fdp[rd & ~1];
-     default:
--      ;
-+      break;
-     }
- #endif
-     if (sregs->fpstate == FP_EXC_PE) {
-diff -uNr gdb-6.7.1.orig/sim/erc32/Makefile.in gdb-6.7.1/sim/erc32/Makefile.in
---- gdb-6.7.1.orig/sim/erc32/Makefile.in	2007-08-24 16:28:35.000000000 +0200
-+++ gdb-6.7.1/sim/erc32/Makefile.in	2007-12-16 09:11:44.000000000 +0100
-@@ -18,8 +18,10 @@
- 
- ## COMMON_PRE_CONFIG_FRAG
- 
--TERMCAP_LIB = @TERMCAP@
--READLINE_LIB = @READLINE@
-+# TERMCAP_LIB = @TERMCAP_LIB@
-+TERMCAP_LIB = -lncurses
-+# READLINE_LIB = @READLINE_LIB@
-+READLINE_LIB = -lreadline
- 
- SIM_OBJS = exec.o erc32.o func.o help.o float.o interf.o
- SIM_EXTRA_LIBS = $(READLINE_LIB) $(TERMCAP_LIB) -lm
-diff -uNr gdb-6.7.1.orig/sim/ppc/ppc-instructions gdb-6.7.1/sim/ppc/ppc-instructions
---- gdb-6.7.1.orig/sim/ppc/ppc-instructions	2006-11-29 16:20:55.000000000 +0100
-+++ gdb-6.7.1/sim/ppc/ppc-instructions	2007-12-16 09:11:44.000000000 +0100
-@@ -3402,6 +3402,14 @@
- 	    case spr_dec:
- 	      *rT = cpu_get_decrementer(processor);
- 	      break;
-+		case spr_tbrl:
-+	  	  if (is_64bit_implementation) *rT = TB;
-+	  	  else                         *rT = EXTRACTED64(TB, 32, 63);
-+		break;
-+		case spr_tbru:
-+	  	  if (is_64bit_implementation) *rT = EXTRACTED64(TB, 0, 31);
-+		  else                         *rT = EXTRACTED64(TB, 0, 31);
-+		break;
- 	    case spr_tbu:
- 	    case spr_tbl:
- 	      /* NOTE - these SPR's are not readable. Use mftb[ul] */
-diff -uNr gdb-6.7.1.orig/sim/ppc/ppc-spr-table gdb-6.7.1/sim/ppc/ppc-spr-table
---- gdb-6.7.1.orig/sim/ppc/ppc-spr-table	2003-06-22 18:48:12.000000000 +0200
-+++ gdb-6.7.1/sim/ppc/ppc-spr-table	2007-12-16 09:11:44.000000000 +0100
-@@ -32,6 +32,8 @@
- SRR0:26:0:0
- SRR1:27:0:0
- VRSAVE:256:0:0
-+TBRL:268:0:0
-+TBRU:269:0:0
- SPRG0:272:0:0
- SPRG1:273:0:0
- SPRG2:274:0:0
diff --git a/contrib/crossrpms/patches/gdb-6.7.1-rtems4.9-20080324.diff b/contrib/crossrpms/patches/gdb-6.7.1-rtems4.9-20080324.diff
deleted file mode 100644
index b7b720f6b9..0000000000
--- a/contrib/crossrpms/patches/gdb-6.7.1-rtems4.9-20080324.diff
+++ /dev/null
@@ -1,136 +0,0 @@
-diff -uNr gdb-6.7.1.orig/sim/erc32/erc32.c gdb-6.7.1/sim/erc32/erc32.c
---- gdb-6.7.1.orig/sim/erc32/erc32.c	1999-04-16 03:35:00.000000000 +0200
-+++ gdb-6.7.1/sim/erc32/erc32.c	2008-03-24 14:17:36.000000000 +0100
-@@ -24,6 +24,7 @@
- 
- #include <sys/types.h>
- #include <stdio.h>
-+#include <string.h>
- #include <termios.h>
- #include <sys/fcntl.h>
- #include <sys/file.h>
-@@ -413,7 +414,7 @@
-     if (rom8) mec_memcfg &= ~0x20000;
-     else mec_memcfg |= 0x20000;
- 
--    mem_ramsz = (256 * 1024) << ((mec_memcfg >> 10) & 7);
-+    mem_ramsz = (512 * 1024) << ((mec_memcfg >> 10) & 7);
-     mem_romsz = (128 * 1024) << ((mec_memcfg >> 18) & 7);
- 
-     if (sparclite_board) {
-@@ -1659,7 +1660,7 @@
- 	errmec = 0;
- 	return(1);
-     }
--#endif;
-+#endif
- 
-     if ((addr >= mem_ramstart) && (addr < (mem_ramstart + mem_ramsz))) {
- 	fetch_bytes (asi, &ramb[addr & mem_rammask], data, sz);
-@@ -1736,7 +1737,7 @@
- 	errmec = 0;
- 	return(1);
-     }
--#endif;
-+#endif
- 
-     if ((addr >= mem_ramstart) && (addr < (mem_ramstart + mem_ramsz))) {
- 	if (mem_accprot) {
-diff -uNr gdb-6.7.1.orig/sim/erc32/exec.c gdb-6.7.1/sim/erc32/exec.c
---- gdb-6.7.1.orig/sim/erc32/exec.c	2005-03-07 12:09:05.000000000 +0100
-+++ gdb-6.7.1/sim/erc32/exec.c	2008-03-24 14:17:36.000000000 +0100
-@@ -1713,7 +1713,7 @@
-     	    sregs->fdp[rs2 | 1] = sregs->fs[rs2 & ~1];
-     	    sregs->fdp[rs2 & ~1] = sregs->fs[rs2 | 1];
-     default:
--      ;
-+      break;
-     }
- #endif
- 
-@@ -1886,7 +1886,7 @@
- 	sregs->fs[rd & ~1] = sregs->fdp[rd | 1];
- 	sregs->fs[rd | 1] = sregs->fdp[rd & ~1];
-     default:
--      ;
-+      break;
-     }
- #endif
-     if (sregs->fpstate == FP_EXC_PE) {
-diff -uNr gdb-6.7.1.orig/sim/erc32/Makefile.in gdb-6.7.1/sim/erc32/Makefile.in
---- gdb-6.7.1.orig/sim/erc32/Makefile.in	2007-08-24 16:28:35.000000000 +0200
-+++ gdb-6.7.1/sim/erc32/Makefile.in	2008-03-24 14:19:19.000000000 +0100
-@@ -18,12 +18,14 @@
- 
- ## COMMON_PRE_CONFIG_FRAG
- 
--TERMCAP_LIB = @TERMCAP@
--READLINE_LIB = @READLINE@
-+# TERMCAP_LIB = @TERMCAP_LIB@
-+TERMCAP_LIB = -lncurses
-+# READLINE_LIB = @READLINE_LIB@
-+READLINE_LIB = -lreadline
- 
- SIM_OBJS = exec.o erc32.o func.o help.o float.o interf.o
- SIM_EXTRA_LIBS = $(READLINE_LIB) $(TERMCAP_LIB) -lm
--SIM_EXTRA_ALL = sis
-+SIM_EXTRA_ALL = sis$(EXEEXT)
- SIM_EXTRA_INSTALL = install-sis
- SIM_EXTRA_CLEAN = clean-sis
- 
-@@ -37,8 +39,8 @@
- # `sis' doesn't need interf.o.
- SIS_OFILES = exec.o erc32.o func.o help.o float.o
- 
--sis: sis.o $(SIS_OFILES) $(COMMON_OBJS) $(LIBDEPS)
--	$(CC) $(ALL_CFLAGS) -o sis \
-+sis$(EXEEXT): sis.o $(SIS_OFILES) $(COMMON_OBJS) $(LIBDEPS)
-+	$(CC) $(ALL_CFLAGS) -o sis$(EXEEXT) \
- 	  sis.o $(SIS_OFILES) $(COMMON_OBJS) $(EXTRA_LIBS)
- 
- # FIXME: This computes the build host's endianness, doesn't it?
-@@ -51,11 +53,11 @@
- 
- # Copy the files into directories where they will be run.
- install-sis: installdirs
--	n=`echo sis | sed '$(program_transform_name)'`; \
--	$(INSTALL_PROGRAM) sis$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT)
-+	n=`echo sis$(EXEEXT) | sed '$(program_transform_name)'`; \
-+	$(INSTALL_PROGRAM) sis$(EXEEXT) $(DESTDIR)$(bindir)/$$n
- 
- clean-sis:
--	rm -f sis end end.h
-+	rm -f sis$(EXEEXT) end end.h
- 
- configure:
- 	@echo "Rebuilding configure..."
-diff -uNr gdb-6.7.1.orig/sim/ppc/ppc-instructions gdb-6.7.1/sim/ppc/ppc-instructions
---- gdb-6.7.1.orig/sim/ppc/ppc-instructions	2006-11-29 16:20:55.000000000 +0100
-+++ gdb-6.7.1/sim/ppc/ppc-instructions	2008-03-24 14:17:36.000000000 +0100
-@@ -3402,6 +3402,14 @@
- 	    case spr_dec:
- 	      *rT = cpu_get_decrementer(processor);
- 	      break;
-+		case spr_tbrl:
-+	  	  if (is_64bit_implementation) *rT = TB;
-+	  	  else                         *rT = EXTRACTED64(TB, 32, 63);
-+		break;
-+		case spr_tbru:
-+	  	  if (is_64bit_implementation) *rT = EXTRACTED64(TB, 0, 31);
-+		  else                         *rT = EXTRACTED64(TB, 0, 31);
-+		break;
- 	    case spr_tbu:
- 	    case spr_tbl:
- 	      /* NOTE - these SPR's are not readable. Use mftb[ul] */
-diff -uNr gdb-6.7.1.orig/sim/ppc/ppc-spr-table gdb-6.7.1/sim/ppc/ppc-spr-table
---- gdb-6.7.1.orig/sim/ppc/ppc-spr-table	2003-06-22 18:48:12.000000000 +0200
-+++ gdb-6.7.1/sim/ppc/ppc-spr-table	2008-03-24 14:17:36.000000000 +0100
-@@ -32,6 +32,8 @@
- SRR0:26:0:0
- SRR1:27:0:0
- VRSAVE:256:0:0
-+TBRL:268:0:0
-+TBRU:269:0:0
- SPRG0:272:0:0
- SPRG1:273:0:0
- SPRG2:274:0:0
diff --git a/contrib/crossrpms/patches/gdb-6.8-rtems4.9-20080329.diff b/contrib/crossrpms/patches/gdb-6.8-rtems4.9-20080329.diff
deleted file mode 100644
index ce818de016..0000000000
--- a/contrib/crossrpms/patches/gdb-6.8-rtems4.9-20080329.diff
+++ /dev/null
@@ -1,136 +0,0 @@
-diff -Naur gdb-6.8.orig/sim/erc32/erc32.c gdb-6.8/sim/erc32/erc32.c
---- gdb-6.8.orig/sim/erc32/erc32.c	1999-04-16 03:35:00.000000000 +0200
-+++ gdb-6.8/sim/erc32/erc32.c	2008-03-29 05:31:09.000000000 +0100
-@@ -24,6 +24,7 @@
- 
- #include <sys/types.h>
- #include <stdio.h>
-+#include <string.h>
- #include <termios.h>
- #include <sys/fcntl.h>
- #include <sys/file.h>
-@@ -413,7 +414,7 @@
-     if (rom8) mec_memcfg &= ~0x20000;
-     else mec_memcfg |= 0x20000;
- 
--    mem_ramsz = (256 * 1024) << ((mec_memcfg >> 10) & 7);
-+    mem_ramsz = (512 * 1024) << ((mec_memcfg >> 10) & 7);
-     mem_romsz = (128 * 1024) << ((mec_memcfg >> 18) & 7);
- 
-     if (sparclite_board) {
-@@ -1659,7 +1660,7 @@
- 	errmec = 0;
- 	return(1);
-     }
--#endif;
-+#endif
- 
-     if ((addr >= mem_ramstart) && (addr < (mem_ramstart + mem_ramsz))) {
- 	fetch_bytes (asi, &ramb[addr & mem_rammask], data, sz);
-@@ -1736,7 +1737,7 @@
- 	errmec = 0;
- 	return(1);
-     }
--#endif;
-+#endif
- 
-     if ((addr >= mem_ramstart) && (addr < (mem_ramstart + mem_ramsz))) {
- 	if (mem_accprot) {
-diff -Naur gdb-6.8.orig/sim/erc32/exec.c gdb-6.8/sim/erc32/exec.c
---- gdb-6.8.orig/sim/erc32/exec.c	2005-03-07 12:09:05.000000000 +0100
-+++ gdb-6.8/sim/erc32/exec.c	2008-03-29 05:31:09.000000000 +0100
-@@ -1713,7 +1713,7 @@
-     	    sregs->fdp[rs2 | 1] = sregs->fs[rs2 & ~1];
-     	    sregs->fdp[rs2 & ~1] = sregs->fs[rs2 | 1];
-     default:
--      ;
-+      break;
-     }
- #endif
- 
-@@ -1886,7 +1886,7 @@
- 	sregs->fs[rd & ~1] = sregs->fdp[rd | 1];
- 	sregs->fs[rd | 1] = sregs->fdp[rd & ~1];
-     default:
--      ;
-+      break;
-     }
- #endif
-     if (sregs->fpstate == FP_EXC_PE) {
-diff -Naur gdb-6.8.orig/sim/erc32/Makefile.in gdb-6.8/sim/erc32/Makefile.in
---- gdb-6.8.orig/sim/erc32/Makefile.in	2008-01-01 23:53:24.000000000 +0100
-+++ gdb-6.8/sim/erc32/Makefile.in	2008-03-29 05:32:11.000000000 +0100
-@@ -18,12 +18,14 @@
- 
- ## COMMON_PRE_CONFIG_FRAG
- 
--TERMCAP_LIB = @TERMCAP@
--READLINE_LIB = @READLINE@
-+# TERMCAP_LIB = @TERMCAP_LIB@
-+TERMCAP_LIB = -lncurses
-+# READLINE_LIB = @READLINE_LIB@
-+READLINE_LIB = -lreadline
- 
- SIM_OBJS = exec.o erc32.o func.o help.o float.o interf.o
- SIM_EXTRA_LIBS = $(READLINE_LIB) $(TERMCAP_LIB) -lm
--SIM_EXTRA_ALL = sis
-+SIM_EXTRA_ALL = sis$(EXEEXT)
- SIM_EXTRA_INSTALL = install-sis
- SIM_EXTRA_CLEAN = clean-sis
- 
-@@ -37,8 +39,8 @@
- # `sis' doesn't need interf.o.
- SIS_OFILES = exec.o erc32.o func.o help.o float.o
- 
--sis: sis.o $(SIS_OFILES) $(COMMON_OBJS) $(LIBDEPS)
--	$(CC) $(ALL_CFLAGS) -o sis \
-+sis$(EXEEXT): sis.o $(SIS_OFILES) $(COMMON_OBJS) $(LIBDEPS)
-+	$(CC) $(ALL_CFLAGS) -o sis$(EXEEXT) \
- 	  sis.o $(SIS_OFILES) $(COMMON_OBJS) $(EXTRA_LIBS)
- 
- # FIXME: This computes the build host's endianness, doesn't it?
-@@ -51,11 +53,11 @@
- 
- # Copy the files into directories where they will be run.
- install-sis: installdirs
--	n=`echo sis | sed '$(program_transform_name)'`; \
--	$(INSTALL_PROGRAM) sis$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT)
-+	n=`echo sis$(EXEEXT) | sed '$(program_transform_name)'`; \
-+	$(INSTALL_PROGRAM) sis$(EXEEXT) $(DESTDIR)$(bindir)/$$n
- 
- clean-sis:
--	rm -f sis end end.h
-+	rm -f sis$(EXEEXT) end end.h
- 
- configure:
- 	@echo "Rebuilding configure..."
-diff -Naur gdb-6.8.orig/sim/ppc/ppc-instructions gdb-6.8/sim/ppc/ppc-instructions
---- gdb-6.8.orig/sim/ppc/ppc-instructions	2006-11-29 16:20:55.000000000 +0100
-+++ gdb-6.8/sim/ppc/ppc-instructions	2008-03-29 05:31:36.000000000 +0100
-@@ -3402,6 +3402,14 @@
- 	    case spr_dec:
- 	      *rT = cpu_get_decrementer(processor);
- 	      break;
-+		case spr_tbrl:
-+	  	  if (is_64bit_implementation) *rT = TB;
-+	  	  else                         *rT = EXTRACTED64(TB, 32, 63);
-+		break;
-+		case spr_tbru:
-+	  	  if (is_64bit_implementation) *rT = EXTRACTED64(TB, 0, 31);
-+		  else                         *rT = EXTRACTED64(TB, 0, 31);
-+		break;
- 	    case spr_tbu:
- 	    case spr_tbl:
- 	      /* NOTE - these SPR's are not readable. Use mftb[ul] */
-diff -Naur gdb-6.8.orig/sim/ppc/ppc-spr-table gdb-6.8/sim/ppc/ppc-spr-table
---- gdb-6.8.orig/sim/ppc/ppc-spr-table	2003-06-22 18:48:12.000000000 +0200
-+++ gdb-6.8/sim/ppc/ppc-spr-table	2008-03-29 05:31:57.000000000 +0100
-@@ -32,6 +32,8 @@
- SRR0:26:0:0
- SRR1:27:0:0
- VRSAVE:256:0:0
-+TBRL:268:0:0
-+TBRU:269:0:0
- SPRG0:272:0:0
- SPRG1:273:0:0
- SPRG2:274:0:0