diff options
author | Jing Yu <jingyu@google.com> | 2010-01-18 13:38:25 -0800 |
---|---|---|
committer | Jing Yu <jingyu@google.com> | 2010-01-18 13:38:25 -0800 |
commit | 30f553f6a7597e8084704b84876dea2af493d6fe (patch) | |
tree | 569579768afd83d884f5f1118272fea213afdb36 /gcc-4.4.0 | |
parent | 727407e24af9df776e77f6a5762a62869198bc09 (diff) | |
download | toolchain_gcc-30f553f6a7597e8084704b84876dea2af493d6fe.tar.gz toolchain_gcc-30f553f6a7597e8084704b84876dea2af493d6fe.tar.bz2 toolchain_gcc-30f553f6a7597e8084704b84876dea2af493d6fe.zip |
Bring gcc-4.4.0 to up-to-date.
Diffstat (limited to 'gcc-4.4.0')
255 files changed, 13948 insertions, 6488 deletions
diff --git a/gcc-4.4.0/Makefile.def b/gcc-4.4.0/Makefile.def index 060d4dbee..fa5e0fe73 100644 --- a/gcc-4.4.0/Makefile.def +++ b/gcc-4.4.0/Makefile.def @@ -255,12 +255,8 @@ 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 ; }; @@ -273,6 +269,7 @@ 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 ; }; @@ -288,6 +285,7 @@ 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 ; }; @@ -542,62 +540,21 @@ dependencies = { module=all-target-winsup; on=all-target-libiberty; }; dependencies = { module=all-target-winsup; on=all-target-libtermcap; }; // Toplevel bootstrap -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=1 ; }; bootstrap_stage = { id=2 ; prev=1 ; - 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_target=bootstrap2 ; }; bootstrap_stage = { id=3 ; prev=2 ; lean=1 ; compare_target=compare ; bootstrap_target=bootstrap ; - cleanstrap_target=cleanstrap ; - stage_configure_flags="@stage2_werror_flag@" ; - stage_cflags="$(STAGE3_CFLAGS)" ; - stage_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" ; }; + cleanstrap_target=cleanstrap ; }; bootstrap_stage = { id=4 ; prev=3 ; lean=2 ; compare_target=compare3 ; - bootstrap_target=bootstrap4 ; - stage_configure_flags="@stage2_werror_flag@" ; - stage_cflags="$(STAGE4_CFLAGS)" ; - stage_libcflags="$(STAGE4_CFLAGS)" ; }; + bootstrap_target=bootstrap4 ; }; bootstrap_stage = { - id=profile ; prev=1 ; - stage_configure_flags="@stage2_werror_flag@" ; - stage_cflags='$(STAGE2_CFLAGS) -fprofile-generate' ; - stage_libcflags='$(STAGE2_LIBCFLAGS)' ; }; + id=profile ; prev=1 ; }; bootstrap_stage = { id=feedback ; prev=profile ; - bootstrap_target=profiledbootstrap ; - stage_configure_flags="@stage2_werror_flag@" ; - stage_cflags='$(STAGE3_CFLAGS) -fprofile-use' ; - stage_libcflags='$(STAGE3_LIBCFLAGS) -fprofile-use' ; }; + bootstrap_target=profiledbootstrap ; }; diff --git a/gcc-4.4.0/Makefile.in b/gcc-4.4.0/Makefile.in index 1a1aa954f..6d95a2fc7 100644 --- a/gcc-4.4.0/Makefile.in +++ b/gcc-4.4.0/Makefile.in @@ -3,7 +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, 2009 +# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 # Free Software Foundation # # This file is free software; you can redistribute it and/or modify @@ -175,6 +175,8 @@ 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; \ @@ -201,7 +203,6 @@ HOST_EXPORTS = \ PPLINC="$(HOST_PPLINC)"; export PPLINC; \ CLOOGLIBS="$(HOST_CLOOGLIBS)"; export CLOOGLIBS; \ CLOOGINC="$(HOST_CLOOGINC)"; export CLOOGINC; \ - PLUGINLIBS="$(HOST_PLUGINLIBS)"; export PLUGINLIBS; \ @if gcc-bootstrap $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \ @endif gcc-bootstrap @@ -211,11 +212,9 @@ 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/"; 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; \ + -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; \ LDFLAGS="$(BOOT_LDFLAGS)"; export LDFLAGS; # Target libraries are put under this directory: @@ -229,13 +228,13 @@ BASE_TARGET_EXPORTS = \ $(BASE_EXPORTS) \ AR="$(AR_FOR_TARGET)"; export AR; \ AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \ - CC="$(CC_FOR_TARGET)"; export CC; \ - CFLAGS="$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CC="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CC; \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \ - 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; \ + 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; \ DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \ LD="$(COMPILER_LD_FOR_TARGET)"; export LD; \ LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \ @@ -251,11 +250,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)"; export CXX; + CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; NORMAL_TARGET_EXPORTS = \ $(BASE_TARGET_EXPORTS) \ - CXX="$(CXX_FOR_TARGET)"; export CXX; + CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; # Where to find GMP HOST_GMPLIBS = @gmplibs@ @@ -269,9 +268,6 @@ HOST_PPLINC = @pplinc@ HOST_CLOOGLIBS = @clooglibs@ HOST_CLOOGINC = @clooginc@ -# Libs and linker option needed for plugin support -HOST_PLUGINLIBS = @pluginlibs@ - # ---------------------------------------------- # Programs producing files for the BUILD machine # ---------------------------------------------- @@ -358,48 +354,90 @@ 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)" -STAGE1_CFLAGS=@stage1_cflags@ -STAGE2_CFLAGS=$(BOOT_CFLAGS) -STAGE3_CFLAGS=$(BOOT_CFLAGS) -STAGE4_CFLAGS=$(BOOT_CFLAGS) +STAGEprofile_CFLAGS = $(STAGE2_CFLAGS) -fprofile-generate +STAGEprofile_TFLAGS = $(STAGE2_TFLAGS) -STAGE1_LIBCFLAGS=$(CFLAGS_FOR_TARGET) -STAGE2_LIBCFLAGS=$(CFLAGS_FOR_TARGET) -STAGE3_LIBCFLAGS=$(CFLAGS_FOR_TARGET) -STAGE4_LIBCFLAGS=$(CFLAGS_FOR_TARGET) +STAGEfeedback_CFLAGS = $(STAGE3_CFLAGS) -fprofile-use +STAGEfeedback_TFLAGS = $(STAGE3_TFLAGS) 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@ $(FLAGS_FOR_TARGET) +CC_FOR_TARGET=$(STAGE_CC_WRAPPER) @CC_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@ $(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) +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@ DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@ LD_FOR_TARGET=@LD_FOR_TARGET@ @@ -417,13 +455,17 @@ 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 # ------------------------------------ @@ -558,12 +600,8 @@ 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)" \ @@ -574,6 +612,7 @@ 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)" \ @@ -587,8 +626,22 @@ 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)" @@ -603,6 +656,8 @@ EXTRA_HOST_FLAGS = \ 'CC=$(CC)' \ 'CXX=$(CXX)' \ 'DLLTOOL=$(DLLTOOL)' \ + 'GCJ=$(GCJ)' \ + 'GFORTRAN=$(GFORTRAN)' \ 'LD=$(LD)' \ 'LIPO=$(LIPO)' \ 'NM=$(NM)' \ @@ -642,20 +697,24 @@ POSTSTAGE1_FLAGS_TO_PASS = \ EXTRA_TARGET_FLAGS = \ 'AR=$$(AR_FOR_TARGET)' \ 'AS=$(COMPILER_AS_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)' \ + '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)' \ '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) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \ - 'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \ + 'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \ + 'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \ 'NM=$(COMPILER_NM_FOR_TARGET)' \ 'OBJDUMP=$$(OBJDUMP_FOR_TARGET)' \ 'RANLIB=$$(RANLIB_FOR_TARGET)' \ 'WINDRES=$$(WINDRES_FOR_TARGET)' \ - 'WINDMC=$$(WINDMC_FOR_TARGET)' + 'WINDMC=$$(WINDMC_FOR_TARGET)' \ + 'XGCC_FLAGS_FOR_TARGET=$(XGCC_FLAGS_FOR_TARGET)' \ + "TFLAGS=$$TFLAGS" TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) @@ -675,6 +734,13 @@ 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 \ @@ -787,11 +853,17 @@ all: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - if [ -f stage_last ]; then \ +@if gcc-bootstrap + if [ -f stage_last ]; then : ; \ + TFLAGS="$(STAGE$(shell 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; \ - fi +@if gcc-bootstrap + fi; \ +@endif gcc-bootstrap + : .PHONY: all-build @@ -4950,10 +5022,12 @@ 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; \ + CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 1 in $(HOST_SUBDIR)/bfd ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ cd $(HOST_SUBDIR)/bfd || exit 1; \ @@ -4967,8 +5041,7 @@ configure-stage1-bfd: $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ - \ - --disable-intermodule $(STAGE1_CHECKING) --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" + $(STAGE1_CONFIGURE_FLAGS) @endif bfd-bootstrap .PHONY: configure-stage2-bfd maybe-configure-stage2-bfd @@ -4980,11 +5053,13 @@ 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; \ + CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 2 in $(HOST_SUBDIR)/bfd ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ cd $(HOST_SUBDIR)/bfd || exit 1; \ @@ -4999,38 +5074,7 @@ configure-stage2-bfd: $(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-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@ + $(STAGE2_CONFIGURE_FLAGS) @endif bfd-bootstrap .PHONY: configure-stage3-bfd maybe-configure-stage3-bfd @@ -5042,11 +5086,13 @@ 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; \ + CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 3 in $(HOST_SUBDIR)/bfd ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ cd $(HOST_SUBDIR)/bfd || exit 1; \ @@ -5061,38 +5107,7 @@ configure-stage3-bfd: $(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-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@ + $(STAGE3_CONFIGURE_FLAGS) @endif bfd-bootstrap .PHONY: configure-stage4-bfd maybe-configure-stage4-bfd @@ -5104,11 +5119,13 @@ 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; \ + CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 4 in $(HOST_SUBDIR)/bfd ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ cd $(HOST_SUBDIR)/bfd || exit 1; \ @@ -5123,7 +5140,7 @@ configure-stage4-bfd: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - @stage2_werror_flag@ + $(STAGE4_CONFIGURE_FLAGS) @endif bfd-bootstrap .PHONY: configure-stageprofile-bfd maybe-configure-stageprofile-bfd @@ -5135,11 +5152,13 @@ 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="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \ - CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage profile in $(HOST_SUBDIR)/bfd ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ cd $(HOST_SUBDIR)/bfd || exit 1; \ @@ -5154,7 +5173,7 @@ configure-stageprofile-bfd: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - @stage2_werror_flag@ + $(STAGEprofile_CONFIGURE_FLAGS) @endif bfd-bootstrap .PHONY: configure-stagefeedback-bfd maybe-configure-stagefeedback-bfd @@ -5166,11 +5185,13 @@ 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="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \ - CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage feedback in $(HOST_SUBDIR)/bfd ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ cd $(HOST_SUBDIR)/bfd || exit 1; \ @@ -5185,7 +5206,7 @@ configure-stagefeedback-bfd: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - @stage2_werror_flag@ + $(STAGEfeedback_CONFIGURE_FLAGS) @endif bfd-bootstrap @@ -5223,13 +5244,18 @@ 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="$(STAGE1_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \ + 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)" \ $(TARGET-stage1-bfd) maybe-clean-stage1-bfd: clean-stage1-bfd @@ -5259,14 +5285,19 @@ 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_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_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)" \ $(TARGET-stage2-bfd) maybe-clean-stage2-bfd: clean-stage2-bfd @@ -5285,44 +5316,6 @@ 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: @@ -5335,14 +5328,19 @@ 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_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_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)" \ $(TARGET-stage3-bfd) maybe-clean-stage3-bfd: clean-stage3-bfd @@ -5361,44 +5359,6 @@ 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: @@ -5411,14 +5371,19 @@ 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="$(STAGE4_CFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ + 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)" \ $(TARGET-stage4-bfd) maybe-clean-stage4-bfd: clean-stage4-bfd @@ -5449,14 +5414,19 @@ 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="$(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) \ + 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)" \ $(TARGET-stageprofile-bfd) maybe-clean-stageprofile-bfd: clean-stageprofile-bfd @@ -5487,14 +5457,19 @@ 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="$(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) \ + 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)" \ $(TARGET-stagefeedback-bfd) maybe-clean-stagefeedback-bfd: clean-stagefeedback-bfd @@ -5913,10 +5888,12 @@ 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; \ + CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 1 in $(HOST_SUBDIR)/opcodes ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ cd $(HOST_SUBDIR)/opcodes || exit 1; \ @@ -5930,8 +5907,7 @@ configure-stage1-opcodes: $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ - \ - --disable-intermodule $(STAGE1_CHECKING) --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" + $(STAGE1_CONFIGURE_FLAGS) @endif opcodes-bootstrap .PHONY: configure-stage2-opcodes maybe-configure-stage2-opcodes @@ -5943,11 +5919,13 @@ 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; \ + CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 2 in $(HOST_SUBDIR)/opcodes ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ cd $(HOST_SUBDIR)/opcodes || exit 1; \ @@ -5962,38 +5940,7 @@ configure-stage2-opcodes: $(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-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@ + $(STAGE2_CONFIGURE_FLAGS) @endif opcodes-bootstrap .PHONY: configure-stage3-opcodes maybe-configure-stage3-opcodes @@ -6005,11 +5952,13 @@ 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; \ + CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 3 in $(HOST_SUBDIR)/opcodes ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ cd $(HOST_SUBDIR)/opcodes || exit 1; \ @@ -6024,38 +5973,7 @@ configure-stage3-opcodes: $(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-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@ + $(STAGE3_CONFIGURE_FLAGS) @endif opcodes-bootstrap .PHONY: configure-stage4-opcodes maybe-configure-stage4-opcodes @@ -6067,11 +5985,13 @@ 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; \ + CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 4 in $(HOST_SUBDIR)/opcodes ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ cd $(HOST_SUBDIR)/opcodes || exit 1; \ @@ -6086,7 +6006,7 @@ configure-stage4-opcodes: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - @stage2_werror_flag@ + $(STAGE4_CONFIGURE_FLAGS) @endif opcodes-bootstrap .PHONY: configure-stageprofile-opcodes maybe-configure-stageprofile-opcodes @@ -6098,11 +6018,13 @@ 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="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \ - CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage profile in $(HOST_SUBDIR)/opcodes ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ cd $(HOST_SUBDIR)/opcodes || exit 1; \ @@ -6117,7 +6039,7 @@ configure-stageprofile-opcodes: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - @stage2_werror_flag@ + $(STAGEprofile_CONFIGURE_FLAGS) @endif opcodes-bootstrap .PHONY: configure-stagefeedback-opcodes maybe-configure-stagefeedback-opcodes @@ -6129,11 +6051,13 @@ 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="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \ - CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage feedback in $(HOST_SUBDIR)/opcodes ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ cd $(HOST_SUBDIR)/opcodes || exit 1; \ @@ -6148,7 +6072,7 @@ configure-stagefeedback-opcodes: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - @stage2_werror_flag@ + $(STAGEfeedback_CONFIGURE_FLAGS) @endif opcodes-bootstrap @@ -6186,13 +6110,18 @@ 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="$(STAGE1_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \ + 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)" \ $(TARGET-stage1-opcodes) maybe-clean-stage1-opcodes: clean-stage1-opcodes @@ -6222,14 +6151,19 @@ 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_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_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)" \ $(TARGET-stage2-opcodes) maybe-clean-stage2-opcodes: clean-stage2-opcodes @@ -6248,44 +6182,6 @@ 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: @@ -6298,14 +6194,19 @@ 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_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_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)" \ $(TARGET-stage3-opcodes) maybe-clean-stage3-opcodes: clean-stage3-opcodes @@ -6324,44 +6225,6 @@ 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: @@ -6374,14 +6237,19 @@ 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="$(STAGE4_CFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ + 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)" \ $(TARGET-stage4-opcodes) maybe-clean-stage4-opcodes: clean-stage4-opcodes @@ -6412,14 +6280,19 @@ 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="$(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) \ + 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)" \ $(TARGET-stageprofile-opcodes) maybe-clean-stageprofile-opcodes: clean-stageprofile-opcodes @@ -6450,14 +6323,19 @@ 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="$(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) \ + 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)" \ $(TARGET-stagefeedback-opcodes) maybe-clean-stagefeedback-opcodes: clean-stagefeedback-opcodes @@ -6876,10 +6754,12 @@ 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; \ + CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 1 in $(HOST_SUBDIR)/binutils ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ cd $(HOST_SUBDIR)/binutils || exit 1; \ @@ -6893,8 +6773,7 @@ configure-stage1-binutils: $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ - \ - --disable-intermodule $(STAGE1_CHECKING) --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" + $(STAGE1_CONFIGURE_FLAGS) @endif binutils-bootstrap .PHONY: configure-stage2-binutils maybe-configure-stage2-binutils @@ -6906,11 +6785,13 @@ 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; \ + CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 2 in $(HOST_SUBDIR)/binutils ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ cd $(HOST_SUBDIR)/binutils || exit 1; \ @@ -6925,38 +6806,7 @@ configure-stage2-binutils: $(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-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@ + $(STAGE2_CONFIGURE_FLAGS) @endif binutils-bootstrap .PHONY: configure-stage3-binutils maybe-configure-stage3-binutils @@ -6968,11 +6818,13 @@ 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; \ + CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 3 in $(HOST_SUBDIR)/binutils ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ cd $(HOST_SUBDIR)/binutils || exit 1; \ @@ -6987,38 +6839,7 @@ configure-stage3-binutils: $(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-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@ + $(STAGE3_CONFIGURE_FLAGS) @endif binutils-bootstrap .PHONY: configure-stage4-binutils maybe-configure-stage4-binutils @@ -7030,11 +6851,13 @@ 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; \ + CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 4 in $(HOST_SUBDIR)/binutils ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ cd $(HOST_SUBDIR)/binutils || exit 1; \ @@ -7049,7 +6872,7 @@ configure-stage4-binutils: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - @stage2_werror_flag@ + $(STAGE4_CONFIGURE_FLAGS) @endif binutils-bootstrap .PHONY: configure-stageprofile-binutils maybe-configure-stageprofile-binutils @@ -7061,11 +6884,13 @@ 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="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \ - CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage profile in $(HOST_SUBDIR)/binutils ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ cd $(HOST_SUBDIR)/binutils || exit 1; \ @@ -7080,7 +6905,7 @@ configure-stageprofile-binutils: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - @stage2_werror_flag@ + $(STAGEprofile_CONFIGURE_FLAGS) @endif binutils-bootstrap .PHONY: configure-stagefeedback-binutils maybe-configure-stagefeedback-binutils @@ -7092,11 +6917,13 @@ 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="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \ - CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage feedback in $(HOST_SUBDIR)/binutils ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ cd $(HOST_SUBDIR)/binutils || exit 1; \ @@ -7111,7 +6938,7 @@ configure-stagefeedback-binutils: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - @stage2_werror_flag@ + $(STAGEfeedback_CONFIGURE_FLAGS) @endif binutils-bootstrap @@ -7149,13 +6976,18 @@ 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="$(STAGE1_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \ + 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)" \ $(TARGET-stage1-binutils) maybe-clean-stage1-binutils: clean-stage1-binutils @@ -7185,14 +7017,19 @@ 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_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_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)" \ $(TARGET-stage2-binutils) maybe-clean-stage2-binutils: clean-stage2-binutils @@ -7211,44 +7048,6 @@ 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: @@ -7261,14 +7060,19 @@ 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_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_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)" \ $(TARGET-stage3-binutils) maybe-clean-stage3-binutils: clean-stage3-binutils @@ -7287,44 +7091,6 @@ 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: @@ -7337,14 +7103,19 @@ 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="$(STAGE4_CFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ + 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)" \ $(TARGET-stage4-binutils) maybe-clean-stage4-binutils: clean-stage4-binutils @@ -7375,14 +7146,19 @@ 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="$(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) \ + 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)" \ $(TARGET-stageprofile-binutils) maybe-clean-stageprofile-binutils: clean-stageprofile-binutils @@ -7413,14 +7189,19 @@ 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="$(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) \ + 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)" \ $(TARGET-stagefeedback-binutils) maybe-clean-stagefeedback-binutils: clean-stagefeedback-binutils @@ -13354,10 +13135,12 @@ 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; \ + CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 1 in $(HOST_SUBDIR)/gas ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ cd $(HOST_SUBDIR)/gas || exit 1; \ @@ -13371,8 +13154,7 @@ configure-stage1-gas: $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ - \ - --disable-intermodule $(STAGE1_CHECKING) --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" + $(STAGE1_CONFIGURE_FLAGS) @endif gas-bootstrap .PHONY: configure-stage2-gas maybe-configure-stage2-gas @@ -13384,11 +13166,13 @@ 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; \ + CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 2 in $(HOST_SUBDIR)/gas ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ cd $(HOST_SUBDIR)/gas || exit 1; \ @@ -13403,38 +13187,7 @@ configure-stage2-gas: $(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-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@ + $(STAGE2_CONFIGURE_FLAGS) @endif gas-bootstrap .PHONY: configure-stage3-gas maybe-configure-stage3-gas @@ -13446,11 +13199,13 @@ 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; \ + CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 3 in $(HOST_SUBDIR)/gas ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ cd $(HOST_SUBDIR)/gas || exit 1; \ @@ -13465,38 +13220,7 @@ configure-stage3-gas: $(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-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@ + $(STAGE3_CONFIGURE_FLAGS) @endif gas-bootstrap .PHONY: configure-stage4-gas maybe-configure-stage4-gas @@ -13508,11 +13232,13 @@ 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; \ + CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 4 in $(HOST_SUBDIR)/gas ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ cd $(HOST_SUBDIR)/gas || exit 1; \ @@ -13527,7 +13253,7 @@ configure-stage4-gas: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - @stage2_werror_flag@ + $(STAGE4_CONFIGURE_FLAGS) @endif gas-bootstrap .PHONY: configure-stageprofile-gas maybe-configure-stageprofile-gas @@ -13539,11 +13265,13 @@ 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="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \ - CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage profile in $(HOST_SUBDIR)/gas ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ cd $(HOST_SUBDIR)/gas || exit 1; \ @@ -13558,7 +13286,7 @@ configure-stageprofile-gas: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - @stage2_werror_flag@ + $(STAGEprofile_CONFIGURE_FLAGS) @endif gas-bootstrap .PHONY: configure-stagefeedback-gas maybe-configure-stagefeedback-gas @@ -13570,11 +13298,13 @@ 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="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \ - CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage feedback in $(HOST_SUBDIR)/gas ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ cd $(HOST_SUBDIR)/gas || exit 1; \ @@ -13589,7 +13319,7 @@ configure-stagefeedback-gas: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - @stage2_werror_flag@ + $(STAGEfeedback_CONFIGURE_FLAGS) @endif gas-bootstrap @@ -13627,13 +13357,18 @@ 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="$(STAGE1_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \ + 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)" \ $(TARGET-stage1-gas) maybe-clean-stage1-gas: clean-stage1-gas @@ -13663,14 +13398,19 @@ 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_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_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)" \ $(TARGET-stage2-gas) maybe-clean-stage2-gas: clean-stage2-gas @@ -13689,44 +13429,6 @@ 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: @@ -13739,14 +13441,19 @@ 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_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_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)" \ $(TARGET-stage3-gas) maybe-clean-stage3-gas: clean-stage3-gas @@ -13765,44 +13472,6 @@ 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: @@ -13815,14 +13484,19 @@ 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="$(STAGE4_CFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ + 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)" \ $(TARGET-stage4-gas) maybe-clean-stage4-gas: clean-stage4-gas @@ -13853,14 +13527,19 @@ 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="$(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) \ + 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)" \ $(TARGET-stageprofile-gas) maybe-clean-stageprofile-gas: clean-stageprofile-gas @@ -13891,14 +13570,19 @@ 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="$(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) \ + 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)" \ $(TARGET-stagefeedback-gas) maybe-clean-stagefeedback-gas: clean-stagefeedback-gas @@ -14317,10 +14001,12 @@ 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; \ + CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 1 in $(HOST_SUBDIR)/gcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ cd $(HOST_SUBDIR)/gcc || exit 1; \ @@ -14334,8 +14020,7 @@ configure-stage1-gcc: $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ - \ - --disable-intermodule $(STAGE1_CHECKING) --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" + $(STAGE1_CONFIGURE_FLAGS) @endif gcc-bootstrap .PHONY: configure-stage2-gcc maybe-configure-stage2-gcc @@ -14347,11 +14032,13 @@ 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; \ + CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 2 in $(HOST_SUBDIR)/gcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ cd $(HOST_SUBDIR)/gcc || exit 1; \ @@ -14366,38 +14053,7 @@ configure-stage2-gcc: $(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-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@ + $(STAGE2_CONFIGURE_FLAGS) @endif gcc-bootstrap .PHONY: configure-stage3-gcc maybe-configure-stage3-gcc @@ -14409,11 +14065,13 @@ 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; \ + CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 3 in $(HOST_SUBDIR)/gcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ cd $(HOST_SUBDIR)/gcc || exit 1; \ @@ -14428,38 +14086,7 @@ configure-stage3-gcc: $(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-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@ + $(STAGE3_CONFIGURE_FLAGS) @endif gcc-bootstrap .PHONY: configure-stage4-gcc maybe-configure-stage4-gcc @@ -14471,11 +14098,13 @@ 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; \ + CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 4 in $(HOST_SUBDIR)/gcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ cd $(HOST_SUBDIR)/gcc || exit 1; \ @@ -14490,7 +14119,7 @@ configure-stage4-gcc: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - @stage2_werror_flag@ + $(STAGE4_CONFIGURE_FLAGS) @endif gcc-bootstrap .PHONY: configure-stageprofile-gcc maybe-configure-stageprofile-gcc @@ -14502,11 +14131,13 @@ 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="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \ - CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage profile in $(HOST_SUBDIR)/gcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ cd $(HOST_SUBDIR)/gcc || exit 1; \ @@ -14521,7 +14152,7 @@ configure-stageprofile-gcc: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - @stage2_werror_flag@ + $(STAGEprofile_CONFIGURE_FLAGS) @endif gcc-bootstrap .PHONY: configure-stagefeedback-gcc maybe-configure-stagefeedback-gcc @@ -14533,11 +14164,13 @@ 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="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \ - CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage feedback in $(HOST_SUBDIR)/gcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ cd $(HOST_SUBDIR)/gcc || exit 1; \ @@ -14552,7 +14185,7 @@ configure-stagefeedback-gcc: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - @stage2_werror_flag@ + $(STAGEfeedback_CONFIGURE_FLAGS) @endif gcc-bootstrap @@ -14590,13 +14223,18 @@ 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="$(STAGE1_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS) \ + 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)" \ $(TARGET-stage1-gcc) maybe-clean-stage1-gcc: clean-stage1-gcc @@ -14626,14 +14264,19 @@ 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_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \ + 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)" \ $(TARGET-stage2-gcc) maybe-clean-stage2-gcc: clean-stage2-gcc @@ -14652,44 +14295,6 @@ 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: @@ -14702,14 +14307,19 @@ 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_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \ + 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)" \ $(TARGET-stage3-gcc) maybe-clean-stage3-gcc: clean-stage3-gcc @@ -14728,44 +14338,6 @@ 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: @@ -14778,14 +14350,19 @@ 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="$(STAGE4_CFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \ + 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)" \ $(TARGET-stage4-gcc) maybe-clean-stage4-gcc: clean-stage4-gcc @@ -14816,14 +14393,19 @@ 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="$(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) \ + 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)" \ $(TARGET-stageprofile-gcc) maybe-clean-stageprofile-gcc: clean-stageprofile-gcc @@ -14854,14 +14436,19 @@ 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="$(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) \ + 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)" \ $(TARGET-stagefeedback-gcc) maybe-clean-stagefeedback-gcc: clean-stagefeedback-gcc @@ -16130,10 +15717,12 @@ 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; \ + CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 1 in $(HOST_SUBDIR)/gmp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \ cd $(HOST_SUBDIR)/gmp || exit 1; \ @@ -16147,8 +15736,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} \ - \ - --disable-intermodule $(STAGE1_CHECKING) --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" --disable-shared + $(STAGE1_CONFIGURE_FLAGS) \ + --disable-shared @endif gmp-bootstrap .PHONY: configure-stage2-gmp maybe-configure-stage2-gmp @@ -16160,11 +15749,13 @@ 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; \ + CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 2 in $(HOST_SUBDIR)/gmp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \ cd $(HOST_SUBDIR)/gmp || exit 1; \ @@ -16179,38 +15770,8 @@ 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_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 + $(STAGE2_CONFIGURE_FLAGS) \ + --disable-shared @endif gmp-bootstrap .PHONY: configure-stage3-gmp maybe-configure-stage3-gmp @@ -16222,11 +15783,13 @@ 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; \ + CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 3 in $(HOST_SUBDIR)/gmp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \ cd $(HOST_SUBDIR)/gmp || exit 1; \ @@ -16241,38 +15804,8 @@ 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) \ - @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 + $(STAGE3_CONFIGURE_FLAGS) \ + --disable-shared @endif gmp-bootstrap .PHONY: configure-stage4-gmp maybe-configure-stage4-gmp @@ -16284,11 +15817,13 @@ 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; \ + CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 4 in $(HOST_SUBDIR)/gmp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \ cd $(HOST_SUBDIR)/gmp || exit 1; \ @@ -16303,7 +15838,8 @@ 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) \ - @stage2_werror_flag@ --disable-shared + $(STAGE4_CONFIGURE_FLAGS) \ + --disable-shared @endif gmp-bootstrap .PHONY: configure-stageprofile-gmp maybe-configure-stageprofile-gmp @@ -16315,11 +15851,13 @@ 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="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \ - CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage profile in $(HOST_SUBDIR)/gmp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \ cd $(HOST_SUBDIR)/gmp || exit 1; \ @@ -16334,7 +15872,8 @@ 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) \ - @stage2_werror_flag@ --disable-shared + $(STAGEprofile_CONFIGURE_FLAGS) \ + --disable-shared @endif gmp-bootstrap .PHONY: configure-stagefeedback-gmp maybe-configure-stagefeedback-gmp @@ -16346,11 +15885,13 @@ 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="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \ - CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage feedback in $(HOST_SUBDIR)/gmp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \ cd $(HOST_SUBDIR)/gmp || exit 1; \ @@ -16365,7 +15906,8 @@ 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) \ - @stage2_werror_flag@ --disable-shared + $(STAGEfeedback_CONFIGURE_FLAGS) \ + --disable-shared @endif gmp-bootstrap @@ -16403,13 +15945,18 @@ 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="$(STAGE1_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \ + 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)" \ $(TARGET-stage1-gmp) maybe-clean-stage1-gmp: clean-stage1-gmp @@ -16439,14 +15986,19 @@ 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_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_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)" \ $(TARGET-stage2-gmp) maybe-clean-stage2-gmp: clean-stage2-gmp @@ -16465,44 +16017,6 @@ 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: @@ -16515,14 +16029,19 @@ 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_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_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)" \ $(TARGET-stage3-gmp) maybe-clean-stage3-gmp: clean-stage3-gmp @@ -16541,44 +16060,6 @@ 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: @@ -16591,14 +16072,19 @@ 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="$(STAGE4_CFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ + 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)" \ $(TARGET-stage4-gmp) maybe-clean-stage4-gmp: clean-stage4-gmp @@ -16629,14 +16115,19 @@ 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="$(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) \ + 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)" \ $(TARGET-stageprofile-gmp) maybe-clean-stageprofile-gmp: clean-stageprofile-gmp @@ -16667,14 +16158,19 @@ 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="$(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) \ + 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)" \ $(TARGET-stagefeedback-gmp) maybe-clean-stagefeedback-gmp: clean-stagefeedback-gmp @@ -17087,10 +16583,12 @@ 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; \ + CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 1 in $(HOST_SUBDIR)/mpfr ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \ cd $(HOST_SUBDIR)/mpfr || exit 1; \ @@ -17104,8 +16602,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} \ - \ - --disable-intermodule $(STAGE1_CHECKING) --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" --disable-shared --with-gmp-build=$$r/$(HOST_SUBDIR)/gmp + $(STAGE1_CONFIGURE_FLAGS) \ + --disable-shared --with-gmp-build=$$r/$(HOST_SUBDIR)/gmp @endif mpfr-bootstrap .PHONY: configure-stage2-mpfr maybe-configure-stage2-mpfr @@ -17117,11 +16615,13 @@ 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; \ + CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 2 in $(HOST_SUBDIR)/mpfr ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \ cd $(HOST_SUBDIR)/mpfr || exit 1; \ @@ -17136,38 +16636,8 @@ 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_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 + $(STAGE2_CONFIGURE_FLAGS) \ + --disable-shared --with-gmp-build=$$r/$(HOST_SUBDIR)/gmp @endif mpfr-bootstrap .PHONY: configure-stage3-mpfr maybe-configure-stage3-mpfr @@ -17179,11 +16649,13 @@ 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; \ + CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 3 in $(HOST_SUBDIR)/mpfr ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \ cd $(HOST_SUBDIR)/mpfr || exit 1; \ @@ -17198,38 +16670,8 @@ 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) \ - @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 + $(STAGE3_CONFIGURE_FLAGS) \ + --disable-shared --with-gmp-build=$$r/$(HOST_SUBDIR)/gmp @endif mpfr-bootstrap .PHONY: configure-stage4-mpfr maybe-configure-stage4-mpfr @@ -17241,11 +16683,13 @@ 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; \ + CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 4 in $(HOST_SUBDIR)/mpfr ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \ cd $(HOST_SUBDIR)/mpfr || exit 1; \ @@ -17260,7 +16704,8 @@ 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) \ - @stage2_werror_flag@ --disable-shared --with-gmp-build=$$r/$(HOST_SUBDIR)/gmp + $(STAGE4_CONFIGURE_FLAGS) \ + --disable-shared --with-gmp-build=$$r/$(HOST_SUBDIR)/gmp @endif mpfr-bootstrap .PHONY: configure-stageprofile-mpfr maybe-configure-stageprofile-mpfr @@ -17272,11 +16717,13 @@ 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="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \ - CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage profile in $(HOST_SUBDIR)/mpfr ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \ cd $(HOST_SUBDIR)/mpfr || exit 1; \ @@ -17291,7 +16738,8 @@ 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) \ - @stage2_werror_flag@ --disable-shared --with-gmp-build=$$r/$(HOST_SUBDIR)/gmp + $(STAGEprofile_CONFIGURE_FLAGS) \ + --disable-shared --with-gmp-build=$$r/$(HOST_SUBDIR)/gmp @endif mpfr-bootstrap .PHONY: configure-stagefeedback-mpfr maybe-configure-stagefeedback-mpfr @@ -17303,11 +16751,13 @@ 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="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \ - CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage feedback in $(HOST_SUBDIR)/mpfr ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \ cd $(HOST_SUBDIR)/mpfr || exit 1; \ @@ -17322,7 +16772,8 @@ 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) \ - @stage2_werror_flag@ --disable-shared --with-gmp-build=$$r/$(HOST_SUBDIR)/gmp + $(STAGEfeedback_CONFIGURE_FLAGS) \ + --disable-shared --with-gmp-build=$$r/$(HOST_SUBDIR)/gmp @endif mpfr-bootstrap @@ -17360,13 +16811,18 @@ 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="$(STAGE1_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \ + 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)" \ $(TARGET-stage1-mpfr) maybe-clean-stage1-mpfr: clean-stage1-mpfr @@ -17396,14 +16852,19 @@ 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_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_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)" \ $(TARGET-stage2-mpfr) maybe-clean-stage2-mpfr: clean-stage2-mpfr @@ -17422,44 +16883,6 @@ 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: @@ -17472,14 +16895,19 @@ 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_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_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)" \ $(TARGET-stage3-mpfr) maybe-clean-stage3-mpfr: clean-stage3-mpfr @@ -17498,44 +16926,6 @@ 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: @@ -17548,14 +16938,19 @@ 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="$(STAGE4_CFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ + 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)" \ $(TARGET-stage4-mpfr) maybe-clean-stage4-mpfr: clean-stage4-mpfr @@ -17586,14 +16981,19 @@ 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="$(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) \ + 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)" \ $(TARGET-stageprofile-mpfr) maybe-clean-stageprofile-mpfr: clean-stageprofile-mpfr @@ -17624,14 +17024,19 @@ 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="$(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) \ + 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)" \ $(TARGET-stagefeedback-mpfr) maybe-clean-stagefeedback-mpfr: clean-stagefeedback-mpfr @@ -18044,10 +17449,12 @@ 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; \ + CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 1 in $(HOST_SUBDIR)/ppl ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl ; \ cd $(HOST_SUBDIR)/ppl || exit 1; \ @@ -18061,8 +17468,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} \ - \ - --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/ + $(STAGE1_CONFIGURE_FLAGS) \ + --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 @@ -18074,11 +17481,13 @@ 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; \ + CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 2 in $(HOST_SUBDIR)/ppl ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl ; \ cd $(HOST_SUBDIR)/ppl || exit 1; \ @@ -18093,38 +17502,8 @@ 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_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/ + $(STAGE2_CONFIGURE_FLAGS) \ + --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 @@ -18136,11 +17515,13 @@ 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; \ + CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 3 in $(HOST_SUBDIR)/ppl ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl ; \ cd $(HOST_SUBDIR)/ppl || exit 1; \ @@ -18155,38 +17536,8 @@ 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) \ - @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/ + $(STAGE3_CONFIGURE_FLAGS) \ + --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 @@ -18198,11 +17549,13 @@ 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; \ + CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 4 in $(HOST_SUBDIR)/ppl ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl ; \ cd $(HOST_SUBDIR)/ppl || exit 1; \ @@ -18217,7 +17570,8 @@ 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) \ - @stage2_werror_flag@ --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/ + $(STAGE4_CONFIGURE_FLAGS) \ + --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 @@ -18229,11 +17583,13 @@ 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="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \ - CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage profile in $(HOST_SUBDIR)/ppl ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl ; \ cd $(HOST_SUBDIR)/ppl || exit 1; \ @@ -18248,7 +17604,8 @@ 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) \ - @stage2_werror_flag@ --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/ + $(STAGEprofile_CONFIGURE_FLAGS) \ + --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 @@ -18260,11 +17617,13 @@ 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="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \ - CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage feedback in $(HOST_SUBDIR)/ppl ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ppl ; \ cd $(HOST_SUBDIR)/ppl || exit 1; \ @@ -18279,7 +17638,8 @@ 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) \ - @stage2_werror_flag@ --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/ + $(STAGEfeedback_CONFIGURE_FLAGS) \ + --disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/ @endif ppl-bootstrap @@ -18317,13 +17677,18 @@ 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="$(STAGE1_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \ + 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)" \ $(TARGET-stage1-ppl) maybe-clean-stage1-ppl: clean-stage1-ppl @@ -18353,14 +17718,19 @@ 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_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_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)" \ $(TARGET-stage2-ppl) maybe-clean-stage2-ppl: clean-stage2-ppl @@ -18379,44 +17749,6 @@ 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: @@ -18429,14 +17761,19 @@ 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_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_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)" \ $(TARGET-stage3-ppl) maybe-clean-stage3-ppl: clean-stage3-ppl @@ -18455,44 +17792,6 @@ 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: @@ -18505,14 +17804,19 @@ 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="$(STAGE4_CFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ + 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)" \ $(TARGET-stage4-ppl) maybe-clean-stage4-ppl: clean-stage4-ppl @@ -18543,14 +17847,19 @@ 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="$(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) \ + 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)" \ $(TARGET-stageprofile-ppl) maybe-clean-stageprofile-ppl: clean-stageprofile-ppl @@ -18581,14 +17890,19 @@ 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="$(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) \ + 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)" \ $(TARGET-stagefeedback-ppl) maybe-clean-stagefeedback-ppl: clean-stagefeedback-ppl @@ -19001,10 +18315,12 @@ 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; \ + CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 1 in $(HOST_SUBDIR)/cloog ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \ cd $(HOST_SUBDIR)/cloog || exit 1; \ @@ -19018,8 +18334,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} \ - \ - --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 + $(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 @endif cloog-bootstrap .PHONY: configure-stage2-cloog maybe-configure-stage2-cloog @@ -19031,11 +18347,13 @@ 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; \ + CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 2 in $(HOST_SUBDIR)/cloog ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \ cd $(HOST_SUBDIR)/cloog || exit 1; \ @@ -19050,38 +18368,8 @@ 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_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 + $(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 @endif cloog-bootstrap .PHONY: configure-stage3-cloog maybe-configure-stage3-cloog @@ -19093,11 +18381,13 @@ 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; \ + CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 3 in $(HOST_SUBDIR)/cloog ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \ cd $(HOST_SUBDIR)/cloog || exit 1; \ @@ -19112,38 +18402,8 @@ 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) \ - @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 + $(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 @endif cloog-bootstrap .PHONY: configure-stage4-cloog maybe-configure-stage4-cloog @@ -19155,11 +18415,13 @@ 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; \ + CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 4 in $(HOST_SUBDIR)/cloog ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \ cd $(HOST_SUBDIR)/cloog || exit 1; \ @@ -19174,7 +18436,8 @@ 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) \ - @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 + $(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 @endif cloog-bootstrap .PHONY: configure-stageprofile-cloog maybe-configure-stageprofile-cloog @@ -19186,11 +18449,13 @@ 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="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \ - CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage profile in $(HOST_SUBDIR)/cloog ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \ cd $(HOST_SUBDIR)/cloog || exit 1; \ @@ -19205,7 +18470,8 @@ 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) \ - @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 + $(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 @endif cloog-bootstrap .PHONY: configure-stagefeedback-cloog maybe-configure-stagefeedback-cloog @@ -19217,11 +18483,13 @@ 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="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \ - CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage feedback in $(HOST_SUBDIR)/cloog ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \ cd $(HOST_SUBDIR)/cloog || exit 1; \ @@ -19236,7 +18504,8 @@ 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) \ - @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 + $(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 @endif cloog-bootstrap @@ -19274,13 +18543,18 @@ 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="$(STAGE1_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \ + 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)" \ $(TARGET-stage1-cloog) maybe-clean-stage1-cloog: clean-stage1-cloog @@ -19310,14 +18584,19 @@ 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_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_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)" \ $(TARGET-stage2-cloog) maybe-clean-stage2-cloog: clean-stage2-cloog @@ -19336,44 +18615,6 @@ 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: @@ -19386,14 +18627,19 @@ 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_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_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)" \ $(TARGET-stage3-cloog) maybe-clean-stage3-cloog: clean-stage3-cloog @@ -19412,44 +18658,6 @@ 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: @@ -19462,14 +18670,19 @@ 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="$(STAGE4_CFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ + 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)" \ $(TARGET-stage4-cloog) maybe-clean-stage4-cloog: clean-stage4-cloog @@ -19500,14 +18713,19 @@ 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="$(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) \ + 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)" \ $(TARGET-stageprofile-cloog) maybe-clean-stageprofile-cloog: clean-stageprofile-cloog @@ -19538,14 +18756,19 @@ 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="$(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) \ + 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)" \ $(TARGET-stagefeedback-cloog) maybe-clean-stagefeedback-cloog: clean-stagefeedback-cloog @@ -20383,10 +19606,12 @@ 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; \ + CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 1 in $(HOST_SUBDIR)/gold ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \ cd $(HOST_SUBDIR)/gold || exit 1; \ @@ -20400,8 +19625,7 @@ configure-stage1-gold: $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ - \ - --disable-intermodule $(STAGE1_CHECKING) --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" + $(STAGE1_CONFIGURE_FLAGS) @endif gold-bootstrap .PHONY: configure-stage2-gold maybe-configure-stage2-gold @@ -20413,11 +19637,13 @@ 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; \ + CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 2 in $(HOST_SUBDIR)/gold ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \ cd $(HOST_SUBDIR)/gold || exit 1; \ @@ -20432,38 +19658,7 @@ configure-stage2-gold: $(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-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@ + $(STAGE2_CONFIGURE_FLAGS) @endif gold-bootstrap .PHONY: configure-stage3-gold maybe-configure-stage3-gold @@ -20475,11 +19670,13 @@ 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; \ + CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 3 in $(HOST_SUBDIR)/gold ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \ cd $(HOST_SUBDIR)/gold || exit 1; \ @@ -20494,38 +19691,7 @@ configure-stage3-gold: $(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-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@ + $(STAGE3_CONFIGURE_FLAGS) @endif gold-bootstrap .PHONY: configure-stage4-gold maybe-configure-stage4-gold @@ -20537,11 +19703,13 @@ 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; \ + CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 4 in $(HOST_SUBDIR)/gold ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \ cd $(HOST_SUBDIR)/gold || exit 1; \ @@ -20556,7 +19724,7 @@ configure-stage4-gold: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - @stage2_werror_flag@ + $(STAGE4_CONFIGURE_FLAGS) @endif gold-bootstrap .PHONY: configure-stageprofile-gold maybe-configure-stageprofile-gold @@ -20568,11 +19736,13 @@ 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="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \ - CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage profile in $(HOST_SUBDIR)/gold ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \ cd $(HOST_SUBDIR)/gold || exit 1; \ @@ -20587,7 +19757,7 @@ configure-stageprofile-gold: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - @stage2_werror_flag@ + $(STAGEprofile_CONFIGURE_FLAGS) @endif gold-bootstrap .PHONY: configure-stagefeedback-gold maybe-configure-stagefeedback-gold @@ -20599,11 +19769,13 @@ 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="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \ - CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage feedback in $(HOST_SUBDIR)/gold ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \ cd $(HOST_SUBDIR)/gold || exit 1; \ @@ -20618,7 +19790,7 @@ configure-stagefeedback-gold: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - @stage2_werror_flag@ + $(STAGEfeedback_CONFIGURE_FLAGS) @endif gold-bootstrap @@ -20656,13 +19828,18 @@ 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="$(STAGE1_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \ + 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)" \ $(TARGET-stage1-gold) maybe-clean-stage1-gold: clean-stage1-gold @@ -20692,14 +19869,19 @@ 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_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_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)" \ $(TARGET-stage2-gold) maybe-clean-stage2-gold: clean-stage2-gold @@ -20718,44 +19900,6 @@ 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: @@ -20768,14 +19912,19 @@ 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_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_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)" \ $(TARGET-stage3-gold) maybe-clean-stage3-gold: clean-stage3-gold @@ -20794,44 +19943,6 @@ 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: @@ -20844,14 +19955,19 @@ 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="$(STAGE4_CFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ + 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)" \ $(TARGET-stage4-gold) maybe-clean-stage4-gold: clean-stage4-gold @@ -20882,14 +19998,19 @@ 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="$(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) \ + 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)" \ $(TARGET-stageprofile-gold) maybe-clean-stageprofile-gold: clean-stageprofile-gold @@ -20920,14 +20041,19 @@ 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="$(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) \ + 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)" \ $(TARGET-stagefeedback-gold) maybe-clean-stagefeedback-gold: clean-stagefeedback-gold @@ -23046,10 +22172,12 @@ 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; \ + CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 1 in $(HOST_SUBDIR)/intl ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ cd $(HOST_SUBDIR)/intl || exit 1; \ @@ -23063,8 +22191,7 @@ configure-stage1-intl: $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ - \ - --disable-intermodule $(STAGE1_CHECKING) --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" + $(STAGE1_CONFIGURE_FLAGS) @endif intl-bootstrap .PHONY: configure-stage2-intl maybe-configure-stage2-intl @@ -23076,11 +22203,13 @@ 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; \ + CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 2 in $(HOST_SUBDIR)/intl ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ cd $(HOST_SUBDIR)/intl || exit 1; \ @@ -23095,38 +22224,7 @@ configure-stage2-intl: $(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-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@ + $(STAGE2_CONFIGURE_FLAGS) @endif intl-bootstrap .PHONY: configure-stage3-intl maybe-configure-stage3-intl @@ -23138,11 +22236,13 @@ 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; \ + CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 3 in $(HOST_SUBDIR)/intl ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ cd $(HOST_SUBDIR)/intl || exit 1; \ @@ -23157,38 +22257,7 @@ configure-stage3-intl: $(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-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@ + $(STAGE3_CONFIGURE_FLAGS) @endif intl-bootstrap .PHONY: configure-stage4-intl maybe-configure-stage4-intl @@ -23200,11 +22269,13 @@ 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; \ + CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 4 in $(HOST_SUBDIR)/intl ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ cd $(HOST_SUBDIR)/intl || exit 1; \ @@ -23219,7 +22290,7 @@ configure-stage4-intl: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - @stage2_werror_flag@ + $(STAGE4_CONFIGURE_FLAGS) @endif intl-bootstrap .PHONY: configure-stageprofile-intl maybe-configure-stageprofile-intl @@ -23231,11 +22302,13 @@ 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="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \ - CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage profile in $(HOST_SUBDIR)/intl ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ cd $(HOST_SUBDIR)/intl || exit 1; \ @@ -23250,7 +22323,7 @@ configure-stageprofile-intl: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - @stage2_werror_flag@ + $(STAGEprofile_CONFIGURE_FLAGS) @endif intl-bootstrap .PHONY: configure-stagefeedback-intl maybe-configure-stagefeedback-intl @@ -23262,11 +22335,13 @@ 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="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \ - CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage feedback in $(HOST_SUBDIR)/intl ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ cd $(HOST_SUBDIR)/intl || exit 1; \ @@ -23281,7 +22356,7 @@ configure-stagefeedback-intl: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - @stage2_werror_flag@ + $(STAGEfeedback_CONFIGURE_FLAGS) @endif intl-bootstrap @@ -23319,13 +22394,18 @@ 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="$(STAGE1_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \ + 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)" \ $(TARGET-stage1-intl) maybe-clean-stage1-intl: clean-stage1-intl @@ -23355,14 +22435,19 @@ 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_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_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)" \ $(TARGET-stage2-intl) maybe-clean-stage2-intl: clean-stage2-intl @@ -23381,44 +22466,6 @@ 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: @@ -23431,14 +22478,19 @@ 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_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_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)" \ $(TARGET-stage3-intl) maybe-clean-stage3-intl: clean-stage3-intl @@ -23457,44 +22509,6 @@ 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: @@ -23507,14 +22521,19 @@ 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="$(STAGE4_CFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ + 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)" \ $(TARGET-stage4-intl) maybe-clean-stage4-intl: clean-stage4-intl @@ -23545,14 +22564,19 @@ 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="$(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) \ + 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)" \ $(TARGET-stageprofile-intl) maybe-clean-stageprofile-intl: clean-stageprofile-intl @@ -23583,14 +22607,19 @@ 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="$(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) \ + 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)" \ $(TARGET-stagefeedback-intl) maybe-clean-stagefeedback-intl: clean-stagefeedback-intl @@ -24844,10 +23873,12 @@ 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; \ + CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 1 in $(HOST_SUBDIR)/ld ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ cd $(HOST_SUBDIR)/ld || exit 1; \ @@ -24861,8 +23892,7 @@ configure-stage1-ld: $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ - \ - --disable-intermodule $(STAGE1_CHECKING) --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" + $(STAGE1_CONFIGURE_FLAGS) @endif ld-bootstrap .PHONY: configure-stage2-ld maybe-configure-stage2-ld @@ -24874,11 +23904,13 @@ 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; \ + CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 2 in $(HOST_SUBDIR)/ld ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ cd $(HOST_SUBDIR)/ld || exit 1; \ @@ -24893,38 +23925,7 @@ configure-stage2-ld: $(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-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@ + $(STAGE2_CONFIGURE_FLAGS) @endif ld-bootstrap .PHONY: configure-stage3-ld maybe-configure-stage3-ld @@ -24936,11 +23937,13 @@ 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; \ + CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 3 in $(HOST_SUBDIR)/ld ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ cd $(HOST_SUBDIR)/ld || exit 1; \ @@ -24955,38 +23958,7 @@ configure-stage3-ld: $(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-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@ + $(STAGE3_CONFIGURE_FLAGS) @endif ld-bootstrap .PHONY: configure-stage4-ld maybe-configure-stage4-ld @@ -24998,11 +23970,13 @@ 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; \ + CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 4 in $(HOST_SUBDIR)/ld ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ cd $(HOST_SUBDIR)/ld || exit 1; \ @@ -25017,7 +23991,7 @@ configure-stage4-ld: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - @stage2_werror_flag@ + $(STAGE4_CONFIGURE_FLAGS) @endif ld-bootstrap .PHONY: configure-stageprofile-ld maybe-configure-stageprofile-ld @@ -25029,11 +24003,13 @@ 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="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \ - CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage profile in $(HOST_SUBDIR)/ld ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ cd $(HOST_SUBDIR)/ld || exit 1; \ @@ -25048,7 +24024,7 @@ configure-stageprofile-ld: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - @stage2_werror_flag@ + $(STAGEprofile_CONFIGURE_FLAGS) @endif ld-bootstrap .PHONY: configure-stagefeedback-ld maybe-configure-stagefeedback-ld @@ -25060,11 +24036,13 @@ 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="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \ - CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage feedback in $(HOST_SUBDIR)/ld ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ cd $(HOST_SUBDIR)/ld || exit 1; \ @@ -25079,7 +24057,7 @@ configure-stagefeedback-ld: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - @stage2_werror_flag@ + $(STAGEfeedback_CONFIGURE_FLAGS) @endif ld-bootstrap @@ -25117,13 +24095,18 @@ 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="$(STAGE1_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \ + 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)" \ $(TARGET-stage1-ld) maybe-clean-stage1-ld: clean-stage1-ld @@ -25153,14 +24136,19 @@ 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_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_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)" \ $(TARGET-stage2-ld) maybe-clean-stage2-ld: clean-stage2-ld @@ -25179,44 +24167,6 @@ 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: @@ -25229,14 +24179,19 @@ 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_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_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)" \ $(TARGET-stage3-ld) maybe-clean-stage3-ld: clean-stage3-ld @@ -25255,44 +24210,6 @@ 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: @@ -25305,14 +24222,19 @@ 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="$(STAGE4_CFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ + 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)" \ $(TARGET-stage4-ld) maybe-clean-stage4-ld: clean-stage4-ld @@ -25343,14 +24265,19 @@ 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="$(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) \ + 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)" \ $(TARGET-stageprofile-ld) maybe-clean-stageprofile-ld: clean-stageprofile-ld @@ -25381,14 +24308,19 @@ 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="$(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) \ + 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)" \ $(TARGET-stagefeedback-ld) maybe-clean-stagefeedback-ld: clean-stagefeedback-ld @@ -25807,10 +24739,12 @@ 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; \ + CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 1 in $(HOST_SUBDIR)/libcpp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ cd $(HOST_SUBDIR)/libcpp || exit 1; \ @@ -25824,8 +24758,7 @@ configure-stage1-libcpp: $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ - \ - --disable-intermodule $(STAGE1_CHECKING) --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" + $(STAGE1_CONFIGURE_FLAGS) @endif libcpp-bootstrap .PHONY: configure-stage2-libcpp maybe-configure-stage2-libcpp @@ -25837,11 +24770,13 @@ 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; \ + CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 2 in $(HOST_SUBDIR)/libcpp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ cd $(HOST_SUBDIR)/libcpp || exit 1; \ @@ -25856,38 +24791,7 @@ configure-stage2-libcpp: $(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-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@ + $(STAGE2_CONFIGURE_FLAGS) @endif libcpp-bootstrap .PHONY: configure-stage3-libcpp maybe-configure-stage3-libcpp @@ -25899,11 +24803,13 @@ 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; \ + CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 3 in $(HOST_SUBDIR)/libcpp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ cd $(HOST_SUBDIR)/libcpp || exit 1; \ @@ -25918,38 +24824,7 @@ configure-stage3-libcpp: $(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-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@ + $(STAGE3_CONFIGURE_FLAGS) @endif libcpp-bootstrap .PHONY: configure-stage4-libcpp maybe-configure-stage4-libcpp @@ -25961,11 +24836,13 @@ 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; \ + CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 4 in $(HOST_SUBDIR)/libcpp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ cd $(HOST_SUBDIR)/libcpp || exit 1; \ @@ -25980,7 +24857,7 @@ configure-stage4-libcpp: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - @stage2_werror_flag@ + $(STAGE4_CONFIGURE_FLAGS) @endif libcpp-bootstrap .PHONY: configure-stageprofile-libcpp maybe-configure-stageprofile-libcpp @@ -25992,11 +24869,13 @@ 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="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \ - CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage profile in $(HOST_SUBDIR)/libcpp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ cd $(HOST_SUBDIR)/libcpp || exit 1; \ @@ -26011,7 +24890,7 @@ configure-stageprofile-libcpp: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - @stage2_werror_flag@ + $(STAGEprofile_CONFIGURE_FLAGS) @endif libcpp-bootstrap .PHONY: configure-stagefeedback-libcpp maybe-configure-stagefeedback-libcpp @@ -26023,11 +24902,13 @@ 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="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \ - CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage feedback in $(HOST_SUBDIR)/libcpp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ cd $(HOST_SUBDIR)/libcpp || exit 1; \ @@ -26042,7 +24923,7 @@ configure-stagefeedback-libcpp: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - @stage2_werror_flag@ + $(STAGEfeedback_CONFIGURE_FLAGS) @endif libcpp-bootstrap @@ -26080,13 +24961,18 @@ 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="$(STAGE1_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \ + 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)" \ $(TARGET-stage1-libcpp) maybe-clean-stage1-libcpp: clean-stage1-libcpp @@ -26116,14 +25002,19 @@ 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_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_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)" \ $(TARGET-stage2-libcpp) maybe-clean-stage2-libcpp: clean-stage2-libcpp @@ -26142,44 +25033,6 @@ 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: @@ -26192,14 +25045,19 @@ 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_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_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)" \ $(TARGET-stage3-libcpp) maybe-clean-stage3-libcpp: clean-stage3-libcpp @@ -26218,44 +25076,6 @@ 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: @@ -26268,14 +25088,19 @@ 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="$(STAGE4_CFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ + 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)" \ $(TARGET-stage4-libcpp) maybe-clean-stage4-libcpp: clean-stage4-libcpp @@ -26306,14 +25131,19 @@ 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="$(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) \ + 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)" \ $(TARGET-stageprofile-libcpp) maybe-clean-stageprofile-libcpp: clean-stageprofile-libcpp @@ -26344,14 +25174,19 @@ 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="$(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) \ + 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)" \ $(TARGET-stagefeedback-libcpp) maybe-clean-stagefeedback-libcpp: clean-stagefeedback-libcpp @@ -26770,10 +25605,12 @@ 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; \ + CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 1 in $(HOST_SUBDIR)/libdecnumber ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \ cd $(HOST_SUBDIR)/libdecnumber || exit 1; \ @@ -26787,8 +25624,7 @@ configure-stage1-libdecnumber: $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ - \ - --disable-intermodule $(STAGE1_CHECKING) --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" + $(STAGE1_CONFIGURE_FLAGS) @endif libdecnumber-bootstrap .PHONY: configure-stage2-libdecnumber maybe-configure-stage2-libdecnumber @@ -26800,11 +25636,13 @@ 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; \ + CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 2 in $(HOST_SUBDIR)/libdecnumber ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \ cd $(HOST_SUBDIR)/libdecnumber || exit 1; \ @@ -26819,38 +25657,7 @@ configure-stage2-libdecnumber: $(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-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@ + $(STAGE2_CONFIGURE_FLAGS) @endif libdecnumber-bootstrap .PHONY: configure-stage3-libdecnumber maybe-configure-stage3-libdecnumber @@ -26862,11 +25669,13 @@ 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; \ + CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 3 in $(HOST_SUBDIR)/libdecnumber ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \ cd $(HOST_SUBDIR)/libdecnumber || exit 1; \ @@ -26881,38 +25690,7 @@ configure-stage3-libdecnumber: $(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-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@ + $(STAGE3_CONFIGURE_FLAGS) @endif libdecnumber-bootstrap .PHONY: configure-stage4-libdecnumber maybe-configure-stage4-libdecnumber @@ -26924,11 +25702,13 @@ 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; \ + CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 4 in $(HOST_SUBDIR)/libdecnumber ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \ cd $(HOST_SUBDIR)/libdecnumber || exit 1; \ @@ -26943,7 +25723,7 @@ configure-stage4-libdecnumber: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - @stage2_werror_flag@ + $(STAGE4_CONFIGURE_FLAGS) @endif libdecnumber-bootstrap .PHONY: configure-stageprofile-libdecnumber maybe-configure-stageprofile-libdecnumber @@ -26955,11 +25735,13 @@ 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="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \ - CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage profile in $(HOST_SUBDIR)/libdecnumber ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \ cd $(HOST_SUBDIR)/libdecnumber || exit 1; \ @@ -26974,7 +25756,7 @@ configure-stageprofile-libdecnumber: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - @stage2_werror_flag@ + $(STAGEprofile_CONFIGURE_FLAGS) @endif libdecnumber-bootstrap .PHONY: configure-stagefeedback-libdecnumber maybe-configure-stagefeedback-libdecnumber @@ -26986,11 +25768,13 @@ 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="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \ - CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage feedback in $(HOST_SUBDIR)/libdecnumber ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \ cd $(HOST_SUBDIR)/libdecnumber || exit 1; \ @@ -27005,7 +25789,7 @@ configure-stagefeedback-libdecnumber: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - @stage2_werror_flag@ + $(STAGEfeedback_CONFIGURE_FLAGS) @endif libdecnumber-bootstrap @@ -27043,13 +25827,18 @@ 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="$(STAGE1_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \ + 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)" \ $(TARGET-stage1-libdecnumber) maybe-clean-stage1-libdecnumber: clean-stage1-libdecnumber @@ -27079,14 +25868,19 @@ 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_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_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)" \ $(TARGET-stage2-libdecnumber) maybe-clean-stage2-libdecnumber: clean-stage2-libdecnumber @@ -27105,44 +25899,6 @@ 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: @@ -27155,14 +25911,19 @@ 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_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_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)" \ $(TARGET-stage3-libdecnumber) maybe-clean-stage3-libdecnumber: clean-stage3-libdecnumber @@ -27181,44 +25942,6 @@ 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: @@ -27231,14 +25954,19 @@ 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="$(STAGE4_CFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ + 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)" \ $(TARGET-stage4-libdecnumber) maybe-clean-stage4-libdecnumber: clean-stage4-libdecnumber @@ -27269,14 +25997,19 @@ 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="$(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) \ + 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)" \ $(TARGET-stageprofile-libdecnumber) maybe-clean-stageprofile-libdecnumber: clean-stageprofile-libdecnumber @@ -27307,14 +26040,19 @@ 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="$(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) \ + 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)" \ $(TARGET-stagefeedback-libdecnumber) maybe-clean-stagefeedback-libdecnumber: clean-stagefeedback-libdecnumber @@ -28158,10 +26896,12 @@ 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; \ + CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 1 in $(HOST_SUBDIR)/libiberty ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ cd $(HOST_SUBDIR)/libiberty || exit 1; \ @@ -28175,8 +26915,7 @@ configure-stage1-libiberty: $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ - \ - --disable-intermodule $(STAGE1_CHECKING) --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" + $(STAGE1_CONFIGURE_FLAGS) @endif libiberty-bootstrap .PHONY: configure-stage2-libiberty maybe-configure-stage2-libiberty @@ -28188,11 +26927,13 @@ 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; \ + CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 2 in $(HOST_SUBDIR)/libiberty ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ cd $(HOST_SUBDIR)/libiberty || exit 1; \ @@ -28207,38 +26948,7 @@ configure-stage2-libiberty: $(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-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@ + $(STAGE2_CONFIGURE_FLAGS) @endif libiberty-bootstrap .PHONY: configure-stage3-libiberty maybe-configure-stage3-libiberty @@ -28250,11 +26960,13 @@ 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; \ + CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 3 in $(HOST_SUBDIR)/libiberty ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ cd $(HOST_SUBDIR)/libiberty || exit 1; \ @@ -28269,38 +26981,7 @@ configure-stage3-libiberty: $(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-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@ + $(STAGE3_CONFIGURE_FLAGS) @endif libiberty-bootstrap .PHONY: configure-stage4-libiberty maybe-configure-stage4-libiberty @@ -28312,11 +26993,13 @@ 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; \ + CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 4 in $(HOST_SUBDIR)/libiberty ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ cd $(HOST_SUBDIR)/libiberty || exit 1; \ @@ -28331,7 +27014,7 @@ configure-stage4-libiberty: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - @stage2_werror_flag@ + $(STAGE4_CONFIGURE_FLAGS) @endif libiberty-bootstrap .PHONY: configure-stageprofile-libiberty maybe-configure-stageprofile-libiberty @@ -28343,11 +27026,13 @@ 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="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \ - CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage profile in $(HOST_SUBDIR)/libiberty ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ cd $(HOST_SUBDIR)/libiberty || exit 1; \ @@ -28362,7 +27047,7 @@ configure-stageprofile-libiberty: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - @stage2_werror_flag@ + $(STAGEprofile_CONFIGURE_FLAGS) @endif libiberty-bootstrap .PHONY: configure-stagefeedback-libiberty maybe-configure-stagefeedback-libiberty @@ -28374,11 +27059,13 @@ 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="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \ - CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage feedback in $(HOST_SUBDIR)/libiberty ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ cd $(HOST_SUBDIR)/libiberty || exit 1; \ @@ -28393,7 +27080,7 @@ configure-stagefeedback-libiberty: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - @stage2_werror_flag@ + $(STAGEfeedback_CONFIGURE_FLAGS) @endif libiberty-bootstrap @@ -28431,13 +27118,18 @@ 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="$(STAGE1_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \ + 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)" \ $(TARGET-stage1-libiberty) maybe-clean-stage1-libiberty: clean-stage1-libiberty @@ -28467,14 +27159,19 @@ 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_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_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)" \ $(TARGET-stage2-libiberty) maybe-clean-stage2-libiberty: clean-stage2-libiberty @@ -28493,44 +27190,6 @@ 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: @@ -28543,14 +27202,19 @@ 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_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_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)" \ $(TARGET-stage3-libiberty) maybe-clean-stage3-libiberty: clean-stage3-libiberty @@ -28569,44 +27233,6 @@ 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: @@ -28619,14 +27245,19 @@ 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="$(STAGE4_CFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ + 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)" \ $(TARGET-stage4-libiberty) maybe-clean-stage4-libiberty: clean-stage4-libiberty @@ -28657,14 +27288,19 @@ 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="$(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) \ + 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)" \ $(TARGET-stageprofile-libiberty) maybe-clean-stageprofile-libiberty: clean-stageprofile-libiberty @@ -28695,14 +27331,19 @@ 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="$(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) \ + 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)" \ $(TARGET-stagefeedback-libiberty) maybe-clean-stagefeedback-libiberty: clean-stagefeedback-libiberty @@ -39243,10 +37884,12 @@ 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; \ + CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 1 in $(HOST_SUBDIR)/zlib ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ cd $(HOST_SUBDIR)/zlib || exit 1; \ @@ -39260,8 +37903,7 @@ configure-stage1-zlib: $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ - \ - --disable-intermodule $(STAGE1_CHECKING) --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" + $(STAGE1_CONFIGURE_FLAGS) @endif zlib-bootstrap .PHONY: configure-stage2-zlib maybe-configure-stage2-zlib @@ -39273,11 +37915,13 @@ 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; \ + CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 2 in $(HOST_SUBDIR)/zlib ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ cd $(HOST_SUBDIR)/zlib || exit 1; \ @@ -39292,38 +37936,7 @@ configure-stage2-zlib: $(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-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@ + $(STAGE2_CONFIGURE_FLAGS) @endif zlib-bootstrap .PHONY: configure-stage3-zlib maybe-configure-stage3-zlib @@ -39335,11 +37948,13 @@ 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; \ + CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 3 in $(HOST_SUBDIR)/zlib ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ cd $(HOST_SUBDIR)/zlib || exit 1; \ @@ -39354,38 +37969,7 @@ configure-stage3-zlib: $(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-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@ + $(STAGE3_CONFIGURE_FLAGS) @endif zlib-bootstrap .PHONY: configure-stage4-zlib maybe-configure-stage4-zlib @@ -39397,11 +37981,13 @@ 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; \ + CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage 4 in $(HOST_SUBDIR)/zlib ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ cd $(HOST_SUBDIR)/zlib || exit 1; \ @@ -39416,7 +38002,7 @@ configure-stage4-zlib: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - @stage2_werror_flag@ + $(STAGE4_CONFIGURE_FLAGS) @endif zlib-bootstrap .PHONY: configure-stageprofile-zlib maybe-configure-stageprofile-zlib @@ -39428,11 +38014,13 @@ 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="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \ - CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGEprofile_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage profile in $(HOST_SUBDIR)/zlib ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ cd $(HOST_SUBDIR)/zlib || exit 1; \ @@ -39447,7 +38035,7 @@ configure-stageprofile-zlib: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - @stage2_werror_flag@ + $(STAGEprofile_CONFIGURE_FLAGS) @endif zlib-bootstrap .PHONY: configure-stagefeedback-zlib maybe-configure-stagefeedback-zlib @@ -39459,11 +38047,13 @@ 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="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \ - CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGEfeedback_CFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ echo Configuring stage feedback in $(HOST_SUBDIR)/zlib ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ cd $(HOST_SUBDIR)/zlib || exit 1; \ @@ -39478,7 +38068,7 @@ configure-stagefeedback-zlib: $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - @stage2_werror_flag@ + $(STAGEfeedback_CONFIGURE_FLAGS) @endif zlib-bootstrap @@ -39516,13 +38106,18 @@ 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="$(STAGE1_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \ + 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)" \ $(TARGET-stage1-zlib) maybe-clean-stage1-zlib: clean-stage1-zlib @@ -39552,14 +38147,19 @@ 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_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_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)" \ $(TARGET-stage2-zlib) maybe-clean-stage2-zlib: clean-stage2-zlib @@ -39578,44 +38178,6 @@ 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: @@ -39628,14 +38190,19 @@ 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_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_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)" \ $(TARGET-stage3-zlib) maybe-clean-stage3-zlib: clean-stage3-zlib @@ -39654,44 +38221,6 @@ 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: @@ -39704,14 +38233,19 @@ 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="$(STAGE4_CFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ + 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)" \ $(TARGET-stage4-zlib) maybe-clean-stage4-zlib: clean-stage4-zlib @@ -39742,14 +38276,19 @@ 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="$(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) \ + 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)" \ $(TARGET-stageprofile-zlib) maybe-clean-stageprofile-zlib: clean-stageprofile-zlib @@ -39780,14 +38319,19 @@ 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="$(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) \ + 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)" \ $(TARGET-stagefeedback-zlib) maybe-clean-stagefeedback-zlib: clean-stagefeedback-zlib @@ -44886,6 +43430,7 @@ 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 \ @@ -44899,9 +43444,10 @@ 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="$(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; \ + $(NORMAL_TARGET_EXPORTS) \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ echo Configuring stage 1 in $(TARGET_SUBDIR)/libgcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \ cd $(TARGET_SUBDIR)/libgcc || exit 1; \ @@ -44915,8 +43461,7 @@ configure-stage1-target-libgcc: $(SHELL) $${libsrcdir}/configure \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ --target=${target_alias} $${srcdiroption} \ - \ - --disable-intermodule $(STAGE1_CHECKING) --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" + $(STAGE1_CONFIGURE_FLAGS) @endif target-libgcc-bootstrap .PHONY: configure-stage2-target-libgcc maybe-configure-stage2-target-libgcc @@ -44928,6 +43473,7 @@ 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 \ @@ -44942,9 +43488,10 @@ configure-stage2-target-libgcc: fi; \ test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ - \ - 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; \ + \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ echo Configuring stage 2 in $(TARGET_SUBDIR)/libgcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \ cd $(TARGET_SUBDIR)/libgcc || exit 1; \ @@ -44959,50 +43506,7 @@ configure-stage2-target-libgcc: $(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-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@ + $(STAGE2_CONFIGURE_FLAGS) @endif target-libgcc-bootstrap .PHONY: configure-stage3-target-libgcc maybe-configure-stage3-target-libgcc @@ -45014,6 +43518,7 @@ 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 \ @@ -45028,9 +43533,10 @@ configure-stage3-target-libgcc: fi; \ test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ - \ - 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; \ + \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ echo Configuring stage 3 in $(TARGET_SUBDIR)/libgcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \ cd $(TARGET_SUBDIR)/libgcc || exit 1; \ @@ -45045,50 +43551,7 @@ configure-stage3-target-libgcc: $(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-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@ + $(STAGE3_CONFIGURE_FLAGS) @endif target-libgcc-bootstrap .PHONY: configure-stage4-target-libgcc maybe-configure-stage4-target-libgcc @@ -45100,6 +43563,7 @@ 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 \ @@ -45114,9 +43578,10 @@ configure-stage4-target-libgcc: fi; \ test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ - \ - 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; \ + \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ echo Configuring stage 4 in $(TARGET_SUBDIR)/libgcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \ cd $(TARGET_SUBDIR)/libgcc || exit 1; \ @@ -45131,7 +43596,7 @@ configure-stage4-target-libgcc: $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - @stage2_werror_flag@ + $(STAGE4_CONFIGURE_FLAGS) @endif target-libgcc-bootstrap .PHONY: configure-stageprofile-target-libgcc maybe-configure-stageprofile-target-libgcc @@ -45143,6 +43608,7 @@ 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 \ @@ -45157,9 +43623,10 @@ configure-stageprofile-target-libgcc: fi; \ test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ - \ - 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; \ + \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ echo Configuring stage profile in $(TARGET_SUBDIR)/libgcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \ cd $(TARGET_SUBDIR)/libgcc || exit 1; \ @@ -45174,7 +43641,7 @@ configure-stageprofile-target-libgcc: $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - @stage2_werror_flag@ + $(STAGEprofile_CONFIGURE_FLAGS) @endif target-libgcc-bootstrap .PHONY: configure-stagefeedback-target-libgcc maybe-configure-stagefeedback-target-libgcc @@ -45186,6 +43653,7 @@ 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 \ @@ -45200,9 +43668,10 @@ configure-stagefeedback-target-libgcc: fi; \ test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ - \ - 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; \ + \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ echo Configuring stage feedback in $(TARGET_SUBDIR)/libgcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \ cd $(TARGET_SUBDIR)/libgcc || exit 1; \ @@ -45217,7 +43686,7 @@ configure-stagefeedback-target-libgcc: $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ --target=${target_alias} $${srcdiroption} \ --with-build-libsubdir=$(HOST_SUBDIR) \ - @stage2_werror_flag@ + $(STAGEfeedback_CONFIGURE_FLAGS) @endif target-libgcc-bootstrap @@ -45255,13 +43724,18 @@ 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="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \ - LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_TARGET_FLAGS) \ + 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)" \ $(TARGET-stage1-target-libgcc) maybe-clean-stage1-target-libgcc: clean-stage1-target-libgcc @@ -45291,14 +43765,19 @@ 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="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \ - LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_TARGET_FLAGS) \ + 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)" \ $(TARGET-stage2-target-libgcc) maybe-clean-stage2-target-libgcc: clean-stage2-target-libgcc @@ -45317,44 +43796,6 @@ 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: @@ -45367,14 +43808,19 @@ 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="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \ - LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_TARGET_FLAGS) \ + 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)" \ $(TARGET-stage3-target-libgcc) maybe-clean-stage3-target-libgcc: clean-stage3-target-libgcc @@ -45393,44 +43839,6 @@ 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: @@ -45443,14 +43851,19 @@ 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="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \ - LIBCFLAGS="$(STAGE4_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \ - CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_TARGET_FLAGS) \ + 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)" \ $(TARGET-stage4-target-libgcc) maybe-clean-stage4-target-libgcc: clean-stage4-target-libgcc @@ -45481,14 +43894,19 @@ 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="$(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) \ + 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)" \ $(TARGET-stageprofile-target-libgcc) maybe-clean-stageprofile-target-libgcc: clean-stageprofile-target-libgcc @@ -45519,14 +43937,19 @@ 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="$(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) \ + 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)" \ $(TARGET-stagefeedback-target-libgcc) maybe-clean-stagefeedback-target-libgcc: clean-stagefeedback-target-libgcc @@ -53469,6 +51892,7 @@ 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: @@ -53479,6 +51903,7 @@ 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 @@ -53494,274 +51919,6 @@ 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:: @@ -54048,6 +52205,7 @@ 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: @@ -54058,6 +52216,7 @@ 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 @@ -54079,328 +52238,7 @@ cleanstrap: do-distclean local-clean @: $(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 - - -.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; \ + TFLAGS="$(STAGE3_TFLAGS)"; \ $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target @endif gcc-bootstrap @@ -54692,6 +52530,7 @@ 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: @@ -54702,6 +52541,7 @@ 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 @@ -55207,6 +53047,7 @@ 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: @@ -55217,6 +53058,7 @@ 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 @@ -55264,7 +53106,7 @@ stage_current: .PHONY: restrap restrap:: @: $(MAKE); $(stage) - rm -rf stage1-$(TARGET_SUBDIR) stage2-* stageb2g0-* stage3-* stageb3g2-* stage4-* stageprofile-* stagefeedback-* + rm -rf stage1-$(TARGET_SUBDIR) stage2-* stage3-* stage4-* stageprofile-* stagefeedback-* restrap:: all @endif gcc-bootstrap @@ -55280,9 +53122,7 @@ 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 @@ -55359,9 +53199,7 @@ 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 @@ -55369,9 +53207,7 @@ 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 @@ -55379,9 +53215,7 @@ 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 @@ -55389,9 +53223,7 @@ 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 @@ -55399,9 +53231,7 @@ 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 @@ -55409,9 +53239,7 @@ 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 @@ -55419,9 +53247,7 @@ 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 @@ -55429,9 +53255,7 @@ 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 @@ -55439,9 +53263,7 @@ 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 @@ -55449,9 +53271,7 @@ 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 @@ -55459,9 +53279,7 @@ 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 @@ -55469,9 +53287,7 @@ 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 @@ -55479,9 +53295,7 @@ 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 @@ -55489,9 +53303,7 @@ 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 @@ -55499,9 +53311,7 @@ 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 @@ -55509,9 +53319,7 @@ 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 @@ -55519,9 +53327,7 @@ 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 @@ -55529,9 +53335,7 @@ 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 @@ -55539,9 +53343,7 @@ 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 @@ -55549,9 +53351,7 @@ 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 @@ -55559,9 +53359,7 @@ 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 @@ -55571,9 +53369,7 @@ 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 @@ -55581,9 +53377,7 @@ 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 @@ -55591,9 +53385,7 @@ 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 @@ -55601,9 +53393,7 @@ 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 @@ -55613,9 +53403,7 @@ 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 @@ -55623,9 +53411,7 @@ 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 @@ -55633,9 +53419,7 @@ 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 @@ -55643,9 +53427,7 @@ 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 @@ -55670,9 +53452,7 @@ 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 @@ -55680,9 +53460,7 @@ 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 @@ -55690,9 +53468,7 @@ 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 @@ -55700,9 +53476,7 @@ 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 @@ -55710,9 +53484,7 @@ 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 @@ -55720,9 +53492,7 @@ 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 @@ -55730,9 +53500,7 @@ 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 @@ -55740,9 +53508,7 @@ 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 @@ -55750,9 +53516,7 @@ 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 @@ -55760,9 +53524,7 @@ 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 @@ -55770,9 +53532,7 @@ 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 @@ -55780,9 +53540,7 @@ 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 @@ -55790,9 +53548,7 @@ 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 @@ -55800,9 +53556,7 @@ 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 @@ -55812,9 +53566,7 @@ 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 @@ -55822,9 +53574,7 @@ 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 @@ -55832,9 +53582,7 @@ 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 @@ -55842,9 +53590,7 @@ 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 @@ -55852,9 +53598,7 @@ 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 @@ -55867,9 +53611,7 @@ 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 @@ -55877,9 +53619,7 @@ 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 @@ -55887,9 +53627,7 @@ 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 @@ -55897,9 +53635,7 @@ 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 @@ -55907,9 +53643,7 @@ 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 @@ -55917,9 +53651,7 @@ 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 @@ -55927,9 +53659,7 @@ 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 @@ -55937,9 +53667,7 @@ 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 @@ -55947,9 +53675,7 @@ 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 @@ -55957,9 +53683,7 @@ 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 @@ -55967,9 +53691,7 @@ 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 @@ -55977,9 +53699,7 @@ 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 @@ -55987,9 +53707,7 @@ 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 @@ -55997,9 +53715,7 @@ 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 @@ -56007,9 +53723,7 @@ 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 @@ -56017,9 +53731,7 @@ 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 @@ -56027,9 +53739,7 @@ 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 @@ -56037,9 +53747,7 @@ 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 @@ -56047,9 +53755,7 @@ 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/gcc-4.4.0/Makefile.tpl b/gcc-4.4.0/Makefile.tpl index d7dc63356..9d8649ca5 100644 --- a/gcc-4.4.0/Makefile.tpl +++ b/gcc-4.4.0/Makefile.tpl @@ -6,7 +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, 2009 +# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 # Free Software Foundation # # This file is free software; you can redistribute it and/or modify @@ -178,6 +178,8 @@ 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; \ @@ -213,11 +215,9 @@ 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/"; 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; \ + -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; \ LDFLAGS="$(BOOT_LDFLAGS)"; export LDFLAGS; # Target libraries are put under this directory: @@ -231,13 +231,13 @@ BASE_TARGET_EXPORTS = \ $(BASE_EXPORTS) \ AR="$(AR_FOR_TARGET)"; export AR; \ AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \ - CC="$(CC_FOR_TARGET)"; export CC; \ - CFLAGS="$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CC="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CC; \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \ - 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; \ + 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; \ DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \ LD="$(COMPILER_LD_FOR_TARGET)"; export LD; \ LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \ @@ -253,11 +253,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)"; export CXX; + CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; NORMAL_TARGET_EXPORTS = \ $(BASE_TARGET_EXPORTS) \ - CXX="$(CXX_FOR_TARGET)"; export CXX; + CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; # Where to find GMP HOST_GMPLIBS = @gmplibs@ @@ -357,48 +357,65 @@ 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)" -STAGE1_CFLAGS=@stage1_cflags@ -STAGE2_CFLAGS=$(BOOT_CFLAGS) -STAGE3_CFLAGS=$(BOOT_CFLAGS) -STAGE4_CFLAGS=$(BOOT_CFLAGS) +STAGEprofile_CFLAGS = $(STAGE2_CFLAGS) -fprofile-generate +STAGEprofile_TFLAGS = $(STAGE2_TFLAGS) -STAGE1_LIBCFLAGS=$(CFLAGS_FOR_TARGET) -STAGE2_LIBCFLAGS=$(CFLAGS_FOR_TARGET) -STAGE3_LIBCFLAGS=$(CFLAGS_FOR_TARGET) -STAGE4_LIBCFLAGS=$(CFLAGS_FOR_TARGET) +STAGEfeedback_CFLAGS = $(STAGE3_CFLAGS) -fprofile-use +STAGEfeedback_TFLAGS = $(STAGE3_TFLAGS) 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@ $(FLAGS_FOR_TARGET) +CC_FOR_TARGET=$(STAGE_CC_WRAPPER) @CC_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@ $(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) +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@ DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@ LD_FOR_TARGET=@LD_FOR_TARGET@ @@ -416,13 +433,17 @@ 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 # ------------------------------------ @@ -472,7 +493,10 @@ 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 +] \ + "[+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)" \ "CONFIG_SHELL=$(SHELL)" \ "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" @@ -487,6 +511,8 @@ EXTRA_HOST_FLAGS = \ 'CC=$(CC)' \ 'CXX=$(CXX)' \ 'DLLTOOL=$(DLLTOOL)' \ + 'GCJ=$(GCJ)' \ + 'GFORTRAN=$(GFORTRAN)' \ 'LD=$(LD)' \ 'LIPO=$(LIPO)' \ 'NM=$(NM)' \ @@ -526,20 +552,24 @@ POSTSTAGE1_FLAGS_TO_PASS = \ EXTRA_TARGET_FLAGS = \ 'AR=$$(AR_FOR_TARGET)' \ 'AS=$(COMPILER_AS_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)' \ + '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)' \ '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) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \ - 'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \ + 'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \ + 'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \ 'NM=$(COMPILER_NM_FOR_TARGET)' \ 'OBJDUMP=$$(OBJDUMP_FOR_TARGET)' \ 'RANLIB=$$(RANLIB_FOR_TARGET)' \ 'WINDRES=$$(WINDRES_FOR_TARGET)' \ - 'WINDMC=$$(WINDMC_FOR_TARGET)' + 'WINDMC=$$(WINDMC_FOR_TARGET)' \ + 'XGCC_FLAGS_FOR_TARGET=$(XGCC_FLAGS_FOR_TARGET)' \ + "TFLAGS=$$TFLAGS" TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) @@ -559,6 +589,13 @@ 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 +] \ @@ -582,11 +619,17 @@ all: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - if [ -f stage_last ]; then \ +@if gcc-bootstrap + if [ -f stage_last ]; then : ; \ + TFLAGS="$(STAGE$(shell 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; \ - fi +@if gcc-bootstrap + fi; \ +@endif gcc-bootstrap + : .PHONY: all-build [+ FOR build_modules +] @@ -867,6 +910,7 @@ 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 ; \ @@ -882,11 +926,14 @@ 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="[+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 +] \ + [+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 +] \ echo Configuring stage [+id+] in [+subdir+]/[+module+] ; \ $(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+] ; \ cd [+subdir+]/[+module+] || exit 1; \ @@ -899,9 +946,10 @@ 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_configure_flags+] [+extra_configure_flags+] + --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 +] @endif [+prefix+][+module+]-bootstrap [+ ENDFOR bootstrap_stage +] [+ ENDIF bootstrap +] @@ -941,16 +989,25 @@ 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) \ - CFLAGS="[+stage_cflags+]" CXXFLAGS="[+stage_cflags+]" \ - LIBCFLAGS="[+stage_libcflags+]" \ - CFLAGS_FOR_TARGET="[+stage_libcflags+]" \ - CXXFLAGS_FOR_TARGET="[+stage_libcflags+]" [+args+] [+ + $(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+] [+ 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+] @@ -1412,6 +1469,7 @@ 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: @@ -1422,6 +1480,7 @@ 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 +] @@ -1444,6 +1503,7 @@ 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 @@ -1481,8 +1541,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/gcc-4.4.0/README.google b/gcc-4.4.0/README.google index c723dd51f..199418057 100644 --- a/gcc-4.4.0/README.google +++ b/gcc-4.4.0/README.google @@ -6,8 +6,8 @@ checkins, keep them separate. Append new entries to the end of this file. Each entry shall include: * The list of files modified by the patch, - * The status of the patch (whether it's been checked in upstream, - or is a local patch), + * The status of the patch (already upstream (indicate upstream revision), + not yet upstream, or not applicable upstream (google local). * The local 'owner' responsible for the patch, and * A description of the patch (preferably including bug numbers). @@ -122,7 +122,7 @@ gcc/gcov-io.c http://b/1302008 Do not open gcda/gcno files in write mode unnecessarily. Owner: nvachhar - Status: not yet upstream + Status: Upstream in svn revision r152419 gcc/config/i386/chkstk.asm gcc/config/i386/cygwin.asm @@ -163,7 +163,7 @@ gcc/varasm.c Add -gdwarf-4 option to enable use of COMDAT sections for debug type information. Owner: ccoutant - Status: in dwarf-4 branch upstream + Status: in dwarf-4 branch upstream; in mainline at rev 152421. gcc/gcov.c Fix a compilation issue in the gcov patch that caused bootstrapping to fail @@ -226,7 +226,7 @@ gcc/builtins.c Add a language-independent parameter "builtin-prefetch-override" to disable the code expansion for __builtin_prefetch(). Owner: nvachhar - Status: not yet upstream + Status: will not send upstream (do not port to future Crosstools) gcc/tree-ssa.c gcc/dominance.c @@ -356,7 +356,7 @@ gcc/tree-pass.h Port the plugin support from the external GCC 'plugins' branch to the v13 tree. This CL contains GCC patch 144439 and 144758. Owner: lcwu - Status: in the external GCC 'plugins' branch. + Status: submitted upstream for the 4.5 release. gcc/configure.ac gcc/gcc.c @@ -388,7 +388,7 @@ gcc/value-prof.c Fix a bug in gimple_stringop_fixed_value where it assumed all stringops have 3 arguments, even though bzero only has two. Owner: nvachhar - Status: not yet upstream + Status: Upstream in svn revision 151864. gcc/value-prof.c Add TYPE_MODE check for icall target. @@ -462,7 +462,7 @@ gcc/testsuite/lib/target-supports.exp Enhance the dejagnu infrastructure to support testing of the plugin mechanism. Also add a couple of new plugin testcases. Owner: lcwu - Status: in the external plugins branch (patch 145075 and 145458). + Status: submitted upstream. To be released with 4.5. Makefile.tpl configure @@ -608,7 +608,7 @@ gcc/tree-ssa-lrs.c gcc/Makefile.in Fix tree-pass.h installation. Owner: espindola - Status: local + Status: google-local patch. gcc/config/arm/eabi.h gcc/config/arm/eabi.opt @@ -732,7 +732,7 @@ gcc/optabs.c gcc/optabs.h If-convert statements of the form 'if (val <0) valnot = ~val;' Owner: eraman - Status: Not in mainline yet + Status: In GCC mainline at 152253. gcc/ipa-inline.c Increase verbosity of inlining dumps. @@ -781,7 +781,7 @@ gcc/recog.c gcc/ifcvt.c: Fix an uninitialized variable bug in noce_try_abs introduced by CL 29955. Owner: eraman - Status: This change and CL 29955 will be pushed upstream. + Status: In GCC mainline at 152253. gcc/config/i386/i386.c Fix for failing g++.dg/eh/async-unwind1.C introduced by mainline 147995, @@ -1025,14 +1025,14 @@ libstdc++-v3/include/ext/vstring.h Various debug checks, controlled by __google_stl_debug_{vector,string} macros. Owner : ppluzhnikov - Status: local. + Status: google-local patch. libstdc++-v3/include/bits/stl_algo.h libstdc++-v3/include/bits/stl_tree.h Check for strict weak ordering, controlled by __google_stl_debug_{rbtree,compare} macros. Owner: ppluzhnikov - Status: local + Status: google-local patch. gcc/dwarf2out.c Apply upstream fix for http://b/1949954 @@ -1043,12 +1043,12 @@ gcc/testsuite/gcc.dg/tree-prof/val-prof-7.c Fix test so that it works on x86 and x86_64. Remove XFAIL since the test passes and is supposed to pass. Owner: nvachhar - Status: Not yet upstream. + Status: Upstream in svn revision 151864. gcc/testsuite/gcc.dg/tree-prof/val-prof-7.c Fix test so that it works regardless of mtune settings. Owner: nvachhar - Status: Not yet upstream. + Status: Upstream in svn revision 151864. gcc/config/arm/arm.h Backport upstream fix that add PACK support to arm platforms. @@ -1267,7 +1267,7 @@ gcc/gcc.c Fix 2031001. Don't search /usr/libexec/gcc and /usr/lib/gcc. Owner: espindola - Status: Being reviewed upstream. + Status: In gcc 4.5 at revision 151054. gcc/cgraph.h gcc/common.opt @@ -1343,3 +1343,889 @@ gcc/dwarf2out.c "unworthy" types. Owner: ccoutant Status: backported from dwarf-4 branch at revision 150574. + +gcc/convert.c +gcc/testsuite/g++.dg/parse/cond5.C + Apply upstream (4.4-branch) change 149123: + [gcc/ChangeLog] + 2009-06-30 Jakub Jelinek <jakub@redhat.com> + PR c++/40566 + * convert.c (convert_to_integer) <case COND_EXPR>: Don't convert + to type arguments that have void type. + [gcc/testsuite/ChangeLog] + 2009-06-30 Jakub Jelinek <jakub@redhat.com> + PR c++/40566 + * g++.dg/parse/cond5.C: New test. + Owner: cgd + Status: Backported from upstream rev. 149123. + +gcc/stmt.c +gcc/testsuite/gcc.dg/Wunused-value-3.c + Apply upstream (4.4-branch) change 146812: + [gcc/ChangeLog] + 2009-04-26 Jakub Jelinek <jakub@redhat.com> + PR c/39889 + * stmt.c (warn_if_unused_value): Look through NON_LVALUE_EXPR. + [gcc/testsuite/ChangeLog] + 2009-04-26 Jakub Jelinek <jakub@redhat.com> + PR c/39889 + * gcc.dg/Wunused-value-3.c: New test. + Owner: cgd + Status: Backported from upstream rev. 146812. + +gcc/dse.c +gcc/testsuite/gcc.c-torture/compile/pr40035.c + Apply upstream (4.4-branch) change 147501: + [gcc/ChangeLog] + 2009-05-14 Ben Elliston <bje@au.ibm.com> + Backport from mainline: + 2009-05-14 Jakub Jelinek <jakub@redhat.com> + Ben Elliston <bje@au.ibm.com> + PR middle-end/40035 + * dse.c (check_mem_read_rtx): Guard against width == -1. + [gcc/testsuite/ChangeLog] + 2009-05-14 Ben Elliston <bje@au.ibm.com> + Backport from mainline: + 2009-05-14 Ben Elliston <bje@au.ibm.com> + PR middle-end/40035 + * gcc.c-torture/compile/pr40035.c: New test. + Owner: cgd + Status: Backported from upstream rev. 147501. + +gcc/gimplify.c +gcc/testsuite/g++.dg/warn/Wuninitialized-4.C +gcc/testsuite/g++.dg/warn/Wuninitialized-5.C +gcc/testsuite/gcc.dg/pr39666-1.c +gcc/testsuite/gcc.dg/pr39666-2.c +gcc/testsuite/gfortran.dg/pr39666-1.f90 +gcc/testsuite/gfortran.dg/pr39666-2.f90 + Apply upstream (4.4-branch) change 147440: + [gcc/ChangeLog] + 2009-05-12 Jakub Jelinek <jakub@redhat.com> + Backport from mainline: + 2009-05-05 Jakub Jelinek <jakub@redhat.com> + PR middle-end/39666 + * gimplify.c (gimplify_switch_expr): If case labels cover the whole + range of the type, but default label is missing, add it with one + of the existing labels instead of adding a new label for it. + [gcc/testsuite/ChangeLog] + 2009-05-12 Jakub Jelinek <jakub@redhat.com> + Backport from mainline: + 2009-05-05 Jakub Jelinek <jakub@redhat.com> + PR middle-end/39666 + * gcc.dg/pr39666-1.c: New test. + * gcc.dg/pr39666-2.c: Likewise. + * g++.dg/warn/Wuninitialized-4.C: Likewise. + * g++.dg/warn/Wuninitialized-5.C: Likewise. + * gfortran.dg/pr39666-1.f90: Likewise. + * gfortran.dg/pr39666-2.f90: Likewise. + Owner: cgd + Status: Backported from upstream rev. 147440. + +gcc/cgraph.h +gcc/common.opt +gcc/ipa-inline.c +gcc/opts.c +gcc/params.def + Implement heuristic which limits i-cache footprint during inlining. The size + of hot components of the call graph are limited to a parameterized value. + Heuristic is enabled by default with FDO, and can be explicitly enabled/disabled + with -flimit-hot-components. + + Owner: meheff + Status: Not yet upstream + +gcc/ipa-utils.h +gcc/tree.h + Apply upstream (4.4-branch) change 147536: + [gcc/ChangeLog] + 2009-05-14 H.J. Lu <hongjiu.lu@intel.com> + Backport from mainline: + 2009-05-14 H.J. Lu <hongjiu.lu@intel.com> + PR middle-end/40147 + * ipa-utils.h (memory_identifier_string): Moved to ... + * tree.h (memory_identifier_string): Here. Add GTY(()). + Owner: cgd + Status: Backported from upstream rev. 147536. + +gcc/gimple.h +gcc/tree-ssa-sccvn.c +gcc/testsuite/gcc.c-torture/compile/pr39999.c + Apply upstream (4.4-branch) change 147657: + [gcc/ChangeLog] + 2009-05-18 Richard Guenther <rguenther@suse.de> + PR tree-optimization/39999 + * gimple.h (gimple_expr_type): Use the expression type looking + through useless conversions. + * tree-ssa-sccvn.c (vn_nary_op_lookup_stmt): Use gimple_expr_type. + (vn_nary_op_insert_stmt): Likewise. + (simplify_binary_expression): Likewise. + [gcc/testsuite/ChangeLog] + 2009-05-18 Richard Guenther <rguenther@suse.de> + PR tree-optimization/39999 + * gcc.c-torture/compile/pr39999.c: New testcase. + Owner: cgd + Status: Backported from upstream rev. 147657. + +gcc/tree-ssa-operands.c +gcc/testsuite/g++.dg/torture/pr40389.C + Apply upstream (4.4-branch) change 148601: + [gcc/ChangeLog] + 2009-06-17 Richard Guenther <rguenther@suse.de> + PR middle-end/40389 + * tree-ssa-operands.c (parse_ssa_operands): Add NRV results + to the addresses taken bitmap. + [gcc/testsuite/ChangeLog] + 2009-06-17 Richard Guenther <rguenther@suse.de> + PR middle-end/40389 + * g++.dg/torture/pr40389.C: New testcase. + Owner: cgd + Status: Backported from upstream rev. 148601. + +gcc/alias.c +gcc/rtl.h +gcc/cse.c +gcc/cselib.c +gcc/gcse.c +gcc/dse.c +gcc/testsuite/gcc.dg/pr39794.c + Apply upstream (4.4-branch) change 146834. + [gcc/ChangeLog] + 2009-04-27 Jakub Jelinek <jakub@redhat.com> + PR rtl-optimization/39794 + * alias.c (canon_true_dependence): Add x_addr argument. + * rtl.h (canon_true_dependence): Adjust prototype. + * cse.c (check_dependence): Adjust canon_true_dependence callers. + * cselib.c (cselib_invalidate_mem): Likewise. + * gcse.c (compute_transp): Likewise. + * dse.c (scan_reads_nospill): Likewise. + (record_store, check_mem_read_rtx): Likewise. For non-const-or-frame + addresses pass base->val_rtx as mem_addr, for const-or-frame addresses + canon_base_addr of the group, plus optional offset. + (struct group_info): Rename canon_base_mem to + canon_base_addr. + (get_group_info): Set canon_base_addr to canon_rtx of base, not + canon_rtx of base_mem. + [gcc/testsuite/ChangeLog] + 2009-04-27 Jakub Jelinek <jakub@redhat.com> + PR rtl-optimization/39794 + * gcc.dg/pr39794.c: New test. + Owner: eraman + Status: Backported from upstream rev. 146834. + +gcc/tree-ssa-phiprop.c +gcc/testsuite/gcc.c-torture/execute/pr40002.c + Apply upstream (4.4-branch) change 147153: + [gcc/ChangeLog] + 2009-05-06 Richard Guenther <rguenther@suse.de> + PR tree-optimization/40022 + * tree-ssa-phiprop.c (phivn_valid_p): Fix tuplification error. + * gcc.c-torture/execute/pr40022.c: New testcase. + Owner: nvachhar + Status: Backported from upstream rev. 147153. + +gcc/tree-ssa-loop-niter.c +gcc/testsuite/gcc.dg/tree-ssa/pr40087.c + Apply upstream (4.4-branch) change 147806 + [gcc/ChangeLog] + 2009-05-22 Zdenek Dvorak <ook@ucw.cz> + PR tree-optimization/40087 + * tree-ssa-loop-niter.c (number_of_iterations_ne_max, + number_of_iterations_ne): Rename never_infinite argument. + (number_of_iterations_lt_to_ne, number_of_iterations_lt, + number_of_iterations_le): Handle pointer-type ivs when + exit_must_be_taken is false. + (number_of_iterations_cond): Do not always assume that + exit_must_be_taken if the control variable is a pointer. + Owner: nvachhar + Status: Backported from upstream rev 147806 + +gcc/final.c + Avoid garbage collecting the memory used by -fdebug-prefix-map. + Owner: espindola + Status: Backported from upstream revision 150759. + +Makefile.def +Makefile.in +Makefile.tpl +config/bootstrap-O1.mk +config/bootstrap-O3.mk +config/bootstrap-debug.mk +config/mt-gnu +config/multi.m4 +gcc/doc/install.texi +gcc/java/Make-lang.in +libjava/configure +libjava/configure.ac + Port revion 147415. This passes -fdebug-prefix-map to stages + 2 and 3. Fixes bug 2045437. + Owner: espindola + Status: Backported from upstream revision 147415. + +gcc/dyn-ipa.c +gcc/tree-ssa-lrs.c + Fix to 2051043 + Owner: davidxl + Status: submitted to lw-ipo branch + +gcc/tree-ssa-lrs.c + Fix to 2056091 + Owner: davidxl + Status: not submitted + +gcc/dwarf2out.c + Backport upstream patch to fix ICE in output_die (b/1906960, PR debug/41063). + http://gcc.gnu.org/ml/gcc-patches/2009-08/msg00799.html + Owner: ccoutant + Status: in gcc mainline at rev 151187. + +gcc/calls.c +gcc/common.opt +gcc/dbxout.c +gcc/debug.c +gcc/debug.h +gcc/dwarf2out.c +gcc/final.c +gcc/sdbout.c +gcc/vmsdbgout.c +gcc/testsuite/g++.dg/debug/dwarf2/icf.C + Add support for debugging with identical code folding (ICF). + Backport of upstream patch. + Owner: ccoutant + Status: in gcc mainline at rev 152577. + +libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/assign_neg.cc +libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_1_neg.cc +libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/constructor_2_neg.cc +libstdc++-v3/testsuite/23_containers/vector/requirements/dr438/insert_neg.cc + Fix for http://b/2056182 -- adjust expected failure line numbers to match + local change in http://cl/31102-p2. + Owner: ppluzhnikov + Status: google-local patch. + +gcc/c-opts.c +gcc/common.opt +gcc/coverage.c +gcc/doc/invoke.texi +gcc/dyn-ipa.c +gcc/gcov-io.c +gcc/gcov-io.h +gcc/opts.c +gcc/opts.h + Handle module groups with mismatching GCC command line options. + Owner: raksit + Status: submitted upstream to lw-ipo branch as r150867. + +gcc/dojump.c +gcc/fold-const.c +gcc/testsuite/gcc.c-torture/compile/pr40204.c +gcc/testsuite/gcc.c-torture/execute/pr40057.c +gcc/testsuite/gcc.c-torture/execute/pr40747.c +gcc/testsuite/gcc.dg/pr39867.c +gcc/testsuite/gcc.dg/torture/pr39855.c + Apply upstream (4.4-branch) revisions 146622, 146702, 147242, + 149681 and 147750. + Owner: dnovillo. + Status: Backported from upstream. + +gcc/dwarf2out.c + Backport upstream patch to fix htab usage where slot pointer is kept alive + across a call that may expand the hash table. + Owner: ccoutant + Status: Backported from dwarf4 branch at revision 150912. + +gcc/tree-ssa-lrs.c + Add missing RD update + Owner: davidxl + Status: not submitted + +gcc/dwarf2out.c + Backport upstream patch to fix invalid use of DW_OP_regx in DWARF info + (b/1560232). + Owner: ccoutant + Status: Backported from upstream revision 147187. + +gcc/tree-profile.c + Make __gcov_indirect_call_counters and __gcov_indirect_call_callee + TLS to avoid race conditions in value profiling. + Owner: nvachhar + Status: Upstream in rev 142953, but reverted due to problems on Darwin. + +gcc/Makefile.in + Backport upstream patch to add tree-ssa-sccvn.h and incpath.h + to PLUGIN_HEADERS. + Owner: dnovillo + Status: In mainline rev 150967. + +gcc/cfgexpand.c +gcc/gimple-pretty-print.c +gcc/graphite.c +gcc/ipa-struct-reorg.c +gcc/lambda-code.c +gcc/omp-low.c +gcc/tree-cfg.c +gcc/tree-cfgcleanup.c +gcc/tree-flow-inline.h +gcc/tree-flow.h +gcc/tree-inline.c +gcc/tree-into-ssa.c +gcc/tree-loop-distribution.c +gcc/tree-outof-ssa.c +gcc/tree-parloops.c +gcc/tree-phinodes.c +gcc/tree-predcom.c +gcc/tree-ssa-loop-manip.c +gcc/tree-ssa-phiopt.c +gcc/tree-ssa-phiprop.c +gcc/tree-ssa-pre.c +gcc/tree-ssa-threadupdate.c +gcc/tree-ssa.c +gcc/tree-switch-conversion.c +gcc/tree-tailcall.c +gcc/tree-vect-transform.c +gcc/tree-vectorizer.c +gcc/tree.h + Backport of upstream patch to track debug locus information in PHI + node arguments. + Owner: ccoutant + Status: Backport from upstream at 150267. + +gcc/final.c + Provide a (Google-internal) documentation reference to help people cope + with stack frame size warnings. + Owner: cgd + Status: local change. + +gcc/testsuite/gcc.dg/tree-ssa/ltrans-1.c +gcc/testsuite/gcc.dg/tree-ssa/ltrans-3.c +gcc/testsuite/gcc.dg/tree-ssa/ltrans-4.c +gcc/testsuite/gcc.dg/tree-ssa/ltrans-5.c +gcc/testsuite/gcc.dg/tree-ssa/ltrans-6.c +gcc/testsuite/gcc.dg/tree-ssa/ltrans-8.c +gcc/testsuite/gcc.dg/tree-ssa/vrp47.c +gcc/testsuite/gfortran.dg/ltrans-7.f90 + Undo change marking these tests XFAIL. They are not expected + to fail in a native configuration (and don't seem to). + Owner: cgd + Status: Local. + +gcc/testsuite/gcc.dg/torture/stackalign/builtin-apply-4.c + Mark as XFAIL due to http://b/2070963 + Owner: cgd + Status: Local. + +gcc/testsuite/gfortran.dg/PR19754_2.f90 +gcc/testsuite/gfortran.dg/array_reference_1.f90 +gcc/testsuite/gfortran.dg/elemental_subroutine_7.f90 +gcc/testsuite/gfortran.dg/intrinsic_modulo_1.f90 +gcc/testsuite/gfortran.dg/streamio_9.f90 + Mark as XFAIL (excluding -O0, -O1, -O2, and -Os) due to http://b/2071024 + Owner: cgd + Status: Reverted by later change. + +libstdc++-v3/testsuite/26_numerics/headers/cmath/c99_classification_macros_c.cc + Un-XFAIL this test for linux. + Owner: cgd + Status: Local. + +gcc/config.gcc +gcc/config/i386/linux.h +gcc/config/i386/linux64.h +gcc/config/linux-grtev1.h + When using GRTE and linking statically, instead of just -lc link: + -lc -lnss_borg -lnss_cache -lnss_dns -lnss_files -lresolv + Owner: cgd + Status: local + +libmudflap/testsuite/libmudflap.c++/pass41-frag.cxx + Force test to use -O when building for i?86 and x86_64 to work + around an expected failure. + Owner: cgd + Status: local + +gcc/gcc.c + Search all -B paths (with and without multilib dirs) before processing + lower-priority paths. + Owner: cgd + Status: not yet upstream. + +gcc/cp/decl2.c + Don't emit auxiliary module functions (don't mark then as referenced), even + if they have static variables. + Owner: raksit + Status: submitted upstream to lw-ipo branch as r151076. + +gcc/opts.c + Don't record -fripa-disallow-opt-mismatch and -Wripa-opt-mismatch in gcda file. + Owner: davidxl + Status: submitted to lw-ipo branch + +gcc/toplev.c + Handle '%E' format in default_tree_printer. From: + http://gcc.gnu.org/ml/gcc-patches/2008-11/msg01115.html + Owner: cgd + Status: backported from trunk r146294. + +gcc/dyn-ipa.c +gcc/opts.c +gcc/common.opt +gcc/tree-ssa-lrs.c +gcc/doc/invoke.texi + Add more statistic dumping in DYN-IPA + Add an option to control LRS + Owner: davidxl + Status: dyn-ipa.c change is in upstream lw-ipo branch. + +config/i386/i386.c +gcc/testsuite/gfortran.dg/PR19754_2.f90 +gcc/testsuite/gfortran.dg/array_reference_1.f90 +gcc/testsuite/gfortran.dg/elemental_subroutine_7.f90 +gcc/testsuite/gfortran.dg/intrinsic_modulo_1.f90 +gcc/testsuite/gfortran.dg/streamio_9.f90 + Undo local XFAIL markings on tests above. Fix root cause of the failures: + incorrect use of SSE2 vector instructions when SSE2 isn't enabled. + Owner: cgd + Status: Backported from upstream 4.4-branch rev 151275. + +gcc/cp/decl.c +gcc/testsuite/g++.dg/warn/Wreturn-type-6.C + Do not suppress warning about functions with no return statement for + functions with a qualified return type. + Owner: cgd + Status: Backported from upstream 4.4-branch rev 150099. + +libcpp/macro.c +gcc/testsuite/gcc.dg/20090902-1.c + Apply upstream change @151343 to fix wide char stringification. + Owner: ppluzhnikov + Status: Upstream change 151343. + +gcc/c-opts.c + Fix b2074282 + Owner: davidxl + Status: in lw-ipo branch + +gcc/ifcvt.c + Fix 2097122 + Owner: davidxl + Status: not submitted + +gcc/cp/decl.c +gcc/dbxout.c +gcc/debug.c +gcc/debug.h +gcc/dwarf2out.c +gcc/sdbout.c +gcc/vmsdbgout.c + Apply upstream change to fix b/1279996 (missing debug info for typedef + of anonymous struct). + http://gcc.gnu.org/ml/gcc-patches/2009-02/msg00749.html + http://gcc.gnu.org/ml/gcc-patches/2009-04/msg01386.html + Owner: ccoutant + Status: Backported from upstream changes at revs 146137 and 146290. + +gcc/common.opt +gcc/gimplify.c +gcc/tree-vrp.c +gcc/testsuite/g++.dg/other/no-strict-enum-precision-1.C +gcc/testsuite/g++.dg/other/no-strict-enum-precision-2.C +gcc/testsuite/g++.dg/other/no-strict-enum-precision-3.C + Implement -fno-strict-enum-precision. Fix root cause of bug 2077625. + Owner: rus. + Status: not yet upstream. + +gcc/cp/cp-objcp-common.c + Change which builtins we save/restore post-parsing. This fixes a LIPO + cfg-checksum mismatch problem. + Owner: raksit + Status: Submitted upstream to lw-ipo branch as r151615. + +gcc/c-opts.c +gcc/testsuite/gcc.dg/cpp/missing-header-MD.c +gcc/testsuite/gcc.dg/cpp/missing-header-MMD.c +gcc/testsuite/gcc.dg/cpp/missing-sysheader-MD.c +gcc/testsuite/gcc.dg/cpp/missing-sysheader-MMD.c +libcpp/files.c +libcpp/include/cpplib.h + When using -MMD, treat missing system headers as errors so that no + output is generated. http://b/1954331 + Owner: cgd + Status: Upstream (trunk) changes 151879 and 151894. + +gcc/testsuite/gcc.misc-tests/linkage.exp + Fixes the test where the built gcc is 32-bit but the platform C compiler + defaults to 64-bit compilation. + Owner: simonb + Status: not yet upstream. + +gcc/coverage.c +gcc/opts.c +gcc/opts.h + Disable -fprofile-use when no .gcda file is found. + Owner: nvachhar + Status: not yet upstream. + +gcc/testsuite/g++.dg/tree-prof/dom-invalid.C +gcc/testsuite/g++.dg/tree-ssa/dom-invalid.C +gcc/testsuite/gcc.dg/pr26570.c +gcc/testsuite/gcc.dg/pr32773.c +gcc/testsuite/gcc.dg/tree-prof/pr26570.c +gcc/testsuite/gcc.dg/tree-prof/pr32773.c + Make tests work given that -fprofile-use does nothing with missing + .gcda files. + Owner: nvachhar + Status: not yet upstream + +gcc/coverage.c + Avoid ICE if the working directory does not exist. + Owner: nvachhar + Status: not yet upstream + +ltoptions.m4 +boehm-gc/configure +gcc/configure +libffi/configure +libgfortran/configure +libgomp/configure +libjava/classpath/configure +libjava/configure +libmudflap/configure +libobjc/configure +libssp/configure +libstdc++-v3/configure +zlib/configure + Modify the --with-pic configuration option to accept a list of library names. + In this mode, the specified libraries are built with PIC, whereas all other + libraries are built with the default mode. + Owner: aaw + Status: not yet upstream + +gcc/doc/cpp.texi +libcpp/directives.c + Do not list #ident and #sccs as deprecated. + Owner: nvachhar + Status: Backported from upstream r152612 + +gcc-4.4.0/gcc/testsuite/gfortran.dg/argument_checking_13.f90 + Work around test that is flaky in the nightly build. + Owner: cgd + Status: local + +gcc/coverage.c +gcc/cp/cp-objcp-common.c + Revert an earlier patch that fixes cfg-checksum mismatches as its now + causing more mismatches than it fixes. Also disable the "no coverage found" + warning in lipo mode for now -- a proper fix will have to wait for v13 + patch release. + Owner: raksit + Status: These are workarounds for bugs that should be fixed in the patch + release -- so these won't be submitted upstream. + +gcc/Makefile.in + Backport from mainline rev. 153472. Add real.h, output.h and + $(IPA_UTILS_H) to the list of file exported in PLUGIN_HEADERS. + Owner: dnovillo + Status: In gcc mainline rev. 153472. + +gcc/tree-ssa-pre.c +gcc/tree-ssa-sccvn.c +gcc/testsuite/g++.dg/warn/Warray-bounds.C +gcc/testsuite/gcc.dg/Warray-bounds.c +gcc/testsuite/gcc.dg/tree-ssa/ssa-dse-11.c +gcc/testsuite/gcc.dg/tree-ssa/ssa-fre-21.c +gcc/testsuite/gcc.dg/tree-ssa/ssa-pre-26.c +gcc/testsuite/gcc.dg/vect/slp-widen-mult-s16.c +gcc/testsuite/gcc.dg/vect/slp-widen-mult-u8.c +gcc/testsuite/gcc.dg/vect/vect-35.c +gcc/testsuite/gcc.dg/vect/vect-multitypes-16.c +gcc/testsuite/gcc.dg/vect/vect-multitypes-17.c +gcc/testsuite/gcc.dg/vect/vect-reduc-dot-u8a.c +gcc/testsuite/gcc.dg/vect/vect-reduc-dot-u8b.c +gcc/testsuite/gcc.dg/vect/wrapv-vect-reduc-dot-s8b.c + Remove redundant store and enable pre for -Os when it won't hurt size. + Also add several missing cases in tree-ssa-sccvn.c. + Owner: carrot + Status: Backported from upstream changes 145172, 145189 and 153491. + +gcc/fold-const.c +gcc/Makefile.in + Fix 2045297 + Owner: davidxl + Status: to be submitted + +gcc/c.opt +gcc/c-typeck.c +gcc/cp/typeck.c +gcc/testsuite/g++.dg/warn/Wicf.C + Add -Wicf flag to warn when pointer comparisons are made. This could be + useful when linker ICF is used. This flag is not turned on with -Wall. + Owner: tmsriram + Status: local. + +gcc/target.h +gcc/target-def.h +gcc/targhooks.h +gcc/targhooks.c +gcc/doc/tm.texi +gcc/config/arm/arm.c +gcc/ifcvt.c +gcc/recog.c +gcc/sched-rgn.c +gcc/final.c +gcc/bb-reorder.c + Change the usage of macro HAVE_conditional_execution to new target hook + have_conditional_execution. And add an arm specific implementation of the + hook. This can enable more if conversion optimization opportunities. + Owner: carrot + Status: Backported from upstream change 153584. + +gcc/basic-block.h +gcc/cfghooks.c +gcc/cfglayout.c +gcc/final.c +gcc/gimple-pretty-print.c +gcc/print-rtl.c +gcc/rtl.h +gcc/tree-cfg.c +gcc/tree-pretty-print.c +gcc/tree.c +gcc/tree.h + Change discriminator tracking from per-basic-block to per-instruction. + Owner: ccoutant + Status: To be submitted upstream. + +gcc/config/arm/arm.md +gcc/testsuite/gcc.target/arm/pr40835.c + Add peephole2 patterns to remove compare after move instructions. + Owner: carrot + Status: Backported from upstream change 153895. + +gcc/testsuite/gcc.target/arm/pr40835.c + Restrict the test for thumb1 target to avoid spurious fails when testing + thumb2 target. + Owner: carrot + Status: Backported from upstream change 154644. + +gcc/tree-ssa-pre.c + Fix 2222512 + Owner: davidxl + Status: to be submitted + +gcc/cp/optimize.c + Rewrites the body of deleting destructor by calling complete destructor + and delete function. + Owner: carrot + Status: This is upstream (4.5) mainline change 151673. + +gcc/common.opt +gcc/doc/invoke.texi +gcc/flags.h +gcc/opts.c +gcc/toplev.c +gcc/tree-sample-profile.c + Add two different heuristics to convert instruction profiles to + block profiles. + Owner: nvachhar + Status: Not yet upstream + +gcc/Makefile.in +gcc/testsuite/g++.dg/uninit-pred-1_a.C +gcc/testsuite/g++.dg/uninit-pred-1_b.C +gcc/testsuite/g++.dg/uninit-pred-2_a.C +gcc/testsuite/g++.dg/uninit-pred-2_b.C +gcc/testsuite/g++.dg/uninit-pred-loop-1_a.cc +gcc/testsuite/g++.dg/uninit-pred-loop-1_b.cc +gcc/testsuite/g++.dg/uninit-pred-loop-1_c.cc +gcc/testsuite/g++.dg/uninit-pred-loop_1.cc +gcc/testsuite/gcc.dg/uninit-11.c +gcc/testsuite/gcc.dg/uninit-5.c +gcc/testsuite/gcc.dg/uninit-pred-2_a.c +gcc/testsuite/gcc.dg/uninit-pred-2_b.c +gcc/testsuite/gcc.dg/uninit-pred-2_c.c +gcc/testsuite/gcc.dg/uninit-pred-3_a.c +gcc/testsuite/gcc.dg/uninit-pred-3_b.c +gcc/testsuite/gcc.dg/uninit-pred-3_c.c +gcc/testsuite/gcc.dg/uninit-pred-3_d.c +gcc/testsuite/gcc.dg/uninit-pred-3_e.c +gcc/testsuite/gcc.dg/uninit-pred-4_a.c +gcc/testsuite/gcc.dg/uninit-pred-4_b.c +gcc/testsuite/gcc.dg/uninit-pred-5_a.c +gcc/testsuite/gcc.dg/uninit-pred-5_b.c +gcc/testsuite/gcc.dg/uninit-pred-6_a.c +gcc/testsuite/gcc.dg/uninit-pred-6_b.c +gcc/testsuite/gcc.dg/uninit-pred-6_c.c +gcc/testsuite/gcc.dg/uninit-pred-6_d.c +gcc/testsuite/gcc.dg/uninit-pred-6_e.c +gcc/testsuite/gcc.dg/uninit-pred-7_a.c +gcc/testsuite/gcc.dg/uninit-pred-7_b.c +gcc/testsuite/gcc.dg/uninit-pred-7_c.c +gcc/testsuite/gcc.dg/uninit-pred-8_a.c +gcc/testsuite/gcc.dg/uninit-pred-8_b.c +gcc/testsuite/gcc.dg/uninit-pred-8_c.c +gcc/testsuite/gcc.dg/uninit-pred-9_a.c +gcc/testsuite/gcc.dg/uninit-pred-9_b.c +gcc/tree-flow.h +gcc/tree-ssa-uninit.c +gcc/tree-ssa.c + Fix 1348501 False uninitialized warning + Owner: davidxl + Status: not in upstream + +gcc/config/arm/arm.c + Add a new function thumb1_size_rtx_costs to model the code size for + thumb1 instructions. + Owner: carrot + Status: Will be submitted to upstream after + http://gcc.gnu.org/bugzilla/show_bug.cgi?id=42258 has been fixed. + +gcc/common.opt +gcc/doc/invoke.texi +gcc/coverage.c +gcc/value-prof.c + Fix 2337841 + Suppress vervose messages from LIPO build + Owner: davidxl + Status: not submitted + +gcc/dwarf2out.c + Backport fix for corrupted rangelist (b/2304062). + http://gcc.gnu.org/ml/gcc-patches/2009-12/msg00994.html + http://gcc.gnu.org/ml/gcc-patches/2009-12/msg01055.html + Owner: ccoutant + Status: Backported from upstream r155402 and r155429 + +gcc/tree-threadsafe-analyze.c +gcc/testsuite/g++.dg/thread-ann/thread_annot_common.h +gcc/testsuite/g++.dg/thread-ann/thread_annot_lock-43.C +gcc/testsuite/g++.dg/thread-ann/thread_annot_lock-44.C + Add support for releasable scoped lock (e.g. ReleasableMutexLock or + std::unique_lock). Also fix an issue when populating the intial lock sets. + We need to canonicalize the locks before adding them to the set. + Owner: lcwu + Status: not yet upstream + +gcc/tree-sample-profile.c +gcc/tree-sample-profile.h + Store file name per sample, not per function. This allows samples + to be attributed to .h files properly (i.e., from macro + expansion). + Owner: nvachhar + Status: Not yet upstream + +gcc/tree-sample-profile.c + Remove newlines from the end of inform calls. + Owner: nvachhar + Status: Not yet upstream + +gcc/tree-sample-profile.c + Use dump_base_name as the base file name for edge profile dumps. + Owner: nvachhar + Status: Not yet upstream + +gcc/mcf.c +gcc/tree-sample-profile.c +gcc/params.def +gcc/doc/invoke.texi + Make the number of iterations used to cancel cycles in MCF a + parameter. Print out a message when cycle cancellation exits early + due to this limit. Also add an assert to avoid any memory buffer + overruns. + Owner: nvachhar + Status: Not yet upstream + +gcc/tree-flow-inline.h + Backport upstream r146299 which fixes an inverted condition in get_lineno. + Owner: nvachhar + Status: Backported from upstream r146299 + +gcc/ifcvt.c + Use the locus information from the if-statment (rather than the then + path) for all the instructions after if conversion. + Owner: nvachhar + Status: Not yet upstream + +gcc/tree-sample-profile.c +gcc/tree-sample-profile.h +gcc/params.def +gcc/doc/invoke.texi + Add support for using discriminator information when doing SampleFDO + attribution. + Owner: nvachhar + Status: Not yet upstream + +gcc/gimple-low.c +gcc/testsuite/g++.dg/warn/Wuninitialized-5.C +gcc/testsuite/g++.dg/warn/pragma-system_header3.h +gcc/testsuite/g++.dg/warn/unit-1.C +gcc/testsuite/gcc.dg/pr39666-2.c +gcc/testsuite/gcc.dg/uninit-I.c +gcc/testsuite/gcc.dg/uninit-pr19430.c +gcc/testsuite/gcc.dg/uninit-pr20644.c +gcc/testsuite/gfortran.dg/pr25923.f90 +gcc/testsuite/gfortran.dg/pr39666-2.f90 + Make merged return statements use the last line of the function as + their line number. Update the test suite accordingly. + Owner: nvachhar + Status: Not yet upstream + +gcc/testsuite/gfortran.dg/pr25923.f90 + Update this test to expect a warning on different lines depending on + whether it is compiled -m32/-m64. + Owner: nvachhar + Status: Not yet upstream + +gcc/mcf.c + Use minimum cost circulation instead of minimum cost flow to ensure + that function entry and exit weights can be adjusted. + Owner: nvachhar + Status: Not yet upstream + +gcc/Makefile.in +gcc/cgraph.h +gcc/common.opt +gcc/cp/error.c +gcc/ipa-inline.c +gcc/opts.c + Add -finline-plan-<pass>=<file> option which reads a list of edges to inline + from a file. + Owner: meheff + Status: Not yet upstream + +gcc/tree-sample-profile.c + Use sample profile data to compute initial counts and probabilities + for edges rather than relying on static estimates. + Owner: nvachhar + Status: Not yet upstream + +gcc/coverage.c +gcc/opts.c +gcc/opts.h + Ensure FDO and Sample FDO parameters are set consistently. + Owner: nvachhar + Status: Not yet upstream + +gcc/basic-block.h +gcc/mcf.c +gcc/tree-sample-profile.c +gcc/params.def +gcc/doc/invoke.texi + Use heuristics to determine the confidence in the sample profile for + a basic block. Use the confidence to adjust edge costs when doing + MCF. + Owner: nvachhar + Status: Not yet upstream + +gcc/config/arm/arm.md +gcc/testsuite/gcc.target/arm/pr40670.c + Backport upstream patch 155427. Pass floating point constant moves to + integer registers as mov immediates for thumb1. + Owner: carrot + Status: backport from upstream + +gcc/combine.c +gcc/testsuite/gcc.c-torture/execute/pr42691.c + Backport upstream patch in revision 155948. Fix a bug (pr42691) where the + outdated i3notes is not removed after combine i3 "set subreg reg" with + i2 "set reg const". + Owner: jingyu + Status: backport from upstream r155948. diff --git a/gcc-4.4.0/boehm-gc/configure b/gcc-4.4.0/boehm-gc/configure index 6d2cf83e4..49121b2e4 100755 --- a/gcc-4.4.0/boehm-gc/configure +++ b/gcc-4.4.0/boehm-gc/configure @@ -7853,7 +7853,22 @@ fi; # Check whether --with-pic or --without-pic was given. if test "${with_pic+set}" = set; then withval="$with_pic" - pic_mode="$withval" + p=${PACKAGE-default} + case "$withval" in + yes|no) pic_mode="$withval" ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in "$withval"; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac else pic_mode=default fi; @@ -8277,11 +8292,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8280: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8295: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8284: \$? = $ac_status" >&5 + echo "$as_me:8299: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8616,11 +8631,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8619: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8634: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8623: \$? = $ac_status" >&5 + echo "$as_me:8638: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8721,11 +8736,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8724: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8739: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8728: \$? = $ac_status" >&5 + echo "$as_me:8743: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8776,11 +8791,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8779: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8794: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8783: \$? = $ac_status" >&5 + echo "$as_me:8798: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11643,7 +11658,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11646 "configure" +#line 11661 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11739,7 +11754,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11742 "configure" +#line 11757 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13765,11 +13780,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13768: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13783: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13772: \$? = $ac_status" >&5 + echo "$as_me:13787: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13864,11 +13879,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13867: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13882: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13871: \$? = $ac_status" >&5 + echo "$as_me:13886: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13916,11 +13931,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13919: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13934: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13923: \$? = $ac_status" >&5 + echo "$as_me:13938: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17407,6 +17422,9 @@ 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" AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" diff --git a/gcc-4.4.0/config/bootstrap-O1.mk b/gcc-4.4.0/config/bootstrap-O1.mk new file mode 100644 index 000000000..031645a12 --- /dev/null +++ b/gcc-4.4.0/config/bootstrap-O1.mk @@ -0,0 +1 @@ +BOOT_CFLAGS := -O1 $(filter-out -O%, $(BOOT_CFLAGS)) diff --git a/gcc-4.4.0/config/bootstrap-O3.mk b/gcc-4.4.0/config/bootstrap-O3.mk new file mode 100644 index 000000000..b269a3f7e --- /dev/null +++ b/gcc-4.4.0/config/bootstrap-O3.mk @@ -0,0 +1 @@ +BOOT_CFLAGS := -O3 $(filter-out -O%, $(BOOT_CFLAGS)) diff --git a/gcc-4.4.0/config/bootstrap-debug.mk b/gcc-4.4.0/config/bootstrap-debug.mk new file mode 100644 index 000000000..521be8241 --- /dev/null +++ b/gcc-4.4.0/config/bootstrap-debug.mk @@ -0,0 +1,2 @@ +STAGE2_CFLAGS += -g0 +do-compare = $(SHELL) $(srcdir)/contrib/compare-debug $$f1 $$f2 diff --git a/gcc-4.4.0/config/mt-gnu b/gcc-4.4.0/config/mt-gnu index 2400fa44e..15bf41716 100644 --- a/gcc-4.4.0/config/mt-gnu +++ b/gcc-4.4.0/config/mt-gnu @@ -1,2 +1 @@ -CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) \ - $(DEBUG_PREFIX_CFLAGS_FOR_TARGET) -D_GNU_SOURCE +CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -D_GNU_SOURCE diff --git a/gcc-4.4.0/config/multi.m4 b/gcc-4.4.0/config/multi.m4 index 98417679f..5b62ecc0a 100644 --- a/gcc-4.4.0/config/multi.m4 +++ b/gcc-4.4.0/config/multi.m4 @@ -1,5 +1,5 @@ ## -*- Autoconf -*- -# Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006 +# Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation @@ -62,4 +62,7 @@ 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"])])dnl +CC="$CC" +CXX="$CXX" +GFORTRAN="$GFORTRAN" +GCJ="$GCJ"])])dnl diff --git a/gcc-4.4.0/gcc/Makefile.in b/gcc-4.4.0/gcc/Makefile.in index 17beae5e8..41494da93 100644 --- a/gcc-4.4.0/gcc/Makefile.in +++ b/gcc-4.4.0/gcc/Makefile.in @@ -1279,6 +1279,7 @@ OBJS-common = \ tree-ssa-threadedge.o \ tree-ssa-threadupdate.o \ tree-ssa-uncprop.o \ + tree-ssa-uninit.o \ tree-ssa.o \ tree-ssanames.o \ tree-stdarg.o \ @@ -2100,6 +2101,12 @@ tree-ssa-structalias.o: tree-ssa-structalias.c tree-ssa-structalias.h \ $(C_TREE_H) $(GIMPLE_H) $(HASHTAB_H) $(FUNCTION_H) $(CGRAPH_H) tree-pass.h \ $(TIMEVAR_H) alloc-pool.h $(SPLAY_TREE_H) $(PARAMS_H) gt-tree-ssa-structalias.h \ $(CGRAPH_H) $(ALIAS_H) pointer-set.h +tree-ssa-uninit.o : tree-ssa-uninit.c $(TREE_FLOW_H) $(CONFIG_H) $(SYSTEM_H) \ + $(RTL_H) $(TREE_H) $(TM_P_H) $(EXPR_H) output.h $(DIAGNOSTIC_H) \ + $(TOPLEV_H) $(FUNCTION_H) $(TIMEVAR_H) $(TM_H) coretypes.h \ + $(TREE_DUMP_H) langhooks.h tree-pass.h $(BASIC_BLOCK_H) $(BITMAP_H) \ + $(FLAGS_H) $(GGC_H) hard-reg-set.h $(HASHTAB_H) pointer-set.h \ + $(GIMPLE_H) $(TREE_INLINE_H) $(VARRAY_H) tree-ssa.o : tree-ssa.c $(TREE_FLOW_H) $(CONFIG_H) $(SYSTEM_H) \ $(RTL_H) $(TREE_H) $(TM_P_H) $(EXPR_H) output.h $(DIAGNOSTIC_H) \ $(TOPLEV_H) $(FUNCTION_H) $(TIMEVAR_H) $(TM_H) coretypes.h \ @@ -2441,7 +2448,7 @@ tree-pretty-print.o : tree-pretty-print.c $(CONFIG_H) $(SYSTEM_H) \ fold-const.o : fold-const.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ $(TREE_H) $(FLAGS_H) $(REAL_H) $(TOPLEV_H) $(HASHTAB_H) $(EXPR_H) $(RTL_H) \ $(GGC_H) $(TM_P_H) langhooks.h $(MD5_H) intl.h fixed-value.h $(TARGET_H) \ - $(GIMPLE_H) + $(GIMPLE_H) tree-flow.h tree-flow-inline.h diagnostic.o : diagnostic.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ $(TREE_H) version.h $(TM_P_H) $(FLAGS_H) $(INPUT_H) $(TOPLEV_H) intl.h \ $(DIAGNOSTIC_H) langhooks.h $(LANGHOOKS_DEF_H) diagnostic.def opts.h \ @@ -2449,7 +2456,8 @@ diagnostic.o : diagnostic.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ opts.o : opts.c opts.h options.h $(TOPLEV_H) $(CONFIG_H) $(SYSTEM_H) \ coretypes.h $(TREE_H) $(TM_H) langhooks.h $(GGC_H) $(EXPR_H) $(RTL_H) \ output.h $(DIAGNOSTIC_H) $(TM_P_H) $(INSN_ATTR_H) intl.h $(TARGET_H) \ - $(FLAGS_H) $(PARAMS_H) tree-pass.h $(DBGCNT_H) debug.h varray.h $(PLUGIN_H) + $(FLAGS_H) $(PARAMS_H) tree-pass.h $(DBGCNT_H) debug.h varray.h $(PLUGIN_H) \ + $(CGRAPH_H) opts-common.o : opts-common.c opts.h $(CONFIG_H) $(SYSTEM_H) \ coretypes.h intl.h targhooks.o : targhooks.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TREE_H) \ @@ -2643,7 +2651,8 @@ matrix-reorg.o : matrix-reorg.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ ipa-inline.o : ipa-inline.c gt-ipa-inline.h $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ $(TREE_H) langhooks.h $(TREE_INLINE_H) $(FLAGS_H) $(CGRAPH_H) intl.h \ $(DIAGNOSTIC_H) $(FIBHEAP_H) $(PARAMS_H) $(TIMEVAR_H) tree-pass.h \ - $(HASHTAB_H) $(COVERAGE_H) $(GGC_H) $(TREE_FLOW_H) $(RTL_H) $(IPA_PROP_H) $(BASIC_BLOCK_H) $(TOPLEV_H) + $(HASHTAB_H) $(COVERAGE_H) $(GGC_H) $(TREE_FLOW_H) $(RTL_H) $(IPA_PROP_H) \ + $(BASIC_BLOCK_H) $(TOPLEV_H) $(TREE_DUMP_H) ipa-utils.o : ipa-utils.c $(IPA_UTILS_H) $(CONFIG_H) $(SYSTEM_H) \ coretypes.h $(TM_H) $(TREE_H) $(TREE_FLOW_H) $(TREE_INLINE_H) langhooks.h \ pointer-set.h $(GGC_H) $(C_COMMON_H) $(GIMPLE_H) \ @@ -4169,7 +4178,8 @@ PLUGIN_HEADERS = $(TREE_H) $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ $(tm_file_list) $(tm_include_list) $(tm_p_file_list) $(tm_p_include_list) \ $(host_xm_file_list) $(host_xm_include_list) $(xm_include_list) \ intl.h $(PLUGIN_VERSION_H) $(DIAGNOSTIC_H) $(C_COMMON_H) $(C_PRETTY_PRINT_H) \ - tree-iterator.h $(PLUGIN_H) $(TREE_FLOW_H) langhooks.h + tree-iterator.h $(PLUGIN_H) $(TREE_FLOW_H) langhooks.h incpath.h \ + tree-ssa-sccvn.h real.h output.h $(IPA_UTILS_H) # Install the headers needed to build a plugin. install-plugin: installdirs lang.install-plugin diff --git a/gcc-4.4.0/gcc/alias.c b/gcc-4.4.0/gcc/alias.c index 2ebde8d73..37c6eb104 100644 --- a/gcc-4.4.0/gcc/alias.c +++ b/gcc-4.4.0/gcc/alias.c @@ -2250,14 +2250,13 @@ true_dependence (const_rtx mem, enum machine_mode mem_mode, const_rtx x, Variant of true_dependence which assumes MEM has already been canonicalized (hence we no longer do that here). The mem_addr argument has been added, since true_dependence computed - this value prior to canonicalizing. */ + this value prior to canonicalizing. + If x_addr is non-NULL, it is used in preference of XEXP (x, 0). */ int canon_true_dependence (const_rtx mem, enum machine_mode mem_mode, rtx mem_addr, - const_rtx x, bool (*varies) (const_rtx, bool)) + const_rtx x, rtx x_addr, bool (*varies) (const_rtx, bool)) { - rtx x_addr; - if (MEM_VOLATILE_P (x) && MEM_VOLATILE_P (mem)) return 1; @@ -2283,7 +2282,8 @@ canon_true_dependence (const_rtx mem, enum machine_mode mem_mode, rtx mem_addr, if (nonoverlapping_memrefs_p (x, mem)) return 0; - x_addr = get_addr (XEXP (x, 0)); + if (! x_addr) + x_addr = get_addr (XEXP (x, 0)); if (! base_alias_check (x_addr, mem_addr, GET_MODE (x), mem_mode)) return 0; diff --git a/gcc-4.4.0/gcc/basic-block.h b/gcc-4.4.0/gcc/basic-block.h index bfda03220..a2905c4f6 100644 --- a/gcc-4.4.0/gcc/basic-block.h +++ b/gcc-4.4.0/gcc/basic-block.h @@ -216,6 +216,13 @@ struct rtl_bb_info; basic block even though these insns can follow or precede insns in basic blocks. */ +enum sample_profile_confidence +{ + LOW_CONFIDENCE = 0, + NORMAL_CONFIDENCE, + HIGH_CONFIDENCE +}; + /* Basic block information indexed by block number. */ struct basic_block_def GTY((chain_next ("%h.next_bb"), chain_prev ("%h.prev_bb"))) { @@ -244,6 +251,9 @@ struct basic_block_def GTY((chain_next ("%h.next_bb"), chain_prev ("%h.prev_bb") /* Expected number of executions: calculated in profile.c. */ gcov_type count; + /* Confidence level for the profile */ + enum sample_profile_confidence confidence; + /* The index of this block. */ int index; @@ -253,9 +263,6 @@ struct basic_block_def GTY((chain_next ("%h.next_bb"), chain_prev ("%h.prev_bb") /* Expected frequency. Normalized to be in range 0 to BB_FREQ_MAX. */ int frequency; - /* The discriminator for this block. */ - int discriminator; - /* Various flags. See BB_* below. */ int flags; }; diff --git a/gcc-4.4.0/gcc/bb-reorder.c b/gcc-4.4.0/gcc/bb-reorder.c index b636c1e3a..3c646aecc 100644 --- a/gcc-4.4.0/gcc/bb-reorder.c +++ b/gcc-4.4.0/gcc/bb-reorder.c @@ -86,10 +86,6 @@ #include "tree-pass.h" #include "df.h" -#ifndef HAVE_conditional_execution -#define HAVE_conditional_execution 0 -#endif - /* The number of rounds. In most cases there will only be 4 rounds, but when partitioning hot and cold basic blocks into separate sections of the .o file there will be an extra round.*/ @@ -2307,5 +2303,3 @@ struct rtl_opt_pass pass_partition_blocks = TODO_dump_func | TODO_verify_rtl_sharing/* todo_flags_finish */ } }; - - diff --git a/gcc-4.4.0/gcc/c-opts.c b/gcc-4.4.0/gcc/c-opts.c index b81e63986..44eeba510 100644 --- a/gcc-4.4.0/gcc/c-opts.c +++ b/gcc-4.4.0/gcc/c-opts.c @@ -340,6 +340,7 @@ c_common_handle_option (size_t scode, const char *arg, int value) case OPT_MD: case OPT_MMD: cpp_opts->deps.style = (code == OPT_MD ? DEPS_SYSTEM: DEPS_USER); + cpp_opts->deps.need_preprocessor_output = true; deps_file = arg; break; @@ -384,6 +385,7 @@ c_common_handle_option (size_t scode, const char *arg, int value) warn_missing_braces = value; warn_parentheses = value; warn_return_type = value; + warn_ripa_opt_mismatch = value; warn_sequence_point = value; /* Was C only. */ warn_switch = value; if (warn_strict_aliasing == -1) @@ -1029,6 +1031,9 @@ c_common_post_options (const char **pfilename) else if (!flag_gnu89_inline && !flag_isoc99) error ("-fno-gnu89-inline is only supported in GNU99 or C99 mode"); + if (flag_dyn_ipa && cpp_opts->preprocessed) + error ("-fpreprocessed/-save-temps are not supported with -fripa"); + /* Default to ObjC sjlj exception handling if NeXT runtime. */ if (flag_objc_sjlj_exceptions < 0) flag_objc_sjlj_exceptions = flag_next_runtime; diff --git a/gcc-4.4.0/gcc/c-typeck.c b/gcc-4.4.0/gcc/c-typeck.c index cf9bccc24..d88c6f9da 100644 --- a/gcc-4.4.0/gcc/c-typeck.c +++ b/gcc-4.4.0/gcc/c-typeck.c @@ -8343,6 +8343,19 @@ build_binary_op (location_t location, enum tree_code code, { tree tt0 = TREE_TYPE (type0); tree tt1 = TREE_TYPE (type1); + if (TREE_CODE (op0) == ADDR_EXPR + && TREE_CODE (TREE_OPERAND (op0, 0)) == FUNCTION_DECL) + warning_at (location, + OPT_Wicf, + "Function pointer used in comparison : %qD", + TREE_OPERAND (op0, 0)); + if (TREE_CODE (op1) == ADDR_EXPR + && TREE_CODE (TREE_OPERAND (op1, 0)) == FUNCTION_DECL) + warning_at (location, + OPT_Wicf, + "Function pointer used in comparison : %qD", + TREE_OPERAND (op1, 0)); + /* Anything compares with void *. void * compares with anything. Otherwise, the targets must be compatible and both must be object or both incomplete. */ diff --git a/gcc-4.4.0/gcc/c.opt b/gcc-4.4.0/gcc/c.opt index 40681bdc3..42cc0d17f 100644 --- a/gcc-4.4.0/gcc/c.opt +++ b/gcc-4.4.0/gcc/c.opt @@ -250,6 +250,10 @@ Warn about zero-length formats Wformat= C ObjC C++ ObjC++ Joined Warning +Wicf +C ObjC C++ ObjC++ Var(warn_icf) Init(0) Warning +Warn about function pointer comparisons + Wignored-qualifiers C C++ Var(warn_ignored_qualifiers) Init(-1) Warning Warn whenever type qualifiers are ignored. diff --git a/gcc-4.4.0/gcc/calls.c b/gcc-4.4.0/gcc/calls.c index 7bad365b5..68768879c 100644 --- a/gcc-4.4.0/gcc/calls.c +++ b/gcc-4.4.0/gcc/calls.c @@ -39,6 +39,7 @@ along with GCC; see the file COPYING3. If not see #include "sbitmap.h" #include "langhooks.h" #include "target.h" +#include "debug.h" #include "cgraph.h" #include "except.h" #include "dbgcnt.h" @@ -401,6 +402,11 @@ emit_call_1 (rtx funexp, tree fntree, tree fndecl ATTRIBUTE_UNUSED, SIBLING_CALL_P (call_insn) = ((ecf_flags & ECF_SIBCALL) != 0); + /* Record debug information for virtual calls. */ + if (flag_enable_icf_debug && fndecl == NULL) + (*debug_hooks->virtual_call_token) (CALL_EXPR_FN (fntree), + INSN_UID (call_insn)); + /* Restore this now, so that we do defer pops for this call's args if the context of the call as a whole permits. */ inhibit_defer_pop = old_inhibit_defer_pop; diff --git a/gcc-4.4.0/gcc/cfgexpand.c b/gcc-4.4.0/gcc/cfgexpand.c index 3eaebd44b..f48ab403a 100644 --- a/gcc-4.4.0/gcc/cfgexpand.c +++ b/gcc-4.4.0/gcc/cfgexpand.c @@ -69,6 +69,9 @@ gimple_assign_rhs_to_tree (gimple stmt) else gcc_unreachable (); + if (gimple_has_location (stmt) && CAN_HAVE_LOCATION_P (t)) + SET_EXPR_LOCATION (t, gimple_location (stmt)); + return t; } diff --git a/gcc-4.4.0/gcc/cfghooks.c b/gcc-4.4.0/gcc/cfghooks.c index e3b3b11f5..10c04a8b0 100644 --- a/gcc-4.4.0/gcc/cfghooks.c +++ b/gcc-4.4.0/gcc/cfghooks.c @@ -437,7 +437,6 @@ split_block (basic_block bb, void *i) new_bb->count = bb->count; new_bb->frequency = bb->frequency; new_bb->loop_depth = bb->loop_depth; - new_bb->discriminator = bb->discriminator; if (dom_info_available_p (CDI_DOMINATORS)) { diff --git a/gcc-4.4.0/gcc/cfglayout.c b/gcc-4.4.0/gcc/cfglayout.c index d04299639..05aa31587 100644 --- a/gcc-4.4.0/gcc/cfglayout.c +++ b/gcc-4.4.0/gcc/cfglayout.c @@ -557,6 +557,16 @@ insn_file (const_rtx insn) return locator_file (INSN_LOCATOR (insn)); } +/* Return discriminator of the statement that produced this insn. */ +int +insn_discriminator (const_rtx insn) +{ + int loc = INSN_LOCATOR (insn); + if (!loc) + return 0; + return get_discriminator_from_locus (locator_location (loc)); +} + /* Return true if LOC1 and LOC2 locators have the same location and scope. */ bool locator_eq (int loc1, int loc2) diff --git a/gcc-4.4.0/gcc/cgraph.h b/gcc-4.4.0/gcc/cgraph.h index f3445284c..3e251f69c 100644 --- a/gcc-4.4.0/gcc/cgraph.h +++ b/gcc-4.4.0/gcc/cgraph.h @@ -508,10 +508,26 @@ varpool_next_static_initializer (struct varpool_node *node) (node) = varpool_next_static_initializer (node)) /* In ipa-inline.c */ + +/* Contains list of user-specified files containing inlining decisions + for particular inlining passes. */ + +struct inline_plan_file +{ + char *pass_name; + char *filename; + struct inline_plan_file *next; +}; +extern struct inline_plan_file *inline_plan_files; + void cgraph_clone_inlined_nodes (struct cgraph_edge *, bool, bool); bool cgraph_default_inline_p (struct cgraph_node *, const char **); unsigned int compute_inline_parameters (struct cgraph_node *); +void compute_hot_components (void); +void free_hot_components (void); +void dump_hot_components (FILE *); +void verify_hot_components (void); /* Create a new static variable of type TYPE. */ tree add_new_static_var (tree type); diff --git a/gcc-4.4.0/gcc/combine.c b/gcc-4.4.0/gcc/combine.c index 5bffb5845..0de23fe0f 100644 --- a/gcc-4.4.0/gcc/combine.c +++ b/gcc-4.4.0/gcc/combine.c @@ -2445,10 +2445,16 @@ try_combine (rtx i3, rtx i2, rtx i1, int *new_direct_jump_p) i2dest = SET_DEST (temp); i2dest_killed = dead_or_set_p (i2, i2dest); + /* Replace the source in I2 with the new constant and make the + resulting insn the new pattern for I3. Then skip to where we + validate the pattern. Everything was set up above. */ SUBST (SET_SRC (temp), immed_double_const (olo, ohi, GET_MODE (SET_DEST (temp)))); newpat = PATTERN (i2); + + /* The dest of I3 has been replaced with the dest of I2. */ + changed_i3_dest = 1; goto validate_replacement; } } @@ -2820,8 +2826,6 @@ try_combine (rtx i3, rtx i2, rtx i1, int *new_direct_jump_p) } } - /* We come here when we are replacing a destination in I2 with the - destination of I3. */ validate_replacement: /* Note which hard regs this insn has as inputs. */ @@ -8512,12 +8516,6 @@ distribute_and_simplify_rtx (rtx x, int n) enum rtx_code outer_code, inner_code; rtx decomposed, distributed, inner_op0, inner_op1, new_op0, new_op1, tmp; - /* Distributivity is not true for floating point as it can change the - value. So we don't do it unless -funsafe-math-optimizations. */ - if (FLOAT_MODE_P (GET_MODE (x)) - && ! flag_unsafe_math_optimizations) - return NULL_RTX; - decomposed = XEXP (x, n); if (!ARITHMETIC_P (decomposed)) return NULL_RTX; diff --git a/gcc-4.4.0/gcc/common.opt b/gcc-4.4.0/gcc/common.opt index 334158d17..7fe65fe39 100644 --- a/gcc-4.4.0/gcc/common.opt +++ b/gcc-4.4.0/gcc/common.opt @@ -156,6 +156,10 @@ Wpadded Common Var(warn_padded) Warning Warn when padding is required to align structure members +Wripa-opt-mismatch +Common Var(warn_ripa_opt_mismatch) Warning +Warn if primary and auxiliary modules have mismatched command line options + Wshadow Common Var(warn_shadow) Warning Warn when one local variable shadows another @@ -502,6 +506,14 @@ fripa Common Report Var(flag_dyn_ipa) Perform Dynamic Inter-Procedural Analysis. +fripa-disallow-opt-mismatch +Common Report Var(flag_ripa_disallow_opt_mismatch) +Don't import an auxiliary module if the command line options mismatch with the primary module + +fripa-verbose +Common Report Var(flag_ripa_verbose) +Enable verbose informational messages for LIPO compilation + fearly-inlining Common Report Var(flag_early_inlining) Init(1) Optimization Perform early inlining @@ -522,6 +534,10 @@ femit-class-debug-always Common Report Var(flag_emit_class_debug_always) Init(0) Do not suppress C++ class debug information. +fenable-icf-debug +Common Report Var(flag_enable_icf_debug) +Generate debug information to support Identical Code Folding (ICF) + fexceptions Common Report Var(flag_exceptions) Optimization Enable exception handling @@ -668,6 +684,10 @@ finline-limit= Common RejectNegative Joined UInteger -finline-limit=<number> Limit the size of inlined functions to <number> +finline-plan- +Common Joined RejectNegative +-finline-plan-<pass>=<file> Apply inlining decisions specified in <file> in inlining pass <pass>. + finstrument-functions Common Report Var(flag_instrument_function_entry_exit) Instrument function entry and exit with profiling calls @@ -797,6 +817,10 @@ fmodulo-sched-allow-regmoves Common Report Var(flag_modulo_sched_allow_regmoves) Perform SMS based modulo scheduling with register moves allowed +flimit-hot-components +Common Report Var(flag_limit_hot_components) Optimization Init(0) +Limit the size of hot components of the call graph to reduce I-cache pressure + fmove-loop-invariants Common Report Var(flag_move_loop_invariants) Init(1) Optimization Move loop invariant computations out of loops @@ -1013,6 +1037,12 @@ Common Joined RejectNegative Use sample profile information for branch probabilities. The sample file is specified in the argument. +fsample-profile-aggregate-using= +Common Joined RejectNegative +-fsample-profile-aggregate-using=[avg|max] Use the maximum or average +number of samples across all instructions in a basic block as the +basic block weight + fsched-interblock Common Report Var(flag_schedule_interblock) Init(1) Optimization Enable scheduling across basic blocks @@ -1264,6 +1294,11 @@ ftree-fre Common Report Var(flag_tree_fre) Optimization Enable Full Redundancy Elimination (FRE) on trees +ftree-lr-shrinking +Common Report Var(flag_tree_lr_shrinking) Optimization +Enable Live Range Shrinking optimization + + ftree-loop-distribution Common Report Var(flag_tree_loop_distribution) Optimization Enable loop distribution on trees @@ -1320,6 +1355,10 @@ ftree-vrp Common Report Var(flag_tree_vrp) Init(0) Optimization Perform Value Range Propagation on trees +fstrict-enum-precision +Common Report Var(flag_strict_enum_precision) Init(1) Optimization +Perform transformations based on enum precision + funit-at-a-time Common Report Var(flag_unit_at_a_time) Init(1) Optimization Compile whole compilation unit at a time @@ -1451,6 +1490,10 @@ ggdb Common JoinedOrMissing Generate debug information in default extended format +gmlt +Common RejectNegative +Generate debug information at level 1 with minimal line table + gstabs Common JoinedOrMissing Negative(gstabs+) Generate debug information in STABS format diff --git a/gcc-4.4.0/gcc/config.gcc b/gcc-4.4.0/gcc/config.gcc index 8e44b2064..46e1af6df 100644 --- a/gcc-4.4.0/gcc/config.gcc +++ b/gcc-4.4.0/gcc/config.gcc @@ -1138,6 +1138,9 @@ i[34567]86-*-linux* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-knetbsd*-gnu | i i[34567]86-*-gnu*) tm_file="$tm_file i386/linux.h gnu.h i386/gnu.h";; esac tmake_file="${tmake_file} i386/t-crtstuff i386/t-crtpc i386/t-crtfm t-dfprules" + if [ "$with_sysroot" = "/usr/grte/v1" ]; then + tm_file="${tm_file} linux-grtev1.h" + fi ;; x86_64-*-linux* | x86_64-*-kfreebsd*-gnu | x86_64-*-knetbsd*-gnu) tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h linux.h \ @@ -1147,6 +1150,9 @@ x86_64-*-linux* | x86_64-*-kfreebsd*-gnu | x86_64-*-knetbsd*-gnu) x86_64-*-knetbsd*-gnu) tm_file="${tm_file} knetbsd-gnu.h" ;; esac tmake_file="${tmake_file} i386/t-linux64 i386/t-crtstuff i386/t-crtpc i386/t-crtfm t-dfprules" + if [ "$with_sysroot" = "/usr/grte/v1" ]; then + tm_file="${tm_file} linux-grtev1.h" + fi ;; i[34567]86-pc-msdosdjgpp*) xm_file=i386/xm-djgpp.h diff --git a/gcc-4.4.0/gcc/config/arm/arm.c b/gcc-4.4.0/gcc/config/arm/arm.c index d0866963d..211db12db 100644 --- a/gcc-4.4.0/gcc/config/arm/arm.c +++ b/gcc-4.4.0/gcc/config/arm/arm.c @@ -126,6 +126,7 @@ static bool arm_function_ok_for_sibcall (tree, tree); static void arm_internal_label (FILE *, const char *, unsigned long); static void arm_output_mi_thunk (FILE *, tree, HOST_WIDE_INT, HOST_WIDE_INT, tree); +static bool arm_have_conditional_execution (void); static bool arm_rtx_costs_1 (rtx, enum rtx_code, int*, bool); static bool arm_size_rtx_costs (rtx, enum rtx_code, enum rtx_code, int *); static bool arm_slowmul_rtx_costs (rtx, enum rtx_code, enum rtx_code, int *, bool); @@ -368,6 +369,9 @@ static bool arm_allocate_stack_slots_for_args (void); #define TARGET_HAVE_TLS true #endif +#undef TARGET_HAVE_CONDITIONAL_EXECUTION +#define TARGET_HAVE_CONDITIONAL_EXECUTION arm_have_conditional_execution + #undef TARGET_CANNOT_FORCE_CONST_MEM #define TARGET_CANNOT_FORCE_CONST_MEM arm_cannot_force_const_mem @@ -5589,6 +5593,121 @@ arm_rtx_costs_1 (rtx x, enum rtx_code outer, int* total, bool speed) } } +/* Estimates the size cost of thumb1 instructions. + For now most of the code is copied from thumb1_rtx_costs. We need more + fine grain tuning when we have more related test cases. */ +static inline int +thumb1_size_rtx_costs (rtx x, enum rtx_code code, enum rtx_code outer) +{ + enum machine_mode mode = GET_MODE (x); + + switch (code) + { + case ASHIFT: + case ASHIFTRT: + case LSHIFTRT: + case ROTATERT: + case PLUS: + case MINUS: + case COMPARE: + case NEG: + case NOT: + return COSTS_N_INSNS (1); + + case MULT: + if (GET_CODE (XEXP (x, 1)) == CONST_INT) + { + /* Thumb1 mul instruction can't operate on const. We must Load it + into a register first. */ + int const_size = thumb1_size_rtx_costs (XEXP (x, 1), CONST_INT, SET); + return COSTS_N_INSNS (1) + const_size; + } + return COSTS_N_INSNS (1); + + case SET: + return (COSTS_N_INSNS (1) + + 4 * ((GET_CODE (SET_SRC (x)) == MEM) + + GET_CODE (SET_DEST (x)) == MEM)); + + case CONST_INT: + if (outer == SET) + { + if ((unsigned HOST_WIDE_INT) INTVAL (x) < 256) + return 0; + if (thumb_shiftable_const (INTVAL (x))) + return COSTS_N_INSNS (2); + return COSTS_N_INSNS (3); + } + else if ((outer == PLUS || outer == COMPARE) + && INTVAL (x) < 256 && INTVAL (x) > -256) + return 0; + else if ((outer == IOR || outer == XOR || outer == AND) + && INTVAL (x) < 256 && INTVAL (x) >= -256) + return COSTS_N_INSNS (1); + else if (outer == ASHIFT || outer == ASHIFTRT + || outer == LSHIFTRT) + return 0; + return COSTS_N_INSNS (2); + + case CONST: + case CONST_DOUBLE: + case LABEL_REF: + case SYMBOL_REF: + return COSTS_N_INSNS (3); + + case UDIV: + case UMOD: + case DIV: + case MOD: + return 100; + + case TRUNCATE: + return 99; + + case AND: + case XOR: + case IOR: + /* XXX guess. */ + return 8; + + case MEM: + /* XXX another guess. */ + /* Memory costs quite a lot for the first word, but subsequent words + load at the equivalent of a single insn each. */ + return (10 + 4 * ((GET_MODE_SIZE (mode) - 1) / UNITS_PER_WORD) + + ((GET_CODE (x) == SYMBOL_REF && CONSTANT_POOL_ADDRESS_P (x)) + ? 4 : 0)); + + case IF_THEN_ELSE: + /* XXX a guess. */ + if (GET_CODE (XEXP (x, 1)) == PC || GET_CODE (XEXP (x, 2)) == PC) + return 14; + return 2; + + case ZERO_EXTEND: + /* XXX still guessing. */ + switch (GET_MODE (XEXP (x, 0))) + { + case QImode: + return (1 + (mode == DImode ? 4 : 0) + + (GET_CODE (XEXP (x, 0)) == MEM ? 10 : 0)); + + case HImode: + return (4 + (mode == DImode ? 4 : 0) + + (GET_CODE (XEXP (x, 0)) == MEM ? 10 : 0)); + + case SImode: + return (1 + (GET_CODE (XEXP (x, 0)) == MEM ? 10 : 0)); + + default: + return 99; + } + + default: + return 99; + } +} + /* RTX costs when optimizing for size. */ static bool arm_size_rtx_costs (rtx x, enum rtx_code code, enum rtx_code outer_code, @@ -5597,8 +5716,7 @@ arm_size_rtx_costs (rtx x, enum rtx_code code, enum rtx_code outer_code, enum machine_mode mode = GET_MODE (x); if (TARGET_THUMB1) { - /* XXX TBD. For now, use the standard costs. */ - *total = thumb1_rtx_costs (x, code, outer_code); + *total = thumb1_size_rtx_costs (x, code, outer_code); return true; } @@ -19714,4 +19832,12 @@ arm_optimization_options (int level, int size ATTRIBUTE_UNUSED) flag_section_anchors = 2; } +/* Only thumb1 can't support conditional execution, so return true if + the target is not thumb1. */ +static bool +arm_have_conditional_execution (void) +{ + return !TARGET_THUMB1; +} + #include "gt-arm.h" diff --git a/gcc-4.4.0/gcc/config/arm/arm.md b/gcc-4.4.0/gcc/config/arm/arm.md index dfab0aa0a..4415ddfed 100644 --- a/gcc-4.4.0/gcc/config/arm/arm.md +++ b/gcc-4.4.0/gcc/config/arm/arm.md @@ -5833,7 +5833,7 @@ (define_split [(set (match_operand:SF 0 "arm_general_register_operand" "") (match_operand:SF 1 "immediate_operand" ""))] - "TARGET_32BIT + "TARGET_EITHER && reload_completed && GET_CODE (operands[1]) == CONST_DOUBLE" [(set (match_dup 2) (match_dup 3))] @@ -6485,6 +6485,7 @@ (const_int 6) (const_int 8))))] ) + (define_insn "*movsi_cbranchsi4" [(set (pc) (if_then_else @@ -6548,6 +6549,45 @@ (const_int 10)))))] ) +(define_peephole2 + [(set (match_operand:SI 0 "low_register_operand" "") + (match_operand:SI 1 "low_register_operand" "")) + (set (pc) + (if_then_else (match_operator 2 "arm_comparison_operator" + [(match_dup 1) (const_int 0)]) + (label_ref (match_operand 3 "" "")) + (pc)))] + "TARGET_THUMB1" + [(parallel + [(set (pc) + (if_then_else (match_op_dup 2 [(match_dup 1) (const_int 0)]) + (label_ref (match_dup 3)) + (pc))) + (set (match_dup 0) (match_dup 1))])] + "" +) + +;; Sigh! This variant shouldn't be needed, but combine often fails to +;; merge cases like this because the op1 is a hard register in +;; CLASS_LIKELY_SPILLED_P. +(define_peephole2 + [(set (match_operand:SI 0 "low_register_operand" "") + (match_operand:SI 1 "low_register_operand" "")) + (set (pc) + (if_then_else (match_operator 2 "arm_comparison_operator" + [(match_dup 0) (const_int 0)]) + (label_ref (match_operand 3 "" "")) + (pc)))] + "TARGET_THUMB1" + [(parallel + [(set (pc) + (if_then_else (match_op_dup 2 [(match_dup 1) (const_int 0)]) + (label_ref (match_dup 3)) + (pc))) + (set (match_dup 0) (match_dup 1))])] + "" +) + (define_insn "*negated_cbranchsi4" [(set (pc) (if_then_else diff --git a/gcc-4.4.0/gcc/config/i386/i386.c b/gcc-4.4.0/gcc/config/i386/i386.c index d42f6c345..9d9efb8f7 100644 --- a/gcc-4.4.0/gcc/config/i386/i386.c +++ b/gcc-4.4.0/gcc/config/i386/i386.c @@ -25491,7 +25491,7 @@ ix86_veclibabi_acml (enum built_in_function fn, tree type_out, tree type_in) static tree ix86_vectorize_builtin_conversion (unsigned int code, tree type) { - if (TREE_CODE (type) != VECTOR_TYPE) + if (!TARGET_SSE2 || TREE_CODE (type) != VECTOR_TYPE) return NULL_TREE; switch (code) diff --git a/gcc-4.4.0/gcc/config/i386/linux.h b/gcc-4.4.0/gcc/config/i386/linux.h index 9809c5988..6b8b3bec4 100644 --- a/gcc-4.4.0/gcc/config/i386/linux.h +++ b/gcc-4.4.0/gcc/config/i386/linux.h @@ -110,8 +110,14 @@ along with GCC; see the file COPYING3. If not see "%{v:-V} %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Yd,*} %{Wa,*:%*} \ %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}" +/* These may be provided by config/linux-grtev1.h. */ +#ifndef LINUX_GRTE_EXTRA_SPECS +#define LINUX_GRTE_EXTRA_SPECS +#endif + #undef SUBTARGET_EXTRA_SPECS #define SUBTARGET_EXTRA_SPECS \ + LINUX_GRTE_EXTRA_SPECS \ { "link_emulation", LINK_EMULATION },\ { "dynamic_linker", LINUX_DYNAMIC_LINKER } diff --git a/gcc-4.4.0/gcc/config/i386/linux64.h b/gcc-4.4.0/gcc/config/i386/linux64.h index 379e2c7d8..759b855dc 100644 --- a/gcc-4.4.0/gcc/config/i386/linux64.h +++ b/gcc-4.4.0/gcc/config/i386/linux64.h @@ -87,6 +87,15 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see %{" SPEC_64 ":%{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}} \ %{static:-static}}" +/* These may be provided by config/linux-grtev1.h. */ +#ifndef LINUX_GRTE_EXTRA_SPECS +#define LINUX_GRTE_EXTRA_SPECS +#endif + +#undef SUBTARGET_EXTRA_SPECS +#define SUBTARGET_EXTRA_SPECS \ + LINUX_GRTE_EXTRA_SPECS + /* Similar to standard Linux, but adding -ffast-math support. */ #undef ENDFILE_SPEC #define ENDFILE_SPEC \ diff --git a/gcc-4.4.0/gcc/config/linux-grtev1.h b/gcc-4.4.0/gcc/config/linux-grtev1.h new file mode 100644 index 000000000..4eb847041 --- /dev/null +++ b/gcc-4.4.0/gcc/config/linux-grtev1.h @@ -0,0 +1,43 @@ +/* Definitions for Linux-based GRTE (Google RunTime Environment) version 1. + Copyright (C) 2009 Free Software Foundation, Inc. + Contributed by Chris Demetriou. + +This file is part of GCC. + +GCC is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 3, or (at your option) +any later version. + +GCC is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +Under Section 7 of GPL version 3, you are granted additional +permissions described in the GCC Runtime Library Exception, version +3.1, as published by the Free Software Foundation. + +You should have received a copy of the GNU General Public License and +a copy of the GCC Runtime Library Exception along with this program; +see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +<http://www.gnu.org/licenses/>. */ + +/* Overrides LIB_SPEC from linux.h. */ +#undef LIB_SPEC +#define LIB_SPEC \ + "%{pthread:-lpthread} \ + %{shared:-lc} \ + %{!shared:%{mieee-fp:-lieee} %{profile:%(libc_p)}%{!profile:%(libc)}}" + +/* When GRTE links statically, it needs its NSS and resolver libraries + linked in as well. Note that when linking statically, these are + enclosed in a group by LINK_GCC_C_SEQUENCE_SPEC. */ +#undef LINUX_GRTE_EXTRA_SPECS +#define LINUX_GRTE_EXTRA_SPECS \ + { "libc", "%{static:%(libc_static);:-lc}" }, \ + { "libc_p", "%{static:%(libc_p_static);:-lc_p}" }, \ + { "libc_static", \ + "-lc -lnss_borg -lnss_cache -lnss_dns -lnss_files -lresolv" }, \ + { "libc_p_static", \ + "-lc_p -lnss_borg_p -lnss_cache_p -lnss_dns_p -lnss_files_p -lresolv_p" }, diff --git a/gcc-4.4.0/gcc/configure b/gcc-4.4.0/gcc/configure index 0610d3e71..299ff6915 100755 --- a/gcc-4.4.0/gcc/configure +++ b/gcc-4.4.0/gcc/configure @@ -16627,7 +16627,22 @@ fi; # Check whether --with-pic or --without-pic was given. if test "${with_pic+set}" = set; then withval="$with_pic" - pic_mode="$withval" + p=${PACKAGE-default} + case "$withval" in + yes|no) pic_mode="$withval" ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in "$withval"; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac else pic_mode=default fi; @@ -17051,11 +17066,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17054: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17069: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17058: \$? = $ac_status" >&5 + echo "$as_me:17073: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17390,11 +17405,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17393: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17408: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17397: \$? = $ac_status" >&5 + echo "$as_me:17412: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17495,11 +17510,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17498: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17513: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17502: \$? = $ac_status" >&5 + echo "$as_me:17517: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17550,11 +17565,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17553: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17568: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17557: \$? = $ac_status" >&5 + echo "$as_me:17572: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -20362,7 +20377,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 20365 "configure" +#line 20380 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -20458,7 +20473,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 20461 "configure" +#line 20476 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/gcc-4.4.0/gcc/convert.c b/gcc-4.4.0/gcc/convert.c index e98b6578d..6a2c817f0 100644 --- a/gcc-4.4.0/gcc/convert.c +++ b/gcc-4.4.0/gcc/convert.c @@ -740,10 +740,16 @@ convert_to_integer (tree type, tree expr) case COND_EXPR: /* It is sometimes worthwhile to push the narrowing down through - the conditional and never loses. */ + the conditional and never loses. A COND_EXPR may have a throw + as one operand, which then has void type. Just leave void + operands as they are. */ return fold_build3 (COND_EXPR, type, TREE_OPERAND (expr, 0), - convert (type, TREE_OPERAND (expr, 1)), - convert (type, TREE_OPERAND (expr, 2))); + VOID_TYPE_P (TREE_TYPE (TREE_OPERAND (expr, 1))) + ? TREE_OPERAND (expr, 1) + : convert (type, TREE_OPERAND (expr, 1)), + VOID_TYPE_P (TREE_TYPE (TREE_OPERAND (expr, 2))) + ? TREE_OPERAND (expr, 2) + : convert (type, TREE_OPERAND (expr, 2))); default: break; diff --git a/gcc-4.4.0/gcc/coverage.c b/gcc-4.4.0/gcc/coverage.c index 80c677d26..393246c84 100644 --- a/gcc-4.4.0/gcc/coverage.c +++ b/gcc-4.4.0/gcc/coverage.c @@ -151,7 +151,7 @@ static tree build_ctr_info_type (void); static tree build_ctr_info_value (unsigned, tree); static tree build_gcov_info (void); static void create_coverage (void); -static void get_da_file_name (const char *); +static char * get_da_file_name (const char *); static char * xstrdup_mask_random (const char *); /* Return the type node for gcov_type. */ @@ -232,6 +232,70 @@ is_last_module (unsigned mod_id) return (mod_id == module_infos[num_in_fnames - 1]->ident); } +/* Returns true if the command-line arguments stored in the given module-infos + are incompatible. */ +static bool +incompatible_cl_args (struct gcov_module_info* mod_info1, + struct gcov_module_info* mod_info2) +{ + char **warning_opts1 = XNEWVEC (char *, mod_info1->num_cl_args); + char **warning_opts2 = XNEWVEC (char *, mod_info2->num_cl_args); + char **non_warning_opts1 = XNEWVEC (char *, mod_info1->num_cl_args); + char **non_warning_opts2 = XNEWVEC (char *, mod_info2->num_cl_args); + unsigned int i, num_warning_opts1 = 0, num_warning_opts2 = 0; + unsigned int num_non_warning_opts1 = 0, num_non_warning_opts2 = 0; + bool warning_mismatch = false; + bool non_warning_mismatch = false; + unsigned int start_index1 = mod_info1->num_quote_paths + + mod_info1->num_bracket_paths + mod_info1->num_cpp_defines; + unsigned int start_index2 = mod_info2->num_quote_paths + + mod_info2->num_bracket_paths + mod_info2->num_cpp_defines; + + /* First, separate the warning and non-warning options. */ + for (i = 0; i < mod_info1->num_cl_args; i++) + if (mod_info1->string_array[start_index1 + i][1] == 'W') + warning_opts1[num_warning_opts1++] = + mod_info1->string_array[start_index1 + i]; + else + non_warning_opts1[num_non_warning_opts1++] = + mod_info1->string_array[start_index1 + i]; + + for (i = 0; i < mod_info2->num_cl_args; i++) + if (mod_info2->string_array[start_index2 + i][1] == 'W') + warning_opts2[num_warning_opts2++] = + mod_info2->string_array[start_index2 + i]; + else + non_warning_opts2[num_non_warning_opts2++] = + mod_info2->string_array[start_index2 + i]; + + /* Compare warning options. If these mismatch, we emit a warning. */ + if (num_warning_opts1 != num_warning_opts2) + warning_mismatch = true; + else + for (i = 0; i < num_warning_opts1 && !warning_mismatch; i++) + warning_mismatch = strcmp (warning_opts1[i], warning_opts2[i]) != 0; + + /* Compare non-warning options. If these mismatch, we emit a warning, and if + -fripa-disallow-opt-mismatch is supplied, the two modules are also + incompatible. */ + if (num_non_warning_opts1 != num_non_warning_opts2) + non_warning_mismatch = true; + else + for (i = 0; i < num_non_warning_opts1 && !non_warning_mismatch; i++) + non_warning_mismatch = + strcmp (non_warning_opts1[i], non_warning_opts2[i]) != 0; + + if (warn_ripa_opt_mismatch && (warning_mismatch || non_warning_mismatch)) + warning (OPT_Wripa_opt_mismatch, "command line arguments mismatch for %s " + "and %s", mod_info1->source_filename, mod_info2->source_filename); + + XDELETEVEC (warning_opts1); + XDELETEVEC (warning_opts2); + XDELETEVEC (non_warning_opts1); + XDELETEVEC (non_warning_opts2); + return flag_ripa_disallow_opt_mismatch && non_warning_mismatch; +} + /* Read in the counts file, if available. DA_FILE_NAME is the name of the gcda file, and MODULE_ID is the module id of the associated source module. */ @@ -239,6 +303,7 @@ is_last_module (unsigned mod_id) static void read_counts_file (const char *da_file_name, unsigned module_id) { + static int warned = 0; gcov_unsigned_t fn_ident = 0; char *name = NULL; counts_entry_t *summaried = NULL; @@ -255,15 +320,29 @@ read_counts_file (const char *da_file_name, unsigned module_id) if (!gcov_open (da_file_name, 1)) { + bool gcda_found = false; + if (PARAM_VALUE (PARAM_GCOV_DEBUG)) { /* Try to find .gcda file in the current working dir. */ da_file_name = lbasename (da_file_name); - if (!gcov_open (da_file_name, 1)) - return; + if (gcov_open (da_file_name, 1)) + { + gcda_found = true; + } } - else - return; + if (!gcda_found) + { + if (!warned) + { + warned = 1; + inform (input_location, + "file %s not found, disabling profile use", + da_file_name); + } + set_profile_use (false, false, true); + return; + } } if (!gcov_magic (gcov_read_unsigned (), GCOV_DATA_MAGIC)) @@ -425,16 +504,16 @@ read_counts_file (const char *da_file_name, unsigned module_id) = (struct gcov_module_info *) alloca ((length + 2) * sizeof (gcov_unsigned_t)); gcov_read_module_info (mod_info, length); - module_infos_read++; - info_sz = (sizeof (struct gcov_module_info) + sizeof (void *) * (mod_info->num_quote_paths + mod_info->num_bracket_paths + - mod_info->num_cpp_defines)); + mod_info->num_cpp_defines + + mod_info->num_cl_args)); /* The first MODULE_INFO record must be for the primary module. */ - if (module_infos_read == 1) + if (module_infos_read == 0) { gcc_assert (mod_info->is_primary && !modset); + module_infos_read++; modset = pointer_set_create (); pointer_set_insert (modset, (void *)(size_t)mod_info->ident); primary_module_id = mod_info->ident; @@ -444,34 +523,50 @@ read_counts_file (const char *da_file_name, unsigned module_id) } else { + int fd; + char *aux_da_filename = get_da_file_name (mod_info->da_filename); gcc_assert (!mod_info->is_primary); - if (!pointer_set_insert (modset, (void *)(size_t)mod_info->ident) - /* Forbid mixed language LIPO for now. */ - && module_infos[0]->lang == mod_info->lang - /* Debugging support. */ - && module_infos_read <= max_group) + if (pointer_set_insert (modset, (void *)(size_t)mod_info->ident)) + inform (input_location, "Not importing %s: already imported", + mod_info->source_filename); + else if (module_infos[0]->lang != mod_info->lang) + inform (input_location, "Not importing %s: source language" + " different from primary module's source language", + mod_info->source_filename); + else if (module_infos_read == max_group) + inform (input_location, "Not importing %s: maximum group size" + " reached", mod_info->source_filename); + else if (incompatible_cl_args (module_infos[0], mod_info)) + inform (input_location, "Not importing %s: command-line" + " arguments not compatible with primary module", + mod_info->source_filename); + else if ((fd = open (aux_da_filename, O_RDONLY)) < 0) + inform (input_location, "Not importing %s: couldn't open %s", + mod_info->source_filename, aux_da_filename); + else { + close (fd); + module_infos_read++; add_input_filename (mod_info->source_filename); - module_infos = XRESIZEVEC (struct gcov_module_info *, module_infos, - num_in_fnames); - gcc_assert (num_in_fnames == module_infos_read); - module_infos[module_infos_read - 1] - = XCNEWVAR (struct gcov_module_info, info_sz); - memcpy (module_infos[module_infos_read - 1], mod_info, info_sz); + module_infos = XRESIZEVEC (struct gcov_module_info *, + module_infos, num_in_fnames); + gcc_assert (num_in_fnames == module_infos_read); + module_infos[module_infos_read - 1] + = XCNEWVAR (struct gcov_module_info, info_sz); + memcpy (module_infos[module_infos_read - 1], mod_info, + info_sz); } - else - module_infos_read--; } - /* Debugging */ - { - fprintf (stderr, - "MODULE Id=%d, Is_Primary=%s," - " Is_Exported=%s, Name=%s (%s)\n", - mod_info->ident, mod_info->is_primary?"yes":"no", - mod_info->is_exported?"yes":"no", mod_info->source_filename, - mod_info->da_filename); - } + if (flag_ripa_verbose) + { + inform (input_location, + "MODULE Id=%d, Is_Primary=%s," + " Is_Exported=%s, Name=%s (%s)", + mod_info->ident, mod_info->is_primary?"yes":"no", + mod_info->is_exported?"yes":"no", mod_info->source_filename, + mod_info->da_filename); + } } gcov_sync (offset, length); if ((is_error = gcov_is_error ())) @@ -514,7 +609,7 @@ get_coverage_counts_entry (struct function *func, elt.name = xstrdup_mask_random (IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (current_function_decl))); entry = (counts_entry_t *) htab_find (counts_hash, &elt); - if (entry) + if (entry) return entry; if (!L_IPO_COMP_MODE) @@ -575,8 +670,9 @@ get_coverage_counts (unsigned counter, unsigned expected, unsigned cfg_checksum, if (!entry) { - warning (0, "no coverage for function %qs found", IDENTIFIER_POINTER - (DECL_ASSEMBLER_NAME (current_function_decl))); + if (!flag_dyn_ipa) + warning (0, "no coverage for function %qs found", IDENTIFIER_POINTER + (DECL_ASSEMBLER_NAME (current_function_decl))); return NULL; } @@ -1292,6 +1388,29 @@ build_cpp_def_array_value (tree string_type, tree cpp_def_value, return cpp_def_value; } +/* Returns an array (tree) of command-line argument strings. STRING_TYPE is + the string type, CL_ARGS_VALUE is the initial value of the command-line + args array. */ + +static tree +build_cl_args_array_value (tree string_type, tree cl_args_value) +{ + unsigned int i; + for (i = 0; i < num_lipo_cl_args; i++) + { + int arg_length = strlen (lipo_cl_args[i]); + tree arg_string = build_string (arg_length + 1, lipo_cl_args[i]); + TREE_TYPE (arg_string) = + build_array_type (char_type_node, + build_index_type (build_int_cst (NULL_TREE, + arg_length))); + cl_args_value = tree_cons (NULL_TREE, + build1 (ADDR_EXPR, string_type, arg_string), + cl_args_value); + } + return cl_args_value; +} + /* Returns the value of the module info associated with the current source module being compiled. */ @@ -1408,11 +1527,19 @@ build_gcov_module_info_value (void) value = tree_cons (field, build_int_cstu (get_gcov_unsigned_t (), num_cpp_defines), value); + /* Num command-line args. */ + field = build_decl (FIELD_DECL, NULL_TREE, get_gcov_unsigned_t ()); + TREE_CHAIN (field) = fields; + fields = field; + value = tree_cons (field, build_int_cstu (get_gcov_unsigned_t (), + num_lipo_cl_args), value); + /* string array */ index_type = build_index_type (build_int_cst (NULL_TREE, num_quote_paths + num_bracket_paths + - num_cpp_defines)); + num_cpp_defines + + num_lipo_cl_args)); string_array_type = build_array_type (string_type, index_type); string_array = build_inc_path_array_value (string_type, string_array, quote_paths, num_quote_paths); @@ -1420,6 +1547,7 @@ build_gcov_module_info_value (void) bracket_paths, num_bracket_paths); string_array = build_cpp_def_array_value (string_type, string_array, cpp_defines_head); + string_array = build_cl_args_array_value (string_type, string_array); string_array = build_constructor_from_list (string_array_type, nreverse (string_array)); field = build_decl (FIELD_DECL, NULL_TREE, string_array_type); @@ -1645,9 +1773,10 @@ create_coverage (void) /* Get the da file name, given base file name. */ -void +static char * get_da_file_name (const char *base_file_name) { + char *da_file_name; int len = strlen (base_file_name); const char *prefix = profile_data_prefix; /* + 1 for extra '/', in case prefix doesn't end with /. */ @@ -1661,7 +1790,6 @@ get_da_file_name (const char *base_file_name) /* Name of da file. */ da_file_name = XNEWVEC (char, len + strlen (GCOV_DATA_SUFFIX) + prefix_len + 1); - da_base_file_name = XNEWVEC (char, len + 1); if (prefix) { @@ -1673,7 +1801,7 @@ get_da_file_name (const char *base_file_name) da_file_name[0] = 0; strcat (da_file_name, base_file_name); strcat (da_file_name, GCOV_DATA_SUFFIX); - strcpy (da_base_file_name, base_file_name); + return da_file_name; } /* Rebuild counts_hash already built the primary module. This hashtable @@ -1785,7 +1913,9 @@ coverage_init (const char *filename, const char* source_name) int src_name_prefix_len = 0; int len = strlen (filename); - get_da_file_name (filename); + da_file_name = get_da_file_name (filename); + da_base_file_name = XNEWVEC (char, strlen (filename) + 1); + strcpy (da_base_file_name, filename); /* Name of bbg file. */ bbg_file_name = XNEWVEC (char, len + strlen (GCOV_NOTE_SUFFIX) + 1); @@ -1795,7 +1925,8 @@ coverage_init (const char *filename, const char* source_name) if (profile_data_prefix == 0 && !IS_ABSOLUTE_PATH (source_name)) { src_name_prefix = getpwd (); - src_name_prefix_len = strlen (src_name_prefix) + 1; + if (src_name_prefix) + src_name_prefix_len = strlen (src_name_prefix) + 1; } main_input_file_name = XNEWVEC (char, strlen (source_name) + 1 + src_name_prefix_len); @@ -1815,17 +1946,11 @@ coverage_init (const char *filename, const char* source_name) if (flag_profile_use && L_IPO_COMP_MODE) { unsigned i; - char *da_file_name_p = da_file_name; - char *da_base_file_name_p = da_base_file_name; gcc_assert (flag_dyn_ipa); rebuild_counts_hash (); for (i = 1; i < num_in_fnames; i++) - { - get_da_file_name (module_infos[i]->da_filename); - read_counts_file (da_file_name, module_infos[i]->ident); - } - da_file_name = da_file_name_p; - da_base_file_name = da_base_file_name_p; + read_counts_file (get_da_file_name (module_infos[i]->da_filename), + module_infos[i]->ident); } } diff --git a/gcc-4.4.0/gcc/cp/cp-objcp-common.c b/gcc-4.4.0/gcc/cp/cp-objcp-common.c index 157a18ea2..8d5acd91c 100644 --- a/gcc-4.4.0/gcc/cp/cp-objcp-common.c +++ b/gcc-4.4.0/gcc/cp/cp-objcp-common.c @@ -623,13 +623,13 @@ cp_save_built_in_decl_post_parsing (void) saved_builtins, i, bi); ++i) { if (!TREE_STATIC (bi->decl) || DECL_ARTIFICIAL (bi->decl)) - continue; + continue; /* Remember the defining module. */ cgraph_link_node (cgraph_node (bi->decl)); if (!bi->decl_fini_copy) bi->decl_fini_copy = lipo_save_decl (bi->decl); else - gcc_assert (TREE_STATIC (bi->decl_fini_copy)); + gcc_assert (TREE_STATIC (bi->decl_fini_copy)); } } diff --git a/gcc-4.4.0/gcc/cp/decl.c b/gcc-4.4.0/gcc/cp/decl.c index dc67a9aa9..2c4b9eb11 100644 --- a/gcc-4.4.0/gcc/cp/decl.c +++ b/gcc-4.4.0/gcc/cp/decl.c @@ -7632,7 +7632,6 @@ grokdeclarator (const cp_declarator *declarator, bool unsigned_p, signed_p, short_p, long_p, thread_p; bool type_was_error_mark_node = false; bool parameter_pack_p = declarator? declarator->parameter_pack_p : false; - bool set_no_warning = false; bool template_type_arg = false; signed_p = declspecs->specs[(int)ds_signed]; @@ -8311,7 +8310,6 @@ grokdeclarator (const cp_declarator *declarator, /* We now know that the TYPE_QUALS don't apply to the decl, but to its return type. */ type_quals = TYPE_UNQUALIFIED; - set_no_warning = true; } /* Error about some types functions can't return. */ @@ -8855,8 +8853,13 @@ grokdeclarator (const cp_declarator *declarator, /* Replace the anonymous name with the real name everywhere. */ for (t = TYPE_MAIN_VARIANT (type); t; t = TYPE_NEXT_VARIANT (t)) - if (TYPE_NAME (t) == oldname) - TYPE_NAME (t) = decl; + { + if (ANON_AGGRNAME_P (TYPE_IDENTIFIER (t))) + { + debug_hooks->set_name (t, decl); + TYPE_NAME (t) = decl; + } + } if (TYPE_LANG_SPECIFIC (type)) TYPE_WAS_ANONYMOUS (type) = 1; @@ -9513,9 +9516,6 @@ grokdeclarator (const cp_declarator *declarator, if (!processing_template_decl) cp_apply_type_quals_to_decl (type_quals, decl); - if (set_no_warning) - TREE_NO_WARNING (decl) = 1; - return decl; } } diff --git a/gcc-4.4.0/gcc/cp/decl2.c b/gcc-4.4.0/gcc/cp/decl2.c index b895dfcd8..551e17f54 100644 --- a/gcc-4.4.0/gcc/cp/decl2.c +++ b/gcc-4.4.0/gcc/cp/decl2.c @@ -3294,7 +3294,8 @@ cxx_callgraph_analyze_expr (tree *tp, int *walk_subtrees ATTRIBUTE_UNUSED) mark_decl_referenced (vtbl); } else if (DECL_CONTEXT (t) - && TREE_CODE (DECL_CONTEXT (t)) == FUNCTION_DECL) + && TREE_CODE (DECL_CONTEXT (t)) == FUNCTION_DECL + && !cgraph_is_auxiliary (DECL_CONTEXT (t))) /* If we need a static variable in a function, then we need the containing function. */ mark_decl_referenced (DECL_CONTEXT (t)); diff --git a/gcc-4.4.0/gcc/cp/error.c b/gcc-4.4.0/gcc/cp/error.c index fa43d8835..403dd62e4 100644 --- a/gcc-4.4.0/gcc/cp/error.c +++ b/gcc-4.4.0/gcc/cp/error.c @@ -1090,6 +1090,7 @@ dump_function_decl (tree t, int flags) int show_return = flags & TFF_RETURN_TYPE || flags & TFF_DECL_SPECIFIERS; int do_outer_scope = ! (flags & TFF_UNQUALIFIED_NAME); tree exceptions; + tree orig_decl = t; flags &= ~TFF_UNQUALIFIED_NAME; if (TREE_CODE (t) == TEMPLATE_DECL) @@ -1180,6 +1181,24 @@ dump_function_decl (tree t, int flags) dump_template_bindings (template_parms, template_args); pp_cxx_right_bracket (cxx_pp); } + + /* Uniquely name the different types of constructors and + destructors. The "complete" ctor/dtor type remains undecorated + as these are used in error messages. Use the original decl, + ORIG_DECL, because T could have been set to the generalized + template decl above which drops the ctor/dtor type. */ + if (DECL_DESTRUCTOR_P (orig_decl)) + { + if (DECL_DELETING_DESTRUCTOR_P (orig_decl)) + pp_string (cxx_pp, " (deleting destructor)"); + else if (DECL_BASE_DESTRUCTOR_P (orig_decl)) + pp_string (cxx_pp, " (base destructor)"); + } + else if (DECL_CONSTRUCTOR_P (orig_decl)) + { + if (DECL_BASE_CONSTRUCTOR_P (orig_decl)) + pp_string (cxx_pp, " (base constructor)"); + } } /* Print a parameter list. If this is for a member function, the diff --git a/gcc-4.4.0/gcc/cp/optimize.c b/gcc-4.4.0/gcc/cp/optimize.c index 8c7b9e82c..3a971abc9 100644 --- a/gcc-4.4.0/gcc/cp/optimize.c +++ b/gcc-4.4.0/gcc/cp/optimize.c @@ -1,5 +1,5 @@ /* Perform optimizations on tree structure. - Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2007, 2008 + Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2007, 2008, 2009 Free Software Foundation, Inc. Written by Mark Michell (mark@codesourcery.com). @@ -108,6 +108,43 @@ clone_body (tree clone, tree fn, void *arg_map) gimple_set_body (clone, new_body); } +/* DELETE_DTOR is a delete destructor whose body will be built. + COMPLETE_DTOR is the corresponding complete destructor. */ + +static void +build_delete_destructor_body (tree delete_dtor, tree complete_dtor) +{ + tree call_dtor, call_delete; + tree parm = DECL_ARGUMENTS (delete_dtor); + tree virtual_size = cxx_sizeof (current_class_type); + + DECL_SAVED_TREE (delete_dtor) = push_stmt_list (); + + /* Call the corresponding complete destructor. */ + gcc_assert (complete_dtor); + call_dtor = build_cxx_call (complete_dtor, 1, &parm); + add_stmt (call_dtor); + + add_stmt (build_stmt (LABEL_EXPR, cdtor_label)); + + /* Call the delete function. */ + call_delete = build_op_delete_call (DELETE_EXPR, current_class_ptr, + virtual_size, + /*global_p=*/false, + /*placement=*/NULL_TREE, + /*alloc_fn=*/NULL_TREE); + add_stmt (call_delete); + + /* Return the address of the object. */ + if (targetm.cxx.cdtor_returns_this ()) + { + tree val = DECL_ARGUMENTS (delete_dtor); + val = build2 (MODIFY_EXPR, TREE_TYPE (val), + DECL_RESULT (delete_dtor), val); + add_stmt (build_stmt (RETURN_EXPR, val)); + } +} + /* FN is a function that has a complete body. Clone the body as necessary. Returns nonzero if there's no longer any need to process the main body. */ @@ -116,6 +153,7 @@ bool maybe_clone_body (tree fn) { tree clone; + tree complete_dtor = NULL_TREE; bool first = true; /* We only clone constructors and destructors. */ @@ -126,6 +164,15 @@ maybe_clone_body (tree fn) /* Emit the DWARF1 abstract instance. */ (*debug_hooks->deferred_inline_function) (fn); + /* Look for the complete destructor which may be used to build the + delete destructor. */ + FOR_EACH_CLONE (clone, fn) + if (DECL_NAME (clone) == complete_dtor_identifier) + { + complete_dtor = clone; + break; + } + /* We know that any clones immediately follow FN in the TYPE_METHODS list. */ push_to_top_level (); @@ -173,58 +220,66 @@ maybe_clone_body (tree fn) /* Start processing the function. */ start_preparsed_function (clone, NULL_TREE, SF_PRE_PARSED); - /* Remap the parameters. */ - decl_map = pointer_map_create (); - for (parmno = 0, - parm = DECL_ARGUMENTS (fn), - clone_parm = DECL_ARGUMENTS (clone); - parm; - ++parmno, - parm = TREE_CHAIN (parm)) - { - /* Map the in-charge parameter to an appropriate constant. */ - if (DECL_HAS_IN_CHARGE_PARM_P (fn) && parmno == 1) - { - tree in_charge; - in_charge = in_charge_arg_for_name (DECL_NAME (clone)); - *pointer_map_insert (decl_map, parm) = in_charge; - } - else if (DECL_ARTIFICIAL (parm) - && DECL_NAME (parm) == vtt_parm_identifier) - { - /* For a subobject constructor or destructor, the next - argument is the VTT parameter. Remap the VTT_PARM - from the CLONE to this parameter. */ - if (DECL_HAS_VTT_PARM_P (clone)) - { - DECL_ABSTRACT_ORIGIN (clone_parm) = parm; - *pointer_map_insert (decl_map, parm) = clone_parm; - clone_parm = TREE_CHAIN (clone_parm); - } - /* Otherwise, map the VTT parameter to `NULL'. */ - else - *pointer_map_insert (decl_map, parm) = null_pointer_node; - } - /* Map other parameters to their equivalents in the cloned - function. */ - else - { - *pointer_map_insert (decl_map, parm) = clone_parm; - clone_parm = TREE_CHAIN (clone_parm); - } - } - - if (targetm.cxx.cdtor_returns_this ()) - { - parm = DECL_RESULT (fn); - clone_parm = DECL_RESULT (clone); - *pointer_map_insert (decl_map, parm) = clone_parm; - } - /* Clone the body. */ - clone_body (clone, fn, decl_map); - - /* Clean up. */ - pointer_map_destroy (decl_map); + /* Build the delete destructor by calling complete destructor + and delete function. */ + if (DECL_NAME (clone) == deleting_dtor_identifier) + build_delete_destructor_body (clone, complete_dtor); + else + { + /* Remap the parameters. */ + decl_map = pointer_map_create (); + for (parmno = 0, + parm = DECL_ARGUMENTS (fn), + clone_parm = DECL_ARGUMENTS (clone); + parm; + ++parmno, + parm = TREE_CHAIN (parm)) + { + /* Map the in-charge parameter to an appropriate constant. */ + if (DECL_HAS_IN_CHARGE_PARM_P (fn) && parmno == 1) + { + tree in_charge; + in_charge = in_charge_arg_for_name (DECL_NAME (clone)); + *pointer_map_insert (decl_map, parm) = in_charge; + } + else if (DECL_ARTIFICIAL (parm) + && DECL_NAME (parm) == vtt_parm_identifier) + { + /* For a subobject constructor or destructor, the next + argument is the VTT parameter. Remap the VTT_PARM + from the CLONE to this parameter. */ + if (DECL_HAS_VTT_PARM_P (clone)) + { + DECL_ABSTRACT_ORIGIN (clone_parm) = parm; + *pointer_map_insert (decl_map, parm) = clone_parm; + clone_parm = TREE_CHAIN (clone_parm); + } + /* Otherwise, map the VTT parameter to `NULL'. */ + else + *pointer_map_insert (decl_map, parm) = null_pointer_node; + } + /* Map other parameters to their equivalents in the cloned + function. */ + else + { + *pointer_map_insert (decl_map, parm) = clone_parm; + clone_parm = TREE_CHAIN (clone_parm); + } + } + + if (targetm.cxx.cdtor_returns_this ()) + { + parm = DECL_RESULT (fn); + clone_parm = DECL_RESULT (clone); + *pointer_map_insert (decl_map, parm) = clone_parm; + } + + /* Clone the body. */ + clone_body (clone, fn, decl_map); + + /* Clean up. */ + pointer_map_destroy (decl_map); + } /* The clone can throw iff the original function can throw. */ cp_function_chain->can_throw = !TREE_NOTHROW (fn); @@ -232,6 +287,12 @@ maybe_clone_body (tree fn) /* Now, expand this function into RTL, if appropriate. */ finish_function (0); BLOCK_ABSTRACT_ORIGIN (DECL_INITIAL (clone)) = DECL_INITIAL (fn); + + /* Gimplify the new built deleting destructor. Gcc 4.5 doesn't need + this since the gimplification occurs in a later pass. */ + if (DECL_NAME (clone) == deleting_dtor_identifier) + gimplify_function_tree (clone); + DECL_SAVED_TREE (clone) = NULL; expand_or_defer_fn (clone); first = false; diff --git a/gcc-4.4.0/gcc/cp/typeck.c b/gcc-4.4.0/gcc/cp/typeck.c index 76d6d5d8c..ffcbe42d0 100644 --- a/gcc-4.4.0/gcc/cp/typeck.c +++ b/gcc-4.4.0/gcc/cp/typeck.c @@ -3578,6 +3578,45 @@ cp_build_binary_op (location_t location, case EQ_EXPR: case NE_EXPR: + if (TYPE_PTRMEMFUNC_P (type0) && TYPE_PTRMEMFUNC_P (type1)) + { + tree pfn0, pfn1; + pfn0 = pfn_from_ptrmemfunc (op0); + pfn1 = pfn_from_ptrmemfunc (op1); + if (TREE_CODE (pfn0) == ADDR_EXPR + && TREE_CODE (TREE_OPERAND (pfn0, 0)) == FUNCTION_DECL) + warning_at (location, + OPT_Wicf, + "Method pointer used in comparison : %qD", + TREE_OPERAND (pfn0, 0)); + if (TREE_CODE (pfn1) == ADDR_EXPR + && TREE_CODE (TREE_OPERAND (pfn1, 0)) == FUNCTION_DECL) + warning_at (location, + OPT_Wicf, + "Method pointer used in comparison : %qD", + TREE_OPERAND (pfn1, 0)); + } + else if (code0 == POINTER_TYPE && code1 == POINTER_TYPE) + { + tree tt0 = TREE_TYPE (type0); + tree tt1 = TREE_TYPE (type1); + /* FUNCTION_TYPE check is made here because this warning should not + * be printed for METHOD_TYPE which is handled above. */ + if (TREE_CODE (op0) == ADDR_EXPR + && TREE_CODE (tt0) == FUNCTION_TYPE + && TREE_CODE (TREE_OPERAND (op0, 0)) == FUNCTION_DECL) + warning_at (location, + OPT_Wicf, + "Function pointer used in comparison : %qD", + TREE_OPERAND (op0, 0)); + if (TREE_CODE (op1) == ADDR_EXPR + && TREE_CODE (tt1) == FUNCTION_TYPE + && TREE_CODE (TREE_OPERAND (op1, 0)) == FUNCTION_DECL) + warning_at (location, + OPT_Wicf, + "Function pointer used in comparison : %qD", + TREE_OPERAND (op1, 0)); + } if ((complain & tf_warning) && (FLOAT_TYPE_P (type0) || FLOAT_TYPE_P (type1))) warning (OPT_Wfloat_equal, diff --git a/gcc-4.4.0/gcc/cse.c b/gcc-4.4.0/gcc/cse.c index 04f52fb7d..c16181e37 100644 --- a/gcc-4.4.0/gcc/cse.c +++ b/gcc-4.4.0/gcc/cse.c @@ -1,6 +1,6 @@ /* Common subexpression elimination for GNU compiler. Copyright (C) 1987, 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998 - 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 + 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. This file is part of GCC. @@ -1658,7 +1658,7 @@ check_dependence (rtx *x, void *data) { struct check_dependence_data *d = (struct check_dependence_data *) data; if (*x && MEM_P (*x)) - return canon_true_dependence (d->exp, d->mode, d->addr, *x, + return canon_true_dependence (d->exp, d->mode, d->addr, *x, NULL_RTX, cse_rtx_varies_p); else return 0; diff --git a/gcc-4.4.0/gcc/cselib.c b/gcc-4.4.0/gcc/cselib.c index 945a4a118..b040231de 100644 --- a/gcc-4.4.0/gcc/cselib.c +++ b/gcc-4.4.0/gcc/cselib.c @@ -1,6 +1,6 @@ /* Common subexpression elimination library for GNU compiler. Copyright (C) 1987, 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007, 2008 + 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. This file is part of GCC. @@ -1483,7 +1483,7 @@ cselib_invalidate_mem (rtx mem_rtx) } if (num_mems < PARAM_VALUE (PARAM_MAX_CSELIB_MEMORY_LOCATIONS) && ! canon_true_dependence (mem_rtx, GET_MODE (mem_rtx), mem_addr, - x, cselib_rtx_varies_p)) + x, NULL_RTX, cselib_rtx_varies_p)) { has_mem = true; num_mems++; diff --git a/gcc-4.4.0/gcc/dbxout.c b/gcc-4.4.0/gcc/dbxout.c index 75930434b..da2fdc9ac 100644 --- a/gcc-4.4.0/gcc/dbxout.c +++ b/gcc-4.4.0/gcc/dbxout.c @@ -376,6 +376,10 @@ const struct gcc_debug_hooks dbx_debug_hooks = dbxout_handle_pch, /* handle_pch */ debug_nothing_rtx, /* var_location */ debug_nothing_void, /* switch_text_section */ + debug_nothing_tree, /* direct_call */ + debug_nothing_tree_int, /* virtual_call_token */ + debug_nothing_uid, /* virtual_call */ + debug_nothing_tree_tree, /* set_name */ 0 /* start_end_main_source_file */ }; #endif /* DBX_DEBUGGING_INFO */ @@ -408,6 +412,10 @@ const struct gcc_debug_hooks xcoff_debug_hooks = dbxout_handle_pch, /* handle_pch */ debug_nothing_rtx, /* var_location */ debug_nothing_void, /* switch_text_section */ + debug_nothing_tree, /* direct_call */ + debug_nothing_tree_int, /* virtual_call_token */ + debug_nothing_uid, /* virtual_call */ + debug_nothing_tree_tree, /* set_name */ 0 /* start_end_main_source_file */ }; #endif /* XCOFF_DEBUGGING_INFO */ diff --git a/gcc-4.4.0/gcc/debug.c b/gcc-4.4.0/gcc/debug.c index 790d4703a..8035c43ca 100644 --- a/gcc-4.4.0/gcc/debug.c +++ b/gcc-4.4.0/gcc/debug.c @@ -50,6 +50,10 @@ const struct gcc_debug_hooks do_nothing_debug_hooks = debug_nothing_int, /* handle_pch */ debug_nothing_rtx, /* var_location */ debug_nothing_void, /* switch_text_section */ + debug_nothing_tree, /* direct_call */ + debug_nothing_tree_int, /* virtual_call_token */ + debug_nothing_uid, /* virtual_call */ + debug_nothing_tree_tree, /* set_name */ 0 /* start_end_main_source_file */ }; @@ -67,6 +71,12 @@ debug_nothing_tree (tree decl ATTRIBUTE_UNUSED) } void +debug_nothing_tree_tree (tree t1 ATTRIBUTE_UNUSED, + tree t2 ATTRIBUTE_UNUSED) +{ +} + +void debug_nothing_tree_tree_tree_bool (tree t1 ATTRIBUTE_UNUSED, tree t2 ATTRIBUTE_UNUSED, tree t3 ATTRIBUTE_UNUSED, @@ -120,3 +130,8 @@ debug_nothing_tree_int (tree decl ATTRIBUTE_UNUSED, int local ATTRIBUTE_UNUSED) { } + +void +debug_nothing_uid (int uid ATTRIBUTE_UNUSED) +{ +} diff --git a/gcc-4.4.0/gcc/debug.h b/gcc-4.4.0/gcc/debug.h index 66df0e81a..f5cff7d22 100644 --- a/gcc-4.4.0/gcc/debug.h +++ b/gcc-4.4.0/gcc/debug.h @@ -126,6 +126,27 @@ struct gcc_debug_hooks text sections. */ void (* switch_text_section) (void); + /* Records a direct call to the function DECL, noting the point of call + and the debug info for the function. Called from final_scan_insn + when ICF debugging is enabled. */ + void (* direct_call) (tree decl); + + /* Records the OBJ_TYPE_REF_TOKEN for a virtual call through ADDR, which + for C++ is the vtable slot index, noting the INSN_UID for the call + instruction. Called from calls.c:emit_call_1 when ICF debugging is + enabled. It's necessary to do this during lowering because the + call instruction and the OBJ_TYPE_REF become separated after that + point. */ + void (* virtual_call_token) (tree addr, int insn_uid); + + /* Records a virtual call given INSN_UID, which is the UID of the call + instruction. The UID is then mapped to the vtable slot index noted + during the lowering phase. Called from final_scan_insn when ICF + debugging is enabled. */ + void (* virtual_call) (int insn_uid); + + void (* set_name) (tree, tree); + /* This is 1 if the debug writer wants to see start and end commands for the main source files, and 0 otherwise. */ int start_end_main_source_file; @@ -142,10 +163,12 @@ extern void debug_nothing_int_charstar_int_bool (unsigned int, const char *, extern void debug_nothing_int (unsigned int); extern void debug_nothing_int_int (unsigned int, unsigned int); extern void debug_nothing_tree (tree); +extern void debug_nothing_tree_tree (tree, tree); extern void debug_nothing_tree_int (tree, int); extern void debug_nothing_tree_tree_tree_bool (tree, tree, tree, bool); extern bool debug_true_const_tree (const_tree); extern void debug_nothing_rtx (rtx); +extern void debug_nothing_uid (int); /* Hooks for various debug formats. */ extern const struct gcc_debug_hooks do_nothing_debug_hooks; diff --git a/gcc-4.4.0/gcc/doc/cpp.texi b/gcc-4.4.0/gcc/doc/cpp.texi index 0eaece14d..edc9fc490 100644 --- a/gcc-4.4.0/gcc/doc/cpp.texi +++ b/gcc-4.4.0/gcc/doc/cpp.texi @@ -3508,8 +3508,6 @@ These directives are not part of the C standard, but they are not official GNU extensions either. What historical information we have been able to find, suggests they originated with System V@. -Both @samp{#ident} and @samp{#sccs} are deprecated extensions. - @cindex null directive The @dfn{null directive} consists of a @samp{#} followed by a newline, with only whitespace (including comments) in between. A null directive diff --git a/gcc-4.4.0/gcc/doc/install.texi b/gcc-4.4.0/gcc/doc/install.texi index 92ef8feb9..814254df1 100644 --- a/gcc-4.4.0/gcc/doc/install.texi +++ b/gcc-4.4.0/gcc/doc/install.texi @@ -1960,7 +1960,7 @@ bootstrapped, you can use @code{CFLAGS_FOR_TARGET} to modify their compilation flags, as for non-bootstrapped target libraries. Again, if the native compiler miscompiles the stage1 compiler, you may need to work around this by avoiding non-working parts of the stage1 -compiler. Use @code{STAGE1_LIBCFLAGS} to this end. +compiler. Use @code{STAGE1_TFLAGS} to this end. If you used the flag @option{--enable-languages=@dots{}} to restrict the compilers to be built, only those you've actually enabled will be @@ -1984,6 +1984,26 @@ the one you are building on: for example, you could build a @code{powerpc64-unknown-linux-gnu} host. In this case, pass @option{--enable-bootstrap} to the configure script. +@code{BUILD_CONFIG} can be used to bring in additional customization to +the build. It can be set to a whitespace-separated list of names. For +each such @code{NAME}, top-level @file{config/@code{NAME}.mk} will be +included by the top-level @file{Makefile}, bringing in any settings it +contains. Some examples are: + +@table @asis +@item @samp{bootstrap-O1} +Removes any @option{-O}-started option from @code{BOOT_CFLAGS}, and adds +@option{-O1} to it. @samp{BUILD_CONFIG=bootstrap-O1} is equivalent to +@samp{BOOT_CFLAGS='-g -O1'}. + +@item @samp{bootstrap-O3} +Analogous to @code{bootstrap-O1}. + +@item @samp{bootstrap-debug} +Builds stage2 without debug information, and uses +@file{contrib/compare-debug} to compare object files. + +@end table @section Building a cross compiler diff --git a/gcc-4.4.0/gcc/doc/invoke.texi b/gcc-4.4.0/gcc/doc/invoke.texi index 649b8e4a4..3c834f542 100644 --- a/gcc-4.4.0/gcc/doc/invoke.texi +++ b/gcc-4.4.0/gcc/doc/invoke.texi @@ -253,7 +253,7 @@ Objective-C and Objective-C++ Dialects}. -Wparentheses -Wpedantic-ms-format -Wno-pedantic-ms-format @gol -Wpointer-arith -Wno-pointer-to-int-cast @gol -Wredundant-decls @gol --Wreturn-type -Wsequence-point -Wshadow @gol +-Wreturn-type -Wripa-opt-mismatch -Wsequence-point -Wshadow @gol -Wsign-compare -Wsign-conversion -Wstack-protector @gol -Wstrict-aliasing -Wstrict-aliasing=n @gol -Wstrict-overflow -Wstrict-overflow=@var{n} @gol @@ -303,12 +303,13 @@ Objective-C and Objective-C++ Dialects}. -fdump-tree-storeccp@r{[}-@var{n}@r{]} @gol -feliminate-dwarf2-dups -feliminate-unused-debug-types @gol -feliminate-unused-debug-symbols -femit-class-debug-always @gol +-fenable-icf-debug @gol -fmem-report -fpre-ipa-mem-report -fpost-ipa-mem-report -fprofile-arcs @gol -frandom-seed=@var{string} -fsched-verbose=@var{n} @gol -fsel-sched-verbose -fsel-sched-dump-cfg -fsel-sched-pipelining-verbose @gol -ftest-coverage -ftime-report -fvar-tracking @gol -g -g@var{level} -gcoff -gdwarf-2 @gol --ggdb -gstabs -gstabs+ -gvms -gxcoff -gxcoff+ @gol +-ggdb -gmlt -gstabs -gstabs+ -gvms -gxcoff -gxcoff+ @gol -fno-merge-debug-strings -fno-dwarf2-cfi-asm @gol -fdebug-prefix-map=@var{old}=@var{new} @gol -femit-struct-debug-baseonly -femit-struct-debug-reduced @gol @@ -329,7 +330,7 @@ Objective-C and Objective-C++ Dialects}. -fcheck-data-deps -fconserve-stack -fcprop-registers -fcrossjumping @gol -fcse-follow-jumps -fcse-skip-blocks -fcx-fortran-rules -fcx-limited-range @gol -fdata-sections -fdce -fdce @gol --fdelayed-branch -fdelete-null-pointer-checks -fdse -fdse -fdyn-ipa @gol +-fdelayed-branch -fdelete-null-pointer-checks -fdse -fdse @gol -fearly-inlining -fexpensive-optimizations -ffast-math @gol -ffinite-math-only -ffloat-store -fforward-propagate @gol -ffunction-sections -fgcse -fgcse-after-reload -fgcse-las -fgcse-lm @gol @@ -357,7 +358,8 @@ Objective-C and Objective-C++ Dialects}. -freciprocal-math -fregmove -frename-registers -freorder-blocks @gol -freorder-blocks-and-partition -freorder-functions @gol -frerun-cse-after-loop -freschedule-modulo-scheduled-loops @gol --frounding-math -fsched2-use-superblocks @gol +-fripa -fripa-disallow-opt-mismatch -fripa-verbose -frounding-math @gol +-fsample-profile -fsample-profile-aggregate-using -fsched2-use-superblocks @gol -fsched2-use-traces -fsched-spec-load -fsched-spec-load-dangerous @gol -fsched-stalled-insns-dep[=@var{n}] -fsched-stalled-insns[=@var{n}] @gol -fschedule-insns -fschedule-insns2 -fsection-anchors -fsee @gol @@ -371,6 +373,7 @@ Objective-C and Objective-C++ Dialects}. -ftree-dominator-opts -ftree-dse -ftree-fre -ftree-loop-im @gol -ftree-loop-distribution @gol -ftree-loop-ivcanon -ftree-loop-linear -ftree-loop-optimize @gol +-ftree-lr-shrinking @gol -ftree-parallelize-loops=@var{n} -ftree-pre -ftree-reassoc @gol -ftree-sink -ftree-sra -ftree-switch-conversion @gol -ftree-ter -ftree-vect-loop-version -ftree-vectorize -ftree-vrp @gol @@ -2763,6 +2766,7 @@ Options} and @ref{Objective-C and Objective-C++ Dialect Options}. -Wpointer-sign @gol -Wreorder @gol -Wreturn-type @gol +-Wripa-opt-mismatch @gol -Wsequence-point @gol -Wsign-compare @r{(only in C++)} @gol -Wstrict-aliasing @gol @@ -3153,6 +3157,16 @@ exceptions are @samp{main} and functions defined in system headers. This warning is enabled by @option{-Wall}. +@item -Wripa-opt-mismatch +@opindex Wripa-opt-mismatch +@opindex Wno-ripa-opt-mismatch +When doing an FDO build with @option{-fprofile-use} and @option{-fripa}, +warn if importing an axuiliary module that was built with a different +GCC command line during the profile-generate phase than the primary +module. + +This warning is enabled by @option{-Wall}. + @item -Wswitch @opindex Wswitch @opindex Wno-switch @@ -4352,6 +4366,11 @@ debug format is long obsolete, but the option cannot be changed now. Instead use an additional @option{-g@var{level}} option to change the debug level for DWARF2. +@item -gmlt +@opindex gmlt +Produce a minimal line table, with level 1 debugging information plus +information about inlined functions and line numbers. + @item -feliminate-dwarf2-dups @opindex feliminate-dwarf2-dups Compress DWARF2 debugging information by eliminating duplicated @@ -4430,6 +4449,11 @@ The default is @samp{-femit-struct-debug-detailed=all}. This option works only with DWARF 2. +@item -fenable-icf-debug +@opindex fenable-icf-debug +Generate additional debug information to support identical code folding (ICF). +This option only works with DWARF version 2 or higher. + @item -fno-merge-debug-strings @opindex fmerge-debug-strings @opindex fno-merge-debug-strings @@ -6233,6 +6257,11 @@ effectiveness of code motion optimizations. It also saves one jump. This flag is enabled by default at @option{-O} and higher. It is not enabled for @option{-Os}, since it usually increases code size. +@item -ftree-lr-shrinking +@opindex ftree-lr-shrinking +Enable live range shrinking optimization on trees. This optimization is used +to help reducing register pressure. + @item -ftree-loop-optimize @opindex ftree-loop-optimize Perform loop optimizations on trees. This flag is enabled by default @@ -6807,14 +6836,38 @@ code. If @var{path} is specified, GCC will look at the @var{path} to find the profile feedback data files. See @option{-fprofile-dir}. -@item -fdyn-ipa -@opindex fdyn-ipa +@item -fripa +@opindex fripa Perform dynamic inter-procedural analysis. This is used in conjunction with the @option{-fprofile-generate} and @option{-fprofile-use} options. During the @option{-fprofile-generate} phase, this flag turns on some additional instrumentation code that enables dynamic call-graph analysis. During the @option{-fprofile-use} phase, this flag enables cross-module optimizations such as inlining. + +@item -fripa-disallow-opt-mismatch +@opindex fripa-disallow-opt-mismatch +Don't import an auxiliary module, if the GCC command line options used for this +auxiliary module during the profile-generate stage were different from those used +for the primary module. Note that any mismatches in warning-related options are +ignored for this comparison. + +@item -fripa-verbose +@opindex fripa-verbose +Enable printing of verbose information about dynamic inter-procedural optimizations. +This is used in conjunction with the @option{-fripa}. + +@item -fsample-profile +@itemx -fsample-profile=@var{path} +@opindex fsample-profile +Enable profile feedback directed optimizations using profiles obtained +via sampling, and optimizations generally profitable only with profile +feedback available. + +@item -fsample-profile-aggregate-using=@var{method} +@opindex fsample-profile-aggreagate-using +Select the method for (average or maximum) for converting +instruction-level profiles into basic block level profiles. @end table The following options control compiler behavior regarding floating @@ -7863,6 +7916,30 @@ number of available registers, live range shrinking optimization is enabled. The minimal size (number of leaves) of a tree to be reshaped in the Live Range Shrinking optimization. +@item min-mcf-cancel-iters +The minimum number of iterations of negative cycle cancellation during +MCF profile correction before early termination. This parameter is +only useful when using @option{-fprofile-correction}. + +@item samplefdo-mcf-high-confidence-cost-mult +Multiply the cost used by MCF during profile correction by this factor +for all input profile data that is determined to be high confidence. +This parameter is only useful when using @option{-fsample-profile} and +@option{-fprofile-correction}. + +@item samplefdo-use-discrim +When attributing samples to the CFG, use discriminators to identify +which CFG nodes correspond to which samples. This parameter is only +useful when using @option{-fsample-profile}. + +@item samplefdo-large-block-thresh +Consider a basic block large if it has more than this many gimple +statements in it. If a block is large and has no profile samples +attributed to it, it will be assigned a weight of 0 with high +confidence. This parameter is only useful when using +@option{-fsample-profile}. + + @end table @end table diff --git a/gcc-4.4.0/gcc/doc/tm.texi b/gcc-4.4.0/gcc/doc/tm.texi index c431eb47b..625c4dd3a 100644 --- a/gcc-4.4.0/gcc/doc/tm.texi +++ b/gcc-4.4.0/gcc/doc/tm.texi @@ -10529,6 +10529,12 @@ to have to make special provisions in @code{INITIAL_ELIMINATION_OFFSET} to reserve space for caller-saved target registers. @end deftypefn +@deftypefn {Target Hook} bool TARGET_HAVE_CONDITIONAL_EXECUTION (void) +This target hook returns true if the target supports conditional execution. +This target hook is required only when the target has several different +modes and they have different conditional execution capability, such as ARM. +@end deftypefn + @defmac POWI_MAX_MULTS If defined, this macro is interpreted as a signed integer C expression that specifies the maximum number of floating point multiplications diff --git a/gcc-4.4.0/gcc/dojump.c b/gcc-4.4.0/gcc/dojump.c index 060eb51e7..11d94ba7b 100644 --- a/gcc-4.4.0/gcc/dojump.c +++ b/gcc-4.4.0/gcc/dojump.c @@ -141,7 +141,8 @@ prefer_and_bit_test (enum machine_mode mode, int bitnum) } /* Fill in the integers. */ - XEXP (and_test, 1) = GEN_INT ((unsigned HOST_WIDE_INT) 1 << bitnum); + XEXP (and_test, 1) + = immed_double_const ((unsigned HOST_WIDE_INT) 1 << bitnum, 0, mode); XEXP (XEXP (shift_test, 0), 1) = GEN_INT (bitnum); return (rtx_cost (and_test, IF_THEN_ELSE, optimize_insn_for_speed_p ()) @@ -475,10 +476,10 @@ do_jump (tree exp, rtx if_false_label, rtx if_true_label) && prefer_and_bit_test (TYPE_MODE (argtype), TREE_INT_CST_LOW (shift))) { - HOST_WIDE_INT mask = (HOST_WIDE_INT) 1 - << TREE_INT_CST_LOW (shift); + unsigned HOST_WIDE_INT mask + = (unsigned HOST_WIDE_INT) 1 << TREE_INT_CST_LOW (shift); do_jump (build2 (BIT_AND_EXPR, argtype, arg, - build_int_cst_type (argtype, mask)), + build_int_cst_wide_type (argtype, mask, 0)), clr_label, set_label); break; } diff --git a/gcc-4.4.0/gcc/dse.c b/gcc-4.4.0/gcc/dse.c index a35f07bb1..3298b4f07 100644 --- a/gcc-4.4.0/gcc/dse.c +++ b/gcc-4.4.0/gcc/dse.c @@ -223,7 +223,7 @@ struct store_info /* This canonized mem. */ rtx mem; - /* The result of get_addr on mem. */ + /* Canonized MEM address for use by canon_true_dependence. */ rtx mem_addr; /* If this is non-zero, it is the alias set of a spill location. */ @@ -476,8 +476,8 @@ struct group_info do read dependency. */ rtx base_mem; - /* Canonized version of base_mem, most likely the same thing. */ - rtx canon_base_mem; + /* Canonized version of base_mem's address. */ + rtx canon_base_addr; /* These two sets of two bitmaps are used to keep track of how many stores are actually referencing that position from this base. We @@ -705,7 +705,7 @@ get_group_info (rtx base) gi->rtx_base = base; gi->id = rtx_group_next_id++; gi->base_mem = gen_rtx_MEM (QImode, base); - gi->canon_base_mem = canon_rtx (gi->base_mem); + gi->canon_base_addr = canon_rtx (base); gi->store1_n = BITMAP_ALLOC (NULL); gi->store1_p = BITMAP_ALLOC (NULL); gi->store2_n = BITMAP_ALLOC (NULL); @@ -1286,7 +1286,7 @@ static rtx get_stored_val (store_info_t, enum machine_mode, HOST_WIDE_INT, static int record_store (rtx body, bb_info_t bb_info) { - rtx mem, rhs, const_rhs; + rtx mem, rhs, const_rhs, mem_addr; HOST_WIDE_INT offset = 0; HOST_WIDE_INT width = 0; alias_set_type spill_alias_set; @@ -1456,6 +1456,23 @@ record_store (rtx body, bb_info_t bb_info) ptr = active_local_stores; last = NULL; redundant_reason = NULL; + mem = canon_rtx (mem); + /* For alias_set != 0 canon_true_dependence should be never called. */ + if (spill_alias_set) + mem_addr = NULL_RTX; + else + { + if (group_id < 0) + mem_addr = base->val_rtx; + else + { + group_info_t group + = VEC_index (group_info_t, rtx_group_vec, group_id); + mem_addr = group->canon_base_addr; + } + if (offset) + mem_addr = plus_constant (mem_addr, offset); + } while (ptr) { @@ -1547,13 +1564,13 @@ record_store (rtx body, bb_info_t bb_info) if (canon_true_dependence (s_info->mem, GET_MODE (s_info->mem), s_info->mem_addr, - mem, rtx_varies_p)) + mem, mem_addr, rtx_varies_p)) { s_info->rhs = NULL; s_info->const_rhs = NULL; } } - + /* An insn can be deleted if every position of every one of its s_infos is zero. */ if (any_positions_needed_p (s_info) @@ -1580,9 +1597,9 @@ record_store (rtx body, bb_info_t bb_info) /* Finish filling in the store_info. */ store_info->next = insn_info->store_rec; insn_info->store_rec = store_info; - store_info->mem = canon_rtx (mem); + store_info->mem = mem; store_info->alias_set = spill_alias_set; - store_info->mem_addr = get_addr (XEXP (mem, 0)); + store_info->mem_addr = mem_addr; store_info->cse_base = base; if (width > HOST_BITS_PER_WIDE_INT) { @@ -2006,7 +2023,7 @@ replace_read (store_info_t store_info, insn_info_t store_insn, static int check_mem_read_rtx (rtx *loc, void *data) { - rtx mem = *loc; + rtx mem = *loc, mem_addr; bb_info_t bb_info; insn_info_t insn_info; HOST_WIDE_INT offset = 0; @@ -2058,6 +2075,22 @@ check_mem_read_rtx (rtx *loc, void *data) read_info->end = offset + width; read_info->next = insn_info->read_rec; insn_info->read_rec = read_info; + /* For alias_set != 0 canon_true_dependence should be never called. */ + if (spill_alias_set) + mem_addr = NULL_RTX; + else + { + if (group_id < 0) + mem_addr = base->val_rtx; + else + { + group_info_t group + = VEC_index (group_info_t, rtx_group_vec, group_id); + mem_addr = group->canon_base_addr; + } + if (offset) + mem_addr = plus_constant (mem_addr, offset); + } /* We ignore the clobbers in store_info. The is mildly aggressive, but there really should not be a clobber followed by a read. */ @@ -2128,7 +2161,7 @@ check_mem_read_rtx (rtx *loc, void *data) = canon_true_dependence (store_info->mem, GET_MODE (store_info->mem), store_info->mem_addr, - mem, rtx_varies_p); + mem, mem_addr, rtx_varies_p); else if (group_id == store_info->group_id) { @@ -2139,7 +2172,7 @@ check_mem_read_rtx (rtx *loc, void *data) = canon_true_dependence (store_info->mem, GET_MODE (store_info->mem), store_info->mem_addr, - mem, rtx_varies_p); + mem, mem_addr, rtx_varies_p); /* If this read is just reading back something that we just stored, rewrite the read. */ @@ -2212,6 +2245,7 @@ check_mem_read_rtx (rtx *loc, void *data) if (store_info->rhs && store_info->group_id == -1 && store_info->cse_base == base + && width != -1 && offset >= store_info->begin && offset + width <= store_info->end && all_positions_needed_p (store_info, @@ -2224,7 +2258,7 @@ check_mem_read_rtx (rtx *loc, void *data) remove = canon_true_dependence (store_info->mem, GET_MODE (store_info->mem), store_info->mem_addr, - mem, rtx_varies_p); + mem, mem_addr, rtx_varies_p); if (remove) { @@ -3066,8 +3100,9 @@ scan_reads_nospill (insn_info_t insn_info, bitmap gen, bitmap kill) if ((read_info->group_id < 0) && canon_true_dependence (group->base_mem, QImode, - group->canon_base_mem, - read_info->mem, rtx_varies_p)) + group->canon_base_addr, + read_info->mem, NULL_RTX, + rtx_varies_p)) { if (kill) bitmap_ior_into (kill, group->group_kill); diff --git a/gcc-4.4.0/gcc/dwarf2out.c b/gcc-4.4.0/gcc/dwarf2out.c index 606d30186..deac83a7e 100644 --- a/gcc-4.4.0/gcc/dwarf2out.c +++ b/gcc-4.4.0/gcc/dwarf2out.c @@ -94,6 +94,10 @@ along with GCC; see the file COPYING3. If not see static void dwarf2out_source_line (unsigned int, const char *, int, bool); #endif +/* True if generating only the minimum line table (-gmlt). */ +#define GENERATE_MINIMUM_LINE_TABLE (debug_info_level == DINFO_LEVEL_TERSE \ + && generate_debug_line_table) + #ifndef DWARF2_FRAME_INFO # ifdef DWARF2_DEBUGGING_INFO # define DWARF2_FRAME_INFO \ @@ -194,6 +198,8 @@ static GTY(()) section *debug_line_section; static GTY(()) section *debug_loc_section; static GTY(()) section *debug_pubnames_section; static GTY(()) section *debug_pubtypes_section; +static GTY(()) section *debug_dcall_section; +static GTY(()) section *debug_vcall_section; static GTY(()) section *debug_str_section; static GTY(()) section *debug_ranges_section; static GTY(()) section *debug_frame_section; @@ -4245,17 +4251,11 @@ new_loc_descr (enum dwarf_location_atom op, unsigned HOST_WIDE_INT oprnd1, static inline dw_loc_descr_ref new_reg_loc_descr (unsigned int reg, unsigned HOST_WIDE_INT offset) { - if (offset) - { - if (reg <= 31) - return new_loc_descr (DW_OP_breg0 + reg, offset, 0); - else - return new_loc_descr (DW_OP_bregx, reg, offset); - } - else if (reg <= 31) - return new_loc_descr (DW_OP_reg0 + reg, 0, 0); + if (reg <= 31) + return new_loc_descr ((enum dwarf_location_atom) (DW_OP_breg0 + reg), + offset, 0); else - return new_loc_descr (DW_OP_regx, reg, 0); + return new_loc_descr (DW_OP_bregx, reg, offset); } /* Add a location description term to a location description expression. */ @@ -4930,7 +4930,11 @@ static void dwarf2out_imported_module_or_decl_1 (tree, tree, tree, dw_die_ref); static void dwarf2out_abstract_function (tree); static void dwarf2out_var_location (rtx); +static void dwarf2out_direct_call (tree); +static void dwarf2out_virtual_call_token (tree, int); +static void dwarf2out_virtual_call (int); static void dwarf2out_begin_function (tree); +static void dwarf2out_set_name (tree, tree); /* The debug hooks structure. */ @@ -4964,6 +4968,10 @@ const struct gcc_debug_hooks dwarf2_debug_hooks = debug_nothing_int, /* handle_pch */ dwarf2out_var_location, dwarf2out_switch_text_section, + dwarf2out_direct_call, + dwarf2out_virtual_call_token, + dwarf2out_virtual_call, + dwarf2out_set_name, 1 /* start_end_main_source_file */ }; #endif @@ -5340,6 +5348,48 @@ static GTY(()) bool have_location_lists; /* Unique label counter. */ static GTY(()) unsigned int loclabel_num; +/* Unique label counter for point-of-call tables. */ +static GTY (()) unsigned int poc_label_num; + +/* The direct call table structure. */ + +typedef struct dcall_struct GTY (()) +{ + unsigned int poc_label_num; + tree poc_decl; + dw_die_ref targ_die; +} +dcall_entry; + +DEF_VEC_O(dcall_entry); +DEF_VEC_ALLOC_O(dcall_entry, gc); + +/* The virtual call table structure. */ + +typedef struct vcall_struct GTY (()) +{ + unsigned int poc_label_num; + unsigned int vtable_slot; +} +vcall_entry; + +DEF_VEC_O(vcall_entry); +DEF_VEC_ALLOC_O(vcall_entry, gc); + +/* Pointers to the direct and virtual call tables. */ +static GTY (()) VEC (dcall_entry, gc) * dcall_table; +static GTY (()) VEC (vcall_entry, gc) * vcall_table; + +/* A hash table to map INSN_UIDs to vtable slot indexes. */ + +struct vcall_insn GTY (()) +{ + int insn_uid; + unsigned int vtable_slot; +}; + +static GTY ((param_is (struct vcall_insn))) htab_t vcall_insn_table; + #ifdef DWARF2_DEBUGGING_INFO /* Record whether the function being analyzed contains inlined functions. */ static int current_function_has_inlines; @@ -5517,7 +5567,8 @@ static void add_arange (tree, dw_die_ref); static void output_aranges (void); static unsigned int add_ranges_num (int); static unsigned int add_ranges (const_tree); -static unsigned int add_ranges_by_labels (const char *, const char *); +static void add_ranges_by_labels (dw_die_ref, const char *, const char *, + bool *); static void output_ranges (void); static void output_line_info (void); static void output_file_names (void); @@ -5662,6 +5713,12 @@ static int maybe_emit_file (struct dwarf_file_data *fd); #ifndef DEBUG_PUBNAMES_SECTION #define DEBUG_PUBNAMES_SECTION ".debug_pubnames" #endif +#ifndef DEBUG_DCALL_SECTION +#define DEBUG_DCALL_SECTION ".debug_dcall" +#endif +#ifndef DEBUG_VCALL_SECTION +#define DEBUG_VCALL_SECTION ".debug_vcall" +#endif #ifndef DEBUG_STR_SECTION #define DEBUG_STR_SECTION ".debug_str" #endif @@ -6386,12 +6443,9 @@ debug_str_eq (const void *x1, const void *x2) (const char *)x2) == 0; } -/* Add a string attribute value to a DIE. */ - -static inline void -add_AT_string (dw_die_ref die, enum dwarf_attribute attr_kind, const char *str) +static struct indirect_string_node * +find_AT_string (const char *str) { - dw_attr_node attr; struct indirect_string_node *node; void **slot; @@ -6412,6 +6466,18 @@ add_AT_string (dw_die_ref die, enum dwarf_attribute attr_kind, const char *str) node = (struct indirect_string_node *) *slot; node->refcount++; + return node; +} + +/* Add a string attribute value to a DIE. */ + +static inline void +add_AT_string (dw_die_ref die, enum dwarf_attribute attr_kind, const char *str) +{ + dw_attr_node attr; + struct indirect_string_node *node; + + node = find_AT_string (str); attr.dw_attr = attr_kind; attr.dw_attr_val.val_class = dw_val_class_str; @@ -8995,6 +9061,12 @@ copy_ancestor_tree (dw_die_ref unit, dw_die_ref die, htab_t decl_table) entry = (struct decl_table_entry *) *slot; return entry->copy; } + + /* Record in DECL_TABLE that DIE has been copied to UNIT. */ + entry = XCNEW (struct decl_table_entry); + entry->orig = die; + entry->copy = NULL; + *slot = entry; } if (parent != NULL) @@ -9010,17 +9082,12 @@ copy_ancestor_tree (dw_die_ref unit, dw_die_ref die, htab_t decl_table) copy = clone_as_declaration (die); add_child_die (new_parent, copy); - /* Make sure the copy is marked as part of the type unit. */ if (decl_table != NULL) - copy->die_mark = 1; - - if (slot != NULL) { - /* Record in DECL_TABLE that DIE has been copied to UNIT. */ - entry = XCNEW (struct decl_table_entry); - entry->orig = die; + /* Make sure the copy is marked as part of the type unit. */ + copy->die_mark = 1; + /* Record the pointer to the copy. */ entry->copy = copy; - *slot = entry; } return copy; @@ -10312,10 +10379,12 @@ add_ranges (const_tree block) /* Add a new entry to .debug_ranges corresponding to a pair of labels. */ -static unsigned int -add_ranges_by_labels (const char *begin, const char *end) +static void +add_ranges_by_labels (dw_die_ref die, const char *begin, const char *end, + bool *added) { unsigned int in_use = ranges_by_label_in_use; + unsigned int offset; if (in_use == ranges_by_label_allocated) { @@ -10332,7 +10401,12 @@ add_ranges_by_labels (const char *begin, const char *end) ranges_by_label[in_use].end = end; ranges_by_label_in_use = in_use + 1; - return add_ranges_num (-(int)in_use - 1); + offset = add_ranges_num (-(int)in_use - 1); + if (!*added) + { + add_AT_range_list (die, DW_AT_ranges, offset); + *added = true; + } } static void @@ -11028,6 +11102,128 @@ output_line_info (void) /* Output the marker for the end of the line number info. */ ASM_OUTPUT_LABEL (asm_out_file, l2); } + +/* Return the size of the .debug_dcall table for the compilation unit. */ + +static unsigned long +size_of_dcall_table (void) +{ + unsigned long size; + unsigned int i; + dcall_entry *p; + tree last_poc_decl = NULL; + + /* Header: version + debug info section pointer + pointer size. */ + size = 2 + DWARF_OFFSET_SIZE + 1; + + /* Each entry: code label + DIE offset. */ + for (i = 0; VEC_iterate (dcall_entry, dcall_table, i, p); i++) + { + gcc_assert (p->targ_die != NULL); + /* Insert a "from" entry when the point-of-call DIE offset changes. */ + if (p->poc_decl != last_poc_decl) + { + dw_die_ref poc_die = lookup_decl_die (p->poc_decl); + last_poc_decl = p->poc_decl; + if (poc_die) + size += (DWARF_OFFSET_SIZE + + size_of_uleb128 (poc_die->die_offset)); + } + size += DWARF_OFFSET_SIZE + size_of_uleb128 (p->targ_die->die_offset); + } + + return size; +} + +/* Output the direct call table used to disambiguate PC values when + identical function have been merged. */ + +static void +output_dcall_table (void) +{ + unsigned i; + unsigned long dcall_length = size_of_dcall_table (); + dcall_entry *p; + char poc_label[MAX_ARTIFICIAL_LABEL_BYTES]; + tree last_poc_decl = NULL; + + if (DWARF_INITIAL_LENGTH_SIZE - DWARF_OFFSET_SIZE == 4) + dw2_asm_output_data (4, 0xffffffff, + "Initial length escape value indicating 64-bit DWARF extension"); + dw2_asm_output_data (DWARF_OFFSET_SIZE, dcall_length, + "Length of Direct Call Table"); + dw2_asm_output_data (2, 4, "Version number"); + dw2_asm_output_offset (DWARF_OFFSET_SIZE, debug_info_section_label, + debug_info_section, + "Offset of Compilation Unit Info"); + dw2_asm_output_data (1, DWARF2_ADDR_SIZE, "Pointer Size (in bytes)"); + + for (i = 0; VEC_iterate (dcall_entry, dcall_table, i, p); i++) + { + /* Insert a "from" entry when the point-of-call DIE offset changes. */ + if (p->poc_decl != last_poc_decl) + { + dw_die_ref poc_die = lookup_decl_die (p->poc_decl); + last_poc_decl = p->poc_decl; + if (poc_die) + { + dw2_asm_output_data (DWARF_OFFSET_SIZE, 0, "New caller"); + dw2_asm_output_data_uleb128 (poc_die->die_offset, + "Caller DIE offset"); + } + } + ASM_GENERATE_INTERNAL_LABEL (poc_label, "LPOC", p->poc_label_num); + dw2_asm_output_addr (DWARF_OFFSET_SIZE, poc_label, "Point of call"); + dw2_asm_output_data_uleb128 (p->targ_die->die_offset, + "Callee DIE offset"); + } +} + +/* Return the size of the .debug_vcall table for the compilation unit. */ + +static unsigned long +size_of_vcall_table (void) +{ + unsigned long size; + unsigned int i; + vcall_entry *p; + + /* Header: version + pointer size. */ + size = 2 + 1; + + /* Each entry: code label + vtable slot index. */ + for (i = 0; VEC_iterate (vcall_entry, vcall_table, i, p); i++) + size += DWARF_OFFSET_SIZE + size_of_uleb128 (p->vtable_slot); + + return size; +} + +/* Output the virtual call table used to disambiguate PC values when + identical function have been merged. */ + +static void +output_vcall_table (void) +{ + unsigned i; + unsigned long vcall_length = size_of_vcall_table (); + vcall_entry *p; + char poc_label[MAX_ARTIFICIAL_LABEL_BYTES]; + + if (DWARF_INITIAL_LENGTH_SIZE - DWARF_OFFSET_SIZE == 4) + dw2_asm_output_data (4, 0xffffffff, + "Initial length escape value indicating 64-bit DWARF extension"); + dw2_asm_output_data (DWARF_OFFSET_SIZE, vcall_length, + "Length of Virtual Call Table"); + dw2_asm_output_data (2, 4, "Version number"); + dw2_asm_output_data (1, DWARF2_ADDR_SIZE, "Pointer Size (in bytes)"); + + for (i = 0; VEC_iterate (vcall_entry, vcall_table, i, p); i++) + { + ASM_GENERATE_INTERNAL_LABEL (poc_label, "LPOC", p->poc_label_num); + dw2_asm_output_addr (DWARF_OFFSET_SIZE, poc_label, "Point of call"); + dw2_asm_output_data_uleb128 (p->vtable_slot, "Vtable slot"); + } +} /* Given a pointer to a tree node for some base type, return a pointer to a DIE that describes the given type. @@ -11466,7 +11662,13 @@ reg_loc_descriptor (rtx rtl, enum var_init_status initialized) static dw_loc_descr_ref one_reg_loc_descriptor (unsigned int regno, enum var_init_status initialized) { - dw_loc_descr_ref reg_loc_descr = new_reg_loc_descr (regno, 0); + dw_loc_descr_ref reg_loc_descr; + + if (regno <= 31) + reg_loc_descr + = new_loc_descr ((enum dwarf_location_atom) (DW_OP_reg0 + regno), 0, 0); + else + reg_loc_descr = new_loc_descr (DW_OP_regx, regno, 0); if (initialized == VAR_INIT_STATUS_UNINITIALIZED) add_loc_descr (®_loc_descr, new_loc_descr (DW_OP_GNU_uninit, 0, 0)); @@ -13505,6 +13707,31 @@ loc_by_reference (dw_loc_descr_ref loc, tree decl) || !DECL_BY_REFERENCE (decl)) return loc; + /* If loc is DW_OP_reg{0...31,x}, don't add DW_OP_deref, instead + change it into corresponding DW_OP_breg{0...31,x} 0. Then the + location expression is considered to be address of a memory location, + rather than the register itself. */ + if (((loc->dw_loc_opc >= DW_OP_reg0 && loc->dw_loc_opc <= DW_OP_reg31) + || loc->dw_loc_opc == DW_OP_regx) + && (loc->dw_loc_next == NULL + || (loc->dw_loc_next->dw_loc_opc == DW_OP_GNU_uninit + && loc->dw_loc_next->dw_loc_next == NULL))) + { + if (loc->dw_loc_opc == DW_OP_regx) + { + loc->dw_loc_opc = DW_OP_bregx; + loc->dw_loc_oprnd2.v.val_int = 0; + } + else + { + loc->dw_loc_opc + = (enum dwarf_location_atom) + (loc->dw_loc_opc + (DW_OP_breg0 - DW_OP_reg0)); + loc->dw_loc_oprnd1.v.val_int = 0; + } + return loc; + } + size = int_size_in_bytes (TREE_TYPE (decl)); if (size > DWARF2_ADDR_SIZE || size == -1) return 0; @@ -14356,7 +14583,8 @@ add_name_and_src_coords_attributes (dw_die_ref die, tree decl) if (! DECL_ARTIFICIAL (decl)) add_src_coords_attributes (die, decl); - if ((TREE_CODE (decl) == FUNCTION_DECL || TREE_CODE (decl) == VAR_DECL) + if (!GENERATE_MINIMUM_LINE_TABLE + && (TREE_CODE (decl) == FUNCTION_DECL || TREE_CODE (decl) == VAR_DECL) && TREE_PUBLIC (decl) && DECL_ASSEMBLER_NAME (decl) != DECL_NAME (decl) && !DECL_ABSTRACT (decl) @@ -14610,6 +14838,22 @@ decl_start_label (tree decl) return fnname; } #endif + +/* Returns the DIE for a context. */ + +static inline dw_die_ref +get_context_die (tree context) +{ + if (context) + { + /* Find die that represents this context. */ + if (TYPE_P (context)) + return force_type_die (context); + else + return force_decl_die (context); + } + return comp_unit_die; +} /* These routines generate the internal representation of the DIE's for the compilation unit. Debugging information is collected by walking @@ -15451,8 +15695,13 @@ gen_subprogram_die (tree decl, dw_die_ref context_die) FUNC_LABEL_ID (cfun)); add_AT_lbl_id (subr_die, DW_AT_high_pc, label_id); - add_pubname (decl, subr_die); - add_arange (decl, subr_die); + /* If we're generating minimum line tables (-gmlt), don't output + pubnames or aranges. */ + if (!GENERATE_MINIMUM_LINE_TABLE) + { + add_pubname (decl, subr_die); + add_arange (decl, subr_die); + } } else { /* Do nothing for now; maybe need to duplicate die, one for @@ -16483,6 +16732,17 @@ gen_type_die_with_usage (tree type, dw_die_ref context_die, statement. */ TREE_ASM_WRITTEN (type) = 1; + /* Figure out the proper context for the basis type. If it is + local to a function, use NULL for now; it will be fixed up + in decls_for_scope. */ + if (TYPE_STUB_DECL (TREE_TYPE (type)) != NULL_TREE) + { + if (decl_function_context (TYPE_STUB_DECL (TREE_TYPE (type)))) + context_die = NULL; + else + context_die = get_context_die (TYPE_CONTEXT (TREE_TYPE (type))); + } + /* For these types, all that is required is that we output a DIE (or a set of DIEs) to represent the "basis" type. */ gen_type_die_with_usage (TREE_TYPE (type), context_die, @@ -16663,7 +16923,10 @@ gen_block_die (tree stmt, dw_die_ref context_die, int depth) if (must_output_die) { if (inlined_func) - gen_inlined_subroutine_die (stmt, context_die, depth); + { + if (! BLOCK_ABSTRACT (stmt)) + gen_inlined_subroutine_die (stmt, context_die, depth); + } else gen_lexical_block_die (stmt, context_die, depth); } @@ -16718,14 +16981,18 @@ decls_for_scope (tree stmt, dw_die_ref context_die, int depth) declared directly within this block but not within any nested sub-blocks. Also, nested function and tag DIEs have been generated with a parent of NULL; fix that up now. */ - for (decl = BLOCK_VARS (stmt); decl != NULL; decl = TREE_CHAIN (decl)) - process_scope_var (stmt, decl, NULL_TREE, context_die); - for (i = 0; i < BLOCK_NUM_NONLOCALIZED_VARS (stmt); i++) - process_scope_var (stmt, NULL, BLOCK_NONLOCALIZED_VAR (stmt, i), - context_die); + if (debug_info_level > DINFO_LEVEL_TERSE) + { + for (decl = BLOCK_VARS (stmt); decl != NULL; decl = TREE_CHAIN (decl)) + process_scope_var (stmt, decl, NULL_TREE, context_die); + for (i = 0; i < BLOCK_NUM_NONLOCALIZED_VARS (stmt); i++) + process_scope_var (stmt, NULL, BLOCK_NONLOCALIZED_VAR (stmt, i), + context_die); + } - /* If we're at -g1, we're not interested in subblocks. */ - if (debug_info_level <= DINFO_LEVEL_TERSE) + /* If we're at -g1 and not generating minimal line tables, + we're not interested in subblocks. */ + if (!generate_debug_line_table && debug_info_level <= DINFO_LEVEL_TERSE) return; /* Output the DIEs to represent all sub-blocks (and the items declared @@ -16755,22 +17022,6 @@ is_redundant_typedef (const_tree decl) return 0; } -/* Returns the DIE for a context. */ - -static inline dw_die_ref -get_context_die (tree context) -{ - if (context) - { - /* Find die that represents this context. */ - if (TYPE_P (context)) - return force_type_die (context); - else - return force_decl_die (context); - } - return comp_unit_die; -} - /* Returns the DIE for decl. A DIE will always be returned. */ static dw_die_ref @@ -16813,6 +17064,10 @@ force_decl_die (tree decl) dwarf2out_decl (decl); break; + case TRANSLATION_UNIT_DECL: + decl_die = comp_unit_die; + break; + default: gcc_unreachable (); } @@ -17538,6 +17793,128 @@ maybe_emit_file (struct dwarf_file_data * fd) return fd->emitted_number; } +/* Called by the final INSN scan whenever we see a direct function call. + Make an entry into the direct call table, recording the point of call + and a reference to the target function's debug entry. */ + +static void +dwarf2out_direct_call (tree targ) +{ + dcall_entry e; + tree origin = decl_ultimate_origin (targ); + + /* If this is a clone, use the abstract origin as the target. */ + if (origin) + targ = origin; + + e.poc_label_num = poc_label_num++; + e.poc_decl = current_function_decl; + e.targ_die = force_decl_die (targ); + VEC_safe_push (dcall_entry, gc, dcall_table, &e); + + /* Drop a label at the return point to mark the point of call. */ + ASM_OUTPUT_DEBUG_LABEL (asm_out_file, "LPOC", e.poc_label_num); +} + +/* Returns a hash value for X (which really is a struct vcall_insn). */ + +static hashval_t +vcall_insn_table_hash (const void *x) +{ + return (hashval_t) ((const struct vcall_insn *) x)->insn_uid; +} + +/* Return nonzero if insn_uid of struct vcall_insn *X is the same as + insnd_uid of *Y. */ + +static int +vcall_insn_table_eq (const void *x, const void *y) +{ + return (((const struct vcall_insn *) x)->insn_uid + == ((const struct vcall_insn *) y)->insn_uid); +} + +/* Called when lowering indirect calls to RTL. We make a note of INSN_UID + and the OBJ_TYPE_REF_TOKEN from ADDR. For C++ virtual calls, the token + is the vtable slot index that we will need to put in the virtual call + table later. */ + +static void +dwarf2out_virtual_call_token (tree addr, int insn_uid) +{ + if (is_cxx() && TREE_CODE (addr) == OBJ_TYPE_REF) + { + tree token = OBJ_TYPE_REF_TOKEN (addr); + if (TREE_CODE (token) == INTEGER_CST) + { + struct vcall_insn *item = XNEW (struct vcall_insn); + struct vcall_insn **slot; + + gcc_assert (item); + item->insn_uid = insn_uid; + item->vtable_slot = TREE_INT_CST_LOW (token); + slot = (struct vcall_insn **) + htab_find_slot_with_hash (vcall_insn_table, (void *) &item, + (hashval_t) insn_uid, INSERT); + *slot = item; + } + } +} + +/* Called by the final INSN scan whenever we see a virtual function call. + Make an entry into the virtual call table, recording the point of call + and the slot index of the vtable entry used to call the virtual member + function. The slot index was associated with the INSN_UID during the + lowering to RTL. */ + +static void +dwarf2out_virtual_call (int insn_uid) +{ + vcall_entry e; + struct vcall_insn item; + struct vcall_insn *p; + + item.insn_uid = insn_uid; + item.vtable_slot = 0; + p = (struct vcall_insn *) htab_find_with_hash (vcall_insn_table, + (void *) &item, + (hashval_t) insn_uid); + if (p == NULL) + return; + + e.poc_label_num = poc_label_num++; + e.vtable_slot = p->vtable_slot; + VEC_safe_push (vcall_entry, gc, vcall_table, &e); + + /* Drop a label at the return point to mark the point of call. */ + ASM_OUTPUT_DEBUG_LABEL (asm_out_file, "LPOC", e.poc_label_num); +} + +/* Replace DW_AT_name for the decl with name. */ + +static void +dwarf2out_set_name (tree decl, tree name) +{ + dw_die_ref die; + dw_attr_ref attr; + + die = TYPE_SYMTAB_DIE (decl); + if (!die) + return; + + attr = get_AT (die, DW_AT_name); + if (attr) + { + struct indirect_string_node *node; + + node = find_AT_string (dwarf2_name (name, 0)); + /* replace the string. */ + attr->dw_attr_val.v.val_str = node; + } + + else + add_name_attribute (die, dwarf2_name (name, 0)); +} /* Called by the final INSN scan whenever we see a var location. We use it to drop labels in the right places, and throw the location in our lookup table. */ @@ -17614,8 +17991,7 @@ dwarf2out_source_line (unsigned int line, const char *filename, { static bool last_is_stmt = true; - if (debug_info_level >= DINFO_LEVEL_NORMAL - && line != 0) + if (generate_debug_line_table && line != 0) { int file_num = maybe_emit_file (lookup_filename (filename)); @@ -17812,6 +18188,12 @@ dwarf2out_init (const char *filename ATTRIBUTE_UNUSED) pubname_table = VEC_alloc (pubname_entry, gc, 32); pubtype_table = VEC_alloc (pubname_entry, gc, 32); + /* Allocate the direct and indirect call tables. */ + dcall_table = VEC_alloc (dcall_entry, gc, 32); + vcall_table = VEC_alloc (vcall_entry, gc, 32); + vcall_insn_table = htab_create_ggc (10, vcall_insn_table_hash, + vcall_insn_table_eq, NULL); + /* Generate the initial DIE for the .debug section. Note that the (string) value given in the DW_AT_name attribute of the DW_TAG_compile_unit DIE will (typically) be a relative pathname and that this pathname should be @@ -17842,6 +18224,10 @@ dwarf2out_init (const char *filename ATTRIBUTE_UNUSED) debug_pubtypes_section = get_section (DEBUG_PUBTYPES_SECTION, SECTION_DEBUG, NULL); #endif + debug_dcall_section = get_section (DEBUG_DCALL_SECTION, + SECTION_DEBUG, NULL); + debug_vcall_section = get_section (DEBUG_VCALL_SECTION, + SECTION_DEBUG, NULL); debug_str_section = get_section (DEBUG_STR_SECTION, DEBUG_STR_SECTION_FLAGS, NULL); debug_ranges_section = get_section (DEBUG_RANGES_SECTION, @@ -18192,6 +18578,7 @@ prune_unused_types (void) limbo_die_node *node; comdat_type_node *ctnode; pubname_ref pub; + dcall_entry *dcall; #if ENABLE_ASSERT_CHECKING /* All the marks should already be clear. */ @@ -18219,6 +18606,10 @@ prune_unused_types (void) for (i = 0; i < arange_table_in_use; i++) prune_unused_types_mark (arange_table[i], 1); + /* Mark nodes referenced from the direct call table. */ + for (i = 0; VEC_iterate (dcall_entry, dcall_table, i, dcall); i++) + prune_unused_types_mark (dcall->targ_die, 1); + /* Get rid of nodes that aren't marked; and update the string counts. */ if (debug_str_hash) htab_empty (debug_str_hash); @@ -18426,6 +18817,7 @@ dwarf2out_finish (const char *filename) else { unsigned fde_idx = 0; + bool range_list_added = false; /* We need to give .debug_loc and .debug_ranges an appropriate "base address". Use zero so that these addresses become @@ -18435,12 +18827,12 @@ dwarf2out_finish (const char *filename) add_AT_addr (comp_unit_die, DW_AT_low_pc, const0_rtx); add_AT_addr (comp_unit_die, DW_AT_entry_pc, const0_rtx); - add_AT_range_list (comp_unit_die, DW_AT_ranges, - add_ranges_by_labels (text_section_label, - text_end_label)); - if (flag_reorder_blocks_and_partition) - add_ranges_by_labels (cold_text_section_label, - cold_end_label); + if (text_section_used) + add_ranges_by_labels (comp_unit_die, text_section_label, + text_end_label, &range_list_added); + if (flag_reorder_blocks_and_partition && cold_text_section_used) + add_ranges_by_labels (comp_unit_die, cold_text_section_label, + cold_end_label, &range_list_added); for (fde_idx = 0; fde_idx < fde_table_in_use; fde_idx++) { @@ -18448,17 +18840,22 @@ dwarf2out_finish (const char *filename) if (fde->dw_fde_switched_sections) { - add_ranges_by_labels (fde->dw_fde_hot_section_label, - fde->dw_fde_hot_section_end_label); - add_ranges_by_labels (fde->dw_fde_unlikely_section_label, - fde->dw_fde_unlikely_section_end_label); + add_ranges_by_labels (comp_unit_die, + fde->dw_fde_hot_section_label, + fde->dw_fde_hot_section_end_label, + &range_list_added); + add_ranges_by_labels (comp_unit_die, + fde->dw_fde_unlikely_section_label, + fde->dw_fde_unlikely_section_end_label, + &range_list_added); } else - add_ranges_by_labels (fde->dw_fde_begin, - fde->dw_fde_end); + add_ranges_by_labels (comp_unit_die, fde->dw_fde_begin, + fde->dw_fde_end, &range_list_added); } - add_ranges (NULL); + if (range_list_added) + add_ranges (NULL); } /* Output location list section if necessary. */ @@ -18472,7 +18869,7 @@ dwarf2out_finish (const char *filename) output_location_lists (die); } - if (debug_info_level >= DINFO_LEVEL_NORMAL) + if (generate_debug_line_table) add_AT_lineptr (comp_unit_die, DW_AT_stmt_list, debug_line_section_label); @@ -18529,6 +18926,18 @@ dwarf2out_finish (const char *filename) } #endif + /* Output direct and virtual call tables if necessary. */ + if (!VEC_empty (dcall_entry, dcall_table)) + { + switch_to_section (debug_dcall_section); + output_dcall_table (); + } + if (!VEC_empty (vcall_entry, vcall_table)) + { + switch_to_section (debug_vcall_section); + output_vcall_table (); + } + /* Output the address range information. We only put functions in the arange table, so don't write it out if we don't have any. */ if (fde_table_in_use) diff --git a/gcc-4.4.0/gcc/dyn-ipa.c b/gcc-4.4.0/gcc/dyn-ipa.c index 99b7fd25a..ee7eeb464 100644 --- a/gcc-4.4.0/gcc/dyn-ipa.c +++ b/gcc-4.4.0/gcc/dyn-ipa.c @@ -72,6 +72,7 @@ struct dyn_cgraph_edge struct dyn_module_info { struct dyn_pointer_set *imported_modules; + gcov_unsigned_t max_func_ident; }; struct dyn_cgraph @@ -82,6 +83,7 @@ struct dyn_cgraph struct dyn_module_info *sup_modules; const struct gcov_fn_info ***functions; unsigned num_modules; + unsigned num_nodes_executed; }; struct dyn_pointer_set @@ -112,6 +114,8 @@ static void pointer_set_destroy (struct dyn_pointer_set *pset); static struct dyn_cgraph the_dyn_call_graph; +static int total_zero_count = 0; +static int total_insane_count = 0; static void init_dyn_cgraph_node (struct dyn_cgraph_node *node, gcov_type guid) @@ -156,7 +160,17 @@ get_cgraph_node (gcov_type func_guid) gcov_unsigned_t mod_id, func_id; mod_id = get_module_idx_from_func_glob_uid (func_guid); + + /* This is to workaround: calls in __static_initialization_and_destruction + should not be instrumented as the module id context for the callees have + not setup yet -- this leads to mod_id == (unsigned) (0 - 1). Multithreaded + programs may also produce insane func_guid in the profile counter. */ + if (mod_id >= the_dyn_call_graph.num_modules) + return 0; + func_id = get_intra_module_func_id (func_guid); + if (func_id > the_dyn_call_graph.sup_modules[mod_id].max_func_ident) + return 0; return &the_dyn_call_graph.call_graph_nodes[mod_id][func_id]; } @@ -182,6 +196,7 @@ init_dyn_call_graph (void) the_dyn_call_graph.call_graph_nodes = 0; the_dyn_call_graph.modules = 0; the_dyn_call_graph.functions = 0; + the_dyn_call_graph.num_nodes_executed = 0; gi_ptr = __gcov_list; @@ -242,6 +257,8 @@ init_dyn_call_graph (void) the_dyn_call_graph.call_graph_nodes[mod_id] = XNEWVEC (struct dyn_cgraph_node, max_func_ident + 1); + the_dyn_call_graph.sup_modules[mod_id].max_func_ident = max_func_ident; + for (j = 0; j < max_func_ident + 1; j++) init_dyn_cgraph_node (&the_dyn_call_graph.call_graph_nodes[mod_id][j], 0); @@ -366,16 +383,20 @@ gcov_build_callgraph_dc_fn (struct dyn_cgraph_node *caller, { struct dyn_cgraph_node *callee; gcov_type count; - gcov_type callee_guid = dir_call_counters[i]; + gcov_type callee_guid = dir_call_counters[i]; + count = dir_call_counters[i + 1]; if (count == 0) - continue; - /* This is to workaround: calls in __static_initialization_and_destruction - should not be instrumented as the module id context for the calles have - not setup yet. */ - if (EXTRACT_MODULE_ID_FROM_GLOBAL_ID (callee_guid) == 0) - continue; + { + total_zero_count++; + continue; + } callee = get_cgraph_node (callee_guid); + if (!callee) + { + total_insane_count++; + continue; + } gcov_add_cgraph_edge (caller, callee, count); } } @@ -398,15 +419,18 @@ gcov_build_callgraph_ic_fn (struct dyn_cgraph_node *caller, struct dyn_cgraph_node *callee; gcov_type count; gcov_type callee_guid = value_array[j]; + count = value_array[j + 1]; + /* Do not update zero edge count here as + it means no such target. */ if (count == 0) continue; - /* This is to workaround: calls in __static_initialization_and_destruction - should not be instrumented as the module id context for the calles have - not setup yet. */ - if (EXTRACT_MODULE_ID_FROM_GLOBAL_ID (callee_guid) == 0) - continue; callee = get_cgraph_node (callee_guid); + if (!callee) + { + total_insane_count++; + continue; + } gcov_add_cgraph_edge (caller, callee, count); } } @@ -427,6 +451,7 @@ gcov_build_callgraph (void) const struct gcov_fn_info *fi_ptr; unsigned c_ix, f_ix, n_counts, dp_cix = 0, ip_cix = 0; gcov_type *dcall_profile_values, *icall_profile_values; + gcov_type *arcs_values = 0; unsigned arcs_cix; gi_ptr = the_dyn_call_graph.modules[m_ix]; @@ -446,6 +471,11 @@ gcov_build_callgraph (void) icall_profile_values = gi_ptr->counts[c_ix].values; ip_cix = c_ix; } + if (t_ix == GCOV_COUNTER_ARCS) + { + arcs_values = gi_ptr->counts[c_ix].values; + arcs_cix = c_ix; + } c_ix++; } @@ -469,6 +499,17 @@ gcov_build_callgraph (void) gcov_build_callgraph_ic_fn (caller, icall_profile_values, n_counts); icall_profile_values += n_counts; } + if (arcs_values && 0) + { + gcov_type total_arc_count = 0; + unsigned arc; + n_counts = fi_ptr->n_ctrs[arcs_cix]; + for (arc = 0; arc < n_counts; arc++) + total_arc_count += arcs_values[arc]; + if (total_arc_count != 0) + the_dyn_call_graph.num_nodes_executed++; + arcs_values += n_counts; + } } } @@ -709,10 +750,13 @@ gcov_compute_cutoff_count (void) } if (do_dump) - fprintf (stderr, "//total = %.0f cum = %.0f cum/total = %.0f%%" - " cutoff_count = %lld [total edges: %d hot edges: %d perc: %d%%]\n", + fprintf (stderr, "// total = %.0f cum = %.0f cum/total = %.0f%%" + " cutoff_count = %lld [total edges: %d hot edges: %d perc: %d%%]\n" + " total_zero_count_edges = %d total_insane_count_edgess = %d\n" + " total_nodes_executed = %d\n", total, cum, (cum * 100)/total, (long long) cutoff_count, - num_edges, i, (i * 100)/num_edges); + num_edges, i, (i * 100)/num_edges, total_zero_count, + total_insane_count, the_dyn_call_graph.num_nodes_executed); XDELETEVEC (edges); return cutoff_count; @@ -1011,7 +1055,7 @@ gcov_write_module_info (const struct gcov_info *mod_info, len += 2; /* each name string is led by a length. */ num_strings = module_info->num_quote_paths + module_info->num_bracket_paths + - module_info->num_cpp_defines; + module_info->num_cpp_defines + module_info->num_cl_args; for (i = 0; i < num_strings; i++) { gcov_unsigned_t string_len @@ -1021,7 +1065,7 @@ gcov_write_module_info (const struct gcov_info *mod_info, len += 1; /* Each string is lead by a length. */ } - len += 7; /* 7 more fields */ + len += 8; /* 8 more fields */ gcov_write_tag_length (GCOV_TAG_MODULE_INFO, len); gcov_write_unsigned (module_info->ident); @@ -1031,6 +1075,7 @@ gcov_write_module_info (const struct gcov_info *mod_info, gcov_write_unsigned (module_info->num_quote_paths); gcov_write_unsigned (module_info->num_bracket_paths); gcov_write_unsigned (module_info->num_cpp_defines); + gcov_write_unsigned (module_info->num_cl_args); /* Now write the filenames */ aligned_fname = (gcov_unsigned_t *) alloca ((filename_len + src_filename_len + 2) * diff --git a/gcc-4.4.0/gcc/final.c b/gcc-4.4.0/gcc/final.c index edc5a0989..dc9a6d818 100644 --- a/gcc-4.4.0/gcc/final.c +++ b/gcc-4.4.0/gcc/final.c @@ -133,9 +133,6 @@ static int last_linenum; /* Last discriminator written to assembly. */ static int last_discriminator; -/* Discriminator of current block. */ -static int discriminator; - /* Highest line number in current block. */ static int high_block_linenum; @@ -145,9 +142,10 @@ static int high_function_linenum; /* Filename of last NOTE. */ static const char *last_filename; -/* Override filename and line number. */ +/* Override filename, line number, and discriminator. */ static const char *override_filename; static int override_linenum; +static int override_discriminator; /* Whether to force emission of a line note before the next insn. */ static bool force_source_line = false; @@ -203,10 +201,8 @@ rtx final_sequence; static int dialect_number; #endif -#ifdef HAVE_conditional_execution /* Nonnull if the insn currently being emitted was a COND_EXEC pattern. */ rtx current_insn_predicate; -#endif #ifdef HAVE_ATTR_length static int asm_insn_count (rtx); @@ -1439,10 +1435,10 @@ add_debug_prefix_map (const char *arg) return; } map = XNEW (debug_prefix_map); - map->old_prefix = ggc_alloc_string (arg, p - arg); + map->old_prefix = xstrndup (arg, p - arg); map->old_len = p - arg; p++; - map->new_prefix = ggc_strdup (p); + map->new_prefix = xstrdup (p); map->new_len = strlen (p); map->next = debug_prefix_maps; debug_prefix_maps = map; @@ -1492,7 +1488,7 @@ final_start_function (rtx first ATTRIBUTE_UNUSED, FILE *file, last_filename = locator_file (prologue_locator); last_linenum = locator_line (prologue_locator); - last_discriminator = discriminator = 0; + last_discriminator = 0; high_block_linenum = high_function_linenum = last_linenum; @@ -1537,7 +1533,8 @@ final_start_function (rtx first ATTRIBUTE_UNUSED, FILE *file, { /* Issue a warning */ warning (OPT_Wframe_larger_than_, - "the frame size of %wd bytes is larger than %wd bytes", + "the frame size of %wd bytes is larger than %wd bytes; " + "see http://go/big_stack_frame", get_frame_size (), frame_larger_than_size); } @@ -1849,8 +1846,6 @@ final_scan_insn (rtx insn, FILE *file, int optimize ATTRIBUTE_UNUSED, else *seen |= SEEN_BB; - discriminator = NOTE_BASIC_BLOCK (insn)->discriminator; - break; case NOTE_INSN_EH_REGION_BEG: @@ -1934,6 +1929,8 @@ final_scan_insn (rtx insn, FILE *file, int optimize ATTRIBUTE_UNUSED, { override_filename = LOCATION_FILE (*locus_ptr); override_linenum = LOCATION_LINE (*locus_ptr); + override_discriminator = + get_discriminator_from_locus (*locus_ptr); } } break; @@ -1966,11 +1963,14 @@ final_scan_insn (rtx insn, FILE *file, int optimize ATTRIBUTE_UNUSED, { override_filename = LOCATION_FILE (*locus_ptr); override_linenum = LOCATION_LINE (*locus_ptr); + override_discriminator = + get_discriminator_from_locus (*locus_ptr); } else { override_filename = NULL; override_linenum = 0; + override_discriminator = 0; } } break; @@ -2088,10 +2088,9 @@ final_scan_insn (rtx insn, FILE *file, int optimize ATTRIBUTE_UNUSED, const char *templ; bool is_stmt; -#ifdef HAVE_conditional_execution /* Reset this early so it is correct for ASM statements. */ current_insn_predicate = NULL_RTX; -#endif + /* An INSN, JUMP_INSN or CALL_INSN. First check for special kinds that recog doesn't recognize. */ @@ -2566,10 +2565,9 @@ final_scan_insn (rtx insn, FILE *file, int optimize ATTRIBUTE_UNUSED, FINAL_PRESCAN_INSN (insn, recog_data.operand, recog_data.n_operands); #endif -#ifdef HAVE_conditional_execution - if (GET_CODE (PATTERN (insn)) == COND_EXEC) + if (targetm.have_conditional_execution () + && GET_CODE (PATTERN (insn)) == COND_EXEC) current_insn_predicate = COND_EXEC_TEST (PATTERN (insn)); -#endif #ifdef HAVE_cc0 cc_prev_status = cc_status; @@ -2660,6 +2658,26 @@ final_scan_insn (rtx insn, FILE *file, int optimize ATTRIBUTE_UNUSED, /* Output assembler code from the template. */ output_asm_insn (templ, recog_data.operand); + /* Record point-of-call information for ICF debugging. */ + if (flag_enable_icf_debug && CALL_P (insn)) + { + rtx x = call_from_call_insn (insn); + x = XEXP (x, 0); + if (x && MEM_P (x)) + { + if (GET_CODE (XEXP (x, 0)) == SYMBOL_REF) + { + tree t; + x = XEXP (x, 0); + t = SYMBOL_REF_DECL (x); + if (t) + (*debug_hooks->direct_call) (t); + } + else + (*debug_hooks->virtual_call) (INSN_UID (insn)); + } + } + /* If necessary, report the effect that the instruction has on the unwind info. We've already done this for delay slots and call instructions. */ @@ -2687,16 +2705,19 @@ notice_source_line (rtx insn, bool *is_stmt) { const char *filename; int linenum; + int discriminator; if (override_filename) { filename = override_filename; linenum = override_linenum; + discriminator = override_discriminator; } else { filename = insn_file (insn); linenum = insn_line (insn); + discriminator = insn_discriminator (insn); } if (filename == NULL) @@ -4386,4 +4407,3 @@ struct rtl_opt_pass pass_clean_state = 0 /* todo_flags_finish */ } }; - diff --git a/gcc-4.4.0/gcc/flags.h b/gcc-4.4.0/gcc/flags.h index 3c4b27628..57ea8c0c4 100644 --- a/gcc-4.4.0/gcc/flags.h +++ b/gcc-4.4.0/gcc/flags.h @@ -55,6 +55,10 @@ enum debug_info_level /* Specify how much debugging info to generate. */ extern enum debug_info_level debug_info_level; +/* Whether to generate line number table. Normally set at DINFO_LEVEL_NORMAL + or above; can also be set for DINFO_LEVEL_TERSE with -gmlt. */ +extern bool generate_debug_line_table; + /* A major contribution to object and executable size is debug information size. A major contribution to debug information size is struct descriptions replicated in several object files. @@ -282,6 +286,13 @@ extern int flag_var_tracking; warning message in case flag was set by -fprofile-{generate,use}. */ extern bool flag_speculative_prefetching_set; +enum sp_aggregate_using_type +{ + SAMPLE_PROFILE_AGGREGATE_USING_AVG, + SAMPLE_PROFILE_AGGREGATE_USING_MAX +}; +extern enum sp_aggregate_using_type flag_sample_profile_aggregate_using; + /* Type of stack check. */ enum stack_check_type { diff --git a/gcc-4.4.0/gcc/fold-const.c b/gcc-4.4.0/gcc/fold-const.c index e38850fd5..623bd61e9 100644 --- a/gcc-4.4.0/gcc/fold-const.c +++ b/gcc-4.4.0/gcc/fold-const.c @@ -66,6 +66,8 @@ along with GCC; see the file COPYING3. If not see #include "langhooks.h" #include "md5.h" #include "gimple.h" +#include "tree-flow.h" +#include "tree-flow-inline.h" /* Nonzero if we are folding constants inside an initializer; zero otherwise. */ @@ -5265,59 +5267,66 @@ fold_cond_expr_with_comparison (tree type, tree arg0, tree arg1, tree arg2) return fold_build3 (COND_EXPR, type, arg0, arg1, arg2); case LT_EXPR: - /* If C1 is C2 + 1, this is min(A, C2). */ + /* If C1 is C2 + 1, this is min(A, C2), but use ARG00's type for + MIN_EXPR, to preserve the signedness of the comparison. */ if (! operand_equal_p (arg2, TYPE_MAX_VALUE (type), OEP_ONLY_CONST) && operand_equal_p (arg01, const_binop (PLUS_EXPR, arg2, build_int_cst (type, 1), 0), OEP_ONLY_CONST)) - return pedantic_non_lvalue (fold_build2 (MIN_EXPR, - type, - fold_convert (type, arg1), - arg2)); + { + tem = fold_build2 (MIN_EXPR, TREE_TYPE (arg00), arg00, + fold_convert (TREE_TYPE (arg00), arg2)); + return pedantic_non_lvalue (fold_convert (type, tem)); + } break; case LE_EXPR: - /* If C1 is C2 - 1, this is min(A, C2). */ + /* If C1 is C2 - 1, this is min(A, C2), with the same care + as above. */ if (! operand_equal_p (arg2, TYPE_MIN_VALUE (type), OEP_ONLY_CONST) && operand_equal_p (arg01, const_binop (MINUS_EXPR, arg2, build_int_cst (type, 1), 0), OEP_ONLY_CONST)) - return pedantic_non_lvalue (fold_build2 (MIN_EXPR, - type, - fold_convert (type, arg1), - |