diff options
| -rw-r--r-- | COPYING.LIBGLOSS | 32 | ||||
| -rw-r--r-- | ChangeLog | 135 | ||||
| -rw-r--r-- | Makefile.def | 72 | ||||
| -rw-r--r-- | Makefile.in | 5594 | ||||
| -rw-r--r-- | Makefile.tpl | 213 | ||||
| -rwxr-xr-x | config.guess | 71 | ||||
| -rwxr-xr-x | config.sub | 13 | ||||
| -rw-r--r-- | config/ChangeLog | 12 | ||||
| -rw-r--r-- | config/bootstrap-O1.mk | 1 | ||||
| -rw-r--r-- | config/bootstrap-O3.mk | 1 | ||||
| -rw-r--r-- | config/bootstrap-debug.mk | 2 | ||||
| -rw-r--r-- | config/mt-gnu | 3 | ||||
| -rw-r--r-- | config/multi.m4 | 7 | ||||
| -rw-r--r-- | config/plugins.m4 | 11 | ||||
| -rwxr-xr-x | configure | 22 | ||||
| -rw-r--r-- | configure.ac | 20 | ||||
| -rw-r--r-- | setup.com | 31 |
17 files changed, 4110 insertions, 2130 deletions
diff --git a/COPYING.LIBGLOSS b/COPYING.LIBGLOSS index a63b737..b4d657e 100644 --- a/COPYING.LIBGLOSS +++ b/COPYING.LIBGLOSS @@ -228,35 +228,3 @@ POSSIBILITY OF SUCH DAMAGE. LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -(13) - Xilinx, Inc. (powerpc-* targets) - -Copyright (c) 2004, 2009 Xilinx, Inc. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - -1. Redistributions source code must retain the above copyright notice, -this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright -notice, this list of conditions and the following disclaimer in the -documentation and/or other materials provided with the distribution. - -3. Neither the name of Xilinx nor the names of its contributors may be -used to endorse or promote products derived from this software without -specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS -IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED -TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - @@ -1,138 +1,3 @@ -2009-06-17 Michael Eager <eager@eagercon.com> - - * COPYING.LIBGLOSS: Add Xilinx license. - -2009-06-15 Ryan Mansfield <rmansfield@qnx.com> - - * configure.ac: Define is_elf for QNX Neutrino targets. - * configure: Regenerate. - -2009-06-03 Jerome Guitton <guitton@adacore.com> - Ralf Wildenhues <Ralf.Wildenhues@gmx.de> - - * Makefile.tpl (all): Avoid a trailing backslash. - * Makefile.in: Regenerate. - -2009-06-03 Ben Elliston <bje@au.ibm.com> - - * config.sub, config.guess: Update from upstream sources. - -2009-06-02 Alexandre Oliva <aoliva@redhat.com> - - * Makefile.tpl ([+compare-target+]): Compare all stage - directories, rather than just gcc. - * Makefile.in: Rebuilt. - -2009-05-28 Doug Kwan <dougkwan@google.com> - - * configure.ac: Support gold for target arm*-*-*. - * configure: Regenerate. - -2009-05-27 Alexandre Oliva <aoliva@redhat.com> - - * Makefile.tpl (all): Avoid harmless warning in make all when - gcc-bootstrap is enabled but stage_last does not exist. - * Makefile.in: Rebuilt. - -2009-05-25 Tristan Gingold <gingold@adacore.com> - - * setup.com: Complete the file with configuration and build. - -2009-05-18 Alexandre Oliva <aoliva@redhat.com> - - PR other/40159 - * Makefile.tpl (all): Don't assume gcc-bootstrap and - gcc-no-bootstrap are mutually exclusive. - * Makefile.in: Rebuilt. - -2009-05-18 Alexandre Oliva <aoliva@redhat.com> - - PR other/40159 - * Makefile.tpl (all): Don't end with unconditional success. - * Makefile.in: Rebuilt. - -2009-05-12 Alexandre Oliva <aoliva@redhat.com> - - PR target/37137 - * Makefile.def (flags_to_pass): Remove redundant and incomplete - STAGE1_CFLAGS, STAGE2_CFLAGS, STAGE3_CFLAGS, and STAGE4_CFLAGS. - Add FLAGS_FOR_TARGET and BUILD_CONFIG. - (bootstrap_stage): Remove bootstrap-debug custom stages. Turn - stage_configureflags, stage_cflags and stage_libcflags into - explicit Makefile macros. - * Makefile.tpl (HOST_EXPORTS, EXTRA_HOST_FLAGS): Pass GCJ and - GFORTRAN. - (POSTSTAGE1_HOST_EXPORTS): Add XGCC_FLAGS_FOR_TARGET and TFLAGS to - CC. Set CC_FOR_BUILD from CC. - (BASE_TARGET_EXPORTS, RAW_CXX_TARGET_EXPORTS, - NORMAL_TARGET_EXPORTS): Move SYSROOT_CFLAGS_FOR_TARGET and - DEBUG_PREFIX_CFLAGS_FOR_TARGET from CFLAGS and CXXFLAGS to - XGCC_FLAGS_FOR_TARGET. Add it along with TFLAGS to CC, CXX, GCJ, - and GFORTRAN. - (TFLAGS, STAGE_CFLAGS, STAGE_TFLAGS, STAGE_CONFIGURE_FLAGS): New. - (_LIBCFLAGS): Renamed to _TFLAGS. - (do-compare-debug, do-compare3-debug): Drop. - (CC, GCC_FOR_TARGET, CXX_FOR_TARGET, RAW_CXX_FOR_TARGET, - GCJ_FOR_TARGET, GFORTRAN_FOR_TARGET): Remove FLAGS_FOR_TARGET. - (FLAGS_FOR_TARGET, SYSROOT_CFLAGS_FOR_TARGET, - DEBUG_PREFIX_CFLAGS_FOR_TARGET): Move down. - (XGCC_FLAGS_FOR_TARGET): New. - (BASE_FLAGS_TO_PASS): Pass STAGEid_CFLAGS, STAGEid_TFLAGS and TFLAGS. - (EXTRA_HOST_FLAGS): Pass GCJ and GFORTRAN. - (POSTSTAGE1_FLAGS_TO_PASS): Move SYSROOT_CFLAGS_FOR_TARGET and - DEBUG_PREFIX_CFLAGS_FOR_TARGET from CFLAGS, CXXFLAGS, LIBCFLAGS, - LIBCXXFLAGS to XGCC_FLAGS_FOR_TARGET. Add it along with TFLAGS - to CC, CXX, GCJ, and GFORTRAN. Pass XGCC_FLAGS_FOR_TARGET and - TFLAGS. - (BUILD_CONFIG): Include if requested. - (all): Set TFLAGS on bootstrap. - (configure-stageid-prefixmodule): Pass TFLAGS, adjust FLAGS. - (all-stageid-prefixmodule): Likewise. - (do-clean, distclean-stageid): Set TFLAGS. - (restrap): Fix whitespace. - * Makefile.in: Rebuilt. - -2009-04-25 Eric Botcazou <ebotcazou@adacore.com> - - * Makefile.tpl (POSTSTAGE1_HOST_EXPORTS): Add GNATBIND. - (POSTSTAGE1_FLAGS_TO_PASS): Pick up exported value for GNATBIND. - * Makefile.in: Regenerate. - -2009-04-24 Eli Zaretskii <eliz@gnu.org> - - * config.guess (pc:*:*:*): Return i586-pc-msdosdjgpp, for - consistency with config.sub. (Update from upstream sources.) - -2009-04-21 Joseph Myers <joseph@codesourcery.com> - - * texinfo/texinfo.tex: Update to version 2009-03-28.05. - -2009-04-17 Ben Elliston <bje@au.ibm.com> - - * config.sub, config.guess: Update from upstream sources. - -2009-04-15 Anthony Green <green@moxielogic.com> - - * configure.ac: Add moxie support. - * configure: Rebuilt. - -2009-04-09 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> - - * configure.ac: Bump minimum GMP/MPFR versions to 4.2 and 2.3.1. - * configure: Regenerate. - -2009-04-09 H.J. Lu <hongjiu.lu@intel.com> - - PR gas/10039 - * configure.ac: Require texinfo 4.7. - * configure: Regenerated. - -2009-04-09 Steve Ellcey <sje@cup.hp.com> - - * Makefil.def (languages): New entries. - * Makefile.tpl (check-gcc-*): New generic target. - * Makefile.in: Regenerate. - 2009-03-27 Eli Zaretskii <eliz@gnu.org> * djunpack.bat: Use ".." quoting in Sed command, for the sake of diff --git a/Makefile.def b/Makefile.def index 30d4d17..a0a5266 100644 --- a/Makefile.def +++ b/Makefile.def @@ -255,8 +255,12 @@ flags_to_pass = { flag= CXXFLAGS ; }; flags_to_pass = { flag= LDFLAGS ; }; flags_to_pass = { flag= LIBCFLAGS ; }; flags_to_pass = { flag= LIBCXXFLAGS ; }; +flags_to_pass = { flag= STAGE1_CFLAGS ; }; flags_to_pass = { flag= STAGE1_CHECKING ; }; flags_to_pass = { flag= STAGE1_LANGUAGES ; }; +flags_to_pass = { flag= STAGE2_CFLAGS ; }; +flags_to_pass = { flag= STAGE3_CFLAGS ; }; +flags_to_pass = { flag= STAGE4_CFLAGS ; }; flags_to_pass = { flag= GNATBIND ; }; flags_to_pass = { flag= GNATMAKE ; }; @@ -269,7 +273,6 @@ flags_to_pass = { flag= CPPFLAGS_FOR_TARGET ; }; flags_to_pass = { flag= CXX_FOR_TARGET ; }; flags_to_pass = { flag= CXXFLAGS_FOR_TARGET ; }; flags_to_pass = { flag= DLLTOOL_FOR_TARGET ; }; -flags_to_pass = { flag= FLAGS_FOR_TARGET ; }; flags_to_pass = { flag= GCJ_FOR_TARGET ; }; flags_to_pass = { flag= GFORTRAN_FOR_TARGET ; }; flags_to_pass = { flag= LD_FOR_TARGET ; }; @@ -285,7 +288,6 @@ flags_to_pass = { flag= WINDRES_FOR_TARGET ; }; flags_to_pass = { flag= WINDMC_FOR_TARGET ; }; // Miscellaneous -flags_to_pass = { flag= BUILD_CONFIG ; }; flags_to_pass = { flag= LANGUAGES ; optional=true ; }; flags_to_pass = { flag= LEAN ; }; @@ -539,35 +541,63 @@ 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; }; -languages = { language=c; gcc-check-target=check-gcc; }; -languages = { language=c++; gcc-check-target=check-c++; - lib-check-target=check-target-libstdc++-v3; }; -languages = { language=fortran; gcc-check-target=check-fortran; - lib-check-target=check-target-libgfortran; }; -languages = { language=java; gcc-check-target=check-java; - lib-check-target=check-target-libjava; }; -languages = { language=ada; gcc-check-target=check-ada; - lib-check-target=check-target-libada; }; -languages = { language=objc; gcc-check-target=check-objc; - lib-check-target=check-target-libobjc; }; -languages = { language=obj-c++; gcc-check-target=check-obj-c++; }; - // Toplevel bootstrap -bootstrap_stage = { id=1 ; }; +bootstrap_stage = { + id=1 ; + + // * We force-disable intermodule optimizations, even if + // --enable-intermodule was passed, since the installed compiler + // probably can't handle them. Luckily, autoconf always respects + // the last argument when conflicting --enable arguments are passed. + // * Likewise, we force-disable coverage flags, since the installed + // 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_libcflags='$(STAGE1_LIBCFLAGS)' ; }; bootstrap_stage = { id=2 ; prev=1 ; - bootstrap_target=bootstrap2 ; }; + bootstrap_target=bootstrap2 ; + stage_configure_flags="@stage2_werror_flag@" ; + 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_libcflags="$(STAGE2_LIBCFLAGS) -g0" ; }; bootstrap_stage = { id=3 ; prev=2 ; lean=1 ; compare_target=compare ; bootstrap_target=bootstrap ; - cleanstrap_target=cleanstrap ; }; + cleanstrap_target=cleanstrap ; + stage_configure_flags="@stage2_werror_flag@" ; + 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_libcflags="$(STAGE3_LIBCFLAGS) -g2" ; }; bootstrap_stage = { id=4 ; prev=3 ; lean=2 ; compare_target=compare3 ; - bootstrap_target=bootstrap4 ; }; + bootstrap_target=bootstrap4 ; + stage_configure_flags="@stage2_werror_flag@" ; + stage_cflags="$(STAGE4_CFLAGS)" ; + stage_libcflags="$(STAGE4_CFLAGS)" ; }; bootstrap_stage = { - id=profile ; prev=1 ; }; + id=profile ; prev=1 ; + stage_configure_flags="@stage2_werror_flag@" ; + stage_cflags='$(STAGE2_CFLAGS) -fprofile-generate' ; + stage_libcflags='$(STAGE2_LIBCFLAGS)' ; }; bootstrap_stage = { id=feedback ; prev=profile ; - bootstrap_target=profiledbootstrap ; }; + bootstrap_target=profiledbootstrap ; + stage_configure_flags="@stage2_werror_flag@" ; + stage_cflags='$(STAGE3_CFLAGS) -fprofile-use' ; + stage_libcflags='$(STAGE3_LIBCFLAGS) -fprofile-use' ; }; diff --git a/Makefile.in b/Makefile.in index fdc2d2e..26d1d01 100644 --- a/Makefile.in +++ b/Makefile.in @@ -3,8 +3,7 @@ # # Makefile for directory with subdirs to build. # Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, -# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -# Free Software Foundation +# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -175,8 +174,6 @@ HOST_EXPORTS = \ CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ CXX="$(CXX)"; export CXX; \ CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \ - GCJ="$(GCJ)"; export GCJ; \ - GFORTRAN="$(GFORTRAN)"; export GFORTRAN; \ AR="$(AR)"; export AR; \ AS="$(AS)"; export AS; \ CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \ @@ -212,10 +209,11 @@ HOST_EXPORTS = \ POSTSTAGE1_HOST_EXPORTS = \ $(HOST_EXPORTS) \ CC="$(STAGE_CC_WRAPPER) $$r/$(HOST_SUBDIR)/prev-gcc/xgcc$(exeext) \ - -B$$r/$(HOST_SUBDIR)/prev-gcc/ -B$(build_tooldir)/bin/ \ - $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CC; \ - CC_FOR_BUILD="$$CC"; export CC_FOR_BUILD; \ - GNATBIND="$$r/$(HOST_SUBDIR)/prev-gcc/gnatbind"; export GNATBIND \ + -B$$r/$(HOST_SUBDIR)/prev-gcc/ -B$(build_tooldir)/bin/"; export CC; \ + CC_FOR_BUILD="$(STAGE_CC_WRAPPER) \ + $$r/$(HOST_SUBDIR)/prev-gcc/xgcc$(exeext) \ + -B$$r/$(HOST_SUBDIR)/prev-gcc/ \ + -B$(build_tooldir)/bin/"; export CC_FOR_BUILD; \ LDFLAGS="$(BOOT_LDFLAGS)"; export LDFLAGS; # Target libraries are put under this directory: @@ -229,13 +227,13 @@ BASE_TARGET_EXPORTS = \ $(BASE_EXPORTS) \ AR="$(AR_FOR_TARGET)"; export AR; \ AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \ - CC="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CC; \ - CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CC="$(CC_FOR_TARGET)"; export CC; \ + 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; \ - GCJ="$(GCJ_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GCJ; \ - GFORTRAN="$(GFORTRAN_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GFORTRAN; \ + 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; \ LD="$(COMPILER_LD_FOR_TARGET)"; export LD; \ LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \ @@ -251,11 +249,11 @@ BASE_TARGET_EXPORTS = \ RAW_CXX_TARGET_EXPORTS = \ $(BASE_TARGET_EXPORTS) \ CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \ - CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; + CXX="$(RAW_CXX_FOR_TARGET)"; export CXX; NORMAL_TARGET_EXPORTS = \ $(BASE_TARGET_EXPORTS) \ - CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; + CXX="$(CXX_FOR_TARGET)"; export CXX; # Where to find GMP HOST_GMPLIBS = @gmplibs@ @@ -355,90 +353,48 @@ LIBCFLAGS = $(CFLAGS) CXXFLAGS = @CXXFLAGS@ LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates -TFLAGS = - -# Defaults for all stages; some are overridden below. - -STAGE_CFLAGS = $(BOOT_CFLAGS) -STAGE_TFLAGS = $(TFLAGS) -STAGE_CONFIGURE_FLAGS=@stage2_werror_flag@ - - -# Defaults for stage 1; some are overridden below. -STAGE1_CFLAGS = $(STAGE_CFLAGS) -STAGE1_TFLAGS = $(STAGE_TFLAGS) -STAGE1_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS) - -# Defaults for stage 2; some are overridden below. -STAGE2_CFLAGS = $(STAGE_CFLAGS) -STAGE2_TFLAGS = $(STAGE_TFLAGS) -STAGE2_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS) - -# Defaults for stage 3; some are overridden below. -STAGE3_CFLAGS = $(STAGE_CFLAGS) -STAGE3_TFLAGS = $(STAGE_TFLAGS) -STAGE3_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS) - -# Defaults for stage 4; some are overridden below. -STAGE4_CFLAGS = $(STAGE_CFLAGS) -STAGE4_TFLAGS = $(STAGE_TFLAGS) -STAGE4_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS) - -# Defaults for stage profile; some are overridden below. -STAGEprofile_CFLAGS = $(STAGE_CFLAGS) -STAGEprofile_TFLAGS = $(STAGE_TFLAGS) -STAGEprofile_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS) - -# Defaults for stage feedback; some are overridden below. -STAGEfeedback_CFLAGS = $(STAGE_CFLAGS) -STAGEfeedback_TFLAGS = $(STAGE_TFLAGS) -STAGEfeedback_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS) - - # Only build the C compiler for stage1, because that is the only one that # we can guarantee will build with the native compiler, and also it is the # only thing useful for building stage2. STAGE1_CFLAGS (via CFLAGS), # MAKEINFO and MAKEINFOFLAGS are explicitly passed here to make them # overrideable (for a bootstrap build stage1 also builds gcc.info). -STAGE1_CFLAGS = @stage1_cflags@ STAGE1_CHECKING=@stage1_checking@ STAGE1_LANGUAGES=@stage1_languages@ -# * We force-disable intermodule optimizations, even if -# --enable-intermodule was passed, since the installed compiler -# probably can't handle them. Luckily, autoconf always respects -# the last argument when conflicting --enable arguments are passed. -# * Likewise, we force-disable coverage flags, since the installed -# compiler probably has never heard of them. -STAGE1_CONFIGURE_FLAGS = --disable-intermodule $(STAGE1_CHECKING) \ - --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" -STAGEprofile_CFLAGS = $(STAGE2_CFLAGS) -fprofile-generate -STAGEprofile_TFLAGS = $(STAGE2_TFLAGS) +STAGE1_CFLAGS=@stage1_cflags@ +STAGE2_CFLAGS=$(BOOT_CFLAGS) +STAGE3_CFLAGS=$(BOOT_CFLAGS) +STAGE4_CFLAGS=$(BOOT_CFLAGS) -STAGEfeedback_CFLAGS = $(STAGE3_CFLAGS) -fprofile-use -STAGEfeedback_TFLAGS = $(STAGE3_TFLAGS) +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 # ----------------------------------------------- # Programs producing files for the TARGET machine # ----------------------------------------------- +FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@ + AR_FOR_TARGET=@AR_FOR_TARGET@ AS_FOR_TARGET=@AS_FOR_TARGET@ -CC_FOR_TARGET=$(STAGE_CC_WRAPPER) @CC_FOR_TARGET@ +CC_FOR_TARGET=$(STAGE_CC_WRAPPER) @CC_FOR_TARGET@ $(FLAGS_FOR_TARGET) # If GCC_FOR_TARGET is not overriden on the command line, then this # variable is passed down to the gcc Makefile, where it is used to # build libgcc2.a. We define it here so that it can itself be # overridden on the command line. -GCC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCC_FOR_TARGET@ -CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @CXX_FOR_TARGET@ -RAW_CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @RAW_CXX_FOR_TARGET@ -GCJ_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCJ_FOR_TARGET@ -GFORTRAN_FOR_TARGET=$(STAGE_CC_WRAPPER) @GFORTRAN_FOR_TARGET@ +GCC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCC_FOR_TARGET@ $(FLAGS_FOR_TARGET) +CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @CXX_FOR_TARGET@ $(FLAGS_FOR_TARGET) +RAW_CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @RAW_CXX_FOR_TARGET@ $(FLAGS_FOR_TARGET) +GCJ_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCJ_FOR_TARGET@ $(FLAGS_FOR_TARGET) +GFORTRAN_FOR_TARGET=$(STAGE_CC_WRAPPER) @GFORTRAN_FOR_TARGET@ $(FLAGS_FOR_TARGET) DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@ LD_FOR_TARGET=@LD_FOR_TARGET@ @@ -456,17 +412,13 @@ COMPILER_NM_FOR_TARGET=@COMPILER_NM_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@ LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates LDFLAGS_FOR_TARGET = -FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@ -SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@ -DEBUG_PREFIX_CFLAGS_FOR_TARGET = @DEBUG_PREFIX_CFLAGS_FOR_TARGET@ - -XGCC_FLAGS_FOR_TARGET = $(FLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET) - # ------------------------------------ # Miscellaneous targets and flag lists # ------------------------------------ @@ -601,8 +553,12 @@ BASE_FLAGS_TO_PASS = \ "LDFLAGS=$(LDFLAGS)" \ "LIBCFLAGS=$(LIBCFLAGS)" \ "LIBCXXFLAGS=$(LIBCXXFLAGS)" \ + "STAGE1_CFLAGS=$(STAGE1_CFLAGS)" \ "STAGE1_CHECKING=$(STAGE1_CHECKING)" \ "STAGE1_LANGUAGES=$(STAGE1_LANGUAGES)" \ + "STAGE2_CFLAGS=$(STAGE2_CFLAGS)" \ + "STAGE3_CFLAGS=$(STAGE3_CFLAGS)" \ + "STAGE4_CFLAGS=$(STAGE4_CFLAGS)" \ "GNATBIND=$(GNATBIND)" \ "GNATMAKE=$(GNATMAKE)" \ "AR_FOR_TARGET=$(AR_FOR_TARGET)" \ @@ -613,7 +569,6 @@ BASE_FLAGS_TO_PASS = \ "CXX_FOR_TARGET=$(CXX_FOR_TARGET)" \ "CXXFLAGS_FOR_TARGET=$(CXXFLAGS_FOR_TARGET)" \ "DLLTOOL_FOR_TARGET=$(DLLTOOL_FOR_TARGET)" \ - "FLAGS_FOR_TARGET=$(FLAGS_FOR_TARGET)" \ "GCJ_FOR_TARGET=$(GCJ_FOR_TARGET)" \ "GFORTRAN_FOR_TARGET=$(GFORTRAN_FOR_TARGET)" \ "LD_FOR_TARGET=$(LD_FOR_TARGET)" \ @@ -627,22 +582,8 @@ BASE_FLAGS_TO_PASS = \ "STRIP_FOR_TARGET=$(STRIP_FOR_TARGET)" \ "WINDRES_FOR_TARGET=$(WINDRES_FOR_TARGET)" \ "WINDMC_FOR_TARGET=$(WINDMC_FOR_TARGET)" \ - "BUILD_CONFIG=$(BUILD_CONFIG)" \ "`echo 'LANGUAGES=$(LANGUAGES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ "LEAN=$(LEAN)" \ - "STAGE1_CFLAGS=$(STAGE1_CFLAGS)" \ - "STAGE1_TFLAGS=$(STAGE1_TFLAGS)" \ - "STAGE2_CFLAGS=$(STAGE2_CFLAGS)" \ - "STAGE2_TFLAGS=$(STAGE2_TFLAGS)" \ - "STAGE3_CFLAGS=$(STAGE3_CFLAGS)" \ - "STAGE3_TFLAGS=$(STAGE3_TFLAGS)" \ - "STAGE4_CFLAGS=$(STAGE4_CFLAGS)" \ - "STAGE4_TFLAGS=$(STAGE4_TFLAGS)" \ - "STAGEprofile_CFLAGS=$(STAGEprofile_CFLAGS)" \ - "STAGEprofile_TFLAGS=$(STAGEprofile_TFLAGS)" \ - "STAGEfeedback_CFLAGS=$(STAGEfeedback_CFLAGS)" \ - "STAGEfeedback_TFLAGS=$(STAGEfeedback_TFLAGS)" \ - "TFLAGS=$(TFLAGS)" \ "CONFIG_SHELL=$(SHELL)" \ "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" @@ -657,8 +598,6 @@ EXTRA_HOST_FLAGS = \ 'CC=$(CC)' \ 'CXX=$(CXX)' \ 'DLLTOOL=$(DLLTOOL)' \ - 'GCJ=$(GCJ)' \ - 'GFORTRAN=$(GFORTRAN)' \ 'LD=$(LD)' \ 'LIPO=$(LIPO)' \ 'NM=$(NM)' \ @@ -685,7 +624,8 @@ X11_FLAGS_TO_PASS = \ # Flags to pass to stage2 and later makes. POSTSTAGE1_FLAGS_TO_PASS = \ - CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" GNATBIND="$${GNATBIND}" \ + CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \ + GNATBIND="$$r/$(HOST_SUBDIR)/prev-gcc/gnatbind" \ LDFLAGS="$(BOOT_LDFLAGS)" \ "`echo 'ADAFLAGS=$(BOOT_ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" @@ -697,24 +637,20 @@ POSTSTAGE1_FLAGS_TO_PASS = \ EXTRA_TARGET_FLAGS = \ 'AR=$$(AR_FOR_TARGET)' \ 'AS=$(COMPILER_AS_FOR_TARGET)' \ - 'CC=$$(CC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ - 'CFLAGS=$$(CFLAGS_FOR_TARGET)' \ - 'CXX=$$(CXX_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ - 'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \ + 'CC=$$(CC_FOR_TARGET)' \ + 'CFLAGS=$$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \ + 'CXX=$$(CXX_FOR_TARGET)' \ + 'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \ 'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \ - 'GCJ=$$(GCJ_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ - 'GFORTRAN=$$(GFORTRAN_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ '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)' \ 'WINDRES=$$(WINDRES_FOR_TARGET)' \ - 'WINDMC=$$(WINDMC_FOR_TARGET)' \ - 'XGCC_FLAGS_FOR_TARGET=$(XGCC_FLAGS_FOR_TARGET)' \ - "TFLAGS=$$TFLAGS" + 'WINDMC=$$(WINDMC_FOR_TARGET)' TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) @@ -734,13 +670,6 @@ EXTRA_GCC_FLAGS = \ GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS) -@if gcc -BUILD_CONFIG = -ifneq ($(BUILD_CONFIG),) -include $(foreach CONFIG, $(BUILD_CONFIG), $(srcdir)/config/$(CONFIG).mk) -endif -@endif gcc - .PHONY: configure-host configure-host: \ maybe-configure-ash \ @@ -853,18 +782,11 @@ all: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -@if gcc-bootstrap if [ -f stage_last ]; then \ - TFLAGS="$(STAGE$(shell test ! -f stage_last || sed s,^stage,, stage_last)_TFLAGS)"; \ $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target; \ else \ -@endif gcc-bootstrap - $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-host all-target \ -@if gcc-bootstrap - ; \ - fi \ -@endif gcc-bootstrap - && : + $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-host all-target; \ + fi .PHONY: all-build @@ -5023,12 +4945,10 @@ configure-stage1-bfd: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE1_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(LIBCFLAGS)"; 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; \ @@ -5042,7 +4962,8 @@ configure-stage1-bfd: $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ - $(STAGE1_CONFIGURE_FLAGS) + \ + --disable-intermodule $(STAGE1_CHECKING) --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" @endif bfd-bootstrap .PHONY: configure-stage2-bfd maybe-configure-stage2-bfd @@ -5054,13 +4975,11 @@ configure-stage2-bfd: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE2_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ - 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; \ @@ -5075,7 +4994,38 @@ configure-stage2-bfd: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE2_CONFIGURE_FLAGS) + @stage2_werror_flag@ +@endif bfd-bootstrap + +.PHONY: configure-stageb2g0-bfd maybe-configure-stageb2g0-bfd +maybe-configure-stageb2g0-bfd: +@if bfd-bootstrap +maybe-configure-stageb2g0-bfd: configure-stageb2g0-bfd +configure-stageb2g0-bfd: + @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \ + 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; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + srcdiroption="--srcdir=$${topdir}/bfd"; \ + libsrcdir="$$s/bfd"; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} $${srcdiroption} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + @stage2_werror_flag@ @endif bfd-bootstrap .PHONY: configure-stage3-bfd maybe-configure-stage3-bfd @@ -5087,13 +5037,11 @@ configure-stage3-bfd: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE3_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ - 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; \ @@ -5108,7 +5056,38 @@ configure-stage3-bfd: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE3_CONFIGURE_FLAGS) + @stage2_werror_flag@ +@endif bfd-bootstrap + +.PHONY: configure-stageb3g2-bfd maybe-configure-stageb3g2-bfd +maybe-configure-stageb3g2-bfd: +@if bfd-bootstrap +maybe-configure-stageb3g2-bfd: configure-stageb3g2-bfd +configure-stageb3g2-bfd: + @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \ + 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; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + srcdiroption="--srcdir=$${topdir}/bfd"; \ + libsrcdir="$$s/bfd"; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} $${srcdiroption} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + @stage2_werror_flag@ @endif bfd-bootstrap .PHONY: configure-stage4-bfd maybe-configure-stage4-bfd @@ -5120,13 +5099,11 @@ configure-stage4-bfd: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE4_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ - 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; \ @@ -5141,7 +5118,7 @@ configure-stage4-bfd: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE4_CONFIGURE_FLAGS) + @stage2_werror_flag@ @endif bfd-bootstrap .PHONY: configure-stageprofile-bfd maybe-configure-stageprofile-bfd @@ -5153,13 +5130,11 @@ configure-stageprofile-bfd: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEprofile_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \ + 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; \ @@ -5174,7 +5149,7 @@ configure-stageprofile-bfd: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEprofile_CONFIGURE_FLAGS) + @stage2_werror_flag@ @endif bfd-bootstrap .PHONY: configure-stagefeedback-bfd maybe-configure-stagefeedback-bfd @@ -5186,13 +5161,11 @@ configure-stagefeedback-bfd: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEfeedback_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \ + 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; \ @@ -5207,7 +5180,7 @@ configure-stagefeedback-bfd: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEfeedback_CONFIGURE_FLAGS) + @stage2_werror_flag@ @endif bfd-bootstrap @@ -5245,18 +5218,13 @@ all-stage1-bfd: configure-stage1-bfd @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE1_TFLAGS)"; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/bfd && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" \ - CXXFLAGS="$(STAGE1_CFLAGS)" \ - LIBCFLAGS="$(LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) \ - TFLAGS="$(STAGE1_TFLAGS)" \ + 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 @@ -5286,19 +5254,14 @@ all-stage2-bfd: configure-stage2-bfd @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE2_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/bfd && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS)" \ - CXXFLAGS="$(STAGE2_CFLAGS)" \ - LIBCFLAGS="$(STAGE2_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGE2_TFLAGS)" \ + 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 @@ -5317,6 +5280,44 @@ clean-stage2-bfd: @endif bfd-bootstrap +.PHONY: all-stageb2g0-bfd maybe-all-stageb2g0-bfd +.PHONY: clean-stageb2g0-bfd maybe-clean-stageb2g0-bfd +maybe-all-stageb2g0-bfd: +maybe-clean-stageb2g0-bfd: +@if bfd-bootstrap +maybe-all-stageb2g0-bfd: all-stageb2g0-bfd +all-stageb2g0: all-stageb2g0-bfd +TARGET-stageb2g0-bfd = $(TARGET-bfd) +all-stageb2g0-bfd: configure-stageb2g0-bfd + @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/bfd && \ + $(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 +clean-stageb2g0: clean-stageb2g0-bfd +clean-stageb2g0-bfd: + @if [ $(current_stage) = stageb2g0 ]; then \ + [ -f $(HOST_SUBDIR)/bfd/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stageb2g0-bfd/Makefile ] || exit 0; \ + $(MAKE) stageb2g0-start; \ + fi; \ + cd $(HOST_SUBDIR)/bfd && \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif bfd-bootstrap + + .PHONY: all-stage3-bfd maybe-all-stage3-bfd .PHONY: clean-stage3-bfd maybe-clean-stage3-bfd maybe-all-stage3-bfd: @@ -5329,19 +5330,14 @@ all-stage3-bfd: configure-stage3-bfd @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE3_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/bfd && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS)" \ - CXXFLAGS="$(STAGE3_CFLAGS)" \ - LIBCFLAGS="$(STAGE3_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGE3_TFLAGS)" \ + 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 @@ -5360,6 +5356,44 @@ clean-stage3-bfd: @endif bfd-bootstrap +.PHONY: all-stageb3g2-bfd maybe-all-stageb3g2-bfd +.PHONY: clean-stageb3g2-bfd maybe-clean-stageb3g2-bfd +maybe-all-stageb3g2-bfd: +maybe-clean-stageb3g2-bfd: +@if bfd-bootstrap +maybe-all-stageb3g2-bfd: all-stageb3g2-bfd +all-stageb3g2: all-stageb3g2-bfd +TARGET-stageb3g2-bfd = $(TARGET-bfd) +all-stageb3g2-bfd: configure-stageb3g2-bfd + @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/bfd && \ + $(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 +clean-stageb3g2: clean-stageb3g2-bfd +clean-stageb3g2-bfd: + @if [ $(current_stage) = stageb3g2 ]; then \ + [ -f $(HOST_SUBDIR)/bfd/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stageb3g2-bfd/Makefile ] || exit 0; \ + $(MAKE) stageb3g2-start; \ + fi; \ + cd $(HOST_SUBDIR)/bfd && \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif bfd-bootstrap + + .PHONY: all-stage4-bfd maybe-all-stage4-bfd .PHONY: clean-stage4-bfd maybe-clean-stage4-bfd maybe-all-stage4-bfd: @@ -5372,19 +5406,14 @@ all-stage4-bfd: configure-stage4-bfd @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE4_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/bfd && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE4_CFLAGS)" \ - CXXFLAGS="$(STAGE4_CFLAGS)" \ + CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \ LIBCFLAGS="$(STAGE4_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGE4_TFLAGS)" \ + 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 @@ -5415,19 +5444,14 @@ all-stageprofile-bfd: configure-stageprofile-bfd @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEprofile_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/bfd && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGEprofile_CFLAGS)" \ - CXXFLAGS="$(STAGEprofile_CFLAGS)" \ - LIBCFLAGS="$(STAGEprofile_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGEprofile_TFLAGS)" \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageprofile-bfd) maybe-clean-stageprofile-bfd: clean-stageprofile-bfd @@ -5458,19 +5482,14 @@ all-stagefeedback-bfd: configure-stagefeedback-bfd @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEfeedback_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/bfd && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGEfeedback_CFLAGS)" \ - CXXFLAGS="$(STAGEfeedback_CFLAGS)" \ - LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGEfeedback_TFLAGS)" \ + 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 @@ -5889,12 +5908,10 @@ configure-stage1-opcodes: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE1_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(LIBCFLAGS)"; 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; \ @@ -5908,7 +5925,8 @@ configure-stage1-opcodes: $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ - $(STAGE1_CONFIGURE_FLAGS) + \ + --disable-intermodule $(STAGE1_CHECKING) --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" @endif opcodes-bootstrap .PHONY: configure-stage2-opcodes maybe-configure-stage2-opcodes @@ -5920,13 +5938,11 @@ configure-stage2-opcodes: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE2_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ - 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; \ @@ -5941,7 +5957,38 @@ configure-stage2-opcodes: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE2_CONFIGURE_FLAGS) + @stage2_werror_flag@ +@endif opcodes-bootstrap + +.PHONY: configure-stageb2g0-opcodes maybe-configure-stageb2g0-opcodes +maybe-configure-stageb2g0-opcodes: +@if opcodes-bootstrap +maybe-configure-stageb2g0-opcodes: configure-stageb2g0-opcodes +configure-stageb2g0-opcodes: + @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \ + 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; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + srcdiroption="--srcdir=$${topdir}/opcodes"; \ + libsrcdir="$$s/opcodes"; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} $${srcdiroption} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + @stage2_werror_flag@ @endif opcodes-bootstrap .PHONY: configure-stage3-opcodes maybe-configure-stage3-opcodes @@ -5953,13 +6000,11 @@ configure-stage3-opcodes: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE3_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ - 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; \ @@ -5974,7 +6019,38 @@ configure-stage3-opcodes: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE3_CONFIGURE_FLAGS) + @stage2_werror_flag@ +@endif opcodes-bootstrap + +.PHONY: configure-stageb3g2-opcodes maybe-configure-stageb3g2-opcodes +maybe-configure-stageb3g2-opcodes: +@if opcodes-bootstrap +maybe-configure-stageb3g2-opcodes: configure-stageb3g2-opcodes +configure-stageb3g2-opcodes: + @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \ + 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; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + srcdiroption="--srcdir=$${topdir}/opcodes"; \ + libsrcdir="$$s/opcodes"; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} $${srcdiroption} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + @stage2_werror_flag@ @endif opcodes-bootstrap .PHONY: configure-stage4-opcodes maybe-configure-stage4-opcodes @@ -5986,13 +6062,11 @@ configure-stage4-opcodes: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE4_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ - 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; \ @@ -6007,7 +6081,7 @@ configure-stage4-opcodes: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE4_CONFIGURE_FLAGS) + @stage2_werror_flag@ @endif opcodes-bootstrap .PHONY: configure-stageprofile-opcodes maybe-configure-stageprofile-opcodes @@ -6019,13 +6093,11 @@ configure-stageprofile-opcodes: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEprofile_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \ + 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; \ @@ -6040,7 +6112,7 @@ configure-stageprofile-opcodes: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEprofile_CONFIGURE_FLAGS) + @stage2_werror_flag@ @endif opcodes-bootstrap .PHONY: configure-stagefeedback-opcodes maybe-configure-stagefeedback-opcodes @@ -6052,13 +6124,11 @@ configure-stagefeedback-opcodes: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEfeedback_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \ + 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; \ @@ -6073,7 +6143,7 @@ configure-stagefeedback-opcodes: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEfeedback_CONFIGURE_FLAGS) + @stage2_werror_flag@ @endif opcodes-bootstrap @@ -6111,18 +6181,13 @@ all-stage1-opcodes: configure-stage1-opcodes @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE1_TFLAGS)"; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/opcodes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" \ - CXXFLAGS="$(STAGE1_CFLAGS)" \ - LIBCFLAGS="$(LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) \ - TFLAGS="$(STAGE1_TFLAGS)" \ + 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 @@ -6152,19 +6217,14 @@ all-stage2-opcodes: configure-stage2-opcodes @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE2_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/opcodes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS)" \ - CXXFLAGS="$(STAGE2_CFLAGS)" \ - LIBCFLAGS="$(STAGE2_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGE2_TFLAGS)" \ + 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 @@ -6183,6 +6243,44 @@ clean-stage2-opcodes: @endif opcodes-bootstrap +.PHONY: all-stageb2g0-opcodes maybe-all-stageb2g0-opcodes +.PHONY: clean-stageb2g0-opcodes maybe-clean-stageb2g0-opcodes +maybe-all-stageb2g0-opcodes: +maybe-clean-stageb2g0-opcodes: +@if opcodes-bootstrap +maybe-all-stageb2g0-opcodes: all-stageb2g0-opcodes +all-stageb2g0: all-stageb2g0-opcodes +TARGET-stageb2g0-opcodes = $(TARGET-opcodes) +all-stageb2g0-opcodes: configure-stageb2g0-opcodes + @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/opcodes && \ + $(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 +clean-stageb2g0: clean-stageb2g0-opcodes +clean-stageb2g0-opcodes: + @if [ $(current_stage) = stageb2g0 ]; then \ + [ -f $(HOST_SUBDIR)/opcodes/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stageb2g0-opcodes/Makefile ] || exit 0; \ + $(MAKE) stageb2g0-start; \ + fi; \ + cd $(HOST_SUBDIR)/opcodes && \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif opcodes-bootstrap + + .PHONY: all-stage3-opcodes maybe-all-stage3-opcodes .PHONY: clean-stage3-opcodes maybe-clean-stage3-opcodes maybe-all-stage3-opcodes: @@ -6195,19 +6293,14 @@ all-stage3-opcodes: configure-stage3-opcodes @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE3_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/opcodes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS)" \ - CXXFLAGS="$(STAGE3_CFLAGS)" \ - LIBCFLAGS="$(STAGE3_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGE3_TFLAGS)" \ + 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 @@ -6226,6 +6319,44 @@ clean-stage3-opcodes: @endif opcodes-bootstrap +.PHONY: all-stageb3g2-opcodes maybe-all-stageb3g2-opcodes +.PHONY: clean-stageb3g2-opcodes maybe-clean-stageb3g2-opcodes +maybe-all-stageb3g2-opcodes: +maybe-clean-stageb3g2-opcodes: +@if opcodes-bootstrap +maybe-all-stageb3g2-opcodes: all-stageb3g2-opcodes +all-stageb3g2: all-stageb3g2-opcodes +TARGET-stageb3g2-opcodes = $(TARGET-opcodes) +all-stageb3g2-opcodes: configure-stageb3g2-opcodes + @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/opcodes && \ + $(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 +clean-stageb3g2: clean-stageb3g2-opcodes +clean-stageb3g2-opcodes: + @if [ $(current_stage) = stageb3g2 ]; then \ + [ -f $(HOST_SUBDIR)/opcodes/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stageb3g2-opcodes/Makefile ] || exit 0; \ + $(MAKE) stageb3g2-start; \ + fi; \ + cd $(HOST_SUBDIR)/opcodes && \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif opcodes-bootstrap + + .PHONY: all-stage4-opcodes maybe-all-stage4-opcodes .PHONY: clean-stage4-opcodes maybe-clean-stage4-opcodes maybe-all-stage4-opcodes: @@ -6238,19 +6369,14 @@ all-stage4-opcodes: configure-stage4-opcodes @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE4_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/opcodes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE4_CFLAGS)" \ - CXXFLAGS="$(STAGE4_CFLAGS)" \ + CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \ LIBCFLAGS="$(STAGE4_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGE4_TFLAGS)" \ + 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 @@ -6281,19 +6407,14 @@ all-stageprofile-opcodes: configure-stageprofile-opcodes @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEprofile_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/opcodes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGEprofile_CFLAGS)" \ - CXXFLAGS="$(STAGEprofile_CFLAGS)" \ - LIBCFLAGS="$(STAGEprofile_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGEprofile_TFLAGS)" \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageprofile-opcodes) maybe-clean-stageprofile-opcodes: clean-stageprofile-opcodes @@ -6324,19 +6445,14 @@ all-stagefeedback-opcodes: configure-stagefeedback-opcodes @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEfeedback_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/opcodes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGEfeedback_CFLAGS)" \ - CXXFLAGS="$(STAGEfeedback_CFLAGS)" \ - LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGEfeedback_TFLAGS)" \ + 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 @@ -6755,12 +6871,10 @@ configure-stage1-binutils: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE1_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(LIBCFLAGS)"; 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; \ @@ -6774,7 +6888,8 @@ configure-stage1-binutils: $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ - $(STAGE1_CONFIGURE_FLAGS) + \ + --disable-intermodule $(STAGE1_CHECKING) --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" @endif binutils-bootstrap .PHONY: configure-stage2-binutils maybe-configure-stage2-binutils @@ -6786,13 +6901,11 @@ configure-stage2-binutils: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE2_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ - 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; \ @@ -6807,7 +6920,38 @@ configure-stage2-binutils: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE2_CONFIGURE_FLAGS) + @stage2_werror_flag@ +@endif binutils-bootstrap + +.PHONY: configure-stageb2g0-binutils maybe-configure-stageb2g0-binutils +maybe-configure-stageb2g0-binutils: +@if binutils-bootstrap +maybe-configure-stageb2g0-binutils: configure-stageb2g0-binutils +configure-stageb2g0-binutils: + @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \ + 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; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + srcdiroption="--srcdir=$${topdir}/binutils"; \ + libsrcdir="$$s/binutils"; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} $${srcdiroption} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + @stage2_werror_flag@ @endif binutils-bootstrap .PHONY: configure-stage3-binutils maybe-configure-stage3-binutils @@ -6819,13 +6963,11 @@ configure-stage3-binutils: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE3_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ - 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; \ @@ -6840,7 +6982,38 @@ configure-stage3-binutils: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE3_CONFIGURE_FLAGS) + @stage2_werror_flag@ +@endif binutils-bootstrap + +.PHONY: configure-stageb3g2-binutils maybe-configure-stageb3g2-binutils +maybe-configure-stageb3g2-binutils: +@if binutils-bootstrap +maybe-configure-stageb3g2-binutils: configure-stageb3g2-binutils +configure-stageb3g2-binutils: + @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \ + 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; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + srcdiroption="--srcdir=$${topdir}/binutils"; \ + libsrcdir="$$s/binutils"; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} $${srcdiroption} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + @stage2_werror_flag@ @endif binutils-bootstrap .PHONY: configure-stage4-binutils maybe-configure-stage4-binutils @@ -6852,13 +7025,11 @@ configure-stage4-binutils: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE4_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ - 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; \ @@ -6873,7 +7044,7 @@ configure-stage4-binutils: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE4_CONFIGURE_FLAGS) + @stage2_werror_flag@ @endif binutils-bootstrap .PHONY: configure-stageprofile-binutils maybe-configure-stageprofile-binutils @@ -6885,13 +7056,11 @@ configure-stageprofile-binutils: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEprofile_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \ + 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; \ @@ -6906,7 +7075,7 @@ configure-stageprofile-binutils: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEprofile_CONFIGURE_FLAGS) + @stage2_werror_flag@ @endif binutils-bootstrap .PHONY: configure-stagefeedback-binutils maybe-configure-stagefeedback-binutils @@ -6918,13 +7087,11 @@ configure-stagefeedback-binutils: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEfeedback_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \ + 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; \ @@ -6939,7 +7106,7 @@ configure-stagefeedback-binutils: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEfeedback_CONFIGURE_FLAGS) + @stage2_werror_flag@ @endif binutils-bootstrap @@ -6977,18 +7144,13 @@ all-stage1-binutils: configure-stage1-binutils @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE1_TFLAGS)"; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/binutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" \ - CXXFLAGS="$(STAGE1_CFLAGS)" \ - LIBCFLAGS="$(LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) \ - TFLAGS="$(STAGE1_TFLAGS)" \ + 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 @@ -7018,19 +7180,14 @@ all-stage2-binutils: configure-stage2-binutils @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE2_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/binutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS)" \ - CXXFLAGS="$(STAGE2_CFLAGS)" \ - LIBCFLAGS="$(STAGE2_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGE2_TFLAGS)" \ + 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 @@ -7049,6 +7206,44 @@ clean-stage2-binutils: @endif binutils-bootstrap +.PHONY: all-stageb2g0-binutils maybe-all-stageb2g0-binutils +.PHONY: clean-stageb2g0-binutils maybe-clean-stageb2g0-binutils +maybe-all-stageb2g0-binutils: +maybe-clean-stageb2g0-binutils: +@if binutils-bootstrap +maybe-all-stageb2g0-binutils: all-stageb2g0-binutils +all-stageb2g0: all-stageb2g0-binutils +TARGET-stageb2g0-binutils = $(TARGET-binutils) +all-stageb2g0-binutils: configure-stageb2g0-binutils + @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/binutils && \ + $(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 +clean-stageb2g0: clean-stageb2g0-binutils +clean-stageb2g0-binutils: + @if [ $(current_stage) = stageb2g0 ]; then \ + [ -f $(HOST_SUBDIR)/binutils/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stageb2g0-binutils/Makefile ] || exit 0; \ + $(MAKE) stageb2g0-start; \ + fi; \ + cd $(HOST_SUBDIR)/binutils && \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif binutils-bootstrap + + .PHONY: all-stage3-binutils maybe-all-stage3-binutils .PHONY: clean-stage3-binutils maybe-clean-stage3-binutils maybe-all-stage3-binutils: @@ -7061,19 +7256,14 @@ all-stage3-binutils: configure-stage3-binutils @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE3_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/binutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS)" \ - CXXFLAGS="$(STAGE3_CFLAGS)" \ - LIBCFLAGS="$(STAGE3_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGE3_TFLAGS)" \ + 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 @@ -7092,6 +7282,44 @@ clean-stage3-binutils: @endif binutils-bootstrap +.PHONY: all-stageb3g2-binutils maybe-all-stageb3g2-binutils +.PHONY: clean-stageb3g2-binutils maybe-clean-stageb3g2-binutils +maybe-all-stageb3g2-binutils: +maybe-clean-stageb3g2-binutils: +@if binutils-bootstrap +maybe-all-stageb3g2-binutils: all-stageb3g2-binutils +all-stageb3g2: all-stageb3g2-binutils +TARGET-stageb3g2-binutils = $(TARGET-binutils) +all-stageb3g2-binutils: configure-stageb3g2-binutils + @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/binutils && \ + $(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 +clean-stageb3g2: clean-stageb3g2-binutils +clean-stageb3g2-binutils: + @if [ $(current_stage) = stageb3g2 ]; then \ + [ -f $(HOST_SUBDIR)/binutils/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stageb3g2-binutils/Makefile ] || exit 0; \ + $(MAKE) stageb3g2-start; \ + fi; \ + cd $(HOST_SUBDIR)/binutils && \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif binutils-bootstrap + + .PHONY: all-stage4-binutils maybe-all-stage4-binutils .PHONY: clean-stage4-binutils maybe-clean-stage4-binutils maybe-all-stage4-binutils: @@ -7104,19 +7332,14 @@ all-stage4-binutils: configure-stage4-binutils @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE4_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/binutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE4_CFLAGS)" \ - CXXFLAGS="$(STAGE4_CFLAGS)" \ + CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \ LIBCFLAGS="$(STAGE4_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGE4_TFLAGS)" \ + 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 @@ -7147,19 +7370,14 @@ all-stageprofile-binutils: configure-stageprofile-binutils @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEprofile_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/binutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGEprofile_CFLAGS)" \ - CXXFLAGS="$(STAGEprofile_CFLAGS)" \ - LIBCFLAGS="$(STAGEprofile_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGEprofile_TFLAGS)" \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageprofile-binutils) maybe-clean-stageprofile-binutils: clean-stageprofile-binutils @@ -7190,19 +7408,14 @@ all-stagefeedback-binutils: configure-stagefeedback-binutils @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEfeedback_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/binutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGEfeedback_CFLAGS)" \ - CXXFLAGS="$(STAGEfeedback_CFLAGS)" \ - LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGEfeedback_TFLAGS)" \ + 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 @@ -13136,12 +13349,10 @@ configure-stage1-gas: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE1_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(LIBCFLAGS)"; 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; \ @@ -13155,7 +13366,8 @@ configure-stage1-gas: $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ - $(STAGE1_CONFIGURE_FLAGS) + \ + --disable-intermodule $(STAGE1_CHECKING) --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" @endif gas-bootstrap .PHONY: configure-stage2-gas maybe-configure-stage2-gas @@ -13167,13 +13379,11 @@ configure-stage2-gas: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE2_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ - 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; \ @@ -13188,7 +13398,38 @@ configure-stage2-gas: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE2_CONFIGURE_FLAGS) + @stage2_werror_flag@ +@endif gas-bootstrap + +.PHONY: configure-stageb2g0-gas maybe-configure-stageb2g0-gas +maybe-configure-stageb2g0-gas: +@if gas-bootstrap +maybe-configure-stageb2g0-gas: configure-stageb2g0-gas +configure-stageb2g0-gas: + @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \ + 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; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/gas/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + srcdiroption="--srcdir=$${topdir}/gas"; \ + libsrcdir="$$s/gas"; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} $${srcdiroption} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + @stage2_werror_flag@ @endif gas-bootstrap .PHONY: configure-stage3-gas maybe-configure-stage3-gas @@ -13200,13 +13441,11 @@ configure-stage3-gas: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE3_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ - 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; \ @@ -13221,7 +13460,38 @@ configure-stage3-gas: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE3_CONFIGURE_FLAGS) + @stage2_werror_flag@ +@endif gas-bootstrap + +.PHONY: configure-stageb3g2-gas maybe-configure-stageb3g2-gas +maybe-configure-stageb3g2-gas: +@if gas-bootstrap +maybe-configure-stageb3g2-gas: configure-stageb3g2-gas +configure-stageb3g2-gas: + @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \ + 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; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/gas/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + srcdiroption="--srcdir=$${topdir}/gas"; \ + libsrcdir="$$s/gas"; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} $${srcdiroption} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + @stage2_werror_flag@ @endif gas-bootstrap .PHONY: configure-stage4-gas maybe-configure-stage4-gas @@ -13233,13 +13503,11 @@ configure-stage4-gas: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE4_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ - 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; \ @@ -13254,7 +13522,7 @@ configure-stage4-gas: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE4_CONFIGURE_FLAGS) + @stage2_werror_flag@ @endif gas-bootstrap .PHONY: configure-stageprofile-gas maybe-configure-stageprofile-gas @@ -13266,13 +13534,11 @@ configure-stageprofile-gas: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEprofile_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \ + 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; \ @@ -13287,7 +13553,7 @@ configure-stageprofile-gas: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEprofile_CONFIGURE_FLAGS) + @stage2_werror_flag@ @endif gas-bootstrap .PHONY: configure-stagefeedback-gas maybe-configure-stagefeedback-gas @@ -13299,13 +13565,11 @@ configure-stagefeedback-gas: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEfeedback_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \ + 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; \ @@ -13320,7 +13584,7 @@ configure-stagefeedback-gas: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEfeedback_CONFIGURE_FLAGS) + @stage2_werror_flag@ @endif gas-bootstrap @@ -13358,18 +13622,13 @@ all-stage1-gas: configure-stage1-gas @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE1_TFLAGS)"; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gas && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" \ - CXXFLAGS="$(STAGE1_CFLAGS)" \ - LIBCFLAGS="$(LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) \ - TFLAGS="$(STAGE1_TFLAGS)" \ + 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 @@ -13399,19 +13658,14 @@ all-stage2-gas: configure-stage2-gas @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE2_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gas && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS)" \ - CXXFLAGS="$(STAGE2_CFLAGS)" \ - LIBCFLAGS="$(STAGE2_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGE2_TFLAGS)" \ + 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 @@ -13430,6 +13684,44 @@ clean-stage2-gas: @endif gas-bootstrap +.PHONY: all-stageb2g0-gas maybe-all-stageb2g0-gas +.PHONY: clean-stageb2g0-gas maybe-clean-stageb2g0-gas +maybe-all-stageb2g0-gas: +maybe-clean-stageb2g0-gas: +@if gas-bootstrap +maybe-all-stageb2g0-gas: all-stageb2g0-gas +all-stageb2g0: all-stageb2g0-gas +TARGET-stageb2g0-gas = $(TARGET-gas) +all-stageb2g0-gas: configure-stageb2g0-gas + @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/gas && \ + $(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 +clean-stageb2g0: clean-stageb2g0-gas +clean-stageb2g0-gas: + @if [ $(current_stage) = stageb2g0 ]; then \ + [ -f $(HOST_SUBDIR)/gas/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stageb2g0-gas/Makefile ] || exit 0; \ + $(MAKE) stageb2g0-start; \ + fi; \ + cd $(HOST_SUBDIR)/gas && \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif gas-bootstrap + + .PHONY: all-stage3-gas maybe-all-stage3-gas .PHONY: clean-stage3-gas maybe-clean-stage3-gas maybe-all-stage3-gas: @@ -13442,19 +13734,14 @@ all-stage3-gas: configure-stage3-gas @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE3_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gas && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS)" \ - CXXFLAGS="$(STAGE3_CFLAGS)" \ - LIBCFLAGS="$(STAGE3_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGE3_TFLAGS)" \ + 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 @@ -13473,6 +13760,44 @@ clean-stage3-gas: @endif gas-bootstrap +.PHONY: all-stageb3g2-gas maybe-all-stageb3g2-gas +.PHONY: clean-stageb3g2-gas maybe-clean-stageb3g2-gas +maybe-all-stageb3g2-gas: +maybe-clean-stageb3g2-gas: +@if gas-bootstrap +maybe-all-stageb3g2-gas: all-stageb3g2-gas +all-stageb3g2: all-stageb3g2-gas +TARGET-stageb3g2-gas = $(TARGET-gas) +all-stageb3g2-gas: configure-stageb3g2-gas + @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/gas && \ + $(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 +clean-stageb3g2: clean-stageb3g2-gas +clean-stageb3g2-gas: + @if [ $(current_stage) = stageb3g2 ]; then \ + [ -f $(HOST_SUBDIR)/gas/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stageb3g2-gas/Makefile ] || exit 0; \ + $(MAKE) stageb3g2-start; \ + fi; \ + cd $(HOST_SUBDIR)/gas && \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif gas-bootstrap + + .PHONY: all-stage4-gas maybe-all-stage4-gas .PHONY: clean-stage4-gas maybe-clean-stage4-gas maybe-all-stage4-gas: @@ -13485,19 +13810,14 @@ all-stage4-gas: configure-stage4-gas @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE4_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gas && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE4_CFLAGS)" \ - CXXFLAGS="$(STAGE4_CFLAGS)" \ + CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \ LIBCFLAGS="$(STAGE4_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGE4_TFLAGS)" \ + 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 @@ -13528,19 +13848,14 @@ all-stageprofile-gas: configure-stageprofile-gas @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEprofile_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gas && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGEprofile_CFLAGS)" \ - CXXFLAGS="$(STAGEprofile_CFLAGS)" \ - LIBCFLAGS="$(STAGEprofile_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGEprofile_TFLAGS)" \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageprofile-gas) maybe-clean-stageprofile-gas: clean-stageprofile-gas @@ -13571,19 +13886,14 @@ all-stagefeedback-gas: configure-stagefeedback-gas @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEfeedback_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gas && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGEfeedback_CFLAGS)" \ - CXXFLAGS="$(STAGEfeedback_CFLAGS)" \ - LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGEfeedback_TFLAGS)" \ + 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 @@ -14002,12 +14312,10 @@ configure-stage1-gcc: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE1_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(LIBCFLAGS)"; 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; \ @@ -14021,7 +14329,8 @@ configure-stage1-gcc: $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ - $(STAGE1_CONFIGURE_FLAGS) + \ + --disable-intermodule $(STAGE1_CHECKING) --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" @endif gcc-bootstrap .PHONY: configure-stage2-gcc maybe-configure-stage2-gcc @@ -14033,13 +14342,11 @@ configure-stage2-gcc: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE2_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ - 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; \ @@ -14054,7 +14361,38 @@ configure-stage2-gcc: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE2_CONFIGURE_FLAGS) + @stage2_werror_flag@ +@endif gcc-bootstrap + +.PHONY: configure-stageb2g0-gcc maybe-configure-stageb2g0-gcc +maybe-configure-stageb2g0-gcc: +@if gcc-bootstrap +maybe-configure-stageb2g0-gcc: configure-stageb2g0-gcc +configure-stageb2g0-gcc: + @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \ + 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; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + srcdiroption="--srcdir=$${topdir}/gcc"; \ + libsrcdir="$$s/gcc"; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} $${srcdiroption} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + @stage2_werror_flag@ @endif gcc-bootstrap .PHONY: configure-stage3-gcc maybe-configure-stage3-gcc @@ -14066,13 +14404,11 @@ configure-stage3-gcc: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE3_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ - 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; \ @@ -14087,7 +14423,38 @@ configure-stage3-gcc: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE3_CONFIGURE_FLAGS) + @stage2_werror_flag@ +@endif gcc-bootstrap + +.PHONY: configure-stageb3g2-gcc maybe-configure-stageb3g2-gcc +maybe-configure-stageb3g2-gcc: +@if gcc-bootstrap +maybe-configure-stageb3g2-gcc: configure-stageb3g2-gcc +configure-stageb3g2-gcc: + @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \ + 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; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + srcdiroption="--srcdir=$${topdir}/gcc"; \ + libsrcdir="$$s/gcc"; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} $${srcdiroption} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + @stage2_werror_flag@ @endif gcc-bootstrap .PHONY: configure-stage4-gcc maybe-configure-stage4-gcc @@ -14099,13 +14466,11 @@ configure-stage4-gcc: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE4_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ - 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; \ @@ -14120,7 +14485,7 @@ configure-stage4-gcc: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE4_CONFIGURE_FLAGS) + @stage2_werror_flag@ @endif gcc-bootstrap .PHONY: configure-stageprofile-gcc maybe-configure-stageprofile-gcc @@ -14132,13 +14497,11 @@ configure-stageprofile-gcc: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEprofile_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \ + 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; \ @@ -14153,7 +14516,7 @@ configure-stageprofile-gcc: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEprofile_CONFIGURE_FLAGS) + @stage2_werror_flag@ @endif gcc-bootstrap .PHONY: configure-stagefeedback-gcc maybe-configure-stagefeedback-gcc @@ -14165,13 +14528,11 @@ configure-stagefeedback-gcc: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEfeedback_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \ + 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; \ @@ -14186,7 +14547,7 @@ configure-stagefeedback-gcc: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEfeedback_CONFIGURE_FLAGS) + @stage2_werror_flag@ @endif gcc-bootstrap @@ -14224,18 +14585,13 @@ all-stage1-gcc: configure-stage1-gcc @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE1_TFLAGS)"; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gcc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" \ - CXXFLAGS="$(STAGE1_CFLAGS)" \ - LIBCFLAGS="$(LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS) \ - TFLAGS="$(STAGE1_TFLAGS)" \ + 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 @@ -14265,19 +14621,14 @@ all-stage2-gcc: configure-stage2-gcc @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE2_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gcc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS)" \ - CXXFLAGS="$(STAGE2_CFLAGS)" \ - LIBCFLAGS="$(STAGE2_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \ - TFLAGS="$(STAGE2_TFLAGS)" \ + 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 @@ -14296,6 +14647,44 @@ clean-stage2-gcc: @endif gcc-bootstrap +.PHONY: all-stageb2g0-gcc maybe-all-stageb2g0-gcc +.PHONY: clean-stageb2g0-gcc maybe-clean-stageb2g0-gcc +maybe-all-stageb2g0-gcc: +maybe-clean-stageb2g0-gcc: +@if gcc-bootstrap +maybe-all-stageb2g0-gcc: all-stageb2g0-gcc +all-stageb2g0: all-stageb2g0-gcc +TARGET-stageb2g0-gcc = $(TARGET-gcc) +all-stageb2g0-gcc: configure-stageb2g0-gcc + @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/gcc && \ + $(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 +clean-stageb2g0: clean-stageb2g0-gcc +clean-stageb2g0-gcc: + @if [ $(current_stage) = stageb2g0 ]; then \ + [ -f $(HOST_SUBDIR)/gcc/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stageb2g0-gcc/Makefile ] || exit 0; \ + $(MAKE) stageb2g0-start; \ + fi; \ + cd $(HOST_SUBDIR)/gcc && \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(EXTRA_GCC_FLAGS) clean +@endif gcc-bootstrap + + .PHONY: all-stage3-gcc maybe-all-stage3-gcc .PHONY: clean-stage3-gcc maybe-clean-stage3-gcc maybe-all-stage3-gcc: @@ -14308,19 +14697,14 @@ all-stage3-gcc: configure-stage3-gcc @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE3_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gcc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS)" \ - CXXFLAGS="$(STAGE3_CFLAGS)" \ - LIBCFLAGS="$(STAGE3_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \ - TFLAGS="$(STAGE3_TFLAGS)" \ + 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 @@ -14339,6 +14723,44 @@ clean-stage3-gcc: @endif gcc-bootstrap +.PHONY: all-stageb3g2-gcc maybe-all-stageb3g2-gcc +.PHONY: clean-stageb3g2-gcc maybe-clean-stageb3g2-gcc +maybe-all-stageb3g2-gcc: +maybe-clean-stageb3g2-gcc: +@if gcc-bootstrap +maybe-all-stageb3g2-gcc: all-stageb3g2-gcc +all-stageb3g2: all-stageb3g2-gcc +TARGET-stageb3g2-gcc = $(TARGET-gcc) +all-stageb3g2-gcc: configure-stageb3g2-gcc + @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/gcc && \ + $(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 +clean-stageb3g2: clean-stageb3g2-gcc +clean-stageb3g2-gcc: + @if [ $(current_stage) = stageb3g2 ]; then \ + [ -f $(HOST_SUBDIR)/gcc/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stageb3g2-gcc/Makefile ] || exit 0; \ + $(MAKE) stageb3g2-start; \ + fi; \ + cd $(HOST_SUBDIR)/gcc && \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(EXTRA_GCC_FLAGS) clean +@endif gcc-bootstrap + + .PHONY: all-stage4-gcc maybe-all-stage4-gcc .PHONY: clean-stage4-gcc maybe-clean-stage4-gcc maybe-all-stage4-gcc: @@ -14351,19 +14773,14 @@ all-stage4-gcc: configure-stage4-gcc @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE4_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gcc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE4_CFLAGS)" \ - CXXFLAGS="$(STAGE4_CFLAGS)" \ + CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \ LIBCFLAGS="$(STAGE4_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \ - TFLAGS="$(STAGE4_TFLAGS)" \ + 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 @@ -14394,19 +14811,14 @@ all-stageprofile-gcc: configure-stageprofile-gcc @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEprofile_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gcc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGEprofile_CFLAGS)" \ - CXXFLAGS="$(STAGEprofile_CFLAGS)" \ - LIBCFLAGS="$(STAGEprofile_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \ - TFLAGS="$(STAGEprofile_TFLAGS)" \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \ $(TARGET-stageprofile-gcc) maybe-clean-stageprofile-gcc: clean-stageprofile-gcc @@ -14437,19 +14849,14 @@ all-stagefeedback-gcc: configure-stagefeedback-gcc @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEfeedback_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gcc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGEfeedback_CFLAGS)" \ - CXXFLAGS="$(STAGEfeedback_CFLAGS)" \ - LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \ - TFLAGS="$(STAGEfeedback_TFLAGS)" \ + 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 @@ -15718,12 +16125,10 @@ configure-stage1-gmp: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE1_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(LIBCFLAGS)"; 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; \ @@ -15737,8 +16142,8 @@ configure-stage1-gmp: $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \ --target=none-${host_vendor}-${host_os} $${srcdiroption} \ - $(STAGE1_CONFIGURE_FLAGS) \ - --disable-shared + \ + --disable-intermodule $(STAGE1_CHECKING) --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" --disable-shared @endif gmp-bootstrap .PHONY: configure-stage2-gmp maybe-configure-stage2-gmp @@ -15750,13 +16155,11 @@ configure-stage2-gmp: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE2_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ - 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; \ @@ -15771,8 +16174,38 @@ configure-stage2-gmp: $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \ --target=none-${host_vendor}-${host_os} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE2_CONFIGURE_FLAGS) \ - --disable-shared + @stage2_werror_flag@ --disable-shared +@endif gmp-bootstrap + +.PHONY: configure-stageb2g0-gmp maybe-configure-stageb2g0-gmp +maybe-configure-stageb2g0-gmp: +@if gmp-bootstrap +maybe-configure-stageb2g0-gmp: configure-stageb2g0-gmp +configure-stageb2g0-gmp: + @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \ + 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; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/gmp/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + srcdiroption="--srcdir=$${topdir}/gmp"; \ + libsrcdir="$$s/gmp"; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \ + --target=none-${host_vendor}-${host_os} $${srcdiroption} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + @stage2_werror_flag@ --disable-shared @endif gmp-bootstrap .PHONY: configure-stage3-gmp maybe-configure-stage3-gmp @@ -15784,13 +16217,11 @@ configure-stage3-gmp: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE3_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ - 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; \ @@ -15805,8 +16236,38 @@ configure-stage3-gmp: $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \ --target=none-${host_vendor}-${host_os} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE3_CONFIGURE_FLAGS) \ - --disable-shared + @stage2_werror_flag@ --disable-shared +@endif gmp-bootstrap + +.PHONY: configure-stageb3g2-gmp maybe-configure-stageb3g2-gmp +maybe-configure-stageb3g2-gmp: +@if gmp-bootstrap +maybe-configure-stageb3g2-gmp: configure-stageb3g2-gmp +configure-stageb3g2-gmp: + @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \ + 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; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/gmp/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + srcdiroption="--srcdir=$${topdir}/gmp"; \ + libsrcdir="$$s/gmp"; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \ + --target=none-${host_vendor}-${host_os} $${srcdiroption} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + @stage2_werror_flag@ --disable-shared @endif gmp-bootstrap .PHONY: configure-stage4-gmp maybe-configure-stage4-gmp @@ -15818,13 +16279,11 @@ configure-stage4-gmp: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE4_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ - 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; \ @@ -15839,8 +16298,7 @@ configure-stage4-gmp: $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \ --target=none-${host_vendor}-${host_os} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE4_CONFIGURE_FLAGS) \ - --disable-shared + @stage2_werror_flag@ --disable-shared @endif gmp-bootstrap .PHONY: configure-stageprofile-gmp maybe-configure-stageprofile-gmp @@ -15852,13 +16310,11 @@ configure-stageprofile-gmp: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEprofile_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \ + 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; \ @@ -15873,8 +16329,7 @@ configure-stageprofile-gmp: $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \ --target=none-${host_vendor}-${host_os} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEprofile_CONFIGURE_FLAGS) \ - --disable-shared + @stage2_werror_flag@ --disable-shared @endif gmp-bootstrap .PHONY: configure-stagefeedback-gmp maybe-configure-stagefeedback-gmp @@ -15886,13 +16341,11 @@ configure-stagefeedback-gmp: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEfeedback_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \ + 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; \ @@ -15907,8 +16360,7 @@ configure-stagefeedback-gmp: $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \ --target=none-${host_vendor}-${host_os} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEfeedback_CONFIGURE_FLAGS) \ - --disable-shared + @stage2_werror_flag@ --disable-shared @endif gmp-bootstrap @@ -15946,18 +16398,13 @@ all-stage1-gmp: configure-stage1-gmp @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE1_TFLAGS)"; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gmp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" \ - CXXFLAGS="$(STAGE1_CFLAGS)" \ - LIBCFLAGS="$(LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) \ - TFLAGS="$(STAGE1_TFLAGS)" \ + 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 @@ -15987,19 +16434,14 @@ all-stage2-gmp: configure-stage2-gmp @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE2_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gmp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS)" \ - CXXFLAGS="$(STAGE2_CFLAGS)" \ - LIBCFLAGS="$(STAGE2_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGE2_TFLAGS)" \ + 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 @@ -16018,6 +16460,44 @@ clean-stage2-gmp: @endif gmp-bootstrap +.PHONY: all-stageb2g0-gmp maybe-all-stageb2g0-gmp +.PHONY: clean-stageb2g0-gmp maybe-clean-stageb2g0-gmp +maybe-all-stageb2g0-gmp: +maybe-clean-stageb2g0-gmp: +@if gmp-bootstrap +maybe-all-stageb2g0-gmp: all-stageb2g0-gmp +all-stageb2g0: all-stageb2g0-gmp +TARGET-stageb2g0-gmp = $(TARGET-gmp) +all-stageb2g0-gmp: configure-stageb2g0-gmp + @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/gmp && \ + $(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 +clean-stageb2g0: clean-stageb2g0-gmp +clean-stageb2g0-gmp: + @if [ $(current_stage) = stageb2g0 ]; then \ + [ -f $(HOST_SUBDIR)/gmp/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stageb2g0-gmp/Makefile ] || exit 0; \ + $(MAKE) stageb2g0-start; \ + fi; \ + cd $(HOST_SUBDIR)/gmp && \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif gmp-bootstrap + + .PHONY: all-stage3-gmp maybe-all-stage3-gmp .PHONY: clean-stage3-gmp maybe-clean-stage3-gmp maybe-all-stage3-gmp: @@ -16030,19 +16510,14 @@ all-stage3-gmp: configure-stage3-gmp @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE3_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gmp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS)" \ - CXXFLAGS="$(STAGE3_CFLAGS)" \ - LIBCFLAGS="$(STAGE3_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGE3_TFLAGS)" \ + 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 @@ -16061,6 +16536,44 @@ clean-stage3-gmp: @endif gmp-bootstrap +.PHONY: all-stageb3g2-gmp maybe-all-stageb3g2-gmp +.PHONY: clean-stageb3g2-gmp maybe-clean-stageb3g2-gmp +maybe-all-stageb3g2-gmp: +maybe-clean-stageb3g2-gmp: +@if gmp-bootstrap +maybe-all-stageb3g2-gmp: all-stageb3g2-gmp +all-stageb3g2: all-stageb3g2-gmp +TARGET-stageb3g2-gmp = $(TARGET-gmp) +all-stageb3g2-gmp: configure-stageb3g2-gmp + @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/gmp && \ + $(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 +clean-stageb3g2: clean-stageb3g2-gmp +clean-stageb3g2-gmp: + @if [ $(current_stage) = stageb3g2 ]; then \ + [ -f $(HOST_SUBDIR)/gmp/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stageb3g2-gmp/Makefile ] || exit 0; \ + $(MAKE) stageb3g2-start; \ + fi; \ + cd $(HOST_SUBDIR)/gmp && \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif gmp-bootstrap + + .PHONY: all-stage4-gmp maybe-all-stage4-gmp .PHONY: clean-stage4-gmp maybe-clean-stage4-gmp maybe-all-stage4-gmp: @@ -16073,19 +16586,14 @@ all-stage4-gmp: configure-stage4-gmp @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE4_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gmp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE4_CFLAGS)" \ - CXXFLAGS="$(STAGE4_CFLAGS)" \ + CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \ LIBCFLAGS="$(STAGE4_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGE4_TFLAGS)" \ + 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 @@ -16116,19 +16624,14 @@ all-stageprofile-gmp: configure-stageprofile-gmp @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEprofile_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gmp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGEprofile_CFLAGS)" \ - CXXFLAGS="$(STAGEprofile_CFLAGS)" \ - LIBCFLAGS="$(STAGEprofile_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGEprofile_TFLAGS)" \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageprofile-gmp) maybe-clean-stageprofile-gmp: clean-stageprofile-gmp @@ -16159,19 +16662,14 @@ all-stagefeedback-gmp: configure-stagefeedback-gmp @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEfeedback_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gmp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGEfeedback_CFLAGS)" \ - CXXFLAGS="$(STAGEfeedback_CFLAGS)" \ - LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGEfeedback_TFLAGS)" \ + 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 @@ -16584,12 +17082,10 @@ configure-stage1-mpfr: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE1_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(LIBCFLAGS)"; 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; \ @@ -16603,8 +17099,8 @@ configure-stage1-mpfr: $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \ --target=none-${host_vendor}-${host_os} $${srcdiroption} \ - $(STAGE1_CONFIGURE_FLAGS) \ - --disable-shared --with-gmp-build=$$r/$(HOST_SUBDIR)/gmp + \ + --disable-intermodule $(STAGE1_CHECKING) --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" --disable-shared --with-gmp-build=$$r/$(HOST_SUBDIR)/gmp @endif mpfr-bootstrap .PHONY: configure-stage2-mpfr maybe-configure-stage2-mpfr @@ -16616,13 +17112,11 @@ configure-stage2-mpfr: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE2_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ - 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; \ @@ -16637,8 +17131,38 @@ configure-stage2-mpfr: $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \ --target=none-${host_vendor}-${host_os} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE2_CONFIGURE_FLAGS) \ - --disable-shared --with-gmp-build=$$r/$(HOST_SUBDIR)/gmp + @stage2_werror_flag@ --disable-shared --with-gmp-build=$$r/$(HOST_SUBDIR)/gmp +@endif mpfr-bootstrap + +.PHONY: configure-stageb2g0-mpfr maybe-configure-stageb2g0-mpfr +maybe-configure-stageb2g0-mpfr: +@if mpfr-bootstrap +maybe-configure-stageb2g0-mpfr: configure-stageb2g0-mpfr +configure-stageb2g0-mpfr: + @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \ + 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; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/mpfr/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + srcdiroption="--srcdir=$${topdir}/mpfr"; \ + libsrcdir="$$s/mpfr"; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \ + --target=none-${host_vendor}-${host_os} $${srcdiroption} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + @stage2_werror_flag@ --disable-shared --with-gmp-build=$$r/$(HOST_SUBDIR)/gmp @endif mpfr-bootstrap .PHONY: configure-stage3-mpfr maybe-configure-stage3-mpfr @@ -16650,13 +17174,11 @@ configure-stage3-mpfr: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE3_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ - 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; \ @@ -16671,8 +17193,38 @@ configure-stage3-mpfr: $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \ --target=none-${host_vendor}-${host_os} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE3_CONFIGURE_FLAGS) \ - --disable-shared --with-gmp-build=$$r/$(HOST_SUBDIR)/gmp + @stage2_werror_flag@ --disable-shared --with-gmp-build=$$r/$(HOST_SUBDIR)/gmp +@endif mpfr-bootstrap + +.PHONY: configure-stageb3g2-mpfr maybe-configure-stageb3g2-mpfr +maybe-configure-stageb3g2-mpfr: +@if mpfr-bootstrap +maybe-configure-stageb3g2-mpfr: configure-stageb3g2-mpfr +configure-stageb3g2-mpfr: + @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \ + 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; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/mpfr/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + srcdiroption="--srcdir=$${topdir}/mpfr"; \ + libsrcdir="$$s/mpfr"; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \ + --target=none-${host_vendor}-${host_os} $${srcdiroption} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + @stage2_werror_flag@ --disable-shared --with-gmp-build=$$r/$(HOST_SUBDIR)/gmp @endif mpfr-bootstrap .PHONY: configure-stage4-mpfr maybe-configure-stage4-mpfr @@ -16684,13 +17236,11 @@ configure-stage4-mpfr: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE4_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ - 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; \ @@ -16705,8 +17255,7 @@ configure-stage4-mpfr: $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \ --target=none-${host_vendor}-${host_os} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE4_CONFIGURE_FLAGS) \ - --disable-shared --with-gmp-build=$$r/$(HOST_SUBDIR)/gmp + @stage2_werror_flag@ --disable-shared --with-gmp-build=$$r/$(HOST_SUBDIR)/gmp @endif mpfr-bootstrap .PHONY: configure-stageprofile-mpfr maybe-configure-stageprofile-mpfr @@ -16718,13 +17267,11 @@ configure-stageprofile-mpfr: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEprofile_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \ + 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; \ @@ -16739,8 +17286,7 @@ configure-stageprofile-mpfr: $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \ --target=none-${host_vendor}-${host_os} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEprofile_CONFIGURE_FLAGS) \ - --disable-shared --with-gmp-build=$$r/$(HOST_SUBDIR)/gmp + @stage2_werror_flag@ --disable-shared --with-gmp-build=$$r/$(HOST_SUBDIR)/gmp @endif mpfr-bootstrap .PHONY: configure-stagefeedback-mpfr maybe-configure-stagefeedback-mpfr @@ -16752,13 +17298,11 @@ configure-stagefeedback-mpfr: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEfeedback_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \ + 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; \ @@ -16773,8 +17317,7 @@ configure-stagefeedback-mpfr: $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \ --target=none-${host_vendor}-${host_os} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEfeedback_CONFIGURE_FLAGS) \ - --disable-shared --with-gmp-build=$$r/$(HOST_SUBDIR)/gmp + @stage2_werror_flag@ --disable-shared --with-gmp-build=$$r/$(HOST_SUBDIR)/gmp @endif mpfr-bootstrap @@ -16812,18 +17355,13 @@ all-stage1-mpfr: configure-stage1-mpfr @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE1_TFLAGS)"; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/mpfr && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" \ - CXXFLAGS="$(STAGE1_CFLAGS)" \ - LIBCFLAGS="$(LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) \ - TFLAGS="$(STAGE1_TFLAGS)" \ + 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 @@ -16853,19 +17391,14 @@ all-stage2-mpfr: configure-stage2-mpfr @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE2_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/mpfr && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS)" \ - CXXFLAGS="$(STAGE2_CFLAGS)" \ - LIBCFLAGS="$(STAGE2_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGE2_TFLAGS)" \ + 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 @@ -16884,6 +17417,44 @@ clean-stage2-mpfr: @endif mpfr-bootstrap +.PHONY: all-stageb2g0-mpfr maybe-all-stageb2g0-mpfr +.PHONY: clean-stageb2g0-mpfr maybe-clean-stageb2g0-mpfr +maybe-all-stageb2g0-mpfr: +maybe-clean-stageb2g0-mpfr: +@if mpfr-bootstrap +maybe-all-stageb2g0-mpfr: all-stageb2g0-mpfr +all-stageb2g0: all-stageb2g0-mpfr +TARGET-stageb2g0-mpfr = $(TARGET-mpfr) +all-stageb2g0-mpfr: configure-stageb2g0-mpfr + @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/mpfr && \ + $(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 +clean-stageb2g0: clean-stageb2g0-mpfr +clean-stageb2g0-mpfr: + @if [ $(current_stage) = stageb2g0 ]; then \ + [ -f $(HOST_SUBDIR)/mpfr/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stageb2g0-mpfr/Makefile ] || exit 0; \ + $(MAKE) stageb2g0-start; \ + fi; \ + cd $(HOST_SUBDIR)/mpfr && \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif mpfr-bootstrap + + .PHONY: all-stage3-mpfr maybe-all-stage3-mpfr .PHONY: clean-stage3-mpfr maybe-clean-stage3-mpfr maybe-all-stage3-mpfr: @@ -16896,19 +17467,14 @@ all-stage3-mpfr: configure-stage3-mpfr @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE3_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/mpfr && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS)" \ - CXXFLAGS="$(STAGE3_CFLAGS)" \ - LIBCFLAGS="$(STAGE3_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGE3_TFLAGS)" \ + 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 @@ -16927,6 +17493,44 @@ clean-stage3-mpfr: @endif mpfr-bootstrap +.PHONY: all-stageb3g2-mpfr maybe-all-stageb3g2-mpfr +.PHONY: clean-stageb3g2-mpfr maybe-clean-stageb3g2-mpfr +maybe-all-stageb3g2-mpfr: +maybe-clean-stageb3g2-mpfr: +@if mpfr-bootstrap +maybe-all-stageb3g2-mpfr: all-stageb3g2-mpfr +all-stageb3g2: all-stageb3g2-mpfr +TARGET-stageb3g2-mpfr = $(TARGET-mpfr) +all-stageb3g2-mpfr: configure-stageb3g2-mpfr + @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/mpfr && \ + $(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 +clean-stageb3g2: clean-stageb3g2-mpfr +clean-stageb3g2-mpfr: + @if [ $(current_stage) = stageb3g2 ]; then \ + [ -f $(HOST_SUBDIR)/mpfr/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stageb3g2-mpfr/Makefile ] || exit 0; \ + $(MAKE) stageb3g2-start; \ + fi; \ + cd $(HOST_SUBDIR)/mpfr && \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif mpfr-bootstrap + + .PHONY: all-stage4-mpfr maybe-all-stage4-mpfr .PHONY: clean-stage4-mpfr maybe-clean-stage4-mpfr maybe-all-stage4-mpfr: @@ -16939,19 +17543,14 @@ all-stage4-mpfr: configure-stage4-mpfr @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE4_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/mpfr && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE4_CFLAGS)" \ - CXXFLAGS="$(STAGE4_CFLAGS)" \ + CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \ LIBCFLAGS="$(STAGE4_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGE4_TFLAGS)" \ + 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 @@ -16982,19 +17581,14 @@ all-stageprofile-mpfr: configure-stageprofile-mpfr @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEprofile_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/mpfr && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGEprofile_CFLAGS)" \ - CXXFLAGS="$(STAGEprofile_CFLAGS)" \ - LIBCFLAGS="$(STAGEprofile_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGEprofile_TFLAGS)" \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageprofile-mpfr) maybe-clean-stageprofile-mpfr: clean-stageprofile-mpfr @@ -17025,19 +17619,14 @@ all-stagefeedback-mpfr: configure-stagefeedback-mpfr @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEfeedback_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/mpfr && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGEfeedback_CFLAGS)" \ - CXXFLAGS="$(STAGEfeedback_CFLAGS)" \ - LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGEfeedback_TFLAGS)" \ + 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 @@ -17450,12 +18039,10 @@ configure-stage1-ppl: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE1_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/ppl/Makefile || exit 0; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 1 in $(HOST_SUBDIR)/ppl ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl ; \ cd $(HOST_SUBDIR)/ppl || exit 1; \ @@ -17469,8 +18056,8 @@ configure-stage1-ppl: $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \ --target=none-${host_vendor}-${host_os} $${srcdiroption} \ - $(STAGE1_CONFIGURE_FLAGS) \ - --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/ + \ + --disable-intermodule $(STAGE1_CHECKING) --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/ @endif ppl-bootstrap .PHONY: configure-stage2-ppl maybe-configure-stage2-ppl @@ -17482,13 +18069,11 @@ configure-stage2-ppl: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE2_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/ppl/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 2 in $(HOST_SUBDIR)/ppl ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl ; \ cd $(HOST_SUBDIR)/ppl || exit 1; \ @@ -17503,8 +18088,38 @@ configure-stage2-ppl: $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \ --target=none-${host_vendor}-${host_os} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE2_CONFIGURE_FLAGS) \ - --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/ + @stage2_werror_flag@ --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/ +@endif ppl-bootstrap + +.PHONY: configure-stageb2g0-ppl maybe-configure-stageb2g0-ppl +maybe-configure-stageb2g0-ppl: +@if ppl-bootstrap +maybe-configure-stageb2g0-ppl: configure-stageb2g0-ppl +configure-stageb2g0-ppl: + @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + test ! -f $(HOST_SUBDIR)/ppl/Makefile || exit 0; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS; \ + echo Configuring stage b2g0 in $(HOST_SUBDIR)/ppl ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl ; \ + cd $(HOST_SUBDIR)/ppl || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/ppl/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + srcdiroption="--srcdir=$${topdir}/ppl"; \ + libsrcdir="$$s/ppl"; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \ + --target=none-${host_vendor}-${host_os} $${srcdiroption} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + @stage2_werror_flag@ --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/ @endif ppl-bootstrap .PHONY: configure-stage3-ppl maybe-configure-stage3-ppl @@ -17516,13 +18131,11 @@ configure-stage3-ppl: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE3_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/ppl/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 3 in $(HOST_SUBDIR)/ppl ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl ; \ cd $(HOST_SUBDIR)/ppl || exit 1; \ @@ -17537,8 +18150,38 @@ configure-stage3-ppl: $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \ --target=none-${host_vendor}-${host_os} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE3_CONFIGURE_FLAGS) \ - --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/ + @stage2_werror_flag@ --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/ +@endif ppl-bootstrap + +.PHONY: configure-stageb3g2-ppl maybe-configure-stageb3g2-ppl +maybe-configure-stageb3g2-ppl: +@if ppl-bootstrap +maybe-configure-stageb3g2-ppl: configure-stageb3g2-ppl +configure-stageb3g2-ppl: + @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + test ! -f $(HOST_SUBDIR)/ppl/Makefile || exit 0; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS; \ + echo Configuring stage b3g2 in $(HOST_SUBDIR)/ppl ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl ; \ + cd $(HOST_SUBDIR)/ppl || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/ppl/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + srcdiroption="--srcdir=$${topdir}/ppl"; \ + libsrcdir="$$s/ppl"; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \ + --target=none-${host_vendor}-${host_os} $${srcdiroption} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + @stage2_werror_flag@ --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/ @endif ppl-bootstrap .PHONY: configure-stage4-ppl maybe-configure-stage4-ppl @@ -17550,13 +18193,11 @@ configure-stage4-ppl: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE4_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/ppl/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 4 in $(HOST_SUBDIR)/ppl ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl ; \ cd $(HOST_SUBDIR)/ppl || exit 1; \ @@ -17571,8 +18212,7 @@ configure-stage4-ppl: $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \ --target=none-${host_vendor}-${host_os} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE4_CONFIGURE_FLAGS) \ - --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/ + @stage2_werror_flag@ --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/ @endif ppl-bootstrap .PHONY: configure-stageprofile-ppl maybe-configure-stageprofile-ppl @@ -17584,13 +18224,11 @@ configure-stageprofile-ppl: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEprofile_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/ppl/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \ echo Configuring stage profile in $(HOST_SUBDIR)/ppl ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl ; \ cd $(HOST_SUBDIR)/ppl || exit 1; \ @@ -17605,8 +18243,7 @@ configure-stageprofile-ppl: $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \ --target=none-${host_vendor}-${host_os} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEprofile_CONFIGURE_FLAGS) \ - --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/ + @stage2_werror_flag@ --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/ @endif ppl-bootstrap .PHONY: configure-stagefeedback-ppl maybe-configure-stagefeedback-ppl @@ -17618,13 +18255,11 @@ configure-stagefeedback-ppl: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEfeedback_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/ppl/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \ echo Configuring stage feedback in $(HOST_SUBDIR)/ppl ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl ; \ cd $(HOST_SUBDIR)/ppl || exit 1; \ @@ -17639,8 +18274,7 @@ configure-stagefeedback-ppl: $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \ --target=none-${host_vendor}-${host_os} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEfeedback_CONFIGURE_FLAGS) \ - --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/ + @stage2_werror_flag@ --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/ @endif ppl-bootstrap @@ -17678,18 +18312,13 @@ all-stage1-ppl: configure-stage1-ppl @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE1_TFLAGS)"; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/ppl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" \ - CXXFLAGS="$(STAGE1_CFLAGS)" \ - LIBCFLAGS="$(LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) \ - TFLAGS="$(STAGE1_TFLAGS)" \ + CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \ + LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \ $(TARGET-stage1-ppl) maybe-clean-stage1-ppl: clean-stage1-ppl @@ -17719,19 +18348,14 @@ all-stage2-ppl: configure-stage2-ppl @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE2_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/ppl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS)" \ - CXXFLAGS="$(STAGE2_CFLAGS)" \ - LIBCFLAGS="$(STAGE2_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGE2_TFLAGS)" \ + 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-ppl) maybe-clean-stage2-ppl: clean-stage2-ppl @@ -17750,6 +18374,44 @@ clean-stage2-ppl: @endif ppl-bootstrap +.PHONY: all-stageb2g0-ppl maybe-all-stageb2g0-ppl +.PHONY: clean-stageb2g0-ppl maybe-clean-stageb2g0-ppl +maybe-all-stageb2g0-ppl: +maybe-clean-stageb2g0-ppl: +@if ppl-bootstrap +maybe-all-stageb2g0-ppl: all-stageb2g0-ppl +all-stageb2g0: all-stageb2g0-ppl +TARGET-stageb2g0-ppl = $(TARGET-ppl) +all-stageb2g0-ppl: configure-stageb2g0-ppl + @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/ppl && \ + $(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-ppl) + +maybe-clean-stageb2g0-ppl: clean-stageb2g0-ppl +clean-stageb2g0: clean-stageb2g0-ppl +clean-stageb2g0-ppl: + @if [ $(current_stage) = stageb2g0 ]; then \ + [ -f $(HOST_SUBDIR)/ppl/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stageb2g0-ppl/Makefile ] || exit 0; \ + $(MAKE) stageb2g0-start; \ + fi; \ + cd $(HOST_SUBDIR)/ppl && \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif ppl-bootstrap + + .PHONY: all-stage3-ppl maybe-all-stage3-ppl .PHONY: clean-stage3-ppl maybe-clean-stage3-ppl maybe-all-stage3-ppl: @@ -17762,19 +18424,14 @@ all-stage3-ppl: configure-stage3-ppl @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE3_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/ppl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS)" \ - CXXFLAGS="$(STAGE3_CFLAGS)" \ - LIBCFLAGS="$(STAGE3_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGE3_TFLAGS)" \ + 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-ppl) maybe-clean-stage3-ppl: clean-stage3-ppl @@ -17793,6 +18450,44 @@ clean-stage3-ppl: @endif ppl-bootstrap +.PHONY: all-stageb3g2-ppl maybe-all-stageb3g2-ppl +.PHONY: clean-stageb3g2-ppl maybe-clean-stageb3g2-ppl +maybe-all-stageb3g2-ppl: +maybe-clean-stageb3g2-ppl: +@if ppl-bootstrap +maybe-all-stageb3g2-ppl: all-stageb3g2-ppl +all-stageb3g2: all-stageb3g2-ppl +TARGET-stageb3g2-ppl = $(TARGET-ppl) +all-stageb3g2-ppl: configure-stageb3g2-ppl + @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/ppl && \ + $(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-ppl) + +maybe-clean-stageb3g2-ppl: clean-stageb3g2-ppl +clean-stageb3g2: clean-stageb3g2-ppl +clean-stageb3g2-ppl: + @if [ $(current_stage) = stageb3g2 ]; then \ + [ -f $(HOST_SUBDIR)/ppl/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stageb3g2-ppl/Makefile ] || exit 0; \ + $(MAKE) stageb3g2-start; \ + fi; \ + cd $(HOST_SUBDIR)/ppl && \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif ppl-bootstrap + + .PHONY: all-stage4-ppl maybe-all-stage4-ppl .PHONY: clean-stage4-ppl maybe-clean-stage4-ppl maybe-all-stage4-ppl: @@ -17805,19 +18500,14 @@ all-stage4-ppl: configure-stage4-ppl @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE4_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/ppl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE4_CFLAGS)" \ - CXXFLAGS="$(STAGE4_CFLAGS)" \ + CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \ LIBCFLAGS="$(STAGE4_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGE4_TFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stage4-ppl) maybe-clean-stage4-ppl: clean-stage4-ppl @@ -17848,19 +18538,14 @@ all-stageprofile-ppl: configure-stageprofile-ppl @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEprofile_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/ppl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGEprofile_CFLAGS)" \ - CXXFLAGS="$(STAGEprofile_CFLAGS)" \ - LIBCFLAGS="$(STAGEprofile_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGEprofile_TFLAGS)" \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageprofile-ppl) maybe-clean-stageprofile-ppl: clean-stageprofile-ppl @@ -17891,19 +18576,14 @@ all-stagefeedback-ppl: configure-stagefeedback-ppl @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEfeedback_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/ppl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGEfeedback_CFLAGS)" \ - CXXFLAGS="$(STAGEfeedback_CFLAGS)" \ - LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGEfeedback_TFLAGS)" \ + 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-ppl) maybe-clean-stagefeedback-ppl: clean-stagefeedback-ppl @@ -18316,12 +18996,10 @@ configure-stage1-cloog: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE1_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/cloog/Makefile || exit 0; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 1 in $(HOST_SUBDIR)/cloog ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \ cd $(HOST_SUBDIR)/cloog || exit 1; \ @@ -18335,8 +19013,8 @@ configure-stage1-cloog: $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \ --target=none-${host_vendor}-${host_os} $${srcdiroption} \ - $(STAGE1_CONFIGURE_FLAGS) \ - --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-ppl=$$r/$(HOST_SUBDIR)/ppl/ --with-bits=gmp + \ + --disable-intermodule $(STAGE1_CHECKING) --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-ppl=$$r/$(HOST_SUBDIR)/ppl/ --with-bits=gmp @endif cloog-bootstrap .PHONY: configure-stage2-cloog maybe-configure-stage2-cloog @@ -18348,13 +19026,11 @@ configure-stage2-cloog: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE2_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/cloog/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 2 in $(HOST_SUBDIR)/cloog ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \ cd $(HOST_SUBDIR)/cloog || exit 1; \ @@ -18369,8 +19045,38 @@ configure-stage2-cloog: $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \ --target=none-${host_vendor}-${host_os} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE2_CONFIGURE_FLAGS) \ - --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-ppl=$$r/$(HOST_SUBDIR)/ppl/ --with-bits=gmp + @stage2_werror_flag@ --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-ppl=$$r/$(HOST_SUBDIR)/ppl/ --with-bits=gmp +@endif cloog-bootstrap + +.PHONY: configure-stageb2g0-cloog maybe-configure-stageb2g0-cloog +maybe-configure-stageb2g0-cloog: +@if cloog-bootstrap +maybe-configure-stageb2g0-cloog: configure-stageb2g0-cloog +configure-stageb2g0-cloog: + @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + test ! -f $(HOST_SUBDIR)/cloog/Makefile || exit 0; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS; \ + echo Configuring stage b2g0 in $(HOST_SUBDIR)/cloog ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \ + cd $(HOST_SUBDIR)/cloog || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/cloog/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + srcdiroption="--srcdir=$${topdir}/cloog"; \ + libsrcdir="$$s/cloog"; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \ + --target=none-${host_vendor}-${host_os} $${srcdiroption} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + @stage2_werror_flag@ --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-ppl=$$r/$(HOST_SUBDIR)/ppl/ --with-bits=gmp @endif cloog-bootstrap .PHONY: configure-stage3-cloog maybe-configure-stage3-cloog @@ -18382,13 +19088,11 @@ configure-stage3-cloog: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE3_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/cloog/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 3 in $(HOST_SUBDIR)/cloog ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \ cd $(HOST_SUBDIR)/cloog || exit 1; \ @@ -18403,8 +19107,38 @@ configure-stage3-cloog: $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \ --target=none-${host_vendor}-${host_os} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE3_CONFIGURE_FLAGS) \ - --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-ppl=$$r/$(HOST_SUBDIR)/ppl/ --with-bits=gmp + @stage2_werror_flag@ --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-ppl=$$r/$(HOST_SUBDIR)/ppl/ --with-bits=gmp +@endif cloog-bootstrap + +.PHONY: configure-stageb3g2-cloog maybe-configure-stageb3g2-cloog +maybe-configure-stageb3g2-cloog: +@if cloog-bootstrap +maybe-configure-stageb3g2-cloog: configure-stageb3g2-cloog +configure-stageb3g2-cloog: + @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + test ! -f $(HOST_SUBDIR)/cloog/Makefile || exit 0; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS; \ + echo Configuring stage b3g2 in $(HOST_SUBDIR)/cloog ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \ + cd $(HOST_SUBDIR)/cloog || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/cloog/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + srcdiroption="--srcdir=$${topdir}/cloog"; \ + libsrcdir="$$s/cloog"; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \ + --target=none-${host_vendor}-${host_os} $${srcdiroption} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + @stage2_werror_flag@ --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-ppl=$$r/$(HOST_SUBDIR)/ppl/ --with-bits=gmp @endif cloog-bootstrap .PHONY: configure-stage4-cloog maybe-configure-stage4-cloog @@ -18416,13 +19150,11 @@ configure-stage4-cloog: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE4_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/cloog/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 4 in $(HOST_SUBDIR)/cloog ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \ cd $(HOST_SUBDIR)/cloog || exit 1; \ @@ -18437,8 +19169,7 @@ configure-stage4-cloog: $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \ --target=none-${host_vendor}-${host_os} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE4_CONFIGURE_FLAGS) \ - --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-ppl=$$r/$(HOST_SUBDIR)/ppl/ --with-bits=gmp + @stage2_werror_flag@ --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-ppl=$$r/$(HOST_SUBDIR)/ppl/ --with-bits=gmp @endif cloog-bootstrap .PHONY: configure-stageprofile-cloog maybe-configure-stageprofile-cloog @@ -18450,13 +19181,11 @@ configure-stageprofile-cloog: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEprofile_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/cloog/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \ echo Configuring stage profile in $(HOST_SUBDIR)/cloog ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \ cd $(HOST_SUBDIR)/cloog || exit 1; \ @@ -18471,8 +19200,7 @@ configure-stageprofile-cloog: $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \ --target=none-${host_vendor}-${host_os} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEprofile_CONFIGURE_FLAGS) \ - --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-ppl=$$r/$(HOST_SUBDIR)/ppl/ --with-bits=gmp + @stage2_werror_flag@ --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-ppl=$$r/$(HOST_SUBDIR)/ppl/ --with-bits=gmp @endif cloog-bootstrap .PHONY: configure-stagefeedback-cloog maybe-configure-stagefeedback-cloog @@ -18484,13 +19212,11 @@ configure-stagefeedback-cloog: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEfeedback_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/cloog/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \ echo Configuring stage feedback in $(HOST_SUBDIR)/cloog ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \ cd $(HOST_SUBDIR)/cloog || exit 1; \ @@ -18505,8 +19231,7 @@ configure-stagefeedback-cloog: $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \ --target=none-${host_vendor}-${host_os} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEfeedback_CONFIGURE_FLAGS) \ - --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-ppl=$$r/$(HOST_SUBDIR)/ppl/ --with-bits=gmp + @stage2_werror_flag@ --disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-ppl=$$r/$(HOST_SUBDIR)/ppl/ --with-bits=gmp @endif cloog-bootstrap @@ -18544,18 +19269,13 @@ all-stage1-cloog: configure-stage1-cloog @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE1_TFLAGS)"; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/cloog && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" \ - CXXFLAGS="$(STAGE1_CFLAGS)" \ - LIBCFLAGS="$(LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) \ - TFLAGS="$(STAGE1_TFLAGS)" \ + CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \ + LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \ $(TARGET-stage1-cloog) maybe-clean-stage1-cloog: clean-stage1-cloog @@ -18585,19 +19305,14 @@ all-stage2-cloog: configure-stage2-cloog @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE2_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/cloog && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS)" \ - CXXFLAGS="$(STAGE2_CFLAGS)" \ - LIBCFLAGS="$(STAGE2_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGE2_TFLAGS)" \ + 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-cloog) maybe-clean-stage2-cloog: clean-stage2-cloog @@ -18616,6 +19331,44 @@ clean-stage2-cloog: @endif cloog-bootstrap +.PHONY: all-stageb2g0-cloog maybe-all-stageb2g0-cloog +.PHONY: clean-stageb2g0-cloog maybe-clean-stageb2g0-cloog +maybe-all-stageb2g0-cloog: +maybe-clean-stageb2g0-cloog: +@if cloog-bootstrap +maybe-all-stageb2g0-cloog: all-stageb2g0-cloog +all-stageb2g0: all-stageb2g0-cloog +TARGET-stageb2g0-cloog = $(TARGET-cloog) +all-stageb2g0-cloog: configure-stageb2g0-cloog + @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/cloog && \ + $(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-cloog) + +maybe-clean-stageb2g0-cloog: clean-stageb2g0-cloog +clean-stageb2g0: clean-stageb2g0-cloog +clean-stageb2g0-cloog: + @if [ $(current_stage) = stageb2g0 ]; then \ + [ -f $(HOST_SUBDIR)/cloog/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stageb2g0-cloog/Makefile ] || exit 0; \ + $(MAKE) stageb2g0-start; \ + fi; \ + cd $(HOST_SUBDIR)/cloog && \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif cloog-bootstrap + + .PHONY: all-stage3-cloog maybe-all-stage3-cloog .PHONY: clean-stage3-cloog maybe-clean-stage3-cloog maybe-all-stage3-cloog: @@ -18628,19 +19381,14 @@ all-stage3-cloog: configure-stage3-cloog @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE3_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/cloog && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS)" \ - CXXFLAGS="$(STAGE3_CFLAGS)" \ - LIBCFLAGS="$(STAGE3_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGE3_TFLAGS)" \ + 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-cloog) maybe-clean-stage3-cloog: clean-stage3-cloog @@ -18659,6 +19407,44 @@ clean-stage3-cloog: @endif cloog-bootstrap +.PHONY: all-stageb3g2-cloog maybe-all-stageb3g2-cloog +.PHONY: clean-stageb3g2-cloog maybe-clean-stageb3g2-cloog +maybe-all-stageb3g2-cloog: +maybe-clean-stageb3g2-cloog: +@if cloog-bootstrap +maybe-all-stageb3g2-cloog: all-stageb3g2-cloog +all-stageb3g2: all-stageb3g2-cloog +TARGET-stageb3g2-cloog = $(TARGET-cloog) +all-stageb3g2-cloog: configure-stageb3g2-cloog + @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/cloog && \ + $(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-cloog) + +maybe-clean-stageb3g2-cloog: clean-stageb3g2-cloog +clean-stageb3g2: clean-stageb3g2-cloog +clean-stageb3g2-cloog: + @if [ $(current_stage) = stageb3g2 ]; then \ + [ -f $(HOST_SUBDIR)/cloog/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stageb3g2-cloog/Makefile ] || exit 0; \ + $(MAKE) stageb3g2-start; \ + fi; \ + cd $(HOST_SUBDIR)/cloog && \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif cloog-bootstrap + + .PHONY: all-stage4-cloog maybe-all-stage4-cloog .PHONY: clean-stage4-cloog maybe-clean-stage4-cloog maybe-all-stage4-cloog: @@ -18671,19 +19457,14 @@ all-stage4-cloog: configure-stage4-cloog @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE4_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/cloog && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE4_CFLAGS)" \ - CXXFLAGS="$(STAGE4_CFLAGS)" \ + CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \ LIBCFLAGS="$(STAGE4_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGE4_TFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stage4-cloog) maybe-clean-stage4-cloog: clean-stage4-cloog @@ -18714,19 +19495,14 @@ all-stageprofile-cloog: configure-stageprofile-cloog @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEprofile_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/cloog && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGEprofile_CFLAGS)" \ - CXXFLAGS="$(STAGEprofile_CFLAGS)" \ - LIBCFLAGS="$(STAGEprofile_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGEprofile_TFLAGS)" \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageprofile-cloog) maybe-clean-stageprofile-cloog: clean-stageprofile-cloog @@ -18757,19 +19533,14 @@ all-stagefeedback-cloog: configure-stagefeedback-cloog @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEfeedback_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/cloog && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGEfeedback_CFLAGS)" \ - CXXFLAGS="$(STAGEfeedback_CFLAGS)" \ - LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGEfeedback_TFLAGS)" \ + 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-cloog) maybe-clean-stagefeedback-cloog: clean-stagefeedback-cloog @@ -19607,12 +20378,10 @@ configure-stage1-gold: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE1_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 1 in $(HOST_SUBDIR)/gold ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \ cd $(HOST_SUBDIR)/gold || exit 1; \ @@ -19626,7 +20395,8 @@ configure-stage1-gold: $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ - $(STAGE1_CONFIGURE_FLAGS) + \ + --disable-intermodule $(STAGE1_CHECKING) --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" @endif gold-bootstrap .PHONY: configure-stage2-gold maybe-configure-stage2-gold @@ -19638,13 +20408,11 @@ configure-stage2-gold: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE2_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 2 in $(HOST_SUBDIR)/gold ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \ cd $(HOST_SUBDIR)/gold || exit 1; \ @@ -19659,7 +20427,38 @@ configure-stage2-gold: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE2_CONFIGURE_FLAGS) + @stage2_werror_flag@ +@endif gold-bootstrap + +.PHONY: configure-stageb2g0-gold maybe-configure-stageb2g0-gold +maybe-configure-stageb2g0-gold: +@if gold-bootstrap +maybe-configure-stageb2g0-gold: configure-stageb2g0-gold +configure-stageb2g0-gold: + @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS; \ + echo Configuring stage b2g0 in $(HOST_SUBDIR)/gold ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \ + cd $(HOST_SUBDIR)/gold || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/gold/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + srcdiroption="--srcdir=$${topdir}/gold"; \ + libsrcdir="$$s/gold"; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} $${srcdiroption} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + @stage2_werror_flag@ @endif gold-bootstrap .PHONY: configure-stage3-gold maybe-configure-stage3-gold @@ -19671,13 +20470,11 @@ configure-stage3-gold: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE3_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 3 in $(HOST_SUBDIR)/gold ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \ cd $(HOST_SUBDIR)/gold || exit 1; \ @@ -19692,7 +20489,38 @@ configure-stage3-gold: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE3_CONFIGURE_FLAGS) + @stage2_werror_flag@ +@endif gold-bootstrap + +.PHONY: configure-stageb3g2-gold maybe-configure-stageb3g2-gold +maybe-configure-stageb3g2-gold: +@if gold-bootstrap +maybe-configure-stageb3g2-gold: configure-stageb3g2-gold +configure-stageb3g2-gold: + @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS; \ + echo Configuring stage b3g2 in $(HOST_SUBDIR)/gold ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \ + cd $(HOST_SUBDIR)/gold || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/gold/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + srcdiroption="--srcdir=$${topdir}/gold"; \ + libsrcdir="$$s/gold"; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} $${srcdiroption} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + @stage2_werror_flag@ @endif gold-bootstrap .PHONY: configure-stage4-gold maybe-configure-stage4-gold @@ -19704,13 +20532,11 @@ configure-stage4-gold: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE4_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 4 in $(HOST_SUBDIR)/gold ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \ cd $(HOST_SUBDIR)/gold || exit 1; \ @@ -19725,7 +20551,7 @@ configure-stage4-gold: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE4_CONFIGURE_FLAGS) + @stage2_werror_flag@ @endif gold-bootstrap .PHONY: configure-stageprofile-gold maybe-configure-stageprofile-gold @@ -19737,13 +20563,11 @@ configure-stageprofile-gold: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEprofile_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \ echo Configuring stage profile in $(HOST_SUBDIR)/gold ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \ cd $(HOST_SUBDIR)/gold || exit 1; \ @@ -19758,7 +20582,7 @@ configure-stageprofile-gold: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEprofile_CONFIGURE_FLAGS) + @stage2_werror_flag@ @endif gold-bootstrap .PHONY: configure-stagefeedback-gold maybe-configure-stagefeedback-gold @@ -19770,13 +20594,11 @@ configure-stagefeedback-gold: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEfeedback_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \ echo Configuring stage feedback in $(HOST_SUBDIR)/gold ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \ cd $(HOST_SUBDIR)/gold || exit 1; \ @@ -19791,7 +20613,7 @@ configure-stagefeedback-gold: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEfeedback_CONFIGURE_FLAGS) + @stage2_werror_flag@ @endif gold-bootstrap @@ -19829,18 +20651,13 @@ all-stage1-gold: configure-stage1-gold @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE1_TFLAGS)"; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gold && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" \ - CXXFLAGS="$(STAGE1_CFLAGS)" \ - LIBCFLAGS="$(LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) \ - TFLAGS="$(STAGE1_TFLAGS)" \ + CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \ + LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \ $(TARGET-stage1-gold) maybe-clean-stage1-gold: clean-stage1-gold @@ -19870,19 +20687,14 @@ all-stage2-gold: configure-stage2-gold @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE2_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gold && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS)" \ - CXXFLAGS="$(STAGE2_CFLAGS)" \ - LIBCFLAGS="$(STAGE2_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGE2_TFLAGS)" \ + 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-gold) maybe-clean-stage2-gold: clean-stage2-gold @@ -19901,6 +20713,44 @@ clean-stage2-gold: @endif gold-bootstrap +.PHONY: all-stageb2g0-gold maybe-all-stageb2g0-gold +.PHONY: clean-stageb2g0-gold maybe-clean-stageb2g0-gold +maybe-all-stageb2g0-gold: +maybe-clean-stageb2g0-gold: +@if gold-bootstrap +maybe-all-stageb2g0-gold: all-stageb2g0-gold +all-stageb2g0: all-stageb2g0-gold +TARGET-stageb2g0-gold = $(TARGET-gold) +all-stageb2g0-gold: configure-stageb2g0-gold + @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/gold && \ + $(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-gold) + +maybe-clean-stageb2g0-gold: clean-stageb2g0-gold +clean-stageb2g0: clean-stageb2g0-gold +clean-stageb2g0-gold: + @if [ $(current_stage) = stageb2g0 ]; then \ + [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stageb2g0-gold/Makefile ] || exit 0; \ + $(MAKE) stageb2g0-start; \ + fi; \ + cd $(HOST_SUBDIR)/gold && \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif gold-bootstrap + + .PHONY: all-stage3-gold maybe-all-stage3-gold .PHONY: clean-stage3-gold maybe-clean-stage3-gold maybe-all-stage3-gold: @@ -19913,19 +20763,14 @@ all-stage3-gold: configure-stage3-gold @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE3_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gold && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS)" \ - CXXFLAGS="$(STAGE3_CFLAGS)" \ - LIBCFLAGS="$(STAGE3_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGE3_TFLAGS)" \ + 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-gold) maybe-clean-stage3-gold: clean-stage3-gold @@ -19944,6 +20789,44 @@ clean-stage3-gold: @endif gold-bootstrap +.PHONY: all-stageb3g2-gold maybe-all-stageb3g2-gold +.PHONY: clean-stageb3g2-gold maybe-clean-stageb3g2-gold +maybe-all-stageb3g2-gold: +maybe-clean-stageb3g2-gold: +@if gold-bootstrap +maybe-all-stageb3g2-gold: all-stageb3g2-gold +all-stageb3g2: all-stageb3g2-gold +TARGET-stageb3g2-gold = $(TARGET-gold) +all-stageb3g2-gold: configure-stageb3g2-gold + @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/gold && \ + $(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-gold) + +maybe-clean-stageb3g2-gold: clean-stageb3g2-gold +clean-stageb3g2: clean-stageb3g2-gold +clean-stageb3g2-gold: + @if [ $(current_stage) = stageb3g2 ]; then \ + [ -f $(HOST_SUBDIR)/gold/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stageb3g2-gold/Makefile ] || exit 0; \ + $(MAKE) stageb3g2-start; \ + fi; \ + cd $(HOST_SUBDIR)/gold && \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif gold-bootstrap + + .PHONY: all-stage4-gold maybe-all-stage4-gold .PHONY: clean-stage4-gold maybe-clean-stage4-gold maybe-all-stage4-gold: @@ -19956,19 +20839,14 @@ all-stage4-gold: configure-stage4-gold @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE4_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gold && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE4_CFLAGS)" \ - CXXFLAGS="$(STAGE4_CFLAGS)" \ + CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \ LIBCFLAGS="$(STAGE4_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGE4_TFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stage4-gold) maybe-clean-stage4-gold: clean-stage4-gold @@ -19999,19 +20877,14 @@ all-stageprofile-gold: configure-stageprofile-gold @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEprofile_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gold && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGEprofile_CFLAGS)" \ - CXXFLAGS="$(STAGEprofile_CFLAGS)" \ - LIBCFLAGS="$(STAGEprofile_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGEprofile_TFLAGS)" \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageprofile-gold) maybe-clean-stageprofile-gold: clean-stageprofile-gold @@ -20042,19 +20915,14 @@ all-stagefeedback-gold: configure-stagefeedback-gold @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEfeedback_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gold && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGEfeedback_CFLAGS)" \ - CXXFLAGS="$(STAGEfeedback_CFLAGS)" \ - LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGEfeedback_TFLAGS)" \ + 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-gold) maybe-clean-stagefeedback-gold: clean-stagefeedback-gold @@ -22173,12 +23041,10 @@ configure-stage1-intl: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE1_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(LIBCFLAGS)"; 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; \ @@ -22192,7 +23058,8 @@ configure-stage1-intl: $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ - $(STAGE1_CONFIGURE_FLAGS) + \ + --disable-intermodule $(STAGE1_CHECKING) --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" @endif intl-bootstrap .PHONY: configure-stage2-intl maybe-configure-stage2-intl @@ -22204,13 +23071,11 @@ configure-stage2-intl: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE2_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ - 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; \ @@ -22225,7 +23090,38 @@ configure-stage2-intl: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE2_CONFIGURE_FLAGS) + @stage2_werror_flag@ +@endif intl-bootstrap + +.PHONY: configure-stageb2g0-intl maybe-configure-stageb2g0-intl +maybe-configure-stageb2g0-intl: +@if intl-bootstrap +maybe-configure-stageb2g0-intl: configure-stageb2g0-intl +configure-stageb2g0-intl: + @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \ + 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; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/intl/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + srcdiroption="--srcdir=$${topdir}/intl"; \ + libsrcdir="$$s/intl"; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} $${srcdiroption} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + @stage2_werror_flag@ @endif intl-bootstrap .PHONY: configure-stage3-intl maybe-configure-stage3-intl @@ -22237,13 +23133,11 @@ configure-stage3-intl: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE3_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ - 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; \ @@ -22258,7 +23152,38 @@ configure-stage3-intl: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE3_CONFIGURE_FLAGS) + @stage2_werror_flag@ +@endif intl-bootstrap + +.PHONY: configure-stageb3g2-intl maybe-configure-stageb3g2-intl +maybe-configure-stageb3g2-intl: +@if intl-bootstrap +maybe-configure-stageb3g2-intl: configure-stageb3g2-intl +configure-stageb3g2-intl: + @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \ + 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; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/intl/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + srcdiroption="--srcdir=$${topdir}/intl"; \ + libsrcdir="$$s/intl"; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} $${srcdiroption} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + @stage2_werror_flag@ @endif intl-bootstrap .PHONY: configure-stage4-intl maybe-configure-stage4-intl @@ -22270,13 +23195,11 @@ configure-stage4-intl: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE4_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ - 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; \ @@ -22291,7 +23214,7 @@ configure-stage4-intl: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE4_CONFIGURE_FLAGS) + @stage2_werror_flag@ @endif intl-bootstrap .PHONY: configure-stageprofile-intl maybe-configure-stageprofile-intl @@ -22303,13 +23226,11 @@ configure-stageprofile-intl: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEprofile_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \ + 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; \ @@ -22324,7 +23245,7 @@ configure-stageprofile-intl: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEprofile_CONFIGURE_FLAGS) + @stage2_werror_flag@ @endif intl-bootstrap .PHONY: configure-stagefeedback-intl maybe-configure-stagefeedback-intl @@ -22336,13 +23257,11 @@ configure-stagefeedback-intl: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEfeedback_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \ + 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; \ @@ -22357,7 +23276,7 @@ configure-stagefeedback-intl: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEfeedback_CONFIGURE_FLAGS) + @stage2_werror_flag@ @endif intl-bootstrap @@ -22395,18 +23314,13 @@ all-stage1-intl: configure-stage1-intl @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE1_TFLAGS)"; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/intl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" \ - CXXFLAGS="$(STAGE1_CFLAGS)" \ - LIBCFLAGS="$(LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) \ - TFLAGS="$(STAGE1_TFLAGS)" \ + 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 @@ -22436,19 +23350,14 @@ all-stage2-intl: configure-stage2-intl @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE2_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/intl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS)" \ - CXXFLAGS="$(STAGE2_CFLAGS)" \ - LIBCFLAGS="$(STAGE2_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGE2_TFLAGS)" \ + 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 @@ -22467,6 +23376,44 @@ clean-stage2-intl: @endif intl-bootstrap +.PHONY: all-stageb2g0-intl maybe-all-stageb2g0-intl +.PHONY: clean-stageb2g0-intl maybe-clean-stageb2g0-intl +maybe-all-stageb2g0-intl: +maybe-clean-stageb2g0-intl: +@if intl-bootstrap +maybe-all-stageb2g0-intl: all-stageb2g0-intl +all-stageb2g0: all-stageb2g0-intl +TARGET-stageb2g0-intl = $(TARGET-intl) +all-stageb2g0-intl: configure-stageb2g0-intl + @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/intl && \ + $(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 +clean-stageb2g0: clean-stageb2g0-intl +clean-stageb2g0-intl: + @if [ $(current_stage) = stageb2g0 ]; then \ + [ -f $(HOST_SUBDIR)/intl/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stageb2g0-intl/Makefile ] || exit 0; \ + $(MAKE) stageb2g0-start; \ + fi; \ + cd $(HOST_SUBDIR)/intl && \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif intl-bootstrap + + .PHONY: all-stage3-intl maybe-all-stage3-intl .PHONY: clean-stage3-intl maybe-clean-stage3-intl maybe-all-stage3-intl: @@ -22479,19 +23426,14 @@ all-stage3-intl: configure-stage3-intl @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE3_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/intl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS)" \ - CXXFLAGS="$(STAGE3_CFLAGS)" \ - LIBCFLAGS="$(STAGE3_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGE3_TFLAGS)" \ + 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 @@ -22510,6 +23452,44 @@ clean-stage3-intl: @endif intl-bootstrap +.PHONY: all-stageb3g2-intl maybe-all-stageb3g2-intl +.PHONY: clean-stageb3g2-intl maybe-clean-stageb3g2-intl +maybe-all-stageb3g2-intl: +maybe-clean-stageb3g2-intl: +@if intl-bootstrap +maybe-all-stageb3g2-intl: all-stageb3g2-intl +all-stageb3g2: all-stageb3g2-intl +TARGET-stageb3g2-intl = $(TARGET-intl) +all-stageb3g2-intl: configure-stageb3g2-intl + @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/intl && \ + $(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 +clean-stageb3g2: clean-stageb3g2-intl +clean-stageb3g2-intl: + @if [ $(current_stage) = stageb3g2 ]; then \ + [ -f $(HOST_SUBDIR)/intl/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stageb3g2-intl/Makefile ] || exit 0; \ + $(MAKE) stageb3g2-start; \ + fi; \ + cd $(HOST_SUBDIR)/intl && \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif intl-bootstrap + + .PHONY: all-stage4-intl maybe-all-stage4-intl .PHONY: clean-stage4-intl maybe-clean-stage4-intl maybe-all-stage4-intl: @@ -22522,19 +23502,14 @@ all-stage4-intl: configure-stage4-intl @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE4_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/intl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE4_CFLAGS)" \ - CXXFLAGS="$(STAGE4_CFLAGS)" \ + CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \ LIBCFLAGS="$(STAGE4_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGE4_TFLAGS)" \ + 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 @@ -22565,19 +23540,14 @@ all-stageprofile-intl: configure-stageprofile-intl @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEprofile_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/intl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGEprofile_CFLAGS)" \ - CXXFLAGS="$(STAGEprofile_CFLAGS)" \ - LIBCFLAGS="$(STAGEprofile_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGEprofile_TFLAGS)" \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageprofile-intl) maybe-clean-stageprofile-intl: clean-stageprofile-intl @@ -22608,19 +23578,14 @@ all-stagefeedback-intl: configure-stagefeedback-intl @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEfeedback_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/intl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGEfeedback_CFLAGS)" \ - CXXFLAGS="$(STAGEfeedback_CFLAGS)" \ - LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGEfeedback_TFLAGS)" \ + 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 @@ -23874,12 +24839,10 @@ configure-stage1-ld: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE1_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(LIBCFLAGS)"; 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; \ @@ -23893,7 +24856,8 @@ configure-stage1-ld: $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ - $(STAGE1_CONFIGURE_FLAGS) + \ + --disable-intermodule $(STAGE1_CHECKING) --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" @endif ld-bootstrap .PHONY: configure-stage2-ld maybe-configure-stage2-ld @@ -23905,13 +24869,11 @@ configure-stage2-ld: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE2_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ - 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; \ @@ -23926,7 +24888,38 @@ configure-stage2-ld: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE2_CONFIGURE_FLAGS) + @stage2_werror_flag@ +@endif ld-bootstrap + +.PHONY: configure-stageb2g0-ld maybe-configure-stageb2g0-ld +maybe-configure-stageb2g0-ld: +@if ld-bootstrap +maybe-configure-stageb2g0-ld: configure-stageb2g0-ld +configure-stageb2g0-ld: + @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \ + 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; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/ld/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + srcdiroption="--srcdir=$${topdir}/ld"; \ + libsrcdir="$$s/ld"; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} $${srcdiroption} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + @stage2_werror_flag@ @endif ld-bootstrap .PHONY: configure-stage3-ld maybe-configure-stage3-ld @@ -23938,13 +24931,11 @@ configure-stage3-ld: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE3_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ - 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; \ @@ -23959,7 +24950,38 @@ configure-stage3-ld: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE3_CONFIGURE_FLAGS) + @stage2_werror_flag@ +@endif ld-bootstrap + +.PHONY: configure-stageb3g2-ld maybe-configure-stageb3g2-ld +maybe-configure-stageb3g2-ld: +@if ld-bootstrap +maybe-configure-stageb3g2-ld: configure-stageb3g2-ld +configure-stageb3g2-ld: + @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \ + 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; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/ld/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + srcdiroption="--srcdir=$${topdir}/ld"; \ + libsrcdir="$$s/ld"; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} $${srcdiroption} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + @stage2_werror_flag@ @endif ld-bootstrap .PHONY: configure-stage4-ld maybe-configure-stage4-ld @@ -23971,13 +24993,11 @@ configure-stage4-ld: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE4_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ - 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; \ @@ -23992,7 +25012,7 @@ configure-stage4-ld: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE4_CONFIGURE_FLAGS) + @stage2_werror_flag@ @endif ld-bootstrap .PHONY: configure-stageprofile-ld maybe-configure-stageprofile-ld @@ -24004,13 +25024,11 @@ configure-stageprofile-ld: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEprofile_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \ + 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; \ @@ -24025,7 +25043,7 @@ configure-stageprofile-ld: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEprofile_CONFIGURE_FLAGS) + @stage2_werror_flag@ @endif ld-bootstrap .PHONY: configure-stagefeedback-ld maybe-configure-stagefeedback-ld @@ -24037,13 +25055,11 @@ configure-stagefeedback-ld: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEfeedback_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \ + 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; \ @@ -24058,7 +25074,7 @@ configure-stagefeedback-ld: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEfeedback_CONFIGURE_FLAGS) + @stage2_werror_flag@ @endif ld-bootstrap @@ -24096,18 +25112,13 @@ all-stage1-ld: configure-stage1-ld @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE1_TFLAGS)"; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/ld && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" \ - CXXFLAGS="$(STAGE1_CFLAGS)" \ - LIBCFLAGS="$(LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) \ - TFLAGS="$(STAGE1_TFLAGS)" \ + 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 @@ -24137,19 +25148,14 @@ all-stage2-ld: configure-stage2-ld @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE2_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/ld && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS)" \ - CXXFLAGS="$(STAGE2_CFLAGS)" \ - LIBCFLAGS="$(STAGE2_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGE2_TFLAGS)" \ + 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 @@ -24168,6 +25174,44 @@ clean-stage2-ld: @endif ld-bootstrap +.PHONY: all-stageb2g0-ld maybe-all-stageb2g0-ld +.PHONY: clean-stageb2g0-ld maybe-clean-stageb2g0-ld +maybe-all-stageb2g0-ld: +maybe-clean-stageb2g0-ld: +@if ld-bootstrap +maybe-all-stageb2g0-ld: all-stageb2g0-ld +all-stageb2g0: all-stageb2g0-ld +TARGET-stageb2g0-ld = $(TARGET-ld) +all-stageb2g0-ld: configure-stageb2g0-ld + @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/ld && \ + $(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 +clean-stageb2g0: clean-stageb2g0-ld +clean-stageb2g0-ld: + @if [ $(current_stage) = stageb2g0 ]; then \ + [ -f $(HOST_SUBDIR)/ld/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stageb2g0-ld/Makefile ] || exit 0; \ + $(MAKE) stageb2g0-start; \ + fi; \ + cd $(HOST_SUBDIR)/ld && \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif ld-bootstrap + + .PHONY: all-stage3-ld maybe-all-stage3-ld .PHONY: clean-stage3-ld maybe-clean-stage3-ld maybe-all-stage3-ld: @@ -24180,19 +25224,14 @@ all-stage3-ld: configure-stage3-ld @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE3_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/ld && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS)" \ - CXXFLAGS="$(STAGE3_CFLAGS)" \ - LIBCFLAGS="$(STAGE3_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGE3_TFLAGS)" \ + 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 @@ -24211,6 +25250,44 @@ clean-stage3-ld: @endif ld-bootstrap +.PHONY: all-stageb3g2-ld maybe-all-stageb3g2-ld +.PHONY: clean-stageb3g2-ld maybe-clean-stageb3g2-ld +maybe-all-stageb3g2-ld: +maybe-clean-stageb3g2-ld: +@if ld-bootstrap +maybe-all-stageb3g2-ld: all-stageb3g2-ld +all-stageb3g2: all-stageb3g2-ld +TARGET-stageb3g2-ld = $(TARGET-ld) +all-stageb3g2-ld: configure-stageb3g2-ld + @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/ld && \ + $(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 +clean-stageb3g2: clean-stageb3g2-ld +clean-stageb3g2-ld: + @if [ $(current_stage) = stageb3g2 ]; then \ + [ -f $(HOST_SUBDIR)/ld/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stageb3g2-ld/Makefile ] || exit 0; \ + $(MAKE) stageb3g2-start; \ + fi; \ + cd $(HOST_SUBDIR)/ld && \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif ld-bootstrap + + .PHONY: all-stage4-ld maybe-all-stage4-ld .PHONY: clean-stage4-ld maybe-clean-stage4-ld maybe-all-stage4-ld: @@ -24223,19 +25300,14 @@ all-stage4-ld: configure-stage4-ld @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE4_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/ld && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE4_CFLAGS)" \ - CXXFLAGS="$(STAGE4_CFLAGS)" \ + CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \ LIBCFLAGS="$(STAGE4_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGE4_TFLAGS)" \ + 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 @@ -24266,19 +25338,14 @@ all-stageprofile-ld: configure-stageprofile-ld @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEprofile_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/ld && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGEprofile_CFLAGS)" \ - CXXFLAGS="$(STAGEprofile_CFLAGS)" \ - LIBCFLAGS="$(STAGEprofile_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGEprofile_TFLAGS)" \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageprofile-ld) maybe-clean-stageprofile-ld: clean-stageprofile-ld @@ -24309,19 +25376,14 @@ all-stagefeedback-ld: configure-stagefeedback-ld @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEfeedback_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/ld && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGEfeedback_CFLAGS)" \ - CXXFLAGS="$(STAGEfeedback_CFLAGS)" \ - LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGEfeedback_TFLAGS)" \ + 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 @@ -24740,12 +25802,10 @@ configure-stage1-libcpp: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE1_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(LIBCFLAGS)"; 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; \ @@ -24759,7 +25819,8 @@ configure-stage1-libcpp: $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ - $(STAGE1_CONFIGURE_FLAGS) + \ + --disable-intermodule $(STAGE1_CHECKING) --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" @endif libcpp-bootstrap .PHONY: configure-stage2-libcpp maybe-configure-stage2-libcpp @@ -24771,13 +25832,11 @@ configure-stage2-libcpp: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE2_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ - 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; \ @@ -24792,7 +25851,38 @@ configure-stage2-libcpp: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE2_CONFIGURE_FLAGS) + @stage2_werror_flag@ +@endif libcpp-bootstrap + +.PHONY: configure-stageb2g0-libcpp maybe-configure-stageb2g0-libcpp +maybe-configure-stageb2g0-libcpp: +@if libcpp-bootstrap +maybe-configure-stageb2g0-libcpp: configure-stageb2g0-libcpp +configure-stageb2g0-libcpp: + @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \ + 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; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + srcdiroption="--srcdir=$${topdir}/libcpp"; \ + libsrcdir="$$s/libcpp"; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} $${srcdiroption} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + @stage2_werror_flag@ @endif libcpp-bootstrap .PHONY: configure-stage3-libcpp maybe-configure-stage3-libcpp @@ -24804,13 +25894,11 @@ configure-stage3-libcpp: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE3_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ - 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; \ @@ -24825,7 +25913,38 @@ configure-stage3-libcpp: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE3_CONFIGURE_FLAGS) + @stage2_werror_flag@ +@endif libcpp-bootstrap + +.PHONY: configure-stageb3g2-libcpp maybe-configure-stageb3g2-libcpp +maybe-configure-stageb3g2-libcpp: +@if libcpp-bootstrap +maybe-configure-stageb3g2-libcpp: configure-stageb3g2-libcpp +configure-stageb3g2-libcpp: + @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \ + 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; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + srcdiroption="--srcdir=$${topdir}/libcpp"; \ + libsrcdir="$$s/libcpp"; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} $${srcdiroption} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + @stage2_werror_flag@ @endif libcpp-bootstrap .PHONY: configure-stage4-libcpp maybe-configure-stage4-libcpp @@ -24837,13 +25956,11 @@ configure-stage4-libcpp: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE4_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ - 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; \ @@ -24858,7 +25975,7 @@ configure-stage4-libcpp: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE4_CONFIGURE_FLAGS) + @stage2_werror_flag@ @endif libcpp-bootstrap .PHONY: configure-stageprofile-libcpp maybe-configure-stageprofile-libcpp @@ -24870,13 +25987,11 @@ configure-stageprofile-libcpp: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEprofile_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \ + 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; \ @@ -24891,7 +26006,7 @@ configure-stageprofile-libcpp: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEprofile_CONFIGURE_FLAGS) + @stage2_werror_flag@ @endif libcpp-bootstrap .PHONY: configure-stagefeedback-libcpp maybe-configure-stagefeedback-libcpp @@ -24903,13 +26018,11 @@ configure-stagefeedback-libcpp: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEfeedback_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \ + 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; \ @@ -24924,7 +26037,7 @@ configure-stagefeedback-libcpp: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEfeedback_CONFIGURE_FLAGS) + @stage2_werror_flag@ @endif libcpp-bootstrap @@ -24962,18 +26075,13 @@ all-stage1-libcpp: configure-stage1-libcpp @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE1_TFLAGS)"; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libcpp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" \ - CXXFLAGS="$(STAGE1_CFLAGS)" \ - LIBCFLAGS="$(LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) \ - TFLAGS="$(STAGE1_TFLAGS)" \ + 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 @@ -25003,19 +26111,14 @@ all-stage2-libcpp: configure-stage2-libcpp @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE2_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libcpp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS)" \ - CXXFLAGS="$(STAGE2_CFLAGS)" \ - LIBCFLAGS="$(STAGE2_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGE2_TFLAGS)" \ + 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 @@ -25034,6 +26137,44 @@ clean-stage2-libcpp: @endif libcpp-bootstrap +.PHONY: all-stageb2g0-libcpp maybe-all-stageb2g0-libcpp +.PHONY: clean-stageb2g0-libcpp maybe-clean-stageb2g0-libcpp +maybe-all-stageb2g0-libcpp: +maybe-clean-stageb2g0-libcpp: +@if libcpp-bootstrap +maybe-all-stageb2g0-libcpp: all-stageb2g0-libcpp +all-stageb2g0: all-stageb2g0-libcpp +TARGET-stageb2g0-libcpp = $(TARGET-libcpp) +all-stageb2g0-libcpp: configure-stageb2g0-libcpp + @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/libcpp && \ + $(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 +clean-stageb2g0: clean-stageb2g0-libcpp +clean-stageb2g0-libcpp: + @if [ $(current_stage) = stageb2g0 ]; then \ + [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stageb2g0-libcpp/Makefile ] || exit 0; \ + $(MAKE) stageb2g0-start; \ + fi; \ + cd $(HOST_SUBDIR)/libcpp && \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif libcpp-bootstrap + + .PHONY: all-stage3-libcpp maybe-all-stage3-libcpp .PHONY: clean-stage3-libcpp maybe-clean-stage3-libcpp maybe-all-stage3-libcpp: @@ -25046,19 +26187,14 @@ all-stage3-libcpp: configure-stage3-libcpp @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE3_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libcpp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS)" \ - CXXFLAGS="$(STAGE3_CFLAGS)" \ - LIBCFLAGS="$(STAGE3_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGE3_TFLAGS)" \ + 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 @@ -25077,6 +26213,44 @@ clean-stage3-libcpp: @endif libcpp-bootstrap +.PHONY: all-stageb3g2-libcpp maybe-all-stageb3g2-libcpp +.PHONY: clean-stageb3g2-libcpp maybe-clean-stageb3g2-libcpp +maybe-all-stageb3g2-libcpp: +maybe-clean-stageb3g2-libcpp: +@if libcpp-bootstrap +maybe-all-stageb3g2-libcpp: all-stageb3g2-libcpp +all-stageb3g2: all-stageb3g2-libcpp +TARGET-stageb3g2-libcpp = $(TARGET-libcpp) +all-stageb3g2-libcpp: configure-stageb3g2-libcpp + @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/libcpp && \ + $(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 +clean-stageb3g2: clean-stageb3g2-libcpp +clean-stageb3g2-libcpp: + @if [ $(current_stage) = stageb3g2 ]; then \ + [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stageb3g2-libcpp/Makefile ] || exit 0; \ + $(MAKE) stageb3g2-start; \ + fi; \ + cd $(HOST_SUBDIR)/libcpp && \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif libcpp-bootstrap + + .PHONY: all-stage4-libcpp maybe-all-stage4-libcpp .PHONY: clean-stage4-libcpp maybe-clean-stage4-libcpp maybe-all-stage4-libcpp: @@ -25089,19 +26263,14 @@ all-stage4-libcpp: configure-stage4-libcpp @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE4_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libcpp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE4_CFLAGS)" \ - CXXFLAGS="$(STAGE4_CFLAGS)" \ + CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \ LIBCFLAGS="$(STAGE4_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGE4_TFLAGS)" \ + 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 @@ -25132,19 +26301,14 @@ all-stageprofile-libcpp: configure-stageprofile-libcpp @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEprofile_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libcpp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGEprofile_CFLAGS)" \ - CXXFLAGS="$(STAGEprofile_CFLAGS)" \ - LIBCFLAGS="$(STAGEprofile_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGEprofile_TFLAGS)" \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageprofile-libcpp) maybe-clean-stageprofile-libcpp: clean-stageprofile-libcpp @@ -25175,19 +26339,14 @@ all-stagefeedback-libcpp: configure-stagefeedback-libcpp @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEfeedback_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libcpp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGEfeedback_CFLAGS)" \ - CXXFLAGS="$(STAGEfeedback_CFLAGS)" \ - LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGEfeedback_TFLAGS)" \ + 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 @@ -25606,12 +26765,10 @@ configure-stage1-libdecnumber: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE1_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(LIBCFLAGS)"; 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; \ @@ -25625,7 +26782,8 @@ configure-stage1-libdecnumber: $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ - $(STAGE1_CONFIGURE_FLAGS) + \ + --disable-intermodule $(STAGE1_CHECKING) --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" @endif libdecnumber-bootstrap .PHONY: configure-stage2-libdecnumber maybe-configure-stage2-libdecnumber @@ -25637,13 +26795,11 @@ configure-stage2-libdecnumber: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE2_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ - 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; \ @@ -25658,7 +26814,38 @@ configure-stage2-libdecnumber: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE2_CONFIGURE_FLAGS) + @stage2_werror_flag@ +@endif libdecnumber-bootstrap + +.PHONY: configure-stageb2g0-libdecnumber maybe-configure-stageb2g0-libdecnumber +maybe-configure-stageb2g0-libdecnumber: +@if libdecnumber-bootstrap +maybe-configure-stageb2g0-libdecnumber: configure-stageb2g0-libdecnumber +configure-stageb2g0-libdecnumber: + @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \ + 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; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + srcdiroption="--srcdir=$${topdir}/libdecnumber"; \ + libsrcdir="$$s/libdecnumber"; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} $${srcdiroption} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + @stage2_werror_flag@ @endif libdecnumber-bootstrap .PHONY: configure-stage3-libdecnumber maybe-configure-stage3-libdecnumber @@ -25670,13 +26857,11 @@ configure-stage3-libdecnumber: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE3_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ - 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; \ @@ -25691,7 +26876,38 @@ configure-stage3-libdecnumber: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE3_CONFIGURE_FLAGS) + @stage2_werror_flag@ +@endif libdecnumber-bootstrap + +.PHONY: configure-stageb3g2-libdecnumber maybe-configure-stageb3g2-libdecnumber +maybe-configure-stageb3g2-libdecnumber: +@if libdecnumber-bootstrap +maybe-configure-stageb3g2-libdecnumber: configure-stageb3g2-libdecnumber +configure-stageb3g2-libdecnumber: + @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \ + 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; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + srcdiroption="--srcdir=$${topdir}/libdecnumber"; \ + libsrcdir="$$s/libdecnumber"; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} $${srcdiroption} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + @stage2_werror_flag@ @endif libdecnumber-bootstrap .PHONY: configure-stage4-libdecnumber maybe-configure-stage4-libdecnumber @@ -25703,13 +26919,11 @@ configure-stage4-libdecnumber: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE4_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ - 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; \ @@ -25724,7 +26938,7 @@ configure-stage4-libdecnumber: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE4_CONFIGURE_FLAGS) + @stage2_werror_flag@ @endif libdecnumber-bootstrap .PHONY: configure-stageprofile-libdecnumber maybe-configure-stageprofile-libdecnumber @@ -25736,13 +26950,11 @@ configure-stageprofile-libdecnumber: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEprofile_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \ + 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; \ @@ -25757,7 +26969,7 @@ configure-stageprofile-libdecnumber: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEprofile_CONFIGURE_FLAGS) + @stage2_werror_flag@ @endif libdecnumber-bootstrap .PHONY: configure-stagefeedback-libdecnumber maybe-configure-stagefeedback-libdecnumber @@ -25769,13 +26981,11 @@ configure-stagefeedback-libdecnumber: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEfeedback_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \ + 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; \ @@ -25790,7 +27000,7 @@ configure-stagefeedback-libdecnumber: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEfeedback_CONFIGURE_FLAGS) + @stage2_werror_flag@ @endif libdecnumber-bootstrap @@ -25828,18 +27038,13 @@ all-stage1-libdecnumber: configure-stage1-libdecnumber @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE1_TFLAGS)"; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libdecnumber && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" \ - CXXFLAGS="$(STAGE1_CFLAGS)" \ - LIBCFLAGS="$(LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) \ - TFLAGS="$(STAGE1_TFLAGS)" \ + 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 @@ -25869,19 +27074,14 @@ all-stage2-libdecnumber: configure-stage2-libdecnumber @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE2_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libdecnumber && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS)" \ - CXXFLAGS="$(STAGE2_CFLAGS)" \ - LIBCFLAGS="$(STAGE2_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGE2_TFLAGS)" \ + 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 @@ -25900,6 +27100,44 @@ clean-stage2-libdecnumber: @endif libdecnumber-bootstrap +.PHONY: all-stageb2g0-libdecnumber maybe-all-stageb2g0-libdecnumber +.PHONY: clean-stageb2g0-libdecnumber maybe-clean-stageb2g0-libdecnumber +maybe-all-stageb2g0-libdecnumber: +maybe-clean-stageb2g0-libdecnumber: +@if libdecnumber-bootstrap +maybe-all-stageb2g0-libdecnumber: all-stageb2g0-libdecnumber +all-stageb2g0: all-stageb2g0-libdecnumber +TARGET-stageb2g0-libdecnumber = $(TARGET-libdecnumber) +all-stageb2g0-libdecnumber: configure-stageb2g0-libdecnumber + @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/libdecnumber && \ + $(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 +clean-stageb2g0: clean-stageb2g0-libdecnumber +clean-stageb2g0-libdecnumber: + @if [ $(current_stage) = stageb2g0 ]; then \ + [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stageb2g0-libdecnumber/Makefile ] || exit 0; \ + $(MAKE) stageb2g0-start; \ + fi; \ + cd $(HOST_SUBDIR)/libdecnumber && \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif libdecnumber-bootstrap + + .PHONY: all-stage3-libdecnumber maybe-all-stage3-libdecnumber .PHONY: clean-stage3-libdecnumber maybe-clean-stage3-libdecnumber maybe-all-stage3-libdecnumber: @@ -25912,19 +27150,14 @@ all-stage3-libdecnumber: configure-stage3-libdecnumber @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE3_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libdecnumber && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS)" \ - CXXFLAGS="$(STAGE3_CFLAGS)" \ - LIBCFLAGS="$(STAGE3_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGE3_TFLAGS)" \ + 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 @@ -25943,6 +27176,44 @@ clean-stage3-libdecnumber: @endif libdecnumber-bootstrap +.PHONY: all-stageb3g2-libdecnumber maybe-all-stageb3g2-libdecnumber +.PHONY: clean-stageb3g2-libdecnumber maybe-clean-stageb3g2-libdecnumber +maybe-all-stageb3g2-libdecnumber: +maybe-clean-stageb3g2-libdecnumber: +@if libdecnumber-bootstrap +maybe-all-stageb3g2-libdecnumber: all-stageb3g2-libdecnumber +all-stageb3g2: all-stageb3g2-libdecnumber +TARGET-stageb3g2-libdecnumber = $(TARGET-libdecnumber) +all-stageb3g2-libdecnumber: configure-stageb3g2-libdecnumber + @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/libdecnumber && \ + $(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 +clean-stageb3g2: clean-stageb3g2-libdecnumber +clean-stageb3g2-libdecnumber: + @if [ $(current_stage) = stageb3g2 ]; then \ + [ -f $(HOST_SUBDIR)/libdecnumber/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stageb3g2-libdecnumber/Makefile ] || exit 0; \ + $(MAKE) stageb3g2-start; \ + fi; \ + cd $(HOST_SUBDIR)/libdecnumber && \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif libdecnumber-bootstrap + + .PHONY: all-stage4-libdecnumber maybe-all-stage4-libdecnumber .PHONY: clean-stage4-libdecnumber maybe-clean-stage4-libdecnumber maybe-all-stage4-libdecnumber: @@ -25955,19 +27226,14 @@ all-stage4-libdecnumber: configure-stage4-libdecnumber @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE4_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libdecnumber && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE4_CFLAGS)" \ - CXXFLAGS="$(STAGE4_CFLAGS)" \ + CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \ LIBCFLAGS="$(STAGE4_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGE4_TFLAGS)" \ + 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 @@ -25998,19 +27264,14 @@ all-stageprofile-libdecnumber: configure-stageprofile-libdecnumber @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEprofile_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libdecnumber && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGEprofile_CFLAGS)" \ - CXXFLAGS="$(STAGEprofile_CFLAGS)" \ - LIBCFLAGS="$(STAGEprofile_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGEprofile_TFLAGS)" \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageprofile-libdecnumber) maybe-clean-stageprofile-libdecnumber: clean-stageprofile-libdecnumber @@ -26041,19 +27302,14 @@ all-stagefeedback-libdecnumber: configure-stagefeedback-libdecnumber @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEfeedback_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libdecnumber && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGEfeedback_CFLAGS)" \ - CXXFLAGS="$(STAGEfeedback_CFLAGS)" \ - LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGEfeedback_TFLAGS)" \ + 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 @@ -26897,12 +28153,10 @@ configure-stage1-libiberty: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE1_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(LIBCFLAGS)"; 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; \ @@ -26916,7 +28170,8 @@ configure-stage1-libiberty: $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ - $(STAGE1_CONFIGURE_FLAGS) + \ + --disable-intermodule $(STAGE1_CHECKING) --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" @endif libiberty-bootstrap .PHONY: configure-stage2-libiberty maybe-configure-stage2-libiberty @@ -26928,13 +28183,11 @@ configure-stage2-libiberty: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE2_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ - 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; \ @@ -26949,7 +28202,38 @@ configure-stage2-libiberty: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE2_CONFIGURE_FLAGS) + @stage2_werror_flag@ +@endif libiberty-bootstrap + +.PHONY: configure-stageb2g0-libiberty maybe-configure-stageb2g0-libiberty +maybe-configure-stageb2g0-libiberty: +@if libiberty-bootstrap +maybe-configure-stageb2g0-libiberty: configure-stageb2g0-libiberty +configure-stageb2g0-libiberty: + @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \ + 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; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + srcdiroption="--srcdir=$${topdir}/libiberty"; \ + libsrcdir="$$s/libiberty"; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} $${srcdiroption} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + @stage2_werror_flag@ @endif libiberty-bootstrap .PHONY: configure-stage3-libiberty maybe-configure-stage3-libiberty @@ -26961,13 +28245,11 @@ configure-stage3-libiberty: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE3_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ - 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; \ @@ -26982,7 +28264,38 @@ configure-stage3-libiberty: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE3_CONFIGURE_FLAGS) + @stage2_werror_flag@ +@endif libiberty-bootstrap + +.PHONY: configure-stageb3g2-libiberty maybe-configure-stageb3g2-libiberty +maybe-configure-stageb3g2-libiberty: +@if libiberty-bootstrap +maybe-configure-stageb3g2-libiberty: configure-stageb3g2-libiberty +configure-stageb3g2-libiberty: + @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \ + 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; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + srcdiroption="--srcdir=$${topdir}/libiberty"; \ + libsrcdir="$$s/libiberty"; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} $${srcdiroption} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + @stage2_werror_flag@ @endif libiberty-bootstrap .PHONY: configure-stage4-libiberty maybe-configure-stage4-libiberty @@ -26994,13 +28307,11 @@ configure-stage4-libiberty: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE4_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ - 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; \ @@ -27015,7 +28326,7 @@ configure-stage4-libiberty: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE4_CONFIGURE_FLAGS) + @stage2_werror_flag@ @endif libiberty-bootstrap .PHONY: configure-stageprofile-libiberty maybe-configure-stageprofile-libiberty @@ -27027,13 +28338,11 @@ configure-stageprofile-libiberty: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEprofile_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \ + 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; \ @@ -27048,7 +28357,7 @@ configure-stageprofile-libiberty: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEprofile_CONFIGURE_FLAGS) + @stage2_werror_flag@ @endif libiberty-bootstrap .PHONY: configure-stagefeedback-libiberty maybe-configure-stagefeedback-libiberty @@ -27060,13 +28369,11 @@ configure-stagefeedback-libiberty: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEfeedback_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \ + 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; \ @@ -27081,7 +28388,7 @@ configure-stagefeedback-libiberty: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEfeedback_CONFIGURE_FLAGS) + @stage2_werror_flag@ @endif libiberty-bootstrap @@ -27119,18 +28426,13 @@ all-stage1-libiberty: configure-stage1-libiberty @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE1_TFLAGS)"; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libiberty && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" \ - CXXFLAGS="$(STAGE1_CFLAGS)" \ - LIBCFLAGS="$(LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) \ - TFLAGS="$(STAGE1_TFLAGS)" \ + 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 @@ -27160,19 +28462,14 @@ all-stage2-libiberty: configure-stage2-libiberty @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE2_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libiberty && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS)" \ - CXXFLAGS="$(STAGE2_CFLAGS)" \ - LIBCFLAGS="$(STAGE2_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGE2_TFLAGS)" \ + 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 @@ -27191,6 +28488,44 @@ clean-stage2-libiberty: @endif libiberty-bootstrap +.PHONY: all-stageb2g0-libiberty maybe-all-stageb2g0-libiberty +.PHONY: clean-stageb2g0-libiberty maybe-clean-stageb2g0-libiberty +maybe-all-stageb2g0-libiberty: +maybe-clean-stageb2g0-libiberty: +@if libiberty-bootstrap +maybe-all-stageb2g0-libiberty: all-stageb2g0-libiberty +all-stageb2g0: all-stageb2g0-libiberty +TARGET-stageb2g0-libiberty = $(TARGET-libiberty) +all-stageb2g0-libiberty: configure-stageb2g0-libiberty + @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/libiberty && \ + $(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 +clean-stageb2g0: clean-stageb2g0-libiberty +clean-stageb2g0-libiberty: + @if [ $(current_stage) = stageb2g0 ]; then \ + [ -f $(HOST_SUBDIR)/libiberty/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stageb2g0-libiberty/Makefile ] || exit 0; \ + $(MAKE) stageb2g0-start; \ + fi; \ + cd $(HOST_SUBDIR)/libiberty && \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif libiberty-bootstrap + + .PHONY: all-stage3-libiberty maybe-all-stage3-libiberty .PHONY: clean-stage3-libiberty maybe-clean-stage3-libiberty maybe-all-stage3-libiberty: @@ -27203,19 +28538,14 @@ all-stage3-libiberty: configure-stage3-libiberty @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE3_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libiberty && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS)" \ - CXXFLAGS="$(STAGE3_CFLAGS)" \ - LIBCFLAGS="$(STAGE3_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGE3_TFLAGS)" \ + 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 @@ -27234,6 +28564,44 @@ clean-stage3-libiberty: @endif libiberty-bootstrap +.PHONY: all-stageb3g2-libiberty maybe-all-stageb3g2-libiberty +.PHONY: clean-stageb3g2-libiberty maybe-clean-stageb3g2-libiberty +maybe-all-stageb3g2-libiberty: +maybe-clean-stageb3g2-libiberty: +@if libiberty-bootstrap +maybe-all-stageb3g2-libiberty: all-stageb3g2-libiberty +all-stageb3g2: all-stageb3g2-libiberty +TARGET-stageb3g2-libiberty = $(TARGET-libiberty) +all-stageb3g2-libiberty: configure-stageb3g2-libiberty + @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/libiberty && \ + $(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 +clean-stageb3g2: clean-stageb3g2-libiberty +clean-stageb3g2-libiberty: + @if [ $(current_stage) = stageb3g2 ]; then \ + [ -f $(HOST_SUBDIR)/libiberty/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stageb3g2-libiberty/Makefile ] || exit 0; \ + $(MAKE) stageb3g2-start; \ + fi; \ + cd $(HOST_SUBDIR)/libiberty && \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif libiberty-bootstrap + + .PHONY: all-stage4-libiberty maybe-all-stage4-libiberty .PHONY: clean-stage4-libiberty maybe-clean-stage4-libiberty maybe-all-stage4-libiberty: @@ -27246,19 +28614,14 @@ all-stage4-libiberty: configure-stage4-libiberty @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE4_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libiberty && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE4_CFLAGS)" \ - CXXFLAGS="$(STAGE4_CFLAGS)" \ + CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \ LIBCFLAGS="$(STAGE4_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGE4_TFLAGS)" \ + 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 @@ -27289,19 +28652,14 @@ all-stageprofile-libiberty: configure-stageprofile-libiberty @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEprofile_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libiberty && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGEprofile_CFLAGS)" \ - CXXFLAGS="$(STAGEprofile_CFLAGS)" \ - LIBCFLAGS="$(STAGEprofile_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGEprofile_TFLAGS)" \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageprofile-libiberty) maybe-clean-stageprofile-libiberty: clean-stageprofile-libiberty @@ -27332,19 +28690,14 @@ all-stagefeedback-libiberty: configure-stagefeedback-libiberty @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEfeedback_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libiberty && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGEfeedback_CFLAGS)" \ - CXXFLAGS="$(STAGEfeedback_CFLAGS)" \ - LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGEfeedback_TFLAGS)" \ + 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 @@ -37885,12 +39238,10 @@ configure-stage1-zlib: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE1_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(LIBCFLAGS)"; 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; \ @@ -37904,7 +39255,8 @@ configure-stage1-zlib: $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ - $(STAGE1_CONFIGURE_FLAGS) + \ + --disable-intermodule $(STAGE1_CHECKING) --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" @endif zlib-bootstrap .PHONY: configure-stage2-zlib maybe-configure-stage2-zlib @@ -37916,13 +39268,11 @@ configure-stage2-zlib: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE2_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ - 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; \ @@ -37937,7 +39287,38 @@ configure-stage2-zlib: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE2_CONFIGURE_FLAGS) + @stage2_werror_flag@ +@endif zlib-bootstrap + +.PHONY: configure-stageb2g0-zlib maybe-configure-stageb2g0-zlib +maybe-configure-stageb2g0-zlib: +@if zlib-bootstrap +maybe-configure-stageb2g0-zlib: configure-stageb2g0-zlib +configure-stageb2g0-zlib: + @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \ + 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; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + srcdiroption="--srcdir=$${topdir}/zlib"; \ + libsrcdir="$$s/zlib"; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} $${srcdiroption} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + @stage2_werror_flag@ @endif zlib-bootstrap .PHONY: configure-stage3-zlib maybe-configure-stage3-zlib @@ -37949,13 +39330,11 @@ configure-stage3-zlib: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE3_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ - 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; \ @@ -37970,7 +39349,38 @@ configure-stage3-zlib: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE3_CONFIGURE_FLAGS) + @stage2_werror_flag@ +@endif zlib-bootstrap + +.PHONY: configure-stageb3g2-zlib maybe-configure-stageb3g2-zlib +maybe-configure-stageb3g2-zlib: +@if zlib-bootstrap +maybe-configure-stageb3g2-zlib: configure-stageb3g2-zlib +configure-stageb3g2-zlib: + @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \ + 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; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + srcdiroption="--srcdir=$${topdir}/zlib"; \ + libsrcdir="$$s/zlib"; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} $${srcdiroption} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + @stage2_werror_flag@ @endif zlib-bootstrap .PHONY: configure-stage4-zlib maybe-configure-stage4-zlib @@ -37982,13 +39392,11 @@ configure-stage4-zlib: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE4_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ - 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; \ @@ -38003,7 +39411,7 @@ configure-stage4-zlib: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE4_CONFIGURE_FLAGS) + @stage2_werror_flag@ @endif zlib-bootstrap .PHONY: configure-stageprofile-zlib maybe-configure-stageprofile-zlib @@ -38015,13 +39423,11 @@ configure-stageprofile-zlib: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEprofile_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \ + 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; \ @@ -38036,7 +39442,7 @@ configure-stageprofile-zlib: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEprofile_CONFIGURE_FLAGS) + @stage2_werror_flag@ @endif zlib-bootstrap .PHONY: configure-stagefeedback-zlib maybe-configure-stagefeedback-zlib @@ -38048,13 +39454,11 @@ configure-stagefeedback-zlib: @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEfeedback_TFLAGS)"; \ test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \ + 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; \ @@ -38069,7 +39473,7 @@ configure-stagefeedback-zlib: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEfeedback_CONFIGURE_FLAGS) + @stage2_werror_flag@ @endif zlib-bootstrap @@ -38107,18 +39511,13 @@ all-stage1-zlib: configure-stage1-zlib @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE1_TFLAGS)"; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/zlib && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" \ - CXXFLAGS="$(STAGE1_CFLAGS)" \ - LIBCFLAGS="$(LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) \ - TFLAGS="$(STAGE1_TFLAGS)" \ + 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 @@ -38148,19 +39547,14 @@ all-stage2-zlib: configure-stage2-zlib @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE2_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/zlib && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS)" \ - CXXFLAGS="$(STAGE2_CFLAGS)" \ - LIBCFLAGS="$(STAGE2_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGE2_TFLAGS)" \ + 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 @@ -38179,6 +39573,44 @@ clean-stage2-zlib: @endif zlib-bootstrap +.PHONY: all-stageb2g0-zlib maybe-all-stageb2g0-zlib +.PHONY: clean-stageb2g0-zlib maybe-clean-stageb2g0-zlib +maybe-all-stageb2g0-zlib: +maybe-clean-stageb2g0-zlib: +@if zlib-bootstrap +maybe-all-stageb2g0-zlib: all-stageb2g0-zlib +all-stageb2g0: all-stageb2g0-zlib +TARGET-stageb2g0-zlib = $(TARGET-zlib) +all-stageb2g0-zlib: configure-stageb2g0-zlib + @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/zlib && \ + $(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 +clean-stageb2g0: clean-stageb2g0-zlib +clean-stageb2g0-zlib: + @if [ $(current_stage) = stageb2g0 ]; then \ + [ -f $(HOST_SUBDIR)/zlib/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stageb2g0-zlib/Makefile ] || exit 0; \ + $(MAKE) stageb2g0-start; \ + fi; \ + cd $(HOST_SUBDIR)/zlib && \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif zlib-bootstrap + + .PHONY: all-stage3-zlib maybe-all-stage3-zlib .PHONY: clean-stage3-zlib maybe-clean-stage3-zlib maybe-all-stage3-zlib: @@ -38191,19 +39623,14 @@ all-stage3-zlib: configure-stage3-zlib @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE3_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/zlib && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS)" \ - CXXFLAGS="$(STAGE3_CFLAGS)" \ - LIBCFLAGS="$(STAGE3_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGE3_TFLAGS)" \ + 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 @@ -38222,6 +39649,44 @@ clean-stage3-zlib: @endif zlib-bootstrap +.PHONY: all-stageb3g2-zlib maybe-all-stageb3g2-zlib +.PHONY: clean-stageb3g2-zlib maybe-clean-stageb3g2-zlib +maybe-all-stageb3g2-zlib: +maybe-clean-stageb3g2-zlib: +@if zlib-bootstrap +maybe-all-stageb3g2-zlib: all-stageb3g2-zlib +all-stageb3g2: all-stageb3g2-zlib +TARGET-stageb3g2-zlib = $(TARGET-zlib) +all-stageb3g2-zlib: configure-stageb3g2-zlib + @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/zlib && \ + $(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 +clean-stageb3g2: clean-stageb3g2-zlib +clean-stageb3g2-zlib: + @if [ $(current_stage) = stageb3g2 ]; then \ + [ -f $(HOST_SUBDIR)/zlib/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stageb3g2-zlib/Makefile ] || exit 0; \ + $(MAKE) stageb3g2-start; \ + fi; \ + cd $(HOST_SUBDIR)/zlib && \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif zlib-bootstrap + + .PHONY: all-stage4-zlib maybe-all-stage4-zlib .PHONY: clean-stage4-zlib maybe-clean-stage4-zlib maybe-all-stage4-zlib: @@ -38234,19 +39699,14 @@ all-stage4-zlib: configure-stage4-zlib @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE4_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/zlib && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE4_CFLAGS)" \ - CXXFLAGS="$(STAGE4_CFLAGS)" \ + CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \ LIBCFLAGS="$(STAGE4_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGE4_TFLAGS)" \ + 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 @@ -38277,19 +39737,14 @@ all-stageprofile-zlib: configure-stageprofile-zlib @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEprofile_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/zlib && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGEprofile_CFLAGS)" \ - CXXFLAGS="$(STAGEprofile_CFLAGS)" \ - LIBCFLAGS="$(STAGEprofile_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGEprofile_TFLAGS)" \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageprofile-zlib) maybe-clean-stageprofile-zlib: clean-stageprofile-zlib @@ -38320,19 +39775,14 @@ all-stagefeedback-zlib: configure-stagefeedback-zlib @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEfeedback_TFLAGS)"; \ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/zlib && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGEfeedback_CFLAGS)" \ - CXXFLAGS="$(STAGEfeedback_CFLAGS)" \ - LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ - TFLAGS="$(STAGEfeedback_TFLAGS)" \ + 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 @@ -43431,7 +44881,6 @@ configure-stage1-target-libgcc: @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE1_TFLAGS)"; \ echo "Checking multilib configuration for libgcc..."; \ $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \ if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \ @@ -43445,10 +44894,9 @@ configure-stage1-target-libgcc: mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \ fi; \ test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \ - $(NORMAL_TARGET_EXPORTS) \ - CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ - CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ - LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ + $(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; \ @@ -43462,7 +44910,8 @@ configure-stage1-target-libgcc: $(SHELL) $${libsrcdir}/configure \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ --target=${target_alias} $${srcdiroption} \ - $(STAGE1_CONFIGURE_FLAGS) + \ + --disable-intermodule $(STAGE1_CHECKING) --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" @endif target-libgcc-bootstrap .PHONY: configure-stage2-target-libgcc maybe-configure-stage2-target-libgcc @@ -43474,7 +44923,6 @@ configure-stage2-target-libgcc: @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE2_TFLAGS)"; \ echo "Checking multilib configuration for libgcc..."; \ $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \ if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \ @@ -43489,10 +44937,9 @@ configure-stage2-target-libgcc: fi; \ test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ - \ - CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ - CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ - LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ + \ + 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; \ @@ -43507,7 +44954,50 @@ configure-stage2-target-libgcc: $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE2_CONFIGURE_FLAGS) + @stage2_werror_flag@ +@endif target-libgcc-bootstrap + +.PHONY: configure-stageb2g0-target-libgcc maybe-configure-stageb2g0-target-libgcc +maybe-configure-stageb2g0-target-libgcc: +@if target-libgcc-bootstrap +maybe-configure-stageb2g0-target-libgcc: configure-stageb2g0-target-libgcc +configure-stageb2g0-target-libgcc: + @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start + @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + echo "Checking multilib configuration for libgcc..."; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \ + if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \ + if cmp -s $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; then \ + rm -f $(TARGET_SUBDIR)/libgcc/multilib.tmp; \ + else \ + rm -f $(TARGET_SUBDIR)/libgcc/Makefile; \ + mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \ + fi; \ + else \ + mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \ + fi; \ + test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \ + $(NORMAL_TARGET_EXPORTS) \ + \ + CFLAGS="$(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; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + srcdiroption="--srcdir=$${topdir}/libgcc"; \ + libsrcdir="$$s/libgcc"; \ + $(SHELL) $${libsrcdir}/configure \ + $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ + --target=${target_alias} $${srcdiroption} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + @stage2_werror_flag@ @endif target-libgcc-bootstrap .PHONY: configure-stage3-target-libgcc maybe-configure-stage3-target-libgcc @@ -43519,7 +45009,6 @@ configure-stage3-target-libgcc: @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE3_TFLAGS)"; \ echo "Checking multilib configuration for libgcc..."; \ $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \ if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \ @@ -43534,10 +45023,9 @@ configure-stage3-target-libgcc: fi; \ test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ - \ - CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ - CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ - LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ + \ + 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; \ @@ -43552,7 +45040,50 @@ configure-stage3-target-libgcc: $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE3_CONFIGURE_FLAGS) + @stage2_werror_flag@ +@endif target-libgcc-bootstrap + +.PHONY: configure-stageb3g2-target-libgcc maybe-configure-stageb3g2-target-libgcc +maybe-configure-stageb3g2-target-libgcc: +@if target-libgcc-bootstrap +maybe-configure-stageb3g2-target-libgcc: configure-stageb3g2-target-libgcc +configure-stageb3g2-target-libgcc: + @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start + @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + echo "Checking multilib configuration for libgcc..."; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \ + if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \ + if cmp -s $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; then \ + rm -f $(TARGET_SUBDIR)/libgcc/multilib.tmp; \ + else \ + rm -f $(TARGET_SUBDIR)/libgcc/Makefile; \ + mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \ + fi; \ + else \ + mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \ + fi; \ + test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \ + $(NORMAL_TARGET_EXPORTS) \ + \ + CFLAGS="$(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; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + srcdiroption="--srcdir=$${topdir}/libgcc"; \ + libsrcdir="$$s/libgcc"; \ + $(SHELL) $${libsrcdir}/configure \ + $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ + --target=${target_alias} $${srcdiroption} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + @stage2_werror_flag@ @endif target-libgcc-bootstrap .PHONY: configure-stage4-target-libgcc maybe-configure-stage4-target-libgcc @@ -43564,7 +45095,6 @@ configure-stage4-target-libgcc: @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE4_TFLAGS)"; \ echo "Checking multilib configuration for libgcc..."; \ $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \ if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \ @@ -43579,10 +45109,9 @@ configure-stage4-target-libgcc: fi; \ test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ - \ - CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ - CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ - LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ + \ + 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; \ @@ -43597,7 +45126,7 @@ configure-stage4-target-libgcc: $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE4_CONFIGURE_FLAGS) + @stage2_werror_flag@ @endif target-libgcc-bootstrap .PHONY: configure-stageprofile-target-libgcc maybe-configure-stageprofile-target-libgcc @@ -43609,7 +45138,6 @@ configure-stageprofile-target-libgcc: @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEprofile_TFLAGS)"; \ echo "Checking multilib configuration for libgcc..."; \ $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \ if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \ @@ -43624,10 +45152,9 @@ configure-stageprofile-target-libgcc: fi; \ test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ - \ - CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ - CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ - LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ + \ + 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 profile in $(TARGET_SUBDIR)/libgcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \ cd $(TARGET_SUBDIR)/libgcc || exit 1; \ @@ -43642,7 +45169,7 @@ configure-stageprofile-target-libgcc: $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEprofile_CONFIGURE_FLAGS) + @stage2_werror_flag@ @endif target-libgcc-bootstrap .PHONY: configure-stagefeedback-target-libgcc maybe-configure-stagefeedback-target-libgcc @@ -43654,7 +45181,6 @@ configure-stagefeedback-target-libgcc: @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEfeedback_TFLAGS)"; \ echo "Checking multilib configuration for libgcc..."; \ $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \ if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \ @@ -43669,10 +45195,9 @@ configure-stagefeedback-target-libgcc: fi; \ test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ - \ - CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ - CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ - LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ + \ + 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; \ @@ -43687,7 +45212,7 @@ configure-stagefeedback-target-libgcc: $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEfeedback_CONFIGURE_FLAGS) + @stage2_werror_flag@ @endif target-libgcc-bootstrap @@ -43725,18 +45250,13 @@ all-stage1-target-libgcc: configure-stage1-target-libgcc @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE1_TFLAGS)"; \ $(NORMAL_TARGET_EXPORTS) \ cd $(TARGET_SUBDIR)/libgcc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_TARGET_FLAGS) \ - TFLAGS="$(STAGE1_TFLAGS)" \ + 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 @@ -43766,19 +45286,14 @@ all-stage2-target-libgcc: configure-stage2-target-libgcc @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE2_TFLAGS)"; \ $(NORMAL_TARGET_EXPORTS) \ \ cd $(TARGET_SUBDIR)/libgcc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_TARGET_FLAGS) \ - TFLAGS="$(STAGE2_TFLAGS)" \ + 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 @@ -43797,6 +45312,44 @@ clean-stage2-target-libgcc: @endif target-libgcc-bootstrap +.PHONY: all-stageb2g0-target-libgcc maybe-all-stageb2g0-target-libgcc +.PHONY: clean-stageb2g0-target-libgcc maybe-clean-stageb2g0-target-libgcc +maybe-all-stageb2g0-target-libgcc: +maybe-clean-stageb2g0-target-libgcc: +@if target-libgcc-bootstrap +maybe-all-stageb2g0-target-libgcc: all-stageb2g0-target-libgcc +all-stageb2g0: all-stageb2g0-target-libgcc +TARGET-stageb2g0-target-libgcc = $(TARGET-target-libgcc) +all-stageb2g0-target-libgcc: configure-stageb2g0-target-libgcc + @[ $(current_stage) = stageb2g0 ] || $(MAKE) stageb2g0-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(NORMAL_TARGET_EXPORTS) \ + \ + cd $(TARGET_SUBDIR)/libgcc && \ + $(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 +clean-stageb2g0: clean-stageb2g0-target-libgcc +clean-stageb2g0-target-libgcc: + @if [ $(current_stage) = stageb2g0 ]; then \ + [ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \ + else \ + [ -f $(TARGET_SUBDIR)/stageb2g0-libgcc/Makefile ] || exit 0; \ + $(MAKE) stageb2g0-start; \ + fi; \ + cd $(TARGET_SUBDIR)/libgcc && \ + $(MAKE) $(EXTRA_TARGET_FLAGS) \ + \ + clean +@endif target-libgcc-bootstrap + + .PHONY: all-stage3-target-libgcc maybe-all-stage3-target-libgcc .PHONY: clean-stage3-target-libgcc maybe-clean-stage3-target-libgcc maybe-all-stage3-target-libgcc: @@ -43809,19 +45362,14 @@ all-stage3-target-libgcc: configure-stage3-target-libgcc @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE3_TFLAGS)"; \ $(NORMAL_TARGET_EXPORTS) \ \ cd $(TARGET_SUBDIR)/libgcc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_TARGET_FLAGS) \ - TFLAGS="$(STAGE3_TFLAGS)" \ + 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 @@ -43840,6 +45388,44 @@ clean-stage3-target-libgcc: @endif target-libgcc-bootstrap +.PHONY: all-stageb3g2-target-libgcc maybe-all-stageb3g2-target-libgcc +.PHONY: clean-stageb3g2-target-libgcc maybe-clean-stageb3g2-target-libgcc +maybe-all-stageb3g2-target-libgcc: +maybe-clean-stageb3g2-target-libgcc: +@if target-libgcc-bootstrap +maybe-all-stageb3g2-target-libgcc: all-stageb3g2-target-libgcc +all-stageb3g2: all-stageb3g2-target-libgcc +TARGET-stageb3g2-target-libgcc = $(TARGET-target-libgcc) +all-stageb3g2-target-libgcc: configure-stageb3g2-target-libgcc + @[ $(current_stage) = stageb3g2 ] || $(MAKE) stageb3g2-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(NORMAL_TARGET_EXPORTS) \ + \ + cd $(TARGET_SUBDIR)/libgcc && \ + $(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 +clean-stageb3g2: clean-stageb3g2-target-libgcc +clean-stageb3g2-target-libgcc: + @if [ $(current_stage) = stageb3g2 ]; then \ + [ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \ + else \ + [ -f $(TARGET_SUBDIR)/stageb3g2-libgcc/Makefile ] || exit 0; \ + $(MAKE) stageb3g2-start; \ + fi; \ + cd $(TARGET_SUBDIR)/libgcc && \ + $(MAKE) $(EXTRA_TARGET_FLAGS) \ + \ + clean +@endif target-libgcc-bootstrap + + .PHONY: all-stage4-target-libgcc maybe-all-stage4-target-libgcc .PHONY: clean-stage4-target-libgcc maybe-clean-stage4-target-libgcc maybe-all-stage4-target-libgcc: @@ -43852,19 +45438,14 @@ all-stage4-target-libgcc: configure-stage4-target-libgcc @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE4_TFLAGS)"; \ $(NORMAL_TARGET_EXPORTS) \ \ cd $(TARGET_SUBDIR)/libgcc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_TARGET_FLAGS) \ - TFLAGS="$(STAGE4_TFLAGS)" \ + 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 @@ -43895,19 +45476,14 @@ all-stageprofile-target-libgcc: configure-stageprofile-target-libgcc @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEprofile_TFLAGS)"; \ $(NORMAL_TARGET_EXPORTS) \ \ cd $(TARGET_SUBDIR)/libgcc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_TARGET_FLAGS) \ - TFLAGS="$(STAGEprofile_TFLAGS)" \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_TARGET_FLAGS) \ $(TARGET-stageprofile-target-libgcc) maybe-clean-stageprofile-target-libgcc: clean-stageprofile-target-libgcc @@ -43938,19 +45514,14 @@ all-stagefeedback-target-libgcc: configure-stagefeedback-target-libgcc @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEfeedback_TFLAGS)"; \ $(NORMAL_TARGET_EXPORTS) \ \ cd $(TARGET_SUBDIR)/libgcc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_TARGET_FLAGS) \ - TFLAGS="$(STAGEfeedback_TFLAGS)" \ + 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 @@ -51350,63 +52921,19 @@ cross: all-build all-gas all-ld @endif gcc-no-bootstrap @if gcc - -.PHONY: check-gcc-c check-c -check-gcc-c: - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-gcc); -check-c: check-gcc-c - -.PHONY: check-gcc-c++ check-c++ +.PHONY: check-gcc-c++ check-gcc-c++: - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-c++); -check-c++: check-gcc-c++ check-target-libstdc++-v3 - -.PHONY: check-gcc-fortran check-fortran -check-gcc-fortran: - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-fortran); -check-fortran: check-gcc-fortran check-target-libgfortran - -.PHONY: check-gcc-java check-java -check-gcc-java: - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-java); -check-java: check-gcc-java check-target-libjava - -.PHONY: check-gcc-ada check-ada -check-gcc-ada: - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-ada); -check-ada: check-gcc-ada check-target-libada - -.PHONY: check-gcc-objc check-objc -check-gcc-objc: - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-objc); -check-objc: check-gcc-objc check-target-libobjc - -.PHONY: check-gcc-obj-c++ check-obj-c++ -check-gcc-obj-c++: - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-obj-c++); -check-obj-c++: check-gcc-obj-c++ + @if [ -f ./gcc/Makefile ] ; then \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-c++); \ + else \ + true; \ + fi +.PHONY: check-c++ +check-c++: check-target-libstdc++-v3 check-gcc-c++ # Install the gcc headers files, but not the fixed include files, # which Cygnus is not allowed to distribute. This rule is very @@ -51937,7 +53464,6 @@ bootstrap2: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE2_TFLAGS)"; \ $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target bootstrap2-lean: @@ -51948,7 +53474,6 @@ bootstrap2-lean: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE2_TFLAGS)"; \ $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target @@ -51964,6 +53489,274 @@ distclean-stage2:: @endif gcc-bootstrap +.PHONY: stageb2g0-start stageb2g0-end + +stageb2g0-start:: + @: $(MAKE); $(stage); \ + echo stageb2g0 > stage_current ; \ + echo stageb2g0 > stage_last; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR) +@if bfd + @cd $(HOST_SUBDIR); [ -d stageb2g0-bfd ] || \ + mkdir stageb2g0-bfd; \ + mv stageb2g0-bfd bfd ; \ + mv stage1-bfd prev-bfd || test -f stage1-lean +@endif bfd +@if opcodes + @cd $(HOST_SUBDIR); [ -d stageb2g0-opcodes ] || \ + mkdir stageb2g0-opcodes; \ + mv stageb2g0-opcodes opcodes ; \ + mv stage1-opcodes prev-opcodes || test -f stage1-lean +@endif opcodes +@if binutils + @cd $(HOST_SUBDIR); [ -d stageb2g0-binutils ] || \ + mkdir stageb2g0-binutils; \ + mv stageb2g0-binutils binutils ; \ + mv stage1-binutils prev-binutils || test -f stage1-lean +@endif binutils +@if gas + @cd $(HOST_SUBDIR); [ -d stageb2g0-gas ] || \ + mkdir stageb2g0-gas; \ + mv stageb2g0-gas gas ; \ + mv stage1-gas prev-gas || test -f stage1-lean +@endif gas +@if gcc + @cd $(HOST_SUBDIR); [ -d stageb2g0-gcc ] || \ + mkdir stageb2g0-gcc; \ + mv stageb2g0-gcc gcc ; \ + mv stage1-gcc prev-gcc || test -f stage1-lean +@endif gcc +@if gmp + @cd $(HOST_SUBDIR); [ -d stageb2g0-gmp ] || \ + mkdir stageb2g0-gmp; \ + mv stageb2g0-gmp gmp ; \ + mv stage1-gmp prev-gmp || test -f stage1-lean +@endif gmp +@if mpfr + @cd $(HOST_SUBDIR); [ -d stageb2g0-mpfr ] || \ + mkdir stageb2g0-mpfr; \ + mv stageb2g0-mpfr mpfr ; \ + mv stage1-mpfr prev-mpfr || test -f stage1-lean +@endif mpfr +@if ppl + @cd $(HOST_SUBDIR); [ -d stageb2g0-ppl ] || \ + mkdir stageb2g0-ppl; \ + mv stageb2g0-ppl ppl ; \ + mv stage1-ppl prev-ppl || test -f stage1-lean +@endif ppl +@if cloog + @cd $(HOST_SUBDIR); [ -d stageb2g0-cloog ] || \ + mkdir stageb2g0-cloog; \ + mv stageb2g0-cloog cloog ; \ + mv stage1-cloog prev-cloog || test -f stage1-lean +@endif cloog +@if gold + @cd $(HOST_SUBDIR); [ -d stageb2g0-gold ] || \ + mkdir stageb2g0-gold; \ + mv stageb2g0-gold gold ; \ + mv stage1-gold prev-gold || test -f stage1-lean +@endif gold +@if intl + @cd $(HOST_SUBDIR); [ -d stageb2g0-intl ] || \ + mkdir stageb2g0-intl; \ + mv stageb2g0-intl intl ; \ + mv stage1-intl prev-intl || test -f stage1-lean +@endif intl +@if ld + @cd $(HOST_SUBDIR); [ -d stageb2g0-ld ] || \ + mkdir stageb2g0-ld; \ + mv stageb2g0-ld ld ; \ + mv stage1-ld prev-ld || test -f stage1-lean +@endif ld +@if libcpp + @cd $(HOST_SUBDIR); [ -d stageb2g0-libcpp ] || \ + mkdir stageb2g0-libcpp; \ + mv stageb2g0-libcpp libcpp ; \ + mv stage1-libcpp prev-libcpp || test -f stage1-lean +@endif libcpp +@if libdecnumber + @cd $(HOST_SUBDIR); [ -d stageb2g0-libdecnumber ] || \ + mkdir stageb2g0-libdecnumber; \ + mv stageb2g0-libdecnumber libdecnumber ; \ + mv stage1-libdecnumber prev-libdecnumber || test -f stage1-lean +@endif libdecnumber +@if libiberty + @cd $(HOST_SUBDIR); [ -d stageb2g0-libiberty ] || \ + mkdir stageb2g0-libiberty; \ + mv stageb2g0-libiberty libiberty ; \ + mv stage1-libiberty prev-libiberty || test -f stage1-lean +@endif libiberty +@if zlib + @cd $(HOST_SUBDIR); [ -d stageb2g0-zlib ] || \ + mkdir stageb2g0-zlib; \ + mv stageb2g0-zlib zlib ; \ + mv stage1-zlib prev-zlib || test -f stage1-lean +@endif zlib + @[ -d stageb2g0-$(TARGET_SUBDIR) ] || \ + mkdir stageb2g0-$(TARGET_SUBDIR); \ + mv stageb2g0-$(TARGET_SUBDIR) $(TARGET_SUBDIR) ; \ + mv stage1-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage1-lean + +stageb2g0-end:: +@if bfd + @if test -d $(HOST_SUBDIR)/bfd ; then \ + cd $(HOST_SUBDIR); mv bfd stageb2g0-bfd ; \ + mv prev-bfd stage1-bfd ; : ; \ + fi +@endif bfd +@if opcodes + @if test -d $(HOST_SUBDIR)/opcodes ; then \ + cd $(HOST_SUBDIR); mv opcodes stageb2g0-opcodes ; \ + mv prev-opcodes stage1-opcodes ; : ; \ + fi +@endif opcodes +@if binutils + @if test -d $(HOST_SUBDIR)/binutils ; then \ + cd $(HOST_SUBDIR); mv binutils stageb2g0-binutils ; \ + mv prev-binutils stage1-binutils ; : ; \ + fi +@endif binutils +@if gas + @if test -d $(HOST_SUBDIR)/gas ; then \ + cd $(HOST_SUBDIR); mv gas stageb2g0-gas ; \ + mv prev-gas stage1-gas ; : ; \ + fi +@endif gas +@if gcc + @if test -d $(HOST_SUBDIR)/gcc ; then \ + cd $(HOST_SUBDIR); mv gcc stageb2g0-gcc ; \ + mv prev-gcc stage1-gcc ; : ; \ + fi +@endif gcc +@if gmp + @if test -d $(HOST_SUBDIR)/gmp ; then \ + cd $(HOST_SUBDIR); mv gmp stageb2g0-gmp ; \ + mv prev-gmp stage1-gmp ; : ; \ + fi +@endif gmp +@if mpfr + @if test -d $(HOST_SUBDIR)/mpfr ; then \ + cd $(HOST_SUBDIR); mv mpfr stageb2g0-mpfr ; \ + mv prev-mpfr stage1-mpfr ; : ; \ + fi +@endif mpfr +@if ppl + @if test -d $(HOST_SUBDIR)/ppl ; then \ + cd $(HOST_SUBDIR); mv ppl stageb2g0-ppl ; \ + mv prev-ppl stage1-ppl ; : ; \ + fi +@endif ppl +@if cloog + @if test -d $(HOST_SUBDIR)/cloog ; then \ + cd $(HOST_SUBDIR); mv cloog stageb2g0-cloog ; \ + mv prev-cloog stage1-cloog ; : ; \ + fi +@endif cloog +@if gold + @if test -d $(HOST_SUBDIR)/gold ; then \ + cd $(HOST_SUBDIR); mv gold stageb2g0-gold ; \ + mv prev-gold stage1-gold ; : ; \ + fi +@endif gold +@if intl + @if test -d $(HOST_SUBDIR)/intl ; then \ + cd $(HOST_SUBDIR); mv intl stageb2g0-intl ; \ + mv prev-intl stage1-intl ; : ; \ + fi +@endif intl +@if ld + @if test -d $(HOST_SUBDIR)/ld ; then \ + cd $(HOST_SUBDIR); mv ld stageb2g0-ld ; \ + mv prev-ld stage1-ld ; : ; \ + fi +@endif ld +@if libcpp + @if test -d $(HOST_SUBDIR)/libcpp ; then \ + cd $(HOST_SUBDIR); mv libcpp stageb2g0-libcpp ; \ + mv prev-libcpp stage1-libcpp ; : ; \ + fi +@endif libcpp +@if libdecnumber + @if test -d $(HOST_SUBDIR)/libdecnumber ; then \ + cd $(HOST_SUBDIR); mv libdecnumber stageb2g0-libdecnumber ; \ + mv prev-libdecnumber stage1-libdecnumber ; : ; \ + fi +@endif libdecnumber +@if libiberty + @if test -d $(HOST_SUBDIR)/libiberty ; then \ + cd $(HOST_SUBDIR); mv libiberty stageb2g0-libiberty ; \ + mv prev-libiberty stage1-libiberty ; : ; \ + fi +@endif libiberty +@if zlib + @if test -d $(HOST_SUBDIR)/zlib ; then \ + cd $(HOST_SUBDIR); mv zlib stageb2g0-zlib ; \ + mv prev-zlib stage1-zlib ; : ; \ + fi +@endif zlib + @if test -d $(TARGET_SUBDIR) ; then \ + mv $(TARGET_SUBDIR) stageb2g0-$(TARGET_SUBDIR) ; \ + mv prev-$(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR) ; : ; \ + fi + rm -f stage_current + +# Bubble a bug fix through all the stages up to stage b2g0. They are +# remade, but not reconfigured. The next stage (if any) will not be +# reconfigured either. +.PHONY: stageb2g0-bubble +stageb2g0-bubble:: stage1-bubble + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + if test -f stageb2g0-lean || test -f stage1-lean ; then \ + echo Skipping rebuild of stageb2g0 ; \ + else \ + $(MAKE) stageb2g0-start; \ + $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stageb2g0; \ + fi + +.PHONY: all-stageb2g0 clean-stageb2g0 +do-clean: clean-stageb2g0 + +# FIXME: Will not need to be conditional when toplevel bootstrap is the +# only possibility, but now it conflicts with no-bootstrap rules +@if gcc-bootstrap + + + +.PHONY: bootstrap2-debug bootstrap2-debug-lean +bootstrap2-debug: + echo stageb2g0 > stage_final + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(MAKE) $(RECURSE_FLAGS_TO_PASS) stageb2g0-bubble + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target + +bootstrap2-debug-lean: + echo stageb2g0 > stage_final + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(MAKE) $(RECURSE_FLAGS_TO_PASS) LEAN=: stageb2g0-bubble + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target + + +# Rules to wipe a stage and all the following ones, also used for cleanstrap +distclean-stage1:: distclean-stageb2g0 +.PHONY: distclean-stageb2g0 +distclean-stageb2g0:: + @: $(MAKE); $(stage) + @test "`cat stage_last`" != stageb2g0 || rm -f stage_last + rm -rf stageb2g0-* + + +@endif gcc-bootstrap + + .PHONY: stage3-start stage3-end stage3-start:: @@ -52211,16 +54004,15 @@ compare: : $(MAKE); $(stage); \ rm -f .bad_compare ; \ echo Comparing stages 2 and 3 ; \ - sed=`echo stage3 | sed 's,^stage,,;s,.,.,g'`; \ - files=`find stage3-* -name "*$(objext)" -print | \ - sed -n s,^stage$$sed-,,p` ; \ + cd stage3-gcc; \ + files=`find . -name "*$(objext)" -print` ; \ + cd .. ; \ for file in $${files} ; do \ - f1=$$r/stage2-$$file; f2=$$r/stage3-$$file; \ - if test ! -f $$f1; then continue; fi; \ + f1=$$r/stage2-gcc/$$file; f2=$$r/stage3-gcc/$$file; \ $(do-compare) > /dev/null 2>&1; \ if test $$? -eq 1; then \ case $$file in \ - gcc/cc*-checksum$(objext) | ./libgcc/* | ./gcc/ada/*tools/*) \ + ./cc*-checksum$(objext) | ./libgcc/* ) \ echo warning: $$file differs ;; \ *) \ echo $$file differs >> .bad_compare ;; \ @@ -52251,7 +54043,6 @@ bootstrap: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE3_TFLAGS)"; \ $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target bootstrap-lean: @@ -52262,7 +54053,6 @@ bootstrap-lean: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE3_TFLAGS)"; \ $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target @@ -52284,7 +54074,328 @@ cleanstrap: do-distclean local-clean @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE3_TFLAGS)"; \ + $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target + +@endif gcc-bootstrap + + +.PHONY: stageb3g2-start stageb3g2-end + +stageb3g2-start:: + @: $(MAKE); $(stage); \ + echo stageb3g2 > stage_current ; \ + echo stageb3g2 > stage_last; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR) +@if bfd + @cd $(HOST_SUBDIR); [ -d stageb3g2-bfd ] || \ + mkdir stageb3g2-bfd; \ + mv stageb3g2-bfd bfd ; \ + mv stageb2g0-bfd prev-bfd || test -f stageb2g0-lean +@endif bfd +@if opcodes + @cd $(HOST_SUBDIR); [ -d stageb3g2-opcodes ] || \ + mkdir stageb3g2-opcodes; \ + mv stageb3g2-opcodes opcodes ; \ + mv stageb2g0-opcodes prev-opcodes || test -f stageb2g0-lean +@endif opcodes +@if binutils + @cd $(HOST_SUBDIR); [ -d stageb3g2-binutils ] || \ + mkdir stageb3g2-binutils; \ + mv stageb3g2-binutils binutils ; \ + mv stageb2g0-binutils prev-binutils || test -f stageb2g0-lean +@endif binutils +@if gas + @cd $(HOST_SUBDIR); [ -d stageb3g2-gas ] || \ + mkdir stageb3g2-gas; \ + mv stageb3g2-gas gas ; \ + mv stageb2g0-gas prev-gas || test -f stageb2g0-lean +@endif gas +@if gcc + @cd $(HOST_SUBDIR); [ -d stageb3g2-gcc ] || \ + mkdir stageb3g2-gcc; \ + mv stageb3g2-gcc gcc ; \ + mv stageb2g0-gcc prev-gcc || test -f stageb2g0-lean +@endif gcc +@if gmp + @cd $(HOST_SUBDIR); [ -d stageb3g2-gmp ] || \ + mkdir stageb3g2-gmp; \ + mv stageb3g2-gmp gmp ; \ + mv stageb2g0-gmp prev-gmp || test -f stageb2g0-lean +@endif gmp +@if mpfr + @cd $(HOST_SUBDIR); [ -d stageb3g2-mpfr ] || \ + mkdir stageb3g2-mpfr; \ + mv stageb3g2-mpfr mpfr ; \ + mv stageb2g0-mpfr prev-mpfr || test -f stageb2g0-lean +@endif mpfr +@if ppl + @cd $(HOST_SUBDIR); [ -d stageb3g2-ppl ] || \ + mkdir stageb3g2-ppl; \ + mv stageb3g2-ppl ppl ; \ + mv stageb2g0-ppl prev-ppl || test -f stageb2g0-lean +@endif ppl +@if cloog + @cd $(HOST_SUBDIR); [ -d stageb3g2-cloog ] || \ + mkdir stageb3g2-cloog; \ + mv stageb3g2-cloog cloog ; \ + mv stageb2g0-cloog prev-cloog || test -f stageb2g0-lean +@endif cloog +@if gold + @cd $(HOST_SUBDIR); [ -d stageb3g2-gold ] || \ + mkdir stageb3g2-gold; \ + mv stageb3g2-gold gold ; \ + mv stageb2g0-gold prev-gold || test -f stageb2g0-lean +@endif gold +@if intl + @cd $(HOST_SUBDIR); [ -d stageb3g2-intl ] || \ + mkdir stageb3g2-intl; \ + mv stageb3g2-intl intl ; \ + mv stageb2g0-intl prev-intl || test -f stageb2g0-lean +@endif intl +@if ld + @cd $(HOST_SUBDIR); [ -d stageb3g2-ld ] || \ + mkdir stageb3g2-ld; \ + mv stageb3g2-ld ld ; \ + mv stageb2g0-ld prev-ld || test -f stageb2g0-lean +@endif ld +@if libcpp + @cd $(HOST_SUBDIR); [ -d stageb3g2-libcpp ] || \ + mkdir stageb3g2-libcpp; \ + mv stageb3g2-libcpp libcpp ; \ + mv stageb2g0-libcpp prev-libcpp || test -f stageb2g0-lean +@endif libcpp +@if libdecnumber + @cd $(HOST_SUBDIR); [ -d stageb3g2-libdecnumber ] || \ + mkdir stageb3g2-libdecnumber; \ + mv stageb3g2-libdecnumber libdecnumber ; \ + mv stageb2g0-libdecnumber prev-libdecnumber || test -f stageb2g0-lean +@endif libdecnumber +@if libiberty + @cd $(HOST_SUBDIR); [ -d stageb3g2-libiberty ] || \ + mkdir stageb3g2-libiberty; \ + mv stageb3g2-libiberty libiberty ; \ + mv stageb2g0-libiberty prev-libiberty || test -f stageb2g0-lean +@endif libiberty +@if zlib + @cd $(HOST_SUBDIR); [ -d stageb3g2-zlib ] || \ + mkdir stageb3g2-zlib; \ + mv stageb3g2-zlib zlib ; \ + mv stageb2g0-zlib prev-zlib || test -f stageb2g0-lean +@endif zlib + @[ -d stageb3g2-$(TARGET_SUBDIR) ] || \ + mkdir stageb3g2-$(TARGET_SUBDIR); \ + mv stageb3g2-$(TARGET_SUBDIR) $(TARGET_SUBDIR) ; \ + mv stageb2g0-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stageb2g0-lean + +stageb3g2-end:: +@if bfd + @if test -d $(HOST_SUBDIR)/bfd ; then \ + cd $(HOST_SUBDIR); mv bfd stageb3g2-bfd ; \ + mv prev-bfd stageb2g0-bfd ; : ; \ + fi +@endif bfd +@if opcodes + @if test -d $(HOST_SUBDIR)/opcodes ; then \ + cd $(HOST_SUBDIR); mv opcodes stageb3g2-opcodes ; \ + mv prev-opcodes stageb2g0-opcodes ; : ; \ + fi +@endif opcodes +@if binutils + @if test -d $(HOST_SUBDIR)/binutils ; then \ + cd $(HOST_SUBDIR); mv binutils stageb3g2-binutils ; \ + mv prev-binutils stageb2g0-binutils ; : ; \ + fi +@endif binutils +@if gas + @if test -d $(HOST_SUBDIR)/gas ; then \ + cd $(HOST_SUBDIR); mv gas stageb3g2-gas ; \ + mv prev-gas stageb2g0-gas ; : ; \ + fi +@endif gas +@if gcc + @if test -d $(HOST_SUBDIR)/gcc ; then \ + cd $(HOST_SUBDIR); mv gcc stageb3g2-gcc ; \ + mv prev-gcc stageb2g0-gcc ; : ; \ + fi +@endif gcc +@if gmp + @if test -d $(HOST_SUBDIR)/gmp ; then \ + cd $(HOST_SUBDIR); mv gmp stageb3g2-gmp ; \ + mv prev-gmp stageb2g0-gmp ; : ; \ + fi +@endif gmp +@if mpfr + @if test -d $(HOST_SUBDIR)/mpfr ; then \ + cd $(HOST_SUBDIR); mv mpfr stageb3g2-mpfr ; \ + mv prev-mpfr stageb2g0-mpfr ; : ; \ + fi +@endif mpfr +@if ppl + @if test -d $(HOST_SUBDIR)/ppl ; then \ + cd $(HOST_SUBDIR); mv ppl stageb3g2-ppl ; \ + mv prev-ppl stageb2g0-ppl ; : ; \ + fi +@endif ppl +@if cloog + @if test -d $(HOST_SUBDIR)/cloog ; then \ + cd $(HOST_SUBDIR); mv cloog stageb3g2-cloog ; \ + mv prev-cloog stageb2g0-cloog ; : ; \ + fi +@endif cloog +@if gold + @if test -d $(HOST_SUBDIR)/gold ; then \ + cd $(HOST_SUBDIR); mv gold stageb3g2-gold ; \ + mv prev-gold stageb2g0-gold ; : ; \ + fi +@endif gold +@if intl + @if test -d $(HOST_SUBDIR)/intl ; then \ + cd $(HOST_SUBDIR); mv intl stageb3g2-intl ; \ + mv prev-intl stageb2g0-intl ; : ; \ + fi +@endif intl +@if ld + @if test -d $(HOST_SUBDIR)/ld ; then \ + cd $(HOST_SUBDIR); mv ld stageb3g2-ld ; \ + mv prev-ld stageb2g0-ld ; : ; \ + fi +@endif ld +@if libcpp + @if test -d $(HOST_SUBDIR)/libcpp ; then \ + cd $(HOST_SUBDIR); mv libcpp stageb3g2-libcpp ; \ + mv prev-libcpp stageb2g0-libcpp ; : ; \ + fi +@endif libcpp +@if libdecnumber + @if test -d $(HOST_SUBDIR)/libdecnumber ; then \ + cd $(HOST_SUBDIR); mv libdecnumber stageb3g2-libdecnumber ; \ + mv prev-libdecnumber stageb2g0-libdecnumber ; : ; \ + fi +@endif libdecnumber +@if libiberty + @if test -d $(HOST_SUBDIR)/libiberty ; then \ + cd $(HOST_SUBDIR); mv libiberty stageb3g2-libiberty ; \ + mv prev-libiberty stageb2g0-libiberty ; : ; \ + fi +@endif libiberty +@if zlib + @if test -d $(HOST_SUBDIR)/zlib ; then \ + cd $(HOST_SUBDIR); mv zlib stageb3g2-zlib ; \ + mv prev-zlib stageb2g0-zlib ; : ; \ + fi +@endif zlib + @if test -d $(TARGET_SUBDIR) ; then \ + mv $(TARGET_SUBDIR) stageb3g2-$(TARGET_SUBDIR) ; \ + mv prev-$(TARGET_SUBDIR) stageb2g0-$(TARGET_SUBDIR) ; : ; \ + fi + rm -f stage_current + +# Bubble a bug fix through all the stages up to stage b3g2. They are +# remade, but not reconfigured. The next stage (if any) will not be +# reconfigured either. +.PHONY: stageb3g2-bubble +stageb3g2-bubble:: stageb2g0-bubble + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + if test -f stageb3g2-lean || test -f stageb2g0-lean ; then \ + echo Skipping rebuild of stageb3g2 ; \ + else \ + $(MAKE) stageb3g2-start; \ + if $(LEAN); then \ + rm -rf stage1-* ; \ + $(STAMP) stage1-lean ; \ + fi; \ + $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stageb3g2; \ + fi + $(MAKE) $(RECURSE_FLAGS_TO_PASS) compare-debug + +.PHONY: all-stageb3g2 clean-stageb3g2 +do-clean: clean-stageb3g2 + +# FIXME: Will not need to be conditional when toplevel bootstrap is the +# only possibility, but now it conflicts with no-bootstrap rules +@if gcc-bootstrap + +compare-debug: + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + if test -f stageb2g0-lean; then \ + echo Cannot compare object files as stage b2g0 was deleted. ; \ + exit 0 ; \ + fi; \ + : $(MAKE); $(stage); \ + rm -f .bad_compare ; \ + echo Comparing stages b2g0 and b3g2 ; \ + cd stageb3g2-gcc; \ + files=`find . -name "*$(objext)" -print` ; \ + cd .. ; \ + for file in $${files} ; do \ + f1=$$r/stageb2g0-gcc/$$file; f2=$$r/stageb3g2-gcc/$$file; \ + $(do-compare-debug) > /dev/null 2>&1; \ + if test $$? -eq 1; then \ + case $$file in \ + ./cc*-checksum$(objext) | ./libgcc/* ) \ + echo warning: $$file differs ;; \ + *) \ + echo $$file differs >> .bad_compare ;; \ + esac ; \ + fi ; \ + done ; \ + if [ -f .bad_compare ]; then \ + echo "Bootstrap comparison failure!"; \ + cat .bad_compare; \ + exit 1; \ + else \ + echo Comparison successful.; \ + fi ; \ + $(STAMP) compare-debug + if $(LEAN); then \ + rm -rf stageb2g0-*; \ + $(STAMP) stageb2g0-lean; \ + fi + + + +.PHONY: bootstrap-debug bootstrap-debug-lean +bootstrap-debug: + echo stageb3g2 > stage_final + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(MAKE) $(RECURSE_FLAGS_TO_PASS) stageb3g2-bubble + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target + +bootstrap-debug-lean: + echo stageb3g2 > stage_final + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(MAKE) $(RECURSE_FLAGS_TO_PASS) LEAN=: stageb3g2-bubble + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target + + +# Rules to wipe a stage and all the following ones, also used for cleanstrap +distclean-stageb2g0:: distclean-stageb3g2 +.PHONY: distclean-stageb3g2 +distclean-stageb3g2:: + @: $(MAKE); $(stage) + @test "`cat stage_last`" != stageb3g2 || rm -f stage_last + rm -rf stageb3g2-* compare-debug + + +.PHONY: cleanstrap-debug +cleanstrap-debug: do-distclean local-clean + echo stageb3g2 > stage_final + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(MAKE) $(RECURSE_FLAGS_TO_PASS) stageb3g2-bubble + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target @endif gcc-bootstrap @@ -52537,16 +54648,15 @@ compare3: : $(MAKE); $(stage); \ rm -f .bad_compare ; \ echo Comparing stages 3 and 4 ; \ - sed=`echo stage4 | sed 's,^stage,,;s,.,.,g'`; \ - files=`find stage4-* -name "*$(objext)" -print | \ - sed -n s,^stage$$sed-,,p` ; \ + cd stage4-gcc; \ + files=`find . -name "*$(objext)" -print` ; \ + cd .. ; \ for file in $${files} ; do \ - f1=$$r/stage3-$$file; f2=$$r/stage4-$$file; \ - if test ! -f $$f1; then continue; fi; \ + f1=$$r/stage3-gcc/$$file; f2=$$r/stage4-gcc/$$file; \ $(do-compare3) > /dev/null 2>&1; \ if test $$? -eq 1; then \ case $$file in \ - gcc/cc*-checksum$(objext) | ./libgcc/* | ./gcc/ada/*tools/*) \ + ./cc*-checksum$(objext) | ./libgcc/* ) \ echo warning: $$file differs ;; \ *) \ echo $$file differs >> .bad_compare ;; \ @@ -52577,7 +54687,6 @@ bootstrap4: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE4_TFLAGS)"; \ $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target bootstrap4-lean: @@ -52588,7 +54697,6 @@ bootstrap4-lean: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE4_TFLAGS)"; \ $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target @@ -53094,7 +55202,6 @@ profiledbootstrap: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEfeedback_TFLAGS)"; \ $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target profiledbootstrap-lean: @@ -53105,7 +55212,6 @@ profiledbootstrap-lean: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEfeedback_TFLAGS)"; \ $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target @@ -53153,7 +55259,7 @@ stage_current: .PHONY: restrap restrap:: @: $(MAKE); $(stage) - rm -rf stage1-$(TARGET_SUBDIR) stage2-* stage3-* stage4-* stageprofile-* stagefeedback-* + rm -rf stage1-$(TARGET_SUBDIR) stage2-* stageb2g0-* stage3-* stageb3g2-* stage4-* stageprofile-* stagefeedback-* restrap:: all @endif gcc-bootstrap @@ -53169,7 +55275,9 @@ configure-target-libssp: stage_last configure-target-newlib: stage_last configure-stage1-target-libgcc: maybe-all-stage1-gcc configure-stage2-target-libgcc: maybe-all-stage2-gcc +configure-stageb2g0-target-libgcc: maybe-all-stageb2g0-gcc configure-stage3-target-libgcc: maybe-all-stage3-gcc +configure-stageb3g2-target-libgcc: maybe-all-stageb3g2-gcc configure-stage4-target-libgcc: maybe-all-stage4-gcc configure-stageprofile-target-libgcc: maybe-all-stageprofile-gcc configure-stagefeedback-target-libgcc: maybe-all-stagefeedback-gcc @@ -53246,7 +55354,9 @@ configure-gcc: maybe-configure-intl configure-stage1-gcc: maybe-configure-stage1-intl configure-stage2-gcc: maybe-configure-stage2-intl +configure-stageb2g0-gcc: maybe-configure-stageb2g0-intl configure-stage3-gcc: maybe-configure-stage3-intl +configure-stageb3g2-gcc: maybe-configure-stageb3g2-intl configure-stage4-gcc: maybe-configure-stage4-intl configure-stageprofile-gcc: maybe-configure-stageprofile-intl configure-stagefeedback-gcc: maybe-configure-stagefeedback-intl @@ -53254,7 +55364,9 @@ configure-gcc: maybe-all-binutils configure-stage1-gcc: maybe-all-stage1-binutils configure-stage2-gcc: maybe-all-stage2-binutils +configure-stageb2g0-gcc: maybe-all-stageb2g0-binutils configure-stage3-gcc: maybe-all-stage3-binutils +configure-stageb3g2-gcc: maybe-all-stageb3g2-binutils configure-stage4-gcc: maybe-all-stage4-binutils configure-stageprofile-gcc: maybe-all-stageprofile-binutils configure-stagefeedback-gcc: maybe-all-stagefeedback-binutils @@ -53262,7 +55374,9 @@ configure-gcc: maybe-all-gas configure-stage1-gcc: maybe-all-stage1-gas configure-stage2-gcc: maybe-all-stage2-gas +configure-stageb2g0-gcc: maybe-all-stageb2g0-gas configure-stage3-gcc: maybe-all-stage3-gas +configure-stageb3g2-gcc: maybe-all-stageb3g2-gas configure-stage4-gcc: maybe-all-stage4-gas configure-stageprofile-gcc: maybe-all-stageprofile-gas configure-stagefeedback-gcc: maybe-all-stagefeedback-gas @@ -53270,7 +55384,9 @@ configure-gcc: maybe-all-ld configure-stage1-gcc: maybe-all-stage1-ld configure-stage2-gcc: maybe-all-stage2-ld +configure-stageb2g0-gcc: maybe-all-stageb2g0-ld configure-stage3-gcc: maybe-all-stage3-ld +configure-stageb3g2-gcc: maybe-all-stageb3g2-ld configure-stage4-gcc: maybe-all-stage4-ld configure-stageprofile-gcc: maybe-all-stageprofile-ld configure-stagefeedback-gcc: maybe-all-stagefeedback-ld @@ -53278,7 +55394,9 @@ configure-gcc: maybe-all-gold configure-stage1-gcc: maybe-all-stage1-gold configure-stage2-gcc: maybe-all-stage2-gold +configure-stageb2g0-gcc: maybe-all-stageb2g0-gold configure-stage3-gcc: maybe-all-stage3-gold +configure-stageb3g2-gcc: maybe-all-stageb3g2-gold configure-stage4-gcc: maybe-all-stage4-gold configure-stageprofile-gcc: maybe-all-stageprofile-gold configure-stagefeedback-gcc: maybe-all-stagefeedback-gold @@ -53286,7 +55404,9 @@ all-gcc: all-libiberty all-stage1-gcc: all-stage1-libiberty all-stage2-gcc: all-stage2-libiberty +all-stageb2g0-gcc: all-stageb2g0-libiberty all-stage3-gcc: all-stage3-libiberty +all-stageb3g2-gcc: all-stageb3g2-libiberty all-stage4-gcc: all-stage4-libiberty all-stageprofile-gcc: all-stageprofile-libiberty all-stagefeedback-gcc: all-stagefeedback-libiberty @@ -53294,7 +55414,9 @@ all-gcc: maybe-all-gmp all-stage1-gcc: maybe-all-stage1-gmp all-stage2-gcc: maybe-all-stage2-gmp +all-stageb2g0-gcc: maybe-all-stageb2g0-gmp all-stage3-gcc: maybe-all-stage3-gmp +all-stageb3g2-gcc: maybe-all-stageb3g2-gmp all-stage4-gcc: maybe-all-stage4-gmp all-stageprofile-gcc: maybe-all-stageprofile-gmp all-stagefeedback-gcc: maybe-all-stagefeedback-gmp @@ -53302,7 +55424,9 @@ all-gcc: maybe-all-intl all-stage1-gcc: maybe-all-stage1-intl all-stage2-gcc: maybe-all-stage2-intl +all-stageb2g0-gcc: maybe-all-stageb2g0-intl all-stage3-gcc: maybe-all-stage3-intl +all-stageb3g2-gcc: maybe-all-stageb3g2-intl all-stage4-gcc: maybe-all-stage4-intl all-stageprofile-gcc: maybe-all-stageprofile-intl all-stagefeedback-gcc: maybe-all-stagefeedback-intl @@ -53310,7 +55434,9 @@ all-gcc: maybe-all-mpfr all-stage1-gcc: maybe-all-stage1-mpfr all-stage2-gcc: maybe-all-stage2-mpfr +all-stageb2g0-gcc: maybe-all-stageb2g0-mpfr all-stage3-gcc: maybe-all-stage3-mpfr +all-stageb3g2-gcc: maybe-all-stageb3g2-mpfr all-stage4-gcc: maybe-all-stage4-mpfr all-stageprofile-gcc: maybe-all-stageprofile-mpfr all-stagefeedback-gcc: maybe-all-stagefeedback-mpfr @@ -53318,7 +55444,9 @@ all-gcc: maybe-all-ppl all-stage1-gcc: maybe-all-stage1-ppl all-stage2-gcc: maybe-all-stage2-ppl +all-stageb2g0-gcc: maybe-all-stageb2g0-ppl all-stage3-gcc: maybe-all-stage3-ppl +all-stageb3g2-gcc: maybe-all-stageb3g2-ppl all-stage4-gcc: maybe-all-stage4-ppl all-stageprofile-gcc: maybe-all-stageprofile-ppl all-stagefeedback-gcc: maybe-all-stagefeedback-ppl @@ -53326,7 +55454,9 @@ all-gcc: maybe-all-cloog all-stage1-gcc: maybe-all-stage1-cloog all-stage2-gcc: maybe-all-stage2-cloog +all-stageb2g0-gcc: maybe-all-stageb2g0-cloog all-stage3-gcc: maybe-all-stage3-cloog +all-stageb3g2-gcc: maybe-all-stageb3g2-cloog all-stage4-gcc: maybe-all-stage4-cloog all-stageprofile-gcc: maybe-all-stageprofile-cloog all-stagefeedback-gcc: maybe-all-stagefeedback-cloog @@ -53334,7 +55464,9 @@ all-gcc: maybe-all-build-texinfo all-stage1-gcc: maybe-all-build-texinfo all-stage2-gcc: maybe-all-build-texinfo +all-stageb2g0-gcc: maybe-all-build-texinfo all-stage3-gcc: maybe-all-build-texinfo +all-stageb3g2-gcc: maybe-all-build-texinfo all-stage4-gcc: maybe-all-build-texinfo all-stageprofile-gcc: maybe-all-build-texinfo all-stagefeedback-gcc: maybe-all-build-texinfo @@ -53342,7 +55474,9 @@ all-gcc: maybe-all-build-bison all-stage1-gcc: maybe-all-build-bison all-stage2-gcc: maybe-all-build-bison +all-stageb2g0-gcc: maybe-all-build-bison all-stage3-gcc: maybe-all-build-bison +all-stageb3g2-gcc: maybe-all-build-bison all-stage4-gcc: maybe-all-build-bison all-stageprofile-gcc: maybe-all-build-bison all-stagefeedback-gcc: maybe-all-build-bison @@ -53350,7 +55484,9 @@ all-gcc: maybe-all-build-byacc all-stage1-gcc: maybe-all-build-byacc all-stage2-gcc: maybe-all-build-byacc +all-stageb2g0-gcc: maybe-all-build-byacc all-stage3-gcc: maybe-all-build-byacc +all-stageb3g2-gcc: maybe-all-build-byacc all-stage4-gcc: maybe-all-build-byacc all-stageprofile-gcc: maybe-all-build-byacc all-stagefeedback-gcc: maybe-all-build-byacc @@ -53358,7 +55494,9 @@ all-gcc: maybe-all-build-flex all-stage1-gcc: maybe-all-build-flex all-stage2-gcc: maybe-all-build-flex +all-stageb2g0-gcc: maybe-all-build-flex all-stage3-gcc: maybe-all-build-flex +all-stageb3g2-gcc: maybe-all-build-flex all-stage4-gcc: maybe-all-build-flex all-stageprofile-gcc: maybe-all-build-flex all-stagefeedback-gcc: maybe-all-build-flex @@ -53366,7 +55504,9 @@ all-gcc: maybe-all-build-libiberty all-stage1-gcc: maybe-all-build-libiberty all-stage2-gcc: maybe-all-build-libiberty +all-stageb2g0-gcc: maybe-all-build-libiberty all-stage3-gcc: maybe-all-build-libiberty +all-stageb3g2-gcc: maybe-all-build-libiberty all-stage4-gcc: maybe-all-build-libiberty all-stageprofile-gcc: maybe-all-build-libiberty all-stagefeedback-gcc: maybe-all-build-libiberty @@ -53374,7 +55514,9 @@ all-gcc: maybe-all-build-fixincludes all-stage1-gcc: maybe-all-build-fixincludes all-stage2-gcc: maybe-all-build-fixincludes +all-stageb2g0-gcc: maybe-all-build-fixincludes all-stage3-gcc: maybe-all-build-fixincludes +all-stageb3g2-gcc: maybe-all-build-fixincludes all-stage4-gcc: maybe-all-build-fixincludes all-stageprofile-gcc: maybe-all-build-fixincludes all-stagefeedback-gcc: maybe-all-build-fixincludes @@ -53382,7 +55524,9 @@ all-gcc: maybe-all-zlib all-stage1-gcc: maybe-all-stage1-zlib all-stage2-gcc: maybe-all-stage2-zlib +all-stageb2g0-gcc: maybe-all-stageb2g0-zlib all-stage3-gcc: maybe-all-stage3-zlib +all-stageb3g2-gcc: maybe-all-stageb3g2-zlib all-stage4-gcc: maybe-all-stage4-zlib all-stageprofile-gcc: maybe-all-stageprofile-zlib all-stagefeedback-gcc: maybe-all-stagefeedback-zlib @@ -53390,7 +55534,9 @@ all-gcc: all-libcpp all-stage1-gcc: all-stage1-libcpp all-stage2-gcc: all-stage2-libcpp +all-stageb2g0-gcc: all-stageb2g0-libcpp all-stage3-gcc: all-stage3-libcpp +all-stageb3g2-gcc: all-stageb3g2-libcpp all-stage4-gcc: all-stage4-libcpp all-stageprofile-gcc: all-stageprofile-libcpp all-stagefeedback-gcc: all-stagefeedback-libcpp @@ -53398,7 +55544,9 @@ all-gcc: all-libdecnumber all-stage1-gcc: all-stage1-libdecnumber all-stage2-gcc: all-stage2-libdecnumber +all-stageb2g0-gcc: all-stageb2g0-libdecnumber all-stage3-gcc: all-stage3-libdecnumber +all-stageb3g2-gcc: all-stageb3g2-libdecnumber all-stage4-gcc: all-stage4-libdecnumber all-stageprofile-gcc: all-stageprofile-libdecnumber all-stagefeedback-gcc: all-stagefeedback-libdecnumber @@ -53406,7 +55554,9 @@ all-gcc: maybe-all-libiberty all-stage1-gcc: maybe-all-stage1-libiberty all-stage2-gcc: maybe-all-stage2-libiberty +all-stageb2g0-gcc: maybe-all-stageb2g0-libiberty all-stage3-gcc: maybe-all-stage3-libiberty +all-stageb3g2-gcc: maybe-all-stageb3g2-libiberty all-stage4-gcc: maybe-all-stage4-libiberty all-stageprofile-gcc: maybe-all-stageprofile-libiberty all-stagefeedback-gcc: maybe-all-stagefeedback-libiberty @@ -53416,7 +55566,9 @@ configure-libcpp: configure-libiberty configure-stage1-libcpp: configure-stage1-libiberty configure-stage2-libcpp: configure-stage2-libiberty +configure-stageb2g0-libcpp: configure-stageb2g0-libiberty configure-stage3-libcpp: configure-stage3-libiberty +configure-stageb3g2-libcpp: configure-stageb3g2-libiberty configure-stage4-libcpp: configure-stage4-libiberty configure-stageprofile-libcpp: configure-stageprofile-libiberty configure-stagefeedback-libcpp: configure-stagefeedback-libiberty @@ -53424,7 +55576,9 @@ configure-libcpp: maybe-configure-intl configure-stage1-libcpp: maybe-configure-stage1-intl configure-stage2-libcpp: maybe-configure-stage2-intl +configure-stageb2g0-libcpp: maybe-configure-stageb2g0-intl configure-stage3-libcpp: maybe-configure-stage3-intl +configure-stageb3g2-libcpp: maybe-configure-stageb3g2-intl configure-stage4-libcpp: maybe-configure-stage4-intl configure-stageprofile-libcpp: maybe-configure-stageprofile-intl configure-stagefeedback-libcpp: maybe-configure-stagefeedback-intl @@ -53432,7 +55586,9 @@ all-libcpp: all-libiberty all-stage1-libcpp: all-stage1-libiberty all-stage2-libcpp: all-stage2-libiberty +all-stageb2g0-libcpp: all-stageb2g0-libiberty all-stage3-libcpp: all-stage3-libiberty +all-stageb3g2-libcpp: all-stageb3g2-libiberty all-stage4-libcpp: all-stage4-libiberty all-stageprofile-libcpp: all-stageprofile-libiberty all-stagefeedback-libcpp: all-stagefeedback-libiberty @@ -53440,7 +55596,9 @@ all-libcpp: maybe-all-intl all-stage1-libcpp: maybe-all-stage1-intl all-stage2-libcpp: maybe-all-stage2-intl +all-stageb2g0-libcpp: maybe-all-stageb2g0-intl all-stage3-libcpp: maybe-all-stage3-intl +all-stageb3g2-libcpp: maybe-all-stageb3g2-intl all-stage4-libcpp: maybe-all-stage4-intl all-stageprofile-libcpp: maybe-all-stageprofile-intl all-stagefeedback-libcpp: maybe-all-stagefeedback-intl @@ -53450,7 +55608,9 @@ configure-mpfr: maybe-all-gmp configure-stage1-mpfr: maybe-all-stage1-gmp configure-stage2-mpfr: maybe-all-stage2-gmp +configure-stageb2g0-mpfr: maybe-all-stageb2g0-gmp configure-stage3-mpfr: maybe-all-stage3-gmp +configure-stageb3g2-mpfr: maybe-all-stageb3g2-gmp configure-stage4-mpfr: maybe-all-stage4-gmp configure-stageprofile-mpfr: maybe-all-stageprofile-gmp configure-stagefeedback-mpfr: maybe-all-stagefeedback-gmp @@ -53458,7 +55618,9 @@ configure-ppl: maybe-all-gmp configure-stage1-ppl: maybe-all-stage1-gmp configure-stage2-ppl: maybe-all-stage2-gmp +configure-stageb2g0-ppl: maybe-all-stageb2g0-gmp configure-stage3-ppl: maybe-all-stage3-gmp +configure-stageb3g2-ppl: maybe-all-stageb3g2-gmp configure-stage4-ppl: maybe-all-stage4-gmp configure-stageprofile-ppl: maybe-all-stageprofile-gmp configure-stagefeedback-ppl: maybe-all-stagefeedback-gmp @@ -53466,7 +55628,9 @@ configure-ppl: maybe-all-mpfr configure-stage1-ppl: maybe-all-stage1-mpfr configure-stage2-ppl: maybe-all-stage2-mpfr +configure-stageb2g0-ppl: maybe-all-stageb2g0-mpfr configure-stage3-ppl: maybe-all-stage3-mpfr +configure-stageb3g2-ppl: maybe-all-stageb3g2-mpfr configure-stage4-ppl: maybe-all-stage4-mpfr configure-stageprofile-ppl: maybe-all-stageprofile-mpfr configure-stagefeedback-ppl: maybe-all-stagefeedback-mpfr @@ -53474,7 +55638,9 @@ configure-cloog: maybe-all-ppl configure-stage1-cloog: maybe-all-stage1-ppl configure-stage2-cloog: maybe-all-stage2-ppl +configure-stageb2g0-cloog: maybe-all-stageb2g0-ppl configure-stage3-cloog: maybe-all-stage3-ppl +configure-stageb3g2-cloog: maybe-all-stageb3g2-ppl configure-stage4-cloog: maybe-all-stage4-ppl configure-stageprofile-cloog: maybe-all-stageprofile-ppl configure-stagefeedback-cloog: maybe-all-stagefeedback-ppl @@ -53499,7 +55665,9 @@ configure-bfd: configure-libiberty configure-stage1-bfd: configure-stage1-libiberty configure-stage2-bfd: configure-stage2-libiberty +configure-stageb2g0-bfd: configure-stageb2g0-libiberty configure-stage3-bfd: configure-stage3-libiberty +configure-stageb3g2-bfd: configure-stageb3g2-libiberty configure-stage4-bfd: configure-stage4-libiberty configure-stageprofile-bfd: configure-stageprofile-libiberty configure-stagefeedback-bfd: configure-stagefeedback-libiberty @@ -53507,7 +55675,9 @@ configure-bfd: maybe-configure-intl configure-stage1-bfd: maybe-configure-stage1-intl configure-stage2-bfd: maybe-configure-stage2-intl +configure-stageb2g0-bfd: maybe-configure-stageb2g0-intl configure-stage3-bfd: maybe-configure-stage3-intl +configure-stageb3g2-bfd: maybe-configure-stageb3g2-intl configure-stage4-bfd: maybe-configure-stage4-intl configure-stageprofile-bfd: maybe-configure-stageprofile-intl configure-stagefeedback-bfd: maybe-configure-stagefeedback-intl @@ -53515,7 +55685,9 @@ all-bfd: maybe-all-libiberty all-stage1-bfd: maybe-all-stage1-libiberty all-stage2-bfd: maybe-all-stage2-libiberty +all-stageb2g0-bfd: maybe-all-stageb2g0-libiberty all-stage3-bfd: maybe-all-stage3-libiberty +all-stageb3g2-bfd: maybe-all-stageb3g2-libiberty all-stage4-bfd: maybe-all-stage4-libiberty all-stageprofile-bfd: maybe-all-stageprofile-libiberty all-stagefeedback-bfd: maybe-all-stagefeedback-libiberty @@ -53523,7 +55695,9 @@ all-bfd: maybe-all-intl all-stage1-bfd: maybe-all-stage1-intl all-stage2-bfd: maybe-all-stage2-intl +all-stageb2g0-bfd: maybe-all-stageb2g0-intl all-stage3-bfd: maybe-all-stage3-intl +all-stageb3g2-bfd: maybe-all-stageb3g2-intl all-stage4-bfd: maybe-all-stage4-intl all-stageprofile-bfd: maybe-all-stageprofile-intl all-stagefeedback-bfd: maybe-all-stagefeedback-intl @@ -53531,7 +55705,9 @@ configure-opcodes: configure-libiberty configure-stage1-opcodes: configure-stage1-libiberty configure-stage2-opcodes: configure-stage2-libiberty +configure-stageb2g0-opcodes: configure-stageb2g0-libiberty configure-stage3-opcodes: configure-stage3-libiberty +configure-stageb3g2-opcodes: configure-stageb3g2-libiberty configure-stage4-opcodes: configure-stage4-libiberty configure-stageprofile-opcodes: configure-stageprofile-libiberty configure-stagefeedback-opcodes: configure-stagefeedback-libiberty @@ -53539,7 +55715,9 @@ all-opcodes: maybe-all-libiberty all-stage1-opcodes: maybe-all-stage1-libiberty all-stage2-opcodes: maybe-all-stage2-libiberty +all-stageb2g0-opcodes: maybe-all-stageb2g0-libiberty all-stage3-opcodes: maybe-all-stage3-libiberty +all-stageb3g2-opcodes: maybe-all-stageb3g2-libiberty all-stage4-opcodes: maybe-all-stage4-libiberty all-stageprofile-opcodes: maybe-all-stageprofile-libiberty all-stagefeedback-opcodes: maybe-all-stagefeedback-libiberty @@ -53547,7 +55725,9 @@ configure-binutils: maybe-configure-intl configure-stage1-binutils: maybe-configure-stage1-intl configure-stage2-binutils: maybe-configure-stage2-intl +configure-stageb2g0-binutils: maybe-configure-stageb2g0-intl configure-stage3-binutils: maybe-configure-stage3-intl +configure-stageb3g2-binutils: maybe-configure-stageb3g2-intl configure-stage4-binutils: maybe-configure-stage4-intl configure-stageprofile-binutils: maybe-configure-stageprofile-intl configure-stagefeedback-binutils: maybe-configure-stagefeedback-intl @@ -53555,7 +55735,9 @@ all-binutils: maybe-all-libiberty all-stage1-binutils: maybe-all-stage1-libiberty all-stage2-binutils: maybe-all-stage2-libiberty +all-stageb2g0-binutils: maybe-all-stageb2g0-libiberty all-stage3-binutils: maybe-all-stage3-libiberty +all-stageb3g2-binutils: maybe-all-stageb3g2-libiberty all-stage4-binutils: maybe-all-stage4-libiberty all-stageprofile-binutils: maybe-all-stageprofile-libiberty all-stagefeedback-binutils: maybe-all-stagefeedback-libiberty @@ -53563,7 +55745,9 @@ all-binutils: maybe-all-opcodes all-stage1-binutils: maybe-all-stage1-opcodes all-stage2-binutils: maybe-all-stage2-opcodes +all-stageb2g0-binutils: maybe-all-stageb2g0-opcodes all-stage3-binutils: maybe-all-stage3-opcodes +all-stageb3g2-binutils: maybe-all-stageb3g2-opcodes all-stage4-binutils: maybe-all-stage4-opcodes all-stageprofile-binutils: maybe-all-stageprofile-opcodes all-stagefeedback-binutils: maybe-all-stagefeedback-opcodes @@ -53571,7 +55755,9 @@ all-binutils: maybe-all-bfd all-stage1-binutils: maybe-all-stage1-bfd all-stage2-binutils: maybe-all-stage2-bfd +all-stageb2g0-binutils: maybe-all-stageb2g0-bfd all-stage3-binutils: maybe-all-stage3-bfd +all-stageb3g2-binutils: maybe-all-stageb3g2-bfd all-stage4-binutils: maybe-all-stage4-bfd all-stageprofile-binutils: maybe-all-stageprofile-bfd all-stagefeedback-binutils: maybe-all-stagefeedback-bfd @@ -53579,7 +55765,9 @@ all-binutils: maybe-all-build-flex all-stage1-binutils: maybe-all-build-flex all-stage2-binutils: maybe-all-build-flex +all-stageb2g0-binutils: maybe-all-build-flex all-stage3-binutils: maybe-all-build-flex +all-stageb3g2-binutils: maybe-all-build-flex all-stage4-binutils: maybe-all-build-flex all-stageprofile-binutils: maybe-all-build-flex all-stagefeedback-binutils: maybe-all-build-flex @@ -53587,7 +55775,9 @@ all-binutils: maybe-all-build-bison all-stage1-binutils: maybe-all-build-bison all-stage2-binutils: maybe-all-build-bison +all-stageb2g0-binutils: maybe-all-build-bison all-stage3-binutils: maybe-all-build-bison +all-stageb3g2-binutils: maybe-all-build-bison all-stage4-binutils: maybe-all-build-bison all-stageprofile-binutils: maybe-all-build-bison all-stagefeedback-binutils: maybe-all-build-bison @@ -53595,7 +55785,9 @@ all-binutils: maybe-all-build-byacc all-stage1-binutils: maybe-all-build-byacc all-stage2-binutils: maybe-all-build-byacc +all-stageb2g0-binutils: maybe-all-build-byacc all-stage3-binutils: maybe-all-build-byacc +all-stageb3g2-binutils: maybe-all-build-byacc all-stage4-binutils: maybe-all-build-byacc all-stageprofile-binutils: maybe-all-build-byacc all-stagefeedback-binutils: maybe-all-build-byacc @@ -53603,7 +55795,9 @@ all-binutils: maybe-all-intl all-stage1-binutils: maybe-all-stage1-intl all-stage2-binutils: maybe-all-stage2-intl +all-stageb2g0-binutils: maybe-all-stageb2g0-intl all-stage3-binutils: maybe-all-stage3-intl +all-stageb3g2-binutils: maybe-all-stageb3g2-intl all-stage4-binutils: maybe-all-stage4-intl all-stageprofile-binutils: maybe-all-stageprofile-intl all-stagefeedback-binutils: maybe-all-stagefeedback-intl @@ -53613,7 +55807,9 @@ configure-gas: maybe-configure-intl configure-stage1-gas: maybe-configure-stage1-intl configure-stage2-gas: maybe-configure-stage2-intl +configure-stageb2g0-gas: maybe-configure-stageb2g0-intl configure-stage3-gas: maybe-configure-stage3-intl +configure-stageb3g2-gas: maybe-configure-stageb3g2-intl configure-stage4-gas: maybe-configure-stage4-intl configure-stageprofile-gas: maybe-configure-stageprofile-intl configure-stagefeedback-gas: maybe-configure-stagefeedback-intl @@ -53621,7 +55817,9 @@ all-gas: maybe-all-libiberty all-stage1-gas: maybe-all-stage1-libiberty all-stage2-gas: maybe-all-stage2-libiberty +all-stageb2g0-gas: maybe-all-stageb2g0-libiberty all-stage3-gas: maybe-all-stage3-libiberty +all-stageb3g2-gas: maybe-all-stageb3g2-libiberty all-stage4-gas: maybe-all-stage4-libiberty all-stageprofile-gas: maybe-all-stageprofile-libiberty all-stagefeedback-gas: maybe-all-stagefeedback-libiberty @@ -53629,7 +55827,9 @@ all-gas: maybe-all-opcodes all-stage1-gas: maybe-all-stage1-opcodes all-stage2-gas: maybe-all-stage2-opcodes +all-stageb2g0-gas: maybe-all-stageb2g0-opcodes all-stage3-gas: maybe-all-stage3-opcodes +all-stageb3g2-gas: maybe-all-stageb3g2-opcodes all-stage4-gas: maybe-all-stage4-opcodes all-stageprofile-gas: maybe-all-stageprofile-opcodes all-stagefeedback-gas: maybe-all-stagefeedback-opcodes @@ -53637,7 +55837,9 @@ all-gas: maybe-all-bfd all-stage1-gas: maybe-all-stage1-bfd all-stage2-gas: maybe-all-stage2-bfd +all-stageb2g0-gas: maybe-all-stageb2g0-bfd all-stage3-gas: maybe-all-stage3-bfd +all-stageb3g2-gas: maybe-all-stageb3g2-bfd all-stage4-gas: maybe-all-stage4-bfd all-stageprofile-gas: maybe-all-stageprofile-bfd all-stagefeedback-gas: maybe-all-stagefeedback-bfd @@ -53645,7 +55847,9 @@ all-gas: maybe-all-intl all-stage1-gas: maybe-all-stage1-intl all-stage2-gas: maybe-all-stage2-intl +all-stageb2g0-gas: maybe-all-stageb2g0-intl all-stage3-gas: maybe-all-stage3-intl +all-stageb3g2-gas: maybe-all-stageb3g2-intl all-stage4-gas: maybe-all-stage4-intl all-stageprofile-gas: maybe-all-stageprofile-intl all-stagefeedback-gas: maybe-all-stagefeedback-intl @@ -53658,7 +55862,9 @@ configure-ld: maybe-configure-intl configure-stage1-ld: maybe-configure-stage1-intl configure-stage2-ld: maybe-configure-stage2-intl +configure-stageb2g0-ld: maybe-configure-stageb2g0-intl configure-stage3-ld: maybe-configure-stage3-intl +configure-stageb3g2-ld: maybe-configure-stageb3g2-intl configure-stage4-ld: maybe-configure-stage4-intl configure-stageprofile-ld: maybe-configure-stageprofile-intl configure-stagefeedback-ld: maybe-configure-stagefeedback-intl @@ -53666,7 +55872,9 @@ all-ld: maybe-all-libiberty all-stage1-ld: maybe-all-stage1-libiberty all-stage2-ld: maybe-all-stage2-libiberty +all-stageb2g0-ld: maybe-all-stageb2g0-libiberty all-stage3-ld: maybe-all-stage3-libiberty +all-stageb3g2-ld: maybe-all-stageb3g2-libiberty all-stage4-ld: maybe-all-stage4-libiberty all-stageprofile-ld: maybe-all-stageprofile-libiberty all-stagefeedback-ld: maybe-all-stagefeedback-libiberty @@ -53674,7 +55882,9 @@ all-ld: maybe-all-bfd all-stage1-ld: maybe-all-stage1-bfd all-stage2-ld: maybe-all-stage2-bfd +all-stageb2g0-ld: maybe-all-stageb2g0-bfd all-stage3-ld: maybe-all-stage3-bfd +all-stageb3g2-ld: maybe-all-stageb3g2-bfd all-stage4-ld: maybe-all-stage4-bfd all-stageprofile-ld: maybe-all-stageprofile-bfd all-stagefeedback-ld: maybe-all-stagefeedback-bfd @@ -53682,7 +55892,9 @@ all-ld: maybe-all-opcodes all-stage1-ld: maybe-all-stage1-opcodes all-stage2-ld: maybe-all-stage2-opcodes +all-stageb2g0-ld: maybe-all-stageb2g0-opcodes all-stage3-ld: maybe-all-stage3-opcodes +all-stageb3g2-ld: maybe-all-stageb3g2-opcodes all-stage4-ld: maybe-all-stage4-opcodes all-stageprofile-ld: maybe-all-stageprofile-opcodes all-stagefeedback-ld: maybe-all-stagefeedback-opcodes @@ -53690,7 +55902,9 @@ all-ld: maybe-all-build-bison all-stage1-ld: maybe-all-build-bison all-stage2-ld: maybe-all-build-bison +all-stageb2g0-ld: maybe-all-build-bison all-stage3-ld: maybe-all-build-bison +all-stageb3g2-ld: maybe-all-build-bison all-stage4-ld: maybe-all-build-bison all-stageprofile-ld: maybe-all-build-bison all-stagefeedback-ld: maybe-all-build-bison @@ -53698,7 +55912,9 @@ all-ld: maybe-all-build-byacc all-stage1-ld: maybe-all-build-byacc all-stage2-ld: maybe-all-build-byacc +all-stageb2g0-ld: maybe-all-build-byacc all-stage3-ld: maybe-all-build-byacc +all-stageb3g2-ld: maybe-all-build-byacc all-stage4-ld: maybe-all-build-byacc all-stageprofile-ld: maybe-all-build-byacc all-stagefeedback-ld: maybe-all-build-byacc @@ -53706,7 +55922,9 @@ all-ld: maybe-all-build-flex all-stage1-ld: maybe-all-build-flex all-stage2-ld: maybe-all-build-flex +all-stageb2g0-ld: maybe-all-build-flex all-stage3-ld: maybe-all-build-flex +all-stageb3g2-ld: maybe-all-build-flex all-stage4-ld: maybe-all-build-flex all-stageprofile-ld: maybe-all-build-flex all-stagefeedback-ld: maybe-all-build-flex @@ -53714,7 +55932,9 @@ all-ld: maybe-all-intl all-stage1-ld: maybe-all-stage1-intl all-stage2-ld: maybe-all-stage2-intl +all-stageb2g0-ld: maybe-all-stageb2g0-intl all-stage3-ld: maybe-all-stage3-intl +all-stageb3g2-ld: maybe-all-stageb3g2-intl all-stage4-ld: maybe-all-stage4-intl all-stageprofile-ld: maybe-all-stageprofile-intl all-stagefeedback-ld: maybe-all-stagefeedback-intl @@ -53722,7 +55942,9 @@ configure-gold: maybe-configure-intl configure-stage1-gold: maybe-configure-stage1-intl configure-stage2-gold: maybe-configure-stage2-intl +configure-stageb2g0-gold: maybe-configure-stageb2g0-intl configure-stage3-gold: maybe-configure-stage3-intl +configure-stageb3g2-gold: maybe-configure-stageb3g2-intl configure-stage4-gold: maybe-configure-stage4-intl configure-stageprofile-gold: maybe-configure-stageprofile-intl configure-stagefeedback-gold: maybe-configure-stagefeedback-intl @@ -53730,7 +55952,9 @@ all-gold: maybe-all-libiberty all-stage1-gold: maybe-all-stage1-libiberty all-stage2-gold: maybe-all-stage2-libiberty +all-stageb2g0-gold: maybe-all-stageb2g0-libiberty all-stage3-gold: maybe-all-stage3-libiberty +all-stageb3g2-gold: maybe-all-stageb3g2-libiberty all-stage4-gold: maybe-all-stage4-libiberty all-stageprofile-gold: maybe-all-stageprofile-libiberty all-stagefeedback-gold: maybe-all-stagefeedback-libiberty @@ -53738,7 +55962,9 @@ all-gold: maybe-all-intl all-stage1-gold: maybe-all-stage1-intl all-stage2-gold: maybe-all-stage2-intl +all-stageb2g0-gold: maybe-all-stageb2g0-intl all-stage3-gold: maybe-all-stage3-intl +all-stageb3g2-gold: maybe-all-stageb3g2-intl all-stage4-gold: maybe-all-stage4-intl all-stageprofile-gold: maybe-all-stageprofile-intl all-stagefeedback-gold: maybe-all-stagefeedback-intl @@ -53746,7 +55972,9 @@ all-gold: maybe-all-bfd all-stage1-gold: maybe-all-stage1-bfd all-stage2-gold: maybe-all-stage2-bfd +all-stageb2g0-gold: maybe-all-stageb2g0-bfd all-stage3-gold: maybe-all-stage3-bfd +all-stageb3g2-gold: maybe-all-stageb3g2-bfd all-stage4-gold: maybe-all-stage4-bfd all-stageprofile-gold: maybe-all-stageprofile-bfd all-stagefeedback-gold: maybe-all-stagefeedback-bfd @@ -53754,7 +55982,9 @@ all-gold: maybe-all-build-bison all-stage1-gold: maybe-all-build-bison all-stage2-gold: maybe-all-build-bison +all-stageb2g0-gold: maybe-all-build-bison all-stage3-gold: maybe-all-build-bison +all-stageb3g2-gold: maybe-all-build-bison all-stage4-gold: maybe-all-build-bison all-stageprofile-gold: maybe-all-build-bison all-stagefeedback-gold: maybe-all-build-bison @@ -53762,7 +55992,9 @@ all-gold: maybe-all-build-byacc all-stage1-gold: maybe-all-build-byacc all-stage2-gold: maybe-all-build-byacc +all-stageb2g0-gold: maybe-all-build-byacc all-stage3-gold: maybe-all-build-byacc +all-stageb3g2-gold: maybe-all-build-byacc all-stage4-gold: maybe-all-build-byacc all-stageprofile-gold: maybe-all-build-byacc all-stagefeedback-gold: maybe-all-build-byacc @@ -53770,7 +56002,9 @@ check-gold: maybe-all-binutils check-stage1-gold: maybe-all-stage1-binutils check-stage2-gold: maybe-all-stage2-binutils +check-stageb2g0-gold: maybe-all-stageb2g0-binutils check-stage3-gold: maybe-all-stage3-binutils +check-stageb3g2-gold: maybe-all-stageb3g2-binutils check-stage4-gold: maybe-all-stage4-binutils check-stageprofile-gold: maybe-all-stageprofile-binutils check-stagefeedback-gold: maybe-all-stagefeedback-binutils @@ -53778,7 +56012,9 @@ configure-opcodes: maybe-configure-intl configure-stage1-opcodes: maybe-configure-stage1-intl configure-stage2-opcodes: maybe-configure-stage2-intl +configure-stageb2g0-opcodes: maybe-configure-stageb2g0-intl configure-stage3-opcodes: maybe-configure-stage3-intl +configure-stageb3g2-opcodes: maybe-configure-stageb3g2-intl configure-stage4-opcodes: maybe-configure-stage4-intl configure-stageprofile-opcodes: maybe-configure-stageprofile-intl configure-stagefeedback-opcodes: maybe-configure-stagefeedback-intl @@ -53786,7 +56022,9 @@ all-opcodes: maybe-all-bfd all-stage1-opcodes: maybe-all-stage1-bfd all-stage2-opcodes: maybe-all-stage2-bfd +all-stageb2g0-opcodes: maybe-all-stageb2g0-bfd all-stage3-opcodes: maybe-all-stage3-bfd +all-stageb3g2-opcodes: maybe-all-stageb3g2-bfd all-stage4-opcodes: maybe-all-stage4-bfd all-stageprofile-opcodes: maybe-all-stageprofile-bfd all-stagefeedback-opcodes: maybe-all-stagefeedback-bfd @@ -53794,7 +56032,9 @@ all-opcodes: maybe-all-libiberty all-stage1-opcodes: maybe-all-stage1-libiberty all-stage2-opcodes: maybe-all-stage2-libiberty +all-stageb2g0-opcodes: maybe-all-stageb2g0-libiberty all-stage3-opcodes: maybe-all-stage3-libiberty +all-stageb3g2-opcodes: maybe-all-stageb3g2-libiberty all-stage4-opcodes: maybe-all-stage4-libiberty all-stageprofile-opcodes: maybe-all-stageprofile-libiberty all-stagefeedback-opcodes: maybe-all-stagefeedback-libiberty @@ -53802,7 +56042,9 @@ all-opcodes: maybe-all-intl all-stage1-opcodes: maybe-all-stage1-intl all-stage2-opcodes: maybe-all-stage2-intl +all-stageb2g0-opcodes: maybe-all-stageb2g0-intl all-stage3-opcodes: maybe-all-stage3-intl +all-stageb3g2-opcodes: maybe-all-stageb3g2-intl all-stage4-opcodes: maybe-all-stage4-intl all-stageprofile-opcodes: maybe-all-stageprofile-intl all-stagefeedback-opcodes: maybe-all-stagefeedback-intl diff --git a/Makefile.tpl b/Makefile.tpl index f543003..acb349f 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -6,8 +6,7 @@ in # # Makefile for directory with subdirs to build. # Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, -# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -# Free Software Foundation +# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -178,8 +177,6 @@ HOST_EXPORTS = \ CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ CXX="$(CXX)"; export CXX; \ CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \ - GCJ="$(GCJ)"; export GCJ; \ - GFORTRAN="$(GFORTRAN)"; export GFORTRAN; \ AR="$(AR)"; export AR; \ AS="$(AS)"; export AS; \ CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \ @@ -215,10 +212,11 @@ HOST_EXPORTS = \ POSTSTAGE1_HOST_EXPORTS = \ $(HOST_EXPORTS) \ CC="$(STAGE_CC_WRAPPER) $$r/$(HOST_SUBDIR)/prev-gcc/xgcc$(exeext) \ - -B$$r/$(HOST_SUBDIR)/prev-gcc/ -B$(build_tooldir)/bin/ \ - $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CC; \ - CC_FOR_BUILD="$$CC"; export CC_FOR_BUILD; \ - GNATBIND="$$r/$(HOST_SUBDIR)/prev-gcc/gnatbind"; export GNATBIND \ + -B$$r/$(HOST_SUBDIR)/prev-gcc/ -B$(build_tooldir)/bin/"; export CC; \ + CC_FOR_BUILD="$(STAGE_CC_WRAPPER) \ + $$r/$(HOST_SUBDIR)/prev-gcc/xgcc$(exeext) \ + -B$$r/$(HOST_SUBDIR)/prev-gcc/ \ + -B$(build_tooldir)/bin/"; export CC_FOR_BUILD; \ LDFLAGS="$(BOOT_LDFLAGS)"; export LDFLAGS; # Target libraries are put under this directory: @@ -232,13 +230,13 @@ BASE_TARGET_EXPORTS = \ $(BASE_EXPORTS) \ AR="$(AR_FOR_TARGET)"; export AR; \ AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \ - CC="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CC; \ - CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CC="$(CC_FOR_TARGET)"; export CC; \ + 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; \ - GCJ="$(GCJ_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GCJ; \ - GFORTRAN="$(GFORTRAN_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GFORTRAN; \ + 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; \ LD="$(COMPILER_LD_FOR_TARGET)"; export LD; \ LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \ @@ -254,11 +252,11 @@ BASE_TARGET_EXPORTS = \ RAW_CXX_TARGET_EXPORTS = \ $(BASE_TARGET_EXPORTS) \ CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \ - CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; + CXX="$(RAW_CXX_FOR_TARGET)"; export CXX; NORMAL_TARGET_EXPORTS = \ $(BASE_TARGET_EXPORTS) \ - CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; + CXX="$(CXX_FOR_TARGET)"; export CXX; # Where to find GMP HOST_GMPLIBS = @gmplibs@ @@ -358,65 +356,48 @@ LIBCFLAGS = $(CFLAGS) CXXFLAGS = @CXXFLAGS@ LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates -TFLAGS = - -# Defaults for all stages; some are overridden below. - -STAGE_CFLAGS = $(BOOT_CFLAGS) -STAGE_TFLAGS = $(TFLAGS) -STAGE_CONFIGURE_FLAGS=@stage2_werror_flag@ - -[+ FOR bootstrap-stage +] -# Defaults for stage [+id+]; some are overridden below. -STAGE[+id+]_CFLAGS = $(STAGE_CFLAGS) -STAGE[+id+]_TFLAGS = $(STAGE_TFLAGS) -STAGE[+id+]_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS) -[+ ENDFOR bootstrap-stage +] - # Only build the C compiler for stage1, because that is the only one that # we can guarantee will build with the native compiler, and also it is the # only thing useful for building stage2. STAGE1_CFLAGS (via CFLAGS), # MAKEINFO and MAKEINFOFLAGS are explicitly passed here to make them # overrideable (for a bootstrap build stage1 also builds gcc.info). -STAGE1_CFLAGS = @stage1_cflags@ STAGE1_CHECKING=@stage1_checking@ STAGE1_LANGUAGES=@stage1_languages@ -# * We force-disable intermodule optimizations, even if -# --enable-intermodule was passed, since the installed compiler -# probably can't handle them. Luckily, autoconf always respects -# the last argument when conflicting --enable arguments are passed. -# * Likewise, we force-disable coverage flags, since the installed -# compiler probably has never heard of them. -STAGE1_CONFIGURE_FLAGS = --disable-intermodule $(STAGE1_CHECKING) \ - --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" -STAGEprofile_CFLAGS = $(STAGE2_CFLAGS) -fprofile-generate -STAGEprofile_TFLAGS = $(STAGE2_TFLAGS) +STAGE1_CFLAGS=@stage1_cflags@ +STAGE2_CFLAGS=$(BOOT_CFLAGS) +STAGE3_CFLAGS=$(BOOT_CFLAGS) +STAGE4_CFLAGS=$(BOOT_CFLAGS) -STAGEfeedback_CFLAGS = $(STAGE3_CFLAGS) -fprofile-use -STAGEfeedback_TFLAGS = $(STAGE3_TFLAGS) +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 # ----------------------------------------------- # Programs producing files for the TARGET machine # ----------------------------------------------- +FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@ + AR_FOR_TARGET=@AR_FOR_TARGET@ AS_FOR_TARGET=@AS_FOR_TARGET@ -CC_FOR_TARGET=$(STAGE_CC_WRAPPER) @CC_FOR_TARGET@ +CC_FOR_TARGET=$(STAGE_CC_WRAPPER) @CC_FOR_TARGET@ $(FLAGS_FOR_TARGET) # If GCC_FOR_TARGET is not overriden on the command line, then this # variable is passed down to the gcc Makefile, where it is used to # build libgcc2.a. We define it here so that it can itself be # overridden on the command line. -GCC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCC_FOR_TARGET@ -CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @CXX_FOR_TARGET@ -RAW_CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @RAW_CXX_FOR_TARGET@ -GCJ_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCJ_FOR_TARGET@ -GFORTRAN_FOR_TARGET=$(STAGE_CC_WRAPPER) @GFORTRAN_FOR_TARGET@ +GCC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCC_FOR_TARGET@ $(FLAGS_FOR_TARGET) +CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @CXX_FOR_TARGET@ $(FLAGS_FOR_TARGET) +RAW_CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @RAW_CXX_FOR_TARGET@ $(FLAGS_FOR_TARGET) +GCJ_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCJ_FOR_TARGET@ $(FLAGS_FOR_TARGET) +GFORTRAN_FOR_TARGET=$(STAGE_CC_WRAPPER) @GFORTRAN_FOR_TARGET@ $(FLAGS_FOR_TARGET) DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@ LD_FOR_TARGET=@LD_FOR_TARGET@ @@ -434,17 +415,13 @@ COMPILER_NM_FOR_TARGET=@COMPILER_NM_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@ LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates LDFLAGS_FOR_TARGET = -FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@ -SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@ -DEBUG_PREFIX_CFLAGS_FOR_TARGET = @DEBUG_PREFIX_CFLAGS_FOR_TARGET@ - -XGCC_FLAGS_FOR_TARGET = $(FLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET) - # ------------------------------------ # Miscellaneous targets and flag lists # ------------------------------------ @@ -494,10 +471,7 @@ HOST_LIB_PATH_[+module+] = \ # Flags to pass down to all sub-makes. BASE_FLAGS_TO_PASS =[+ FOR flags_to_pass +][+ IF optional +] \ "`echo '[+flag+]=$([+flag+])' | sed -e s'/[^=][^=]*=$$/XFOO=/'`"[+ ELSE optional +] \ - "[+flag+]=$([+flag+])"[+ ENDIF optional+][+ ENDFOR flags_to_pass +][+ FOR bootstrap-stage +] \ - "STAGE[+id+]_CFLAGS=$(STAGE[+id+]_CFLAGS)" \ - "STAGE[+id+]_TFLAGS=$(STAGE[+id+]_TFLAGS)"[+ ENDFOR bootstrap-stage +] \ - "TFLAGS=$(TFLAGS)" \ + "[+flag+]=$([+flag+])"[+ ENDIF optional+][+ ENDFOR flags_to_pass +] \ "CONFIG_SHELL=$(SHELL)" \ "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" @@ -512,8 +486,6 @@ EXTRA_HOST_FLAGS = \ 'CC=$(CC)' \ 'CXX=$(CXX)' \ 'DLLTOOL=$(DLLTOOL)' \ - 'GCJ=$(GCJ)' \ - 'GFORTRAN=$(GFORTRAN)' \ 'LD=$(LD)' \ 'LIPO=$(LIPO)' \ 'NM=$(NM)' \ @@ -540,7 +512,8 @@ X11_FLAGS_TO_PASS = \ # Flags to pass to stage2 and later makes. POSTSTAGE1_FLAGS_TO_PASS = \ - CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" GNATBIND="$${GNATBIND}" \ + CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \ + GNATBIND="$$r/$(HOST_SUBDIR)/prev-gcc/gnatbind" \ LDFLAGS="$(BOOT_LDFLAGS)" \ "`echo 'ADAFLAGS=$(BOOT_ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" @@ -552,24 +525,20 @@ POSTSTAGE1_FLAGS_TO_PASS = \ EXTRA_TARGET_FLAGS = \ 'AR=$$(AR_FOR_TARGET)' \ 'AS=$(COMPILER_AS_FOR_TARGET)' \ - 'CC=$$(CC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ - 'CFLAGS=$$(CFLAGS_FOR_TARGET)' \ - 'CXX=$$(CXX_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ - 'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \ + 'CC=$$(CC_FOR_TARGET)' \ + 'CFLAGS=$$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \ + 'CXX=$$(CXX_FOR_TARGET)' \ + 'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \ 'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \ - 'GCJ=$$(GCJ_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ - 'GFORTRAN=$$(GFORTRAN_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ '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)' \ 'WINDRES=$$(WINDRES_FOR_TARGET)' \ - 'WINDMC=$$(WINDMC_FOR_TARGET)' \ - 'XGCC_FLAGS_FOR_TARGET=$(XGCC_FLAGS_FOR_TARGET)' \ - "TFLAGS=$$TFLAGS" + 'WINDMC=$$(WINDMC_FOR_TARGET)' TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) @@ -589,13 +558,6 @@ EXTRA_GCC_FLAGS = \ GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS) -@if gcc -BUILD_CONFIG = -ifneq ($(BUILD_CONFIG),) -include $(foreach CONFIG, $(BUILD_CONFIG), $(srcdir)/config/$(CONFIG).mk) -endif -@endif gcc - .PHONY: configure-host configure-host: [+ FOR host_modules +] \ @@ -619,18 +581,11 @@ all: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -@if gcc-bootstrap if [ -f stage_last ]; then \ - TFLAGS="$(STAGE$(shell test ! -f stage_last || sed s,^stage,, stage_last)_TFLAGS)"; \ $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target; \ else \ -@endif gcc-bootstrap - $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-host all-target \ -@if gcc-bootstrap - ; \ - fi \ -@endif gcc-bootstrap - && : + $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-host all-target; \ + fi .PHONY: all-build [+ FOR build_modules +] @@ -911,7 +866,6 @@ configure-stage[+id+]-[+prefix+][+module+]: @$(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+] @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE[+id+]_TFLAGS)"; \ [+ IF check_multilibs +]echo "Checking multilib configuration for [+module+]..."; \ $(CC_FOR_TARGET) --print-multi-lib > [+subdir+]/[+module+]/multilib.tmp 2> /dev/null ; \ @@ -927,14 +881,11 @@ configure-stage[+id+]-[+prefix+][+module+]: fi; \ [+ ENDIF check_multilibs +]test ! -f [+subdir+]/[+module+]/Makefile || exit 0; \ [+exports+][+ IF prev +] \ - [+poststage1_exports+][+ ENDIF prev +][+ IF prefix +] \ - CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ - CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ - LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS;[+ ELSE prefix +] \ - CFLAGS="$(STAGE[+id+]_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE[+id+]_CFLAGS)"; export CXXFLAGS;[+ IF prev +] \ - LIBCFLAGS="$(STAGE[+id+]_CFLAGS)"[+ ELSE prev +] \ - LIBCFLAGS="$(LIBCFLAGS)"[+ ENDIF prev +]; export LIBCFLAGS;[+ ENDIF prefix +] \ + [+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; \ + CXXFLAGS="[+stage_cflags+]"; export CXXFLAGS; [+ ENDIF +] \ echo Configuring stage [+id+] in [+subdir+]/[+module+] ; \ $(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+] ; \ cd [+subdir+]/[+module+] || exit 1; \ @@ -947,10 +898,9 @@ configure-stage[+id+]-[+prefix+][+module+]: libsrcdir="$$s/[+module+]"; \ $(SHELL) $${libsrcdir}/configure \ [+args+] --build=${build_alias} --host=[+host_alias+] \ - --target=[+target_alias+] $${srcdiroption} [+ IF prev +]\ - --with-build-libsubdir=$(HOST_SUBDIR) [+ ENDIF prev +]\ - $(STAGE[+id+]_CONFIGURE_FLAGS)[+ IF extra_configure_flags +] \ - [+extra_configure_flags+][+ ENDIF extra_configure_flags +] + --target=[+target_alias+] $${srcdiroption} \ + [+ IF prev +]--with-build-libsubdir=$(HOST_SUBDIR)[+ ENDIF prev +] \ + [+stage_configure_flags+] [+extra_configure_flags+] @endif [+prefix+][+module+]-bootstrap [+ ENDFOR bootstrap_stage +] [+ ENDIF bootstrap +] @@ -990,25 +940,16 @@ all-stage[+id+]-[+prefix+][+module+]: configure-stage[+id+]-[+prefix+][+module+] @[ $(current_stage) = stage[+id+] ] || $(MAKE) stage[+id+]-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE[+id+]_TFLAGS)"; \ [+exports+][+ IF prev +] \ [+poststage1_exports+][+ ENDIF prev +] \ cd [+subdir+]/[+module+] && \ - $(MAKE) $(BASE_FLAGS_TO_PASS)[+ IF prefix +] \ - CFLAGS="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"[+ ELSE prefix +] \ - CFLAGS="$(STAGE[+id+]_CFLAGS)" \ - CXXFLAGS="$(STAGE[+id+]_CFLAGS)"[+ IF prev +] \ - LIBCFLAGS="$(STAGE[+id+]_CFLAGS)"[+ ELSE prev +] \ - LIBCFLAGS="$(LIBCFLAGS)"[+ ENDIF prev +][+ ENDIF prefix +] \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - [+args+] [+ + $(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+] \ - TFLAGS="$(STAGE[+id+]_TFLAGS)" \ $(TARGET-stage[+id+]-[+prefix+][+module+]) maybe-clean-stage[+id+]-[+prefix+][+module+]: clean-stage[+id+]-[+prefix+][+module+] @@ -1275,15 +1216,19 @@ cross: all-build all-gas all-ld @endif gcc-no-bootstrap @if gcc -[+ FOR languages +] -.PHONY: check-gcc-[+language+] check-[+language+] -check-gcc-[+language+]: - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) [+gcc-check-target+]); -check-[+language+]: check-gcc-[+language+][+ IF lib-check-target +] [+ lib-check-target +][+ ENDIF lib-check-target +] -[+ ENDFOR languages +] +.PHONY: check-gcc-c++ +check-gcc-c++: + @if [ -f ./gcc/Makefile ] ; then \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-c++); \ + else \ + true; \ + fi + +.PHONY: check-c++ +check-c++: check-target-libstdc++-v3 check-gcc-c++ # Install the gcc headers files, but not the fixed include files, # which Cygnus is not allowed to distribute. This rule is very @@ -1427,16 +1372,15 @@ do-clean: clean-stage[+id+] : $(MAKE); $(stage); \ rm -f .bad_compare ; \ echo Comparing stages [+prev+] and [+id+] ; \ - sed=`echo stage[+id+] | sed 's,^stage,,;s,.,.,g'`; \ - files=`find stage[+id+]-* -name "*$(objext)" -print | \ - sed -n s,^stage$$sed-,,p` ; \ + cd stage[+id+]-gcc; \ + files=`find . -name "*$(objext)" -print` ; \ + cd .. ; \ for file in $${files} ; do \ - f1=$$r/stage[+prev+]-$$file; f2=$$r/stage[+id+]-$$file; \ - if test ! -f $$f1; then continue; fi; \ + f1=$$r/stage[+prev+]-gcc/$$file; f2=$$r/stage[+id+]-gcc/$$file; \ $(do-[+compare-target+]) > /dev/null 2>&1; \ if test $$? -eq 1; then \ case $$file in \ - gcc/cc*-checksum$(objext) | ./libgcc/* | ./gcc/ada/*tools/*) \ + ./cc*-checksum$(objext) | ./libgcc/* ) \ echo warning: $$file differs ;; \ *) \ echo $$file differs >> .bad_compare ;; \ @@ -1467,7 +1411,6 @@ do-clean: clean-stage[+id+] @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE[+id+]_TFLAGS)"; \ $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target [+bootstrap-target+]-lean: @@ -1478,7 +1421,6 @@ do-clean: clean-stage[+id+] @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE[+id+]_TFLAGS)"; \ $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target [+ ENDIF bootstrap-target +] @@ -1501,7 +1443,6 @@ distclean-stage[+id+]:: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE[+id+]_TFLAGS)"; \ $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target [+ ENDIF cleanstrap-target +] @endif gcc-bootstrap @@ -1539,8 +1480,8 @@ stage_current: .PHONY: restrap restrap:: @: $(MAKE); $(stage) - rm -rf stage1-$(TARGET_SUBDIR)[+ FOR bootstrap-stage +][+ IF prev - +] stage[+id+]-*[+ ENDIF prev +][+ ENDFOR bootstrap-stage +] + rm -rf stage1-$(TARGET_SUBDIR) [+ FOR bootstrap-stage +][+ IF prev + +]stage[+id+]-* [+ ENDIF prev +][+ ENDFOR bootstrap-stage +] restrap:: all @endif gcc-bootstrap diff --git a/config.guess b/config.guess index 7c48073..aeb5323 100755 --- a/config.guess +++ b/config.guess @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. -timestamp='2009-06-03' +timestamp='2008-12-18' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -324,9 +324,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in case `/usr/bin/uname -p` in sparc) echo sparc-icl-nx7; exit ;; esac ;; - s390x:SunOS:*:*) - echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; @@ -822,9 +819,6 @@ EOF [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; - 8664:Windows_NT:*) - echo x86_64-pc-mks - exit ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we @@ -885,17 +879,40 @@ EOF m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; - mips:Linux:*:* | mips64:Linux:*:*) + mips:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips + #undef mipsel + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mipsel + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips + #else + CPU= + #endif + #endif +EOF + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + mips64:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #undef CPU - #undef ${UNAME_MACHINE} - #undef ${UNAME_MACHINE}el + #undef mips64 + #undef mips64el #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=${UNAME_MACHINE}el + CPU=mips64el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=${UNAME_MACHINE} + CPU=mips64 #else CPU= #endif @@ -981,6 +998,14 @@ EOF elf32-i386) TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" ;; + a.out-i386-linux) + echo "${UNAME_MACHINE}-pc-linux-gnuaout" + exit ;; + "") + # Either a pre-BFD a.out linker (linux-gnuoldld) or + # one that does not give us useful --help. + echo "${UNAME_MACHINE}-pc-linux-gnuoldld" + exit ;; esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build @@ -1090,11 +1115,8 @@ EOF pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. - # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configury will decide that - # this is a cross-build. - echo i586-pc-msdosdjgpp + # the processor, so we play safe by assuming i386. + echo i386-pc-msdosdjgpp exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 @@ -1132,16 +1154,6 @@ EOF 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4; exit; } ;; - NCR*:*:4.2:* | MPRAS*:*:4.2:*) - OS_REL='.3' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} exit ;; @@ -1328,9 +1340,6 @@ EOF i*86:rdos:*:*) echo ${UNAME_MACHINE}-pc-rdos exit ;; - i*86:AROS:*:*) - echo ${UNAME_MACHINE}-pc-aros - exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. -timestamp='2009-06-03' +timestamp='2008-12-11' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -122,7 +122,6 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` @@ -272,7 +271,6 @@ case $basic_machine in | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ - | moxie \ | mt \ | msp430 \ | nios | nios2 \ @@ -447,10 +445,6 @@ case $basic_machine in basic_machine=m68k-apollo os=-bsd ;; - aros) - basic_machine=i386-pc - os=-aros - ;; aux) basic_machine=m68k-apple os=-aux @@ -1262,9 +1256,8 @@ case $os in -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ - | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* \ + | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ diff --git a/config/ChangeLog b/config/ChangeLog index d6ff565..b762abf 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,15 +1,3 @@ -2009-05-26 Rafael Avila de Espindola <espindola@google.com> - - * plugins.m4: New. - -2009-05-12 Alexandre Oliva <aoliva@redhat.com> - - * multi.m4: Save CXX, GFORTRAN and GCJ in config.status. - * mt-gnu (CXXFLAGS_FOR_TARGET): Adjust. - * bootstrap-O1.mk: New. - * bootstrap-O3.mk: New. - * bootstrap-debug.mk: New. - 2009-02-02 Doug Evans <dje@google.com> * tcl.m4 (SC_PATH_TCLCONFIG): Don't exit 0 if tclconfig fails. diff --git a/config/bootstrap-O1.mk b/config/bootstrap-O1.mk deleted file mode 100644 index 031645a..0000000 --- a/config/bootstrap-O1.mk +++ /dev/null @@ -1 +0,0 @@ -BOOT_CFLAGS := -O1 $(filter-out -O%, $(BOOT_CFLAGS)) diff --git a/config/bootstrap-O3.mk b/config/bootstrap-O3.mk deleted file mode 100644 index b269a3f..0000000 --- a/config/bootstrap-O3.mk +++ /dev/null @@ -1 +0,0 @@ -BOOT_CFLAGS := -O3 $(filter-out -O%, $(BOOT_CFLAGS)) diff --git a/config/bootstrap-debug.mk b/config/bootstrap-debug.mk deleted file mode 100644 index 521be82..0000000 --- a/config/bootstrap-debug.mk +++ /dev/null @@ -1,2 +0,0 @@ -STAGE2_CFLAGS += -g0 -do-compare = $(SHELL) $(srcdir)/contrib/compare-debug $$f1 $$f2 diff --git a/config/mt-gnu b/config/mt-gnu index 15bf417..2400fa4 100644 --- a/config/mt-gnu +++ b/config/mt-gnu @@ -1 +1,2 @@ -CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -D_GNU_SOURCE +CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) \ + $(DEBUG_PREFIX_CFLAGS_FOR_TARGET) -D_GNU_SOURCE diff --git a/config/multi.m4 b/config/multi.m4 index 5b62ecc..9841767 100644 --- a/config/multi.m4 +++ b/config/multi.m4 @@ -1,5 +1,5 @@ ## -*- Autoconf -*- -# Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2008 +# Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation @@ -62,7 +62,4 @@ with_target_subdir="$with_target_subdir" ac_configure_args="${multilib_arg} ${ac_configure_args}" multi_basedir="$multi_basedir" CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -CC="$CC" -CXX="$CXX" -GFORTRAN="$GFORTRAN" -GCJ="$GCJ"])])dnl +CC="$CC"])])dnl diff --git a/config/plugins.m4 b/config/plugins.m4 deleted file mode 100644 index 7ee8412..0000000 --- a/config/plugins.m4 +++ /dev/null @@ -1,11 +0,0 @@ -AC_DEFUN([AC_PLUGINS], -[ -AC_ARG_ENABLE([plugins], -AS_HELP_STRING([--enable-plugins], [Enable support for plugins (defaults no)]), -[case "${enableval}" in - yes | "") plugins=yes ;; - no) plugins=no ;; - *) plugins=yes ;; - esac], -[plugins=no]) -]) @@ -2,7 +2,7 @@ # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59. # -# Copyright (C) 2003, 2008 Free Software Foundation, Inc. +# Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## @@ -2064,7 +2064,7 @@ if test "${ENABLE_GOLD}" = "yes"; then case "${target}" in *-*-elf* | *-*-sysv4* | *-*-unixware* | *-*-eabi* | hppa*64*-*-hpux* \ | *-*-linux* | frv-*-uclinux* | *-*-irix5* | *-*-irix6* \ - | *-*-netbsd* | *-*-openbsd* | *-*-freebsd* | *-*-solaris2* | *-*-nto*) + | *-*-netbsd* | *-*-openbsd* | *-*-freebsd* | *-*-solaris2*) case "${target}" in *-*-linux*aout* | *-*-linux*oldld*) ;; @@ -2077,7 +2077,7 @@ if test "${ENABLE_GOLD}" = "yes"; then if test "$is_elf" = "yes"; then # Check for target supported by gold. case "${target}" in - i?86-*-* | x86_64-*-* | sparc*-*-* | powerpc*-*-* | arm*-*-*) + i?86-*-* | x86_64-*-* | sparc*-*-* | powerpc*-*-*) configdirs="`echo " ${configdirs} " | sed -e 's/ ld / gold /'`" ;; esac @@ -2409,10 +2409,6 @@ case "${target}" in frv-*-*) noconfigdirs="$noconfigdirs ${libgcj}" ;; - moxie-*-*) - noconfigdirs="$noconfigdirs ${libgcj}" - noconfigdirs="$noconfigdirs gprof" - ;; h8300*-*-*) noconfigdirs="$noconfigdirs target-libgloss ${libgcj}" ;; @@ -4626,7 +4622,7 @@ int main () { - #if __GNU_MP_VERSION < 4 || (__GNU_MP_VERSION == 4 && __GNU_MP_VERSION_MINOR < 2) + #if __GNU_MP_VERSION < 4 || (__GNU_MP_VERSION == 4 && __GNU_MP_VERSION_MINOR < 1) choke me #endif @@ -4684,7 +4680,7 @@ int main () { - #if MPFR_VERSION < MPFR_VERSION_NUM(2,3,1) + #if MPFR_VERSION < MPFR_VERSION_NUM(2,3,0) choke me #endif mpfr_t n; @@ -4790,7 +4786,7 @@ rm -f conftest.err conftest.$ac_objext \ CFLAGS="$saved_CFLAGS" if test x$have_gmp != xyes; then - { { echo "$as_me:$LINENO: error: Building GCC requires GMP 4.2+ and MPFR 2.3.2+. + { { echo "$as_me:$LINENO: error: Building GCC requires GMP 4.1+ and MPFR 2.3.2+. 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/. @@ -4798,7 +4794,7 @@ See also http://gcc.gnu.org/install/prerequisites.html for additional info. 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.2+ and MPFR 2.3.2+. +echo "$as_me: error: Building GCC requires GMP 4.1+ and MPFR 2.3.2+. 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/. @@ -6669,10 +6665,10 @@ case " $build_configdirs " in *" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;; *) - # For an installed makeinfo, we require it to be from texinfo 4.7 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\.([7-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" diff --git a/configure.ac b/configure.ac index d2ad27e..a34cbe1 100644 --- a/configure.ac +++ b/configure.ac @@ -305,7 +305,7 @@ if test "${ENABLE_GOLD}" = "yes"; then case "${target}" in *-*-elf* | *-*-sysv4* | *-*-unixware* | *-*-eabi* | hppa*64*-*-hpux* \ | *-*-linux* | frv-*-uclinux* | *-*-irix5* | *-*-irix6* \ - | *-*-netbsd* | *-*-openbsd* | *-*-freebsd* | *-*-solaris2* | *-*-nto*) + | *-*-netbsd* | *-*-openbsd* | *-*-freebsd* | *-*-solaris2*) case "${target}" in *-*-linux*aout* | *-*-linux*oldld*) ;; @@ -318,7 +318,7 @@ if test "${ENABLE_GOLD}" = "yes"; then if test "$is_elf" = "yes"; then # Check for target supported by gold. case "${target}" in - i?86-*-* | x86_64-*-* | sparc*-*-* | powerpc*-*-* | arm*-*-*) + i?86-*-* | x86_64-*-* | sparc*-*-* | powerpc*-*-*) configdirs="`echo " ${configdirs} " | sed -e 's/ ld / gold /'`" ;; esac @@ -644,10 +644,6 @@ case "${target}" in frv-*-*) noconfigdirs="$noconfigdirs ${libgcj}" ;; - moxie-*-*) - noconfigdirs="$noconfigdirs ${libgcj}" - noconfigdirs="$noconfigdirs gprof" - ;; h8300*-*-*) noconfigdirs="$noconfigdirs target-libgloss ${libgcj}" ;; @@ -1268,7 +1264,7 @@ if test -d ${srcdir}/gcc && test "x$have_gmp" = xno; then # Check GMP actually works AC_MSG_CHECKING([for correct version of gmp.h]) AC_TRY_COMPILE([#include "gmp.h"],[ - #if __GNU_MP_VERSION < 4 || (__GNU_MP_VERSION == 4 && __GNU_MP_VERSION_MINOR < 2) + #if __GNU_MP_VERSION < 4 || (__GNU_MP_VERSION == 4 && __GNU_MP_VERSION_MINOR < 1) choke me #endif ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); have_gmp=no]) @@ -1276,11 +1272,11 @@ if test -d ${srcdir}/gcc && test "x$have_gmp" = xno; then if test x"$have_gmp" = xyes; then saved_LIBS="$LIBS" LIBS="$LIBS $gmplibs" - dnl MPFR 2.3.1 is acceptable, but MPFR 2.3.2 is better. + dnl MPFR 2.3.0 is acceptable, but MPFR 2.3.2 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,3,1) + #if MPFR_VERSION < MPFR_VERSION_NUM(2,3,0) choke me #endif mpfr_t n; @@ -1304,7 +1300,7 @@ if test -d ${srcdir}/gcc && test "x$have_gmp" = xno; then CFLAGS="$saved_CFLAGS" if test x$have_gmp != xyes; then - AC_MSG_ERROR([Building GCC requires GMP 4.2+ and MPFR 2.3.2+. + AC_MSG_ERROR([Building GCC requires GMP 4.1+ and MPFR 2.3.2+. 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/. @@ -2730,10 +2726,10 @@ case " $build_configdirs " in *" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;; *) changequote(,) - # For an installed makeinfo, we require it to be from texinfo 4.7 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\.([7-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" @@ -5,34 +5,3 @@ $ define coff [-.INCLUDE.COFF] $ define elf [-.INCLUDE.ELF] $ define nlm [-.INCLUDE.NLM] $ define opcode [-.INCLUDE.OPCODE] -$! -$! Build procedures -$! -$! Note: you need make 3.76 -$ MAKE="gmake_3_76" -$ OPT= -$! -$ if (P1 .EQS. "CONFIGURE") .OR. (P1 .EQS. "ALL") -$ then -$ set def [.bfd] -$ @configure -$ set def [-.binutils] -$ @configure -$ set def [-.gas] -$ @configure -$ set def [-] -$ endif -$ if (P1 .EQS. "MAKE") .OR. (P1 .EQS. "ALL") -$ then -$ set def [.bfd] -$ 'MAKE "ARCH=ALPHA" "OPT=''OPT'" -$ set def [-.libiberty] -$ 'MAKE "ARCH=ALPHA" "OPT=''OPT'" -$ set def [-.opcodes] -$ 'MAKE "ARCH=ALPHA" "OPT=''OPT'" -$ set def [-.binutils] -$ 'MAKE "ARCH=ALPHA" "OPT=''OPT'" -$ set def [-.gas] -$ 'MAKE "ARCH=ALPHA" "OPT=''OPT'" -$ set def [-] -$ endif
\ No newline at end of file |