Index: gcc-4.3.4/configure.ac =================================================================== --- gcc-4.3.4.orig/configure.ac 2009-04-25 07:55:24.000000000 +0200 +++ gcc-4.3.4/configure.ac 2009-08-10 09:04:59.698821593 +0200 @@ -1669,6 +1669,38 @@ AC_ARG_WITH([debug-prefix-map], [DEBUG_PREFIX_CFLAGS_FOR_TARGET=]) AC_SUBST(DEBUG_PREFIX_CFLAGS_FOR_TARGET) +# During gcc bootstrap, if we use some random cc for stage1 then CFLAGS +# might be empty or "-g". We don't require a C++ compiler, so CXXFLAGS +# might also be empty (or "-g", if a non-GCC C++ compiler is in the path). +# We want to ensure that TARGET libraries (which we know are built with +# gcc) are built with "-O2 -g", so include those options when setting +# CFLAGS_FOR_TARGET and CXXFLAGS_FOR_TARGET. +if test "x$CFLAGS_FOR_TARGET" = x; then + CFLAGS_FOR_TARGET=$CFLAGS + case " $CFLAGS " in + *" -O2 "*) ;; + *) CFLAGS_FOR_TARGET="-O2 $CFLAGS" ;; + esac + case " $CFLAGS " in + *" -g "* | *" -g3 "*) ;; + *) CFLAGS_FOR_TARGET="-g $CFLAGS" ;; + esac +fi +AC_SUBST(CFLAGS_FOR_TARGET) + +if test "x$CXXFLAGS_FOR_TARGET" = x; then + CXXFLAGS_FOR_TARGET=$CXXFLAGS + case " $CXXFLAGS " in + *" -O2 "*) ;; + *) CXXFLAGS_FOR_TARGET="-O2 $CXXFLAGS" ;; + esac + case " $CXXFLAGS " in + *" -g "* | *" -g3 "*) ;; + *) CXXFLAGS_FOR_TARGET="-g $CXXFLAGS" ;; + esac +fi +AC_SUBST(CXXFLAGS_FOR_TARGET) + # Handle --with-headers=XXX. If the value is not "yes", the contents of # the named directory are copied to $(tooldir)/sys-include. if test x"${with_headers}" != x && test x"${with_headers}" != xno ; then Index: gcc-4.3.4/Makefile.def =================================================================== --- gcc-4.3.4.orig/Makefile.def 2009-04-25 07:55:24.000000000 +0200 +++ gcc-4.3.4/Makefile.def 2009-08-10 09:04:59.698821593 +0200 @@ -214,6 +214,7 @@ flags_to_pass = { flag= INSTALL ; }; flags_to_pass = { flag= INSTALL_DATA ; }; flags_to_pass = { flag= INSTALL_PROGRAM ; }; flags_to_pass = { flag= INSTALL_SCRIPT ; }; +flags_to_pass = { flag= LDFLAGS_FOR_BUILD ; }; flags_to_pass = { flag= LEX ; }; flags_to_pass = { flag= M4 ; }; flags_to_pass = { flag= MAKE ; }; @@ -511,43 +512,51 @@ bootstrap_stage = { // compiler probably has never heard of them. stage_configure_flags='--disable-intermodule $(STAGE1_CHECKING) \ --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"' ; - stage_cflags='$(STAGE1_CFLAGS)' ; }; + stage_cflags='$(STAGE1_CFLAGS)' ; + stage_libcflags='$(STAGE1_LIBCFLAGS)' ; }; bootstrap_stage = { id=2 ; prev=1 ; bootstrap_target=bootstrap2 ; stage_configure_flags="@stage2_werror_flag@" ; - stage_cflags="$(STAGE2_CFLAGS)" ; }; + stage_cflags="$(STAGE2_CFLAGS)" ; + stage_libcflags="$(STAGE2_LIBCFLAGS)" ; }; bootstrap_stage = { id=b2g0 ; prev=1 ; bootstrap_target=bootstrap2-debug ; stage_configure_flags="@stage2_werror_flag@" ; - stage_cflags="$(STAGE2_CFLAGS) -g0" ; }; + stage_cflags="$(STAGE2_CFLAGS) -g0" ; + stage_libcflags="$(STAGE2_LIBCFLAGS) -g0" ; }; bootstrap_stage = { id=3 ; prev=2 ; lean=1 ; compare_target=compare ; bootstrap_target=bootstrap ; cleanstrap_target=cleanstrap ; stage_configure_flags="@stage2_werror_flag@" ; - stage_cflags="$(STAGE3_CFLAGS)" ; }; + stage_cflags="$(STAGE3_CFLAGS)" ; + stage_libcflags="$(STAGE3_LIBCFLAGS)" ; }; bootstrap_stage = { id=b3g2 ; prev=b2g0 ; lean=1 ; compare_target=compare-debug ; bootstrap_target=bootstrap-debug ; cleanstrap_target=cleanstrap-debug ; stage_configure_flags="@stage2_werror_flag@" ; - stage_cflags="$(STAGE3_CFLAGS) -g2" ; }; + stage_cflags="$(STAGE3_CFLAGS) -g2" ; + stage_libcflags="$(STAGE3_LIBCFLAGS) -g2" ; }; bootstrap_stage = { id=4 ; prev=3 ; lean=2 ; compare_target=compare3 ; bootstrap_target=bootstrap4 ; stage_configure_flags="@stage2_werror_flag@" ; - stage_cflags="$(STAGE4_CFLAGS)" ; }; + stage_cflags="$(STAGE4_CFLAGS)" ; + stage_libcflags="$(STAGE4_CFLAGS)" ; }; bootstrap_stage = { id=profile ; prev=1 ; stage_configure_flags="@stage2_werror_flag@" ; - stage_cflags='$(STAGE2_CFLAGS) -fprofile-generate' ; }; + stage_cflags='$(STAGE2_CFLAGS) -fprofile-generate' ; + stage_libcflags='$(STAGE2_LIBCFLAGS) -fprofile-generate' ; }; bootstrap_stage = { id=feedback ; prev=profile ; bootstrap_target=profiledbootstrap ; stage_configure_flags="@stage2_werror_flag@" ; - stage_cflags='$(STAGE3_CFLAGS) -fprofile-use' ; }; + stage_cflags='$(STAGE3_CFLAGS) -fprofile-use' ; + stage_libcflags='$(STAGE3_LIBCFLAGS) -fprofile-use' ; }; Index: gcc-4.3.4/Makefile.tpl =================================================================== --- gcc-4.3.4.orig/Makefile.tpl 2009-02-05 16:37:38.000000000 +0100 +++ gcc-4.3.4/Makefile.tpl 2009-08-10 09:04:59.702824809 +0200 @@ -23,6 +23,14 @@ in # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # +# First, test for a proper version of make, but only where one is required. + +@if gcc +ifeq (,$(.VARIABLES)) # The variable .VARIABLES, new with 3.80, is never empty. +$(error GNU make version 3.80 or newer is required.) +endif +@endif gcc + # ------------------------------- # Standard Autoconf-set variables # ------------------------------- @@ -139,6 +147,13 @@ BUILD_EXPORTS = \ WINDRES="$(WINDRES_FOR_BUILD)"; export WINDRES; \ WINDMC="$(WINDMC_FOR_BUILD)"; export WINDMC; +# These variables must be set on the make command line for directories +# built for the build system to override those in BASE_FLAGS_TO_PASSS. +EXTRA_BUILD_FLAGS = \ + CFLAGS="$(CFLAGS_FOR_BUILD)" \ + LDFLAGS="$(LDFLAGS_FOR_BUILD)" \ + LIBCFLAGS="" + # This is the list of directories to built for the host system. SUBDIRS = @configdirs@ # This is set by the configure script to the arguments to use when configuring @@ -153,6 +168,7 @@ HOST_SUBDIR = @host_subdir@ HOST_EXPORTS = \ $(BASE_EXPORTS) \ CC="$(CC)"; export CC; \ + ADA_CFLAGS="$(ADA_CFLAGS)"; export ADA_CFLAGS; \ CFLAGS="$(CFLAGS)"; export CFLAGS; \ CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ CXX="$(CXX)"; export CXX; \ @@ -207,10 +223,10 @@ BASE_TARGET_EXPORTS = \ AR="$(AR_FOR_TARGET)"; export AR; \ AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \ CC="$(CC_FOR_TARGET)"; export CC; \ - CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CFLAGS="$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \ CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \ - CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS; \ GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \ GFORTRAN="$(GFORTRAN_FOR_TARGET)"; export GFORTRAN; \ DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \ @@ -323,7 +339,6 @@ LDFLAGS = @LDFLAGS@ LIBCFLAGS = $(CFLAGS) CXXFLAGS = @CXXFLAGS@ LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates -PICFLAG = # 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 @@ -331,14 +346,19 @@ PICFLAG = # MAKEINFO and MAKEINFOFLAGS are explicitly passed here to make them # overrideable (for a bootstrap build stage1 also builds gcc.info). -STAGE1_CFLAGS=@stage1_cflags@ STAGE1_CHECKING=@stage1_checking@ STAGE1_LANGUAGES=@stage1_languages@ +STAGE1_CFLAGS=@stage1_cflags@ STAGE2_CFLAGS=$(BOOT_CFLAGS) STAGE3_CFLAGS=$(BOOT_CFLAGS) STAGE4_CFLAGS=$(BOOT_CFLAGS) +STAGE1_LIBCFLAGS=$(CFLAGS_FOR_TARGET) +STAGE2_LIBCFLAGS=$(CFLAGS_FOR_TARGET) +STAGE3_LIBCFLAGS=$(CFLAGS_FOR_TARGET) +STAGE4_LIBCFLAGS=$(CFLAGS_FOR_TARGET) + do-compare = @do_compare@ do-compare3 = $(do-compare) do-compare-debug = $(SHELL) $(srcdir)/contrib/compare-debug $$f1 $$f2 @@ -377,22 +397,14 @@ COMPILER_AS_FOR_TARGET=@COMPILER_AS_FOR_ COMPILER_LD_FOR_TARGET=@COMPILER_LD_FOR_TARGET@ COMPILER_NM_FOR_TARGET=@COMPILER_NM_FOR_TARGET@ -# During gcc bootstrap, if we use some random cc for stage1 then CFLAGS -# might be empty or "-g". We don't require a C++ compiler, so CXXFLAGS -# might also be empty (or "-g", if a non-GCC C++ compiler is in the path). -# We want to ensure that TARGET libraries (which we know are built with -# gcc) are built with "-O2 -g", so prepend those options when setting -# CFLAGS_FOR_TARGET and CXXFLAGS_FOR_TARGET. -CFLAGS_FOR_TARGET = -O2 -g $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) \ - $(DEBUG_PREFIX_CFLAGS_FOR_TARGET) +CFLAGS_FOR_TARGET = @CFLAGS_FOR_TARGET@ +CXXFLAGS_FOR_TARGET = @CXXFLAGS_FOR_TARGET@ SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@ DEBUG_PREFIX_CFLAGS_FOR_TARGET = @DEBUG_PREFIX_CFLAGS_FOR_TARGET@ -CXXFLAGS_FOR_TARGET = -O2 -g $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) \ - $(DEBUG_PREFIX_CFLAGS_FOR_TARGET) + LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates -LDFLAGS_FOR_TARGET = -PICFLAG_FOR_TARGET = +LDFLAGS_FOR_TARGET = @LDFLAGS@ # ------------------------------------ # Miscellaneous targets and flag lists @@ -492,19 +504,20 @@ POSTSTAGE1_FLAGS_TO_PASS = \ # Flags to pass down to makes which are built with the target environment. # The double $ decreases the length of the command line; those variables # are set in BASE_FLAGS_TO_PASS, and the sub-make will expand them. The -# COMPILER_ prefixed variables are not passed down so we expand them here. +# *_CFLAGS_FOR_TARGET variables are not passed down and most often empty, +# so we expand them here. EXTRA_TARGET_FLAGS = \ 'AR=$$(AR_FOR_TARGET)' \ 'AS=$(COMPILER_AS_FOR_TARGET)' \ 'CC=$$(CC_FOR_TARGET)' \ - 'CFLAGS=$$(CFLAGS_FOR_TARGET)' \ + 'CFLAGS=$$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \ 'CXX=$$(CXX_FOR_TARGET)' \ - 'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \ + 'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \ 'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \ 'LD=$(COMPILER_LD_FOR_TARGET)' \ 'LDFLAGS=$$(LDFLAGS_FOR_TARGET)' \ - 'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \ - 'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \ + 'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \ + 'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \ 'NM=$(COMPILER_NM_FOR_TARGET)' \ 'OBJDUMP=$$(OBJDUMP_FOR_TARGET)' \ 'RANLIB=$$(RANLIB_FOR_TARGET)' \ @@ -852,9 +865,11 @@ configure-stage[+id+]-[+prefix+][+module fi; \ [+ ENDIF check_multilibs +]test ! -f [+subdir+]/[+module+]/Makefile || exit 0; \ [+exports+][+ IF prev +] \ - [+poststage1_exports+][+ ENDIF prev +] \ + [+poststage1_exports+][+ ENDIF prev +] [+ IF prefix +] \ + CFLAGS="[+stage_libcflags+] $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="[+stage_libcflags+] $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS; [+ ELSE +] \ CFLAGS="[+stage_cflags+]"; export CFLAGS; \ - LIBCFLAGS="[+stage_cflags+]"; export LIBCFLAGS; \ + CXXFLAGS="[+stage_cflags+]"; export CXXFLAGS; [+ ENDIF +] \ echo Configuring stage [+id+] in [+subdir+]/[+module+] ; \ $(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+] ; \ cd [+subdir+]/[+module+] || exit 1; \ @@ -891,7 +906,8 @@ all-[+prefix+][+module+]: configure-[+pr s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ [+exports+] \ (cd [+subdir+]/[+module+] && \ - $(MAKE) [+args+] [+extra_make_flags+] $(TARGET-[+prefix+][+module+])) + $(MAKE) $(BASE_FLAGS_TO_PASS) [+args+] [+extra_make_flags+] \ + $(TARGET-[+prefix+][+module+])) @endif [+prefix+][+module+] [+ IF bootstrap +] @@ -911,8 +927,11 @@ all-stage[+id+]-[+prefix+][+module+]: co [+exports+][+ IF prev +] \ [+poststage1_exports+][+ ENDIF prev +] \ cd [+subdir+]/[+module+] && \ - $(MAKE) [+args+] \ - CFLAGS="[+stage_cflags+]" LIBCFLAGS="[+stage_cflags+]" [+ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="[+stage_cflags+]" CXXFLAGS="[+stage_cflags+]" \ + LIBCFLAGS="[+stage_libcflags+]" \ + CFLAGS_FOR_TARGET="[+stage_libcflags+]" \ + CXXFLAGS_FOR_TARGET="[+stage_libcflags+]" [+args+] [+ IF prev +][+poststage1_args+][+ ENDIF prev +] [+extra_make_flags+] \ $(TARGET-stage[+id+]-[+prefix+][+module+]) @@ -945,7 +964,8 @@ clean-stage[+id+]-[+prefix+][+module+]: target_alias=(get "target" "${target_alias}") args="$(BUILD_CONFIGARGS)" no-config-site=true +] -[+ all prefix="build-" subdir="$(BUILD_SUBDIR)" exports="$(BUILD_EXPORTS)" +] +[+ all prefix="build-" subdir="$(BUILD_SUBDIR)" exports="$(BUILD_EXPORTS)" + args="$(EXTRA_BUILD_FLAGS)" +] [+ ENDFOR build_module +] # -------------------------------------- @@ -962,7 +982,7 @@ clean-stage[+id+]-[+prefix+][+module+]: [+ all prefix="" subdir="$(HOST_SUBDIR)" exports="$(HOST_EXPORTS)" poststage1_exports="$(POSTSTAGE1_HOST_EXPORTS)" - args="$(FLAGS_TO_PASS)" + args="$(EXTRA_HOST_FLAGS)" poststage1_args="$(POSTSTAGE1_FLAGS_TO_PASS)" +] .PHONY: check-[+module+] maybe-check-[+module+] @@ -1060,7 +1080,7 @@ maybe-[+make_target+]-[+module+]: [+make [+ all prefix="target-" subdir="$(TARGET_SUBDIR)" exports="$(RAW_CXX_TARGET_EXPORTS)" - args="$(TARGET_FLAGS_TO_PASS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'" +] + args="$(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'" +] [+ ELSE +] [+ configure prefix="target-" subdir="$(TARGET_SUBDIR)" check_multilibs=true @@ -1071,7 +1091,7 @@ maybe-[+make_target+]-[+module+]: [+make [+ all prefix="target-" subdir="$(TARGET_SUBDIR)" exports="$(NORMAL_TARGET_EXPORTS)" - args="$(TARGET_FLAGS_TO_PASS)" +] + args="$(EXTRA_TARGET_FLAGS)" +] [+ ENDIF +] .PHONY: check-target-[+module+] maybe-check-target-[+module+] @@ -1301,7 +1321,7 @@ stage[+id+]-end:: [+ FOR host_modules +] # Bubble a bug fix through all the stages up to stage [+id+]. They are # remade, but not reconfigured. The next stage (if any) will not be -# reconfigured as well. +# reconfigured either. .PHONY: stage[+id+]-bubble stage[+id+]-bubble:: [+ IF prev +]stage[+prev+]-bubble[+ ENDIF +] @r=`${PWD_COMMAND}`; export r; \ @@ -1442,11 +1462,11 @@ stage_current: @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi .PHONY: restrap -restrap: +restrap:: @: $(MAKE); $(stage) rm -rf stage1-$(TARGET_SUBDIR) [+ FOR bootstrap-stage +][+ IF prev +]stage[+id+]-* [+ ENDIF prev +][+ ENDFOR bootstrap-stage +] - $(MAKE) $(RECURSE_FLAGS_TO_PASS) all +restrap:: all @endif gcc-bootstrap # -------------------------------------- @@ -1477,7 +1497,7 @@ configure-target-[+module+]: maybe-all-g [+ ;; These Scheme functions build the bulk of the dependencies. ;; dep-target builds a string like "maybe-all-MODULE_KIND-gcc", - ;; where "maybe-" is only included if HARD is true, and all-gcc + ;; where "maybe-" is only included if HARD is not true, and all-gcc ;; is taken from VAR-NAME. (define dep-target (lambda (module-kind var-name hard) (string-append @@ -1635,7 +1655,8 @@ config.status: configure # Rebuilding configure. AUTOCONF = autoconf -$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac $(srcdir)/config/acx.m4 +$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac $(srcdir)/config/acx.m4 \ + $(srcdir)/config/override.m4 $(srcdir)/config/proginstall.m4 cd $(srcdir) && $(AUTOCONF) # ------------------------------ Index: gcc-4.3.4/config/mh-ppc-darwin =================================================================== --- gcc-4.3.4.orig/config/mh-ppc-darwin 2007-05-23 16:26:31.000000000 +0200 +++ gcc-4.3.4/config/mh-ppc-darwin 2009-08-10 09:04:59.702824809 +0200 @@ -2,5 +2,4 @@ # position-independent-code -- the usual default on Darwin. This fix speeds # compiles by 3-5%. -# Broken because of PR32009. -# BOOT_CFLAGS=-g -O2 -mdynamic-no-pic +BOOT_CFLAGS=-g -O2 -mdynamic-no-pic Index: gcc-4.3.4/gcc/doc/install.texi =================================================================== --- gcc-4.3.4.orig/gcc/doc/install.texi 2009-01-07 01:52:26.000000000 +0100 +++ gcc-4.3.4/gcc/doc/install.texi 2009-08-10 09:04:59.706827352 +0200 @@ -1778,33 +1778,35 @@ same described above, but object files f stage2 of the 3-stage bootstrap of the compiler are deleted as soon as they are no longer needed. -If you want to save additional space during the bootstrap and in -the final installation as well, you can build the compiler binaries -without debugging information as in the following example. This will save -roughly 40% of disk space both for the bootstrap and the final installation. -(Libraries will still contain debugging information.) - -@smallexample - make CFLAGS='-O' LIBCFLAGS='-g -O2' \ - LIBCXXFLAGS='-g -O2 -fno-implicit-templates' bootstrap -@end smallexample - -If you wish to use non-default GCC flags when compiling the stage2 and -stage3 compilers, set @code{BOOT_CFLAGS} on the command line when doing -@samp{make}. Non-default optimization flags are less well -tested here than the default of @samp{-g -O2}, but should still work. -In a few cases, you may find that you need to specify special flags such -as @option{-msoft-float} here to complete the bootstrap; or, if the -native compiler miscompiles the stage1 compiler, you may need to work -around this, by choosing @code{BOOT_CFLAGS} to avoid the parts of the -stage1 compiler that were miscompiled, or by using @samp{make +If you wish to use non-default GCC flags when compiling the stage2 +and stage3 compilers, set @code{BOOT_CFLAGS} on the command line when +doing @samp{make}. For example, if you want to save additional space +during the bootstrap and in the final installation as well, you can +build the compiler binaries without debugging information as in the +following example. This will save roughly 40% of disk space both for +the bootstrap and the final installation. (Libraries will still contain +debugging information.) + +@smallexample + make BOOT_CFLAGS='-O' bootstrap +@end smallexample + +You can place non-default optimization flags into @code{BOOT_CFLAGS}; they +are less well tested here than the default of @samp{-g -O2}, but should +still work. In a few cases, you may find that you need to specify special +flags such as @option{-msoft-float} here to complete the bootstrap; or, +if the native compiler miscompiles the stage1 compiler, you may need +to work around this, by choosing @code{BOOT_CFLAGS} to avoid the parts +of the stage1 compiler that were miscompiled, or by using @samp{make bootstrap4} to increase the number of stages of bootstrap. -Note that using non-standard @code{CFLAGS} can cause bootstrap to fail -if these trigger a warning with the new compiler. For example using -@samp{-O2 -g -mcpu=i686} on @code{i686-pc-linux-gnu} will cause bootstrap -failure as @option{-mcpu=} is deprecated in 3.4.0 and above. - +@code{BOOT_CFLAGS} does not apply to bootstrapped target libraries. +Since these are always compiled with the compiler currently being +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. If you used the flag @option{--enable-languages=@dots{}} to restrict the compilers to be built, only those you've actually enabled will be @@ -2687,8 +2689,8 @@ new version of DEC Unix, you should rebu stamp. @samp{make compare} may fail on old versions of DEC Unix unless you add -@option{-save-temps} to @code{CFLAGS}. On these systems, the name of the -assembler input file is stored in the object file, and that makes +@option{-save-temps} to @code{BOOT_CFLAGS}. On these systems, the name +of the assembler input file is stored in the object file, and that makes comparison fail if it differs between the @code{stage1} and @code{stage2} compilations. The option @option{-save-temps} forces a fixed name to be used for the assembler input file, instead of a Index: gcc-4.3.4/Makefile.in =================================================================== --- gcc-4.3.4.orig/Makefile.in 2009-04-25 07:55:24.000000000 +0200 +++ gcc-4.3.4/Makefile.in 2009-08-10 09:04:59.742841494 +0200 @@ -20,6 +20,14 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # +# First, test for a proper version of make, but only where one is required. + +@if gcc +ifeq (,$(.VARIABLES)) # The variable .VARIABLES, new with 3.80, is never empty. +$(error GNU make version 3.80 or newer is required.) +endif +@endif gcc + # ------------------------------- # Standard Autoconf-set variables # ------------------------------- @@ -136,6 +144,13 @@ BUILD_EXPORTS = \ WINDRES="$(WINDRES_FOR_BUILD)"; export WINDRES; \ WINDMC="$(WINDMC_FOR_BUILD)"; export WINDMC; +# These variables must be set on the make command line for directories +# built for the build system to override those in BASE_FLAGS_TO_PASSS. +EXTRA_BUILD_FLAGS = \ + CFLAGS="$(CFLAGS_FOR_BUILD)" \ + LDFLAGS="$(LDFLAGS_FOR_BUILD)" \ + LIBCFLAGS="" + # This is the list of directories to built for the host system. SUBDIRS = @configdirs@ # This is set by the configure script to the arguments to use when configuring @@ -150,6 +165,7 @@ HOST_SUBDIR = @host_subdir@ HOST_EXPORTS = \ $(BASE_EXPORTS) \ CC="$(CC)"; export CC; \ + ADA_CFLAGS="$(ADA_CFLAGS)"; export ADA_CFLAGS; \ CFLAGS="$(CFLAGS)"; export CFLAGS; \ CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ CXX="$(CXX)"; export CXX; \ @@ -204,10 +220,10 @@ BASE_TARGET_EXPORTS = \ AR="$(AR_FOR_TARGET)"; export AR; \ AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \ CC="$(CC_FOR_TARGET)"; export CC; \ - CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CFLAGS="$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \ CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \ - CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS; \ GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \ GFORTRAN="$(GFORTRAN_FOR_TARGET)"; export GFORTRAN; \ DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \ @@ -320,7 +336,6 @@ LDFLAGS = @LDFLAGS@ LIBCFLAGS = $(CFLAGS) CXXFLAGS = @CXXFLAGS@ LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates -PICFLAG = # 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 @@ -328,14 +343,19 @@ PICFLAG = # MAKEINFO and MAKEINFOFLAGS are explicitly passed here to make them # overrideable (for a bootstrap build stage1 also builds gcc.info). -STAGE1_CFLAGS=@stage1_cflags@ STAGE1_CHECKING=@stage1_checking@ STAGE1_LANGUAGES=@stage1_languages@ +STAGE1_CFLAGS=@stage1_cflags@ STAGE2_CFLAGS=$(BOOT_CFLAGS) STAGE3_CFLAGS=$(BOOT_CFLAGS) STAGE4_CFLAGS=$(BOOT_CFLAGS) +STAGE1_LIBCFLAGS=$(CFLAGS_FOR_TARGET) +STAGE2_LIBCFLAGS=$(CFLAGS_FOR_TARGET) +STAGE3_LIBCFLAGS=$(CFLAGS_FOR_TARGET) +STAGE4_LIBCFLAGS=$(CFLAGS_FOR_TARGET) + do-compare = @do_compare@ do-compare3 = $(do-compare) do-compare-debug = $(SHELL) $(srcdir)/contrib/compare-debug $$f1 $$f2 @@ -374,22 +394,14 @@ COMPILER_AS_FOR_TARGET=@COMPILER_AS_FOR_ COMPILER_LD_FOR_TARGET=@COMPILER_LD_FOR_TARGET@ COMPILER_NM_FOR_TARGET=@COMPILER_NM_FOR_TARGET@ -# During gcc bootstrap, if we use some random cc for stage1 then CFLAGS -# might be empty or "-g". We don't require a C++ compiler, so CXXFLAGS -# might also be empty (or "-g", if a non-GCC C++ compiler is in the path). -# We want to ensure that TARGET libraries (which we know are built with -# gcc) are built with "-O2 -g", so prepend those options when setting -# CFLAGS_FOR_TARGET and CXXFLAGS_FOR_TARGET. -CFLAGS_FOR_TARGET = -O2 -g $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) \ - $(DEBUG_PREFIX_CFLAGS_FOR_TARGET) +CFLAGS_FOR_TARGET = @CFLAGS_FOR_TARGET@ +CXXFLAGS_FOR_TARGET = @CXXFLAGS_FOR_TARGET@ SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@ DEBUG_PREFIX_CFLAGS_FOR_TARGET = @DEBUG_PREFIX_CFLAGS_FOR_TARGET@ -CXXFLAGS_FOR_TARGET = -O2 -g $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) \ - $(DEBUG_PREFIX_CFLAGS_FOR_TARGET) + LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates -LDFLAGS_FOR_TARGET = -PICFLAG_FOR_TARGET = +LDFLAGS_FOR_TARGET = @LDFLAGS@ # ------------------------------------ # Miscellaneous targets and flag lists @@ -496,6 +508,7 @@ BASE_FLAGS_TO_PASS = \ "INSTALL_DATA=$(INSTALL_DATA)" \ "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \ + "LDFLAGS_FOR_BUILD=$(LDFLAGS_FOR_BUILD)" \ "LEX=$(LEX)" \ "M4=$(M4)" \ "MAKE=$(MAKE)" \ @@ -592,19 +605,20 @@ POSTSTAGE1_FLAGS_TO_PASS = \ # Flags to pass down to makes which are built with the target environment. # The double $ decreases the length of the command line; those variables # are set in BASE_FLAGS_TO_PASS, and the sub-make will expand them. The -# COMPILER_ prefixed variables are not passed down so we expand them here. +# *_CFLAGS_FOR_TARGET variables are not passed down and most often empty, +# so we expand them here. EXTRA_TARGET_FLAGS = \ 'AR=$$(AR_FOR_TARGET)' \ 'AS=$(COMPILER_AS_FOR_TARGET)' \ 'CC=$$(CC_FOR_TARGET)' \ - 'CFLAGS=$$(CFLAGS_FOR_TARGET)' \ + 'CFLAGS=$$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \ 'CXX=$$(CXX_FOR_TARGET)' \ - 'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \ + 'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \ 'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \ 'LD=$(COMPILER_LD_FOR_TARGET)' \ 'LDFLAGS=$$(LDFLAGS_FOR_TARGET)' \ - 'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \ - 'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \ + 'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \ + 'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \ 'NM=$(COMPILER_NM_FOR_TARGET)' \ 'OBJDUMP=$$(OBJDUMP_FOR_TARGET)' \ 'RANLIB=$$(RANLIB_FOR_TARGET)' \ @@ -2738,7 +2752,8 @@ all-build-libiberty: configure-build-lib s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ (cd $(BUILD_SUBDIR)/libiberty && \ - $(MAKE) $(TARGET-build-libiberty)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS) \ + $(TARGET-build-libiberty)) @endif build-libiberty @@ -2793,7 +2808,8 @@ all-build-bison: configure-build-bison s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ (cd $(BUILD_SUBDIR)/bison && \ - $(MAKE) $(TARGET-build-bison)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS) \ + $(TARGET-build-bison)) @endif build-bison @@ -2848,7 +2864,8 @@ all-build-byacc: configure-build-byacc s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ (cd $(BUILD_SUBDIR)/byacc && \ - $(MAKE) $(TARGET-build-byacc)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS) \ + $(TARGET-build-byacc)) @endif build-byacc @@ -2903,7 +2920,8 @@ all-build-flex: configure-build-flex s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ (cd $(BUILD_SUBDIR)/flex && \ - $(MAKE) $(TARGET-build-flex)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS) \ + $(TARGET-build-flex)) @endif build-flex @@ -2958,7 +2976,8 @@ all-build-m4: configure-build-m4 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ (cd $(BUILD_SUBDIR)/m4 && \ - $(MAKE) $(TARGET-build-m4)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS) \ + $(TARGET-build-m4)) @endif build-m4 @@ -3013,7 +3032,8 @@ all-build-texinfo: configure-build-texin s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ (cd $(BUILD_SUBDIR)/texinfo && \ - $(MAKE) $(TARGET-build-texinfo)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS) \ + $(TARGET-build-texinfo)) @endif build-texinfo @@ -3068,7 +3088,8 @@ all-build-fixincludes: configure-build-f s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ (cd $(BUILD_SUBDIR)/fixincludes && \ - $(MAKE) $(TARGET-build-fixincludes)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS) \ + $(TARGET-build-fixincludes)) @endif build-fixincludes @@ -3127,7 +3148,8 @@ all-ash: configure-ash s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/ash && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-ash)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-ash)) @endif ash @@ -3551,7 +3573,8 @@ all-autoconf: configure-autoconf s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/autoconf && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-autoconf)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-autoconf)) @endif autoconf @@ -3975,7 +3998,8 @@ all-automake: configure-automake s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/automake && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-automake)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-automake)) @endif automake @@ -4399,7 +4423,8 @@ all-bash: configure-bash s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/bash && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-bash)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-bash)) @endif bash @@ -4816,9 +4841,9 @@ configure-stage1-bfd: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 1 in $(HOST_SUBDIR)/bfd ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ cd $(HOST_SUBDIR)/bfd || exit 1; \ @@ -4847,9 +4872,9 @@ configure-stage2-bfd: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 2 in $(HOST_SUBDIR)/bfd ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ cd $(HOST_SUBDIR)/bfd || exit 1; \ @@ -4878,9 +4903,9 @@ configure-stageb2g0-bfd: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \ - LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS; \ echo Configuring stage b2g0 in $(HOST_SUBDIR)/bfd ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ cd $(HOST_SUBDIR)/bfd || exit 1; \ @@ -4909,9 +4934,9 @@ configure-stage3-bfd: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 3 in $(HOST_SUBDIR)/bfd ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ cd $(HOST_SUBDIR)/bfd || exit 1; \ @@ -4940,9 +4965,9 @@ configure-stageb3g2-bfd: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \ - LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS; \ echo Configuring stage b3g2 in $(HOST_SUBDIR)/bfd ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ cd $(HOST_SUBDIR)/bfd || exit 1; \ @@ -4971,9 +4996,9 @@ configure-stage4-bfd: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 4 in $(HOST_SUBDIR)/bfd ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ cd $(HOST_SUBDIR)/bfd || exit 1; \ @@ -5002,9 +5027,9 @@ configure-stageprofile-bfd: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \ - LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \ echo Configuring stage profile in $(HOST_SUBDIR)/bfd ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ cd $(HOST_SUBDIR)/bfd || exit 1; \ @@ -5033,9 +5058,9 @@ configure-stagefeedback-bfd: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \ - LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \ echo Configuring stage feedback in $(HOST_SUBDIR)/bfd ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ cd $(HOST_SUBDIR)/bfd || exit 1; \ @@ -5070,7 +5095,8 @@ all-bfd: configure-bfd s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/bfd && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-bfd)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-bfd)) @endif bfd @@ -5089,8 +5115,11 @@ all-stage1-bfd: configure-stage1-bfd s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/bfd && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \ + LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \ $(TARGET-stage1-bfd) maybe-clean-stage1-bfd: clean-stage1-bfd @@ -5103,7 +5132,7 @@ clean-stage1-bfd: $(MAKE) stage1-start; \ fi; \ cd $(HOST_SUBDIR)/bfd && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ clean @endif bfd-bootstrap @@ -5123,8 +5152,11 @@ all-stage2-bfd: configure-stage2-bfd $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/bfd && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stage2-bfd) maybe-clean-stage2-bfd: clean-stage2-bfd @@ -5137,7 +5169,7 @@ clean-stage2-bfd: $(MAKE) stage2-start; \ fi; \ cd $(HOST_SUBDIR)/bfd && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif bfd-bootstrap @@ -5158,8 +5190,11 @@ all-stageb2g0-bfd: configure-stageb2g0-b $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/bfd && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageb2g0-bfd) maybe-clean-stageb2g0-bfd: clean-stageb2g0-bfd @@ -5172,7 +5207,7 @@ clean-stageb2g0-bfd: $(MAKE) stageb2g0-start; \ fi; \ cd $(HOST_SUBDIR)/bfd && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif bfd-bootstrap @@ -5193,8 +5228,11 @@ all-stage3-bfd: configure-stage3-bfd $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/bfd && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \ + LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stage3-bfd) maybe-clean-stage3-bfd: clean-stage3-bfd @@ -5207,7 +5245,7 @@ clean-stage3-bfd: $(MAKE) stage3-start; \ fi; \ cd $(HOST_SUBDIR)/bfd && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif bfd-bootstrap @@ -5228,8 +5266,11 @@ all-stageb3g2-bfd: configure-stageb3g2-b $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/bfd && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \ + LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \ + CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \ + CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageb3g2-bfd) maybe-clean-stageb3g2-bfd: clean-stageb3g2-bfd @@ -5242,7 +5283,7 @@ clean-stageb3g2-bfd: $(MAKE) stageb3g2-start; \ fi; \ cd $(HOST_SUBDIR)/bfd && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif bfd-bootstrap @@ -5263,8 +5304,11 @@ all-stage4-bfd: configure-stage4-bfd $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/bfd && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \ + LIBCFLAGS="$(STAGE4_CFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stage4-bfd) maybe-clean-stage4-bfd: clean-stage4-bfd @@ -5277,7 +5321,7 @@ clean-stage4-bfd: $(MAKE) stage4-start; \ fi; \ cd $(HOST_SUBDIR)/bfd && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif bfd-bootstrap @@ -5298,8 +5342,11 @@ all-stageprofile-bfd: configure-stagepro $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/bfd && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageprofile-bfd) maybe-clean-stageprofile-bfd: clean-stageprofile-bfd @@ -5312,7 +5359,7 @@ clean-stageprofile-bfd: $(MAKE) stageprofile-start; \ fi; \ cd $(HOST_SUBDIR)/bfd && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif bfd-bootstrap @@ -5333,8 +5380,11 @@ all-stagefeedback-bfd: configure-stagefe $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/bfd && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \ + LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \ + CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \ + CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stagefeedback-bfd) maybe-clean-stagefeedback-bfd: clean-stagefeedback-bfd @@ -5347,7 +5397,7 @@ clean-stagefeedback-bfd: $(MAKE) stagefeedback-start; \ fi; \ cd $(HOST_SUBDIR)/bfd && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif bfd-bootstrap @@ -5754,9 +5804,9 @@ configure-stage1-opcodes: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 1 in $(HOST_SUBDIR)/opcodes ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ cd $(HOST_SUBDIR)/opcodes || exit 1; \ @@ -5785,9 +5835,9 @@ configure-stage2-opcodes: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 2 in $(HOST_SUBDIR)/opcodes ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ cd $(HOST_SUBDIR)/opcodes || exit 1; \ @@ -5816,9 +5866,9 @@ configure-stageb2g0-opcodes: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \ - LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS; \ echo Configuring stage b2g0 in $(HOST_SUBDIR)/opcodes ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ cd $(HOST_SUBDIR)/opcodes || exit 1; \ @@ -5847,9 +5897,9 @@ configure-stage3-opcodes: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 3 in $(HOST_SUBDIR)/opcodes ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ cd $(HOST_SUBDIR)/opcodes || exit 1; \ @@ -5878,9 +5928,9 @@ configure-stageb3g2-opcodes: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \ - LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS; \ echo Configuring stage b3g2 in $(HOST_SUBDIR)/opcodes ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ cd $(HOST_SUBDIR)/opcodes || exit 1; \ @@ -5909,9 +5959,9 @@ configure-stage4-opcodes: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 4 in $(HOST_SUBDIR)/opcodes ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ cd $(HOST_SUBDIR)/opcodes || exit 1; \ @@ -5940,9 +5990,9 @@ configure-stageprofile-opcodes: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \ - LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \ echo Configuring stage profile in $(HOST_SUBDIR)/opcodes ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ cd $(HOST_SUBDIR)/opcodes || exit 1; \ @@ -5971,9 +6021,9 @@ configure-stagefeedback-opcodes: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \ - LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \ echo Configuring stage feedback in $(HOST_SUBDIR)/opcodes ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ cd $(HOST_SUBDIR)/opcodes || exit 1; \ @@ -6008,7 +6058,8 @@ all-opcodes: configure-opcodes s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/opcodes && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-opcodes)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-opcodes)) @endif opcodes @@ -6027,8 +6078,11 @@ all-stage1-opcodes: configure-stage1-opc s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/opcodes && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \ + LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \ $(TARGET-stage1-opcodes) maybe-clean-stage1-opcodes: clean-stage1-opcodes @@ -6041,7 +6095,7 @@ clean-stage1-opcodes: $(MAKE) stage1-start; \ fi; \ cd $(HOST_SUBDIR)/opcodes && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ clean @endif opcodes-bootstrap @@ -6061,8 +6115,11 @@ all-stage2-opcodes: configure-stage2-opc $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/opcodes && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stage2-opcodes) maybe-clean-stage2-opcodes: clean-stage2-opcodes @@ -6075,7 +6132,7 @@ clean-stage2-opcodes: $(MAKE) stage2-start; \ fi; \ cd $(HOST_SUBDIR)/opcodes && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif opcodes-bootstrap @@ -6096,8 +6153,11 @@ all-stageb2g0-opcodes: configure-stageb2 $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/opcodes && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageb2g0-opcodes) maybe-clean-stageb2g0-opcodes: clean-stageb2g0-opcodes @@ -6110,7 +6170,7 @@ clean-stageb2g0-opcodes: $(MAKE) stageb2g0-start; \ fi; \ cd $(HOST_SUBDIR)/opcodes && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif opcodes-bootstrap @@ -6131,8 +6191,11 @@ all-stage3-opcodes: configure-stage3-opc $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/opcodes && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \ + LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stage3-opcodes) maybe-clean-stage3-opcodes: clean-stage3-opcodes @@ -6145,7 +6208,7 @@ clean-stage3-opcodes: $(MAKE) stage3-start; \ fi; \ cd $(HOST_SUBDIR)/opcodes && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif opcodes-bootstrap @@ -6166,8 +6229,11 @@ all-stageb3g2-opcodes: configure-stageb3 $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/opcodes && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \ + LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \ + CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \ + CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageb3g2-opcodes) maybe-clean-stageb3g2-opcodes: clean-stageb3g2-opcodes @@ -6180,7 +6246,7 @@ clean-stageb3g2-opcodes: $(MAKE) stageb3g2-start; \ fi; \ cd $(HOST_SUBDIR)/opcodes && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif opcodes-bootstrap @@ -6201,8 +6267,11 @@ all-stage4-opcodes: configure-stage4-opc $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/opcodes && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \ + LIBCFLAGS="$(STAGE4_CFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stage4-opcodes) maybe-clean-stage4-opcodes: clean-stage4-opcodes @@ -6215,7 +6284,7 @@ clean-stage4-opcodes: $(MAKE) stage4-start; \ fi; \ cd $(HOST_SUBDIR)/opcodes && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif opcodes-bootstrap @@ -6236,8 +6305,11 @@ all-stageprofile-opcodes: configure-stag $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/opcodes && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageprofile-opcodes) maybe-clean-stageprofile-opcodes: clean-stageprofile-opcodes @@ -6250,7 +6322,7 @@ clean-stageprofile-opcodes: $(MAKE) stageprofile-start; \ fi; \ cd $(HOST_SUBDIR)/opcodes && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif opcodes-bootstrap @@ -6271,8 +6343,11 @@ all-stagefeedback-opcodes: configure-sta $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/opcodes && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \ + LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \ + CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \ + CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stagefeedback-opcodes) maybe-clean-stagefeedback-opcodes: clean-stagefeedback-opcodes @@ -6285,7 +6360,7 @@ clean-stagefeedback-opcodes: $(MAKE) stagefeedback-start; \ fi; \ cd $(HOST_SUBDIR)/opcodes && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif opcodes-bootstrap @@ -6692,9 +6767,9 @@ configure-stage1-binutils: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 1 in $(HOST_SUBDIR)/binutils ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ cd $(HOST_SUBDIR)/binutils || exit 1; \ @@ -6723,9 +6798,9 @@ configure-stage2-binutils: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 2 in $(HOST_SUBDIR)/binutils ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ cd $(HOST_SUBDIR)/binutils || exit 1; \ @@ -6754,9 +6829,9 @@ configure-stageb2g0-binutils: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \ - LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS; \ echo Configuring stage b2g0 in $(HOST_SUBDIR)/binutils ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ cd $(HOST_SUBDIR)/binutils || exit 1; \ @@ -6785,9 +6860,9 @@ configure-stage3-binutils: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 3 in $(HOST_SUBDIR)/binutils ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ cd $(HOST_SUBDIR)/binutils || exit 1; \ @@ -6816,9 +6891,9 @@ configure-stageb3g2-binutils: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \ - LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS; \ echo Configuring stage b3g2 in $(HOST_SUBDIR)/binutils ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ cd $(HOST_SUBDIR)/binutils || exit 1; \ @@ -6847,9 +6922,9 @@ configure-stage4-binutils: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 4 in $(HOST_SUBDIR)/binutils ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ cd $(HOST_SUBDIR)/binutils || exit 1; \ @@ -6878,9 +6953,9 @@ configure-stageprofile-binutils: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \ - LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \ echo Configuring stage profile in $(HOST_SUBDIR)/binutils ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ cd $(HOST_SUBDIR)/binutils || exit 1; \ @@ -6909,9 +6984,9 @@ configure-stagefeedback-binutils: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \ - LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \ echo Configuring stage feedback in $(HOST_SUBDIR)/binutils ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ cd $(HOST_SUBDIR)/binutils || exit 1; \ @@ -6946,7 +7021,8 @@ all-binutils: configure-binutils s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/binutils && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-binutils)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-binutils)) @endif binutils @@ -6965,8 +7041,11 @@ all-stage1-binutils: configure-stage1-bi s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/binutils && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \ + LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \ $(TARGET-stage1-binutils) maybe-clean-stage1-binutils: clean-stage1-binutils @@ -6979,7 +7058,7 @@ clean-stage1-binutils: $(MAKE) stage1-start; \ fi; \ cd $(HOST_SUBDIR)/binutils && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ clean @endif binutils-bootstrap @@ -6999,8 +7078,11 @@ all-stage2-binutils: configure-stage2-bi $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/binutils && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stage2-binutils) maybe-clean-stage2-binutils: clean-stage2-binutils @@ -7013,7 +7095,7 @@ clean-stage2-binutils: $(MAKE) stage2-start; \ fi; \ cd $(HOST_SUBDIR)/binutils && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif binutils-bootstrap @@ -7034,8 +7116,11 @@ all-stageb2g0-binutils: configure-stageb $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/binutils && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageb2g0-binutils) maybe-clean-stageb2g0-binutils: clean-stageb2g0-binutils @@ -7048,7 +7133,7 @@ clean-stageb2g0-binutils: $(MAKE) stageb2g0-start; \ fi; \ cd $(HOST_SUBDIR)/binutils && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif binutils-bootstrap @@ -7069,8 +7154,11 @@ all-stage3-binutils: configure-stage3-bi $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/binutils && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \ + LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stage3-binutils) maybe-clean-stage3-binutils: clean-stage3-binutils @@ -7083,7 +7171,7 @@ clean-stage3-binutils: $(MAKE) stage3-start; \ fi; \ cd $(HOST_SUBDIR)/binutils && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif binutils-bootstrap @@ -7104,8 +7192,11 @@ all-stageb3g2-binutils: configure-stageb $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/binutils && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \ + LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \ + CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \ + CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageb3g2-binutils) maybe-clean-stageb3g2-binutils: clean-stageb3g2-binutils @@ -7118,7 +7209,7 @@ clean-stageb3g2-binutils: $(MAKE) stageb3g2-start; \ fi; \ cd $(HOST_SUBDIR)/binutils && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif binutils-bootstrap @@ -7139,8 +7230,11 @@ all-stage4-binutils: configure-stage4-bi $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/binutils && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \ + LIBCFLAGS="$(STAGE4_CFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stage4-binutils) maybe-clean-stage4-binutils: clean-stage4-binutils @@ -7153,7 +7247,7 @@ clean-stage4-binutils: $(MAKE) stage4-start; \ fi; \ cd $(HOST_SUBDIR)/binutils && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif binutils-bootstrap @@ -7174,8 +7268,11 @@ all-stageprofile-binutils: configure-sta $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/binutils && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageprofile-binutils) maybe-clean-stageprofile-binutils: clean-stageprofile-binutils @@ -7188,7 +7285,7 @@ clean-stageprofile-binutils: $(MAKE) stageprofile-start; \ fi; \ cd $(HOST_SUBDIR)/binutils && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif binutils-bootstrap @@ -7209,8 +7306,11 @@ all-stagefeedback-binutils: configure-st $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/binutils && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \ + LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \ + CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \ + CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stagefeedback-binutils) maybe-clean-stagefeedback-binutils: clean-stagefeedback-binutils @@ -7223,7 +7323,7 @@ clean-stagefeedback-binutils: $(MAKE) stagefeedback-start; \ fi; \ cd $(HOST_SUBDIR)/binutils && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif binutils-bootstrap @@ -7637,7 +7737,8 @@ all-bison: configure-bison s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/bison && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-bison)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-bison)) @endif bison @@ -8064,7 +8165,8 @@ all-byacc: configure-byacc s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/byacc && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-byacc)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-byacc)) @endif byacc @@ -8491,7 +8593,8 @@ all-bzip2: configure-bzip2 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/bzip2 && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-bzip2)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-bzip2)) @endif bzip2 @@ -8915,7 +9018,8 @@ all-dejagnu: configure-dejagnu s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/dejagnu && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-dejagnu)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-dejagnu)) @endif dejagnu @@ -9339,7 +9443,8 @@ all-diff: configure-diff s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/diff && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-diff)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-diff)) @endif diff @@ -9763,7 +9868,8 @@ all-dosutils: configure-dosutils s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/dosutils && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-dosutils)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-dosutils)) @endif dosutils @@ -10181,7 +10287,8 @@ all-etc: configure-etc s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/etc && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-etc)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-etc)) @endif etc @@ -10605,7 +10712,8 @@ all-fastjar: configure-fastjar s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/fastjar && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-fastjar)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-fastjar)) @endif fastjar @@ -11032,7 +11140,8 @@ all-fileutils: configure-fileutils s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/fileutils && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-fileutils)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-fileutils)) @endif fileutils @@ -11456,7 +11565,8 @@ all-findutils: configure-findutils s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/findutils && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-findutils)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-findutils)) @endif findutils @@ -11880,7 +11990,8 @@ all-find: configure-find s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/find && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-find)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-find)) @endif find @@ -12304,7 +12415,8 @@ all-fixincludes: configure-fixincludes s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/fixincludes && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-fixincludes)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-fixincludes)) @endif fixincludes @@ -12712,7 +12824,8 @@ all-flex: configure-flex s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/flex && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-flex)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-flex)) @endif flex @@ -13132,9 +13245,9 @@ configure-stage1-gas: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 1 in $(HOST_SUBDIR)/gas ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ cd $(HOST_SUBDIR)/gas || exit 1; \ @@ -13163,9 +13276,9 @@ configure-stage2-gas: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 2 in $(HOST_SUBDIR)/gas ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ cd $(HOST_SUBDIR)/gas || exit 1; \ @@ -13194,9 +13307,9 @@ configure-stageb2g0-gas: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \ - LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS; \ echo Configuring stage b2g0 in $(HOST_SUBDIR)/gas ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ cd $(HOST_SUBDIR)/gas || exit 1; \ @@ -13225,9 +13338,9 @@ configure-stage3-gas: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 3 in $(HOST_SUBDIR)/gas ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ cd $(HOST_SUBDIR)/gas || exit 1; \ @@ -13256,9 +13369,9 @@ configure-stageb3g2-gas: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \ - LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS; \ echo Configuring stage b3g2 in $(HOST_SUBDIR)/gas ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ cd $(HOST_SUBDIR)/gas || exit 1; \ @@ -13287,9 +13400,9 @@ configure-stage4-gas: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 4 in $(HOST_SUBDIR)/gas ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ cd $(HOST_SUBDIR)/gas || exit 1; \ @@ -13318,9 +13431,9 @@ configure-stageprofile-gas: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \ - LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \ echo Configuring stage profile in $(HOST_SUBDIR)/gas ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ cd $(HOST_SUBDIR)/gas || exit 1; \ @@ -13349,9 +13462,9 @@ configure-stagefeedback-gas: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \ - LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \ echo Configuring stage feedback in $(HOST_SUBDIR)/gas ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ cd $(HOST_SUBDIR)/gas || exit 1; \ @@ -13386,7 +13499,8 @@ all-gas: configure-gas s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/gas && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-gas)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-gas)) @endif gas @@ -13405,8 +13519,11 @@ all-stage1-gas: configure-stage1-gas s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gas && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \ + LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \ $(TARGET-stage1-gas) maybe-clean-stage1-gas: clean-stage1-gas @@ -13419,7 +13536,7 @@ clean-stage1-gas: $(MAKE) stage1-start; \ fi; \ cd $(HOST_SUBDIR)/gas && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ clean @endif gas-bootstrap @@ -13439,8 +13556,11 @@ all-stage2-gas: configure-stage2-gas $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gas && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stage2-gas) maybe-clean-stage2-gas: clean-stage2-gas @@ -13453,7 +13573,7 @@ clean-stage2-gas: $(MAKE) stage2-start; \ fi; \ cd $(HOST_SUBDIR)/gas && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif gas-bootstrap @@ -13474,8 +13594,11 @@ all-stageb2g0-gas: configure-stageb2g0-g $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gas && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageb2g0-gas) maybe-clean-stageb2g0-gas: clean-stageb2g0-gas @@ -13488,7 +13611,7 @@ clean-stageb2g0-gas: $(MAKE) stageb2g0-start; \ fi; \ cd $(HOST_SUBDIR)/gas && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif gas-bootstrap @@ -13509,8 +13632,11 @@ all-stage3-gas: configure-stage3-gas $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gas && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \ + LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stage3-gas) maybe-clean-stage3-gas: clean-stage3-gas @@ -13523,7 +13649,7 @@ clean-stage3-gas: $(MAKE) stage3-start; \ fi; \ cd $(HOST_SUBDIR)/gas && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif gas-bootstrap @@ -13544,8 +13670,11 @@ all-stageb3g2-gas: configure-stageb3g2-g $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gas && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \ + LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \ + CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \ + CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageb3g2-gas) maybe-clean-stageb3g2-gas: clean-stageb3g2-gas @@ -13558,7 +13687,7 @@ clean-stageb3g2-gas: $(MAKE) stageb3g2-start; \ fi; \ cd $(HOST_SUBDIR)/gas && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif gas-bootstrap @@ -13579,8 +13708,11 @@ all-stage4-gas: configure-stage4-gas $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gas && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \ + LIBCFLAGS="$(STAGE4_CFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stage4-gas) maybe-clean-stage4-gas: clean-stage4-gas @@ -13593,7 +13725,7 @@ clean-stage4-gas: $(MAKE) stage4-start; \ fi; \ cd $(HOST_SUBDIR)/gas && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif gas-bootstrap @@ -13614,8 +13746,11 @@ all-stageprofile-gas: configure-stagepro $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gas && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageprofile-gas) maybe-clean-stageprofile-gas: clean-stageprofile-gas @@ -13628,7 +13763,7 @@ clean-stageprofile-gas: $(MAKE) stageprofile-start; \ fi; \ cd $(HOST_SUBDIR)/gas && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif gas-bootstrap @@ -13649,8 +13784,11 @@ all-stagefeedback-gas: configure-stagefe $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gas && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \ + LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \ + CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \ + CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stagefeedback-gas) maybe-clean-stagefeedback-gas: clean-stagefeedback-gas @@ -13663,7 +13801,7 @@ clean-stagefeedback-gas: $(MAKE) stagefeedback-start; \ fi; \ cd $(HOST_SUBDIR)/gas && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif gas-bootstrap @@ -14070,9 +14208,9 @@ configure-stage1-gcc: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 1 in $(HOST_SUBDIR)/gcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ cd $(HOST_SUBDIR)/gcc || exit 1; \ @@ -14101,9 +14239,9 @@ configure-stage2-gcc: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 2 in $(HOST_SUBDIR)/gcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ cd $(HOST_SUBDIR)/gcc || exit 1; \ @@ -14132,9 +14270,9 @@ configure-stageb2g0-gcc: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \ - LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS; \ echo Configuring stage b2g0 in $(HOST_SUBDIR)/gcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ cd $(HOST_SUBDIR)/gcc || exit 1; \ @@ -14163,9 +14301,9 @@ configure-stage3-gcc: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 3 in $(HOST_SUBDIR)/gcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ cd $(HOST_SUBDIR)/gcc || exit 1; \ @@ -14194,9 +14332,9 @@ configure-stageb3g2-gcc: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \ - LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS; \ echo Configuring stage b3g2 in $(HOST_SUBDIR)/gcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ cd $(HOST_SUBDIR)/gcc || exit 1; \ @@ -14225,9 +14363,9 @@ configure-stage4-gcc: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 4 in $(HOST_SUBDIR)/gcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ cd $(HOST_SUBDIR)/gcc || exit 1; \ @@ -14256,9 +14394,9 @@ configure-stageprofile-gcc: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \ - LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \ echo Configuring stage profile in $(HOST_SUBDIR)/gcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ cd $(HOST_SUBDIR)/gcc || exit 1; \ @@ -14287,9 +14425,9 @@ configure-stagefeedback-gcc: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \ - LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \ echo Configuring stage feedback in $(HOST_SUBDIR)/gcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ cd $(HOST_SUBDIR)/gcc || exit 1; \ @@ -14324,7 +14462,8 @@ all-gcc: configure-gcc s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/gcc && \ - $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) $(TARGET-gcc)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS) \ + $(TARGET-gcc)) @endif gcc @@ -14343,8 +14482,11 @@ all-stage1-gcc: configure-stage1-gcc s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gcc && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" $(EXTRA_GCC_FLAGS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \ + LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS) \ $(TARGET-stage1-gcc) maybe-clean-stage1-gcc: clean-stage1-gcc @@ -14357,7 +14499,7 @@ clean-stage1-gcc: $(MAKE) stage1-start; \ fi; \ cd $(HOST_SUBDIR)/gcc && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(EXTRA_GCC_FLAGS) clean @endif gcc-bootstrap @@ -14377,8 +14519,11 @@ all-stage2-gcc: configure-stage2-gcc $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gcc && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \ $(TARGET-stage2-gcc) maybe-clean-stage2-gcc: clean-stage2-gcc @@ -14391,7 +14536,7 @@ clean-stage2-gcc: $(MAKE) stage2-start; \ fi; \ cd $(HOST_SUBDIR)/gcc && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ $(EXTRA_GCC_FLAGS) clean @endif gcc-bootstrap @@ -14412,8 +14557,11 @@ all-stageb2g0-gcc: configure-stageb2g0-g $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gcc && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \ $(TARGET-stageb2g0-gcc) maybe-clean-stageb2g0-gcc: clean-stageb2g0-gcc @@ -14426,7 +14574,7 @@ clean-stageb2g0-gcc: $(MAKE) stageb2g0-start; \ fi; \ cd $(HOST_SUBDIR)/gcc && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ $(EXTRA_GCC_FLAGS) clean @endif gcc-bootstrap @@ -14447,8 +14595,11 @@ all-stage3-gcc: configure-stage3-gcc $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gcc && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \ + LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \ $(TARGET-stage3-gcc) maybe-clean-stage3-gcc: clean-stage3-gcc @@ -14461,7 +14612,7 @@ clean-stage3-gcc: $(MAKE) stage3-start; \ fi; \ cd $(HOST_SUBDIR)/gcc && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ $(EXTRA_GCC_FLAGS) clean @endif gcc-bootstrap @@ -14482,8 +14633,11 @@ all-stageb3g2-gcc: configure-stageb3g2-g $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gcc && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \ + LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \ + CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \ + CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \ $(TARGET-stageb3g2-gcc) maybe-clean-stageb3g2-gcc: clean-stageb3g2-gcc @@ -14496,7 +14650,7 @@ clean-stageb3g2-gcc: $(MAKE) stageb3g2-start; \ fi; \ cd $(HOST_SUBDIR)/gcc && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ $(EXTRA_GCC_FLAGS) clean @endif gcc-bootstrap @@ -14517,8 +14671,11 @@ all-stage4-gcc: configure-stage4-gcc $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gcc && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \ + LIBCFLAGS="$(STAGE4_CFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \ $(TARGET-stage4-gcc) maybe-clean-stage4-gcc: clean-stage4-gcc @@ -14531,7 +14688,7 @@ clean-stage4-gcc: $(MAKE) stage4-start; \ fi; \ cd $(HOST_SUBDIR)/gcc && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ $(EXTRA_GCC_FLAGS) clean @endif gcc-bootstrap @@ -14552,8 +14709,11 @@ all-stageprofile-gcc: configure-stagepro $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gcc && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \ $(TARGET-stageprofile-gcc) maybe-clean-stageprofile-gcc: clean-stageprofile-gcc @@ -14566,7 +14726,7 @@ clean-stageprofile-gcc: $(MAKE) stageprofile-start; \ fi; \ cd $(HOST_SUBDIR)/gcc && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ $(EXTRA_GCC_FLAGS) clean @endif gcc-bootstrap @@ -14587,8 +14747,11 @@ all-stagefeedback-gcc: configure-stagefe $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gcc && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \ + LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \ + CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \ + CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \ $(TARGET-stagefeedback-gcc) maybe-clean-stagefeedback-gcc: clean-stagefeedback-gcc @@ -14601,7 +14764,7 @@ clean-stagefeedback-gcc: $(MAKE) stagefeedback-start; \ fi; \ cd $(HOST_SUBDIR)/gcc && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ $(EXTRA_GCC_FLAGS) clean @endif gcc-bootstrap @@ -15015,7 +15178,8 @@ all-gawk: configure-gawk s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/gawk && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-gawk)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-gawk)) @endif gawk @@ -15439,7 +15603,8 @@ all-gettext: configure-gettext s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/gettext && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-gettext)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-gettext)) @endif gettext @@ -15856,9 +16021,9 @@ configure-stage1-gmp: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 1 in $(HOST_SUBDIR)/gmp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \ cd $(HOST_SUBDIR)/gmp || exit 1; \ @@ -15887,9 +16052,9 @@ configure-stage2-gmp: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 2 in $(HOST_SUBDIR)/gmp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \ cd $(HOST_SUBDIR)/gmp || exit 1; \ @@ -15918,9 +16083,9 @@ configure-stageb2g0-gmp: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \ - LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS; \ echo Configuring stage b2g0 in $(HOST_SUBDIR)/gmp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \ cd $(HOST_SUBDIR)/gmp || exit 1; \ @@ -15949,9 +16114,9 @@ configure-stage3-gmp: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 3 in $(HOST_SUBDIR)/gmp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \ cd $(HOST_SUBDIR)/gmp || exit 1; \ @@ -15980,9 +16145,9 @@ configure-stageb3g2-gmp: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \ - LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS; \ echo Configuring stage b3g2 in $(HOST_SUBDIR)/gmp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \ cd $(HOST_SUBDIR)/gmp || exit 1; \ @@ -16011,9 +16176,9 @@ configure-stage4-gmp: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 4 in $(HOST_SUBDIR)/gmp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \ cd $(HOST_SUBDIR)/gmp || exit 1; \ @@ -16042,9 +16207,9 @@ configure-stageprofile-gmp: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \ - LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \ echo Configuring stage profile in $(HOST_SUBDIR)/gmp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \ cd $(HOST_SUBDIR)/gmp || exit 1; \ @@ -16073,9 +16238,9 @@ configure-stagefeedback-gmp: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \ - LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \ echo Configuring stage feedback in $(HOST_SUBDIR)/gmp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \ cd $(HOST_SUBDIR)/gmp || exit 1; \ @@ -16110,7 +16275,8 @@ all-gmp: configure-gmp s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/gmp && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-gmp)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-gmp)) @endif gmp @@ -16129,8 +16295,11 @@ all-stage1-gmp: configure-stage1-gmp s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gmp && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \ + LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \ $(TARGET-stage1-gmp) maybe-clean-stage1-gmp: clean-stage1-gmp @@ -16143,7 +16312,7 @@ clean-stage1-gmp: $(MAKE) stage1-start; \ fi; \ cd $(HOST_SUBDIR)/gmp && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ clean @endif gmp-bootstrap @@ -16163,8 +16332,11 @@ all-stage2-gmp: configure-stage2-gmp $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gmp && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stage2-gmp) maybe-clean-stage2-gmp: clean-stage2-gmp @@ -16177,7 +16349,7 @@ clean-stage2-gmp: $(MAKE) stage2-start; \ fi; \ cd $(HOST_SUBDIR)/gmp && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif gmp-bootstrap @@ -16198,8 +16370,11 @@ all-stageb2g0-gmp: configure-stageb2g0-g $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gmp && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageb2g0-gmp) maybe-clean-stageb2g0-gmp: clean-stageb2g0-gmp @@ -16212,7 +16387,7 @@ clean-stageb2g0-gmp: $(MAKE) stageb2g0-start; \ fi; \ cd $(HOST_SUBDIR)/gmp && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif gmp-bootstrap @@ -16233,8 +16408,11 @@ all-stage3-gmp: configure-stage3-gmp $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gmp && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \ + LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stage3-gmp) maybe-clean-stage3-gmp: clean-stage3-gmp @@ -16247,7 +16425,7 @@ clean-stage3-gmp: $(MAKE) stage3-start; \ fi; \ cd $(HOST_SUBDIR)/gmp && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif gmp-bootstrap @@ -16268,8 +16446,11 @@ all-stageb3g2-gmp: configure-stageb3g2-g $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gmp && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \ + LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \ + CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \ + CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageb3g2-gmp) maybe-clean-stageb3g2-gmp: clean-stageb3g2-gmp @@ -16282,7 +16463,7 @@ clean-stageb3g2-gmp: $(MAKE) stageb3g2-start; \ fi; \ cd $(HOST_SUBDIR)/gmp && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif gmp-bootstrap @@ -16303,8 +16484,11 @@ all-stage4-gmp: configure-stage4-gmp $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gmp && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \ + LIBCFLAGS="$(STAGE4_CFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stage4-gmp) maybe-clean-stage4-gmp: clean-stage4-gmp @@ -16317,7 +16501,7 @@ clean-stage4-gmp: $(MAKE) stage4-start; \ fi; \ cd $(HOST_SUBDIR)/gmp && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif gmp-bootstrap @@ -16338,8 +16522,11 @@ all-stageprofile-gmp: configure-stagepro $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gmp && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageprofile-gmp) maybe-clean-stageprofile-gmp: clean-stageprofile-gmp @@ -16352,7 +16539,7 @@ clean-stageprofile-gmp: $(MAKE) stageprofile-start; \ fi; \ cd $(HOST_SUBDIR)/gmp && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif gmp-bootstrap @@ -16373,8 +16560,11 @@ all-stagefeedback-gmp: configure-stagefe $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gmp && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \ + LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \ + CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \ + CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stagefeedback-gmp) maybe-clean-stagefeedback-gmp: clean-stagefeedback-gmp @@ -16387,7 +16577,7 @@ clean-stagefeedback-gmp: $(MAKE) stagefeedback-start; \ fi; \ cd $(HOST_SUBDIR)/gmp && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif gmp-bootstrap @@ -16788,9 +16978,9 @@ configure-stage1-mpfr: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 1 in $(HOST_SUBDIR)/mpfr ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \ cd $(HOST_SUBDIR)/mpfr || exit 1; \ @@ -16819,9 +17009,9 @@ configure-stage2-mpfr: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 2 in $(HOST_SUBDIR)/mpfr ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \ cd $(HOST_SUBDIR)/mpfr || exit 1; \ @@ -16850,9 +17040,9 @@ configure-stageb2g0-mpfr: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \ - LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS; \ echo Configuring stage b2g0 in $(HOST_SUBDIR)/mpfr ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \ cd $(HOST_SUBDIR)/mpfr || exit 1; \ @@ -16881,9 +17071,9 @@ configure-stage3-mpfr: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 3 in $(HOST_SUBDIR)/mpfr ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \ cd $(HOST_SUBDIR)/mpfr || exit 1; \ @@ -16912,9 +17102,9 @@ configure-stageb3g2-mpfr: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \ - LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS; \ echo Configuring stage b3g2 in $(HOST_SUBDIR)/mpfr ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \ cd $(HOST_SUBDIR)/mpfr || exit 1; \ @@ -16943,9 +17133,9 @@ configure-stage4-mpfr: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 4 in $(HOST_SUBDIR)/mpfr ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \ cd $(HOST_SUBDIR)/mpfr || exit 1; \ @@ -16974,9 +17164,9 @@ configure-stageprofile-mpfr: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \ - LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \ echo Configuring stage profile in $(HOST_SUBDIR)/mpfr ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \ cd $(HOST_SUBDIR)/mpfr || exit 1; \ @@ -17005,9 +17195,9 @@ configure-stagefeedback-mpfr: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \ - LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \ echo Configuring stage feedback in $(HOST_SUBDIR)/mpfr ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \ cd $(HOST_SUBDIR)/mpfr || exit 1; \ @@ -17042,7 +17232,8 @@ all-mpfr: configure-mpfr s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/mpfr && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-mpfr)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-mpfr)) @endif mpfr @@ -17061,8 +17252,11 @@ all-stage1-mpfr: configure-stage1-mpfr s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/mpfr && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \ + LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \ $(TARGET-stage1-mpfr) maybe-clean-stage1-mpfr: clean-stage1-mpfr @@ -17075,7 +17269,7 @@ clean-stage1-mpfr: $(MAKE) stage1-start; \ fi; \ cd $(HOST_SUBDIR)/mpfr && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ clean @endif mpfr-bootstrap @@ -17095,8 +17289,11 @@ all-stage2-mpfr: configure-stage2-mpfr $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/mpfr && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stage2-mpfr) maybe-clean-stage2-mpfr: clean-stage2-mpfr @@ -17109,7 +17306,7 @@ clean-stage2-mpfr: $(MAKE) stage2-start; \ fi; \ cd $(HOST_SUBDIR)/mpfr && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif mpfr-bootstrap @@ -17130,8 +17327,11 @@ all-stageb2g0-mpfr: configure-stageb2g0- $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/mpfr && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageb2g0-mpfr) maybe-clean-stageb2g0-mpfr: clean-stageb2g0-mpfr @@ -17144,7 +17344,7 @@ clean-stageb2g0-mpfr: $(MAKE) stageb2g0-start; \ fi; \ cd $(HOST_SUBDIR)/mpfr && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif mpfr-bootstrap @@ -17165,8 +17365,11 @@ all-stage3-mpfr: configure-stage3-mpfr $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/mpfr && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \ + LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stage3-mpfr) maybe-clean-stage3-mpfr: clean-stage3-mpfr @@ -17179,7 +17382,7 @@ clean-stage3-mpfr: $(MAKE) stage3-start; \ fi; \ cd $(HOST_SUBDIR)/mpfr && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif mpfr-bootstrap @@ -17200,8 +17403,11 @@ all-stageb3g2-mpfr: configure-stageb3g2- $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/mpfr && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \ + LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \ + CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \ + CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageb3g2-mpfr) maybe-clean-stageb3g2-mpfr: clean-stageb3g2-mpfr @@ -17214,7 +17420,7 @@ clean-stageb3g2-mpfr: $(MAKE) stageb3g2-start; \ fi; \ cd $(HOST_SUBDIR)/mpfr && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif mpfr-bootstrap @@ -17235,8 +17441,11 @@ all-stage4-mpfr: configure-stage4-mpfr $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/mpfr && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \ + LIBCFLAGS="$(STAGE4_CFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stage4-mpfr) maybe-clean-stage4-mpfr: clean-stage4-mpfr @@ -17249,7 +17458,7 @@ clean-stage4-mpfr: $(MAKE) stage4-start; \ fi; \ cd $(HOST_SUBDIR)/mpfr && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif mpfr-bootstrap @@ -17270,8 +17479,11 @@ all-stageprofile-mpfr: configure-stagepr $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/mpfr && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageprofile-mpfr) maybe-clean-stageprofile-mpfr: clean-stageprofile-mpfr @@ -17284,7 +17496,7 @@ clean-stageprofile-mpfr: $(MAKE) stageprofile-start; \ fi; \ cd $(HOST_SUBDIR)/mpfr && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif mpfr-bootstrap @@ -17305,8 +17517,11 @@ all-stagefeedback-mpfr: configure-stagef $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/mpfr && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \ + LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \ + CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \ + CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stagefeedback-mpfr) maybe-clean-stagefeedback-mpfr: clean-stagefeedback-mpfr @@ -17319,7 +17534,7 @@ clean-stagefeedback-mpfr: $(MAKE) stagefeedback-start; \ fi; \ cd $(HOST_SUBDIR)/mpfr && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif mpfr-bootstrap @@ -17727,7 +17942,8 @@ all-gnuserv: configure-gnuserv s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/gnuserv && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-gnuserv)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-gnuserv)) @endif gnuserv @@ -18151,7 +18367,8 @@ all-gprof: configure-gprof s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/gprof && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-gprof)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-gprof)) @endif gprof @@ -18575,7 +18792,8 @@ all-gzip: configure-gzip s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/gzip && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-gzip)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-gzip)) @endif gzip @@ -18999,7 +19217,8 @@ all-hello: configure-hello s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/hello && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-hello)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-hello)) @endif hello @@ -19423,7 +19642,8 @@ all-indent: configure-indent s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/indent && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-indent)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-indent)) @endif indent @@ -19840,9 +20060,9 @@ configure-stage1-intl: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 1 in $(HOST_SUBDIR)/intl ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ cd $(HOST_SUBDIR)/intl || exit 1; \ @@ -19871,9 +20091,9 @@ configure-stage2-intl: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 2 in $(HOST_SUBDIR)/intl ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ cd $(HOST_SUBDIR)/intl || exit 1; \ @@ -19902,9 +20122,9 @@ configure-stageb2g0-intl: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \ - LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS; \ echo Configuring stage b2g0 in $(HOST_SUBDIR)/intl ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ cd $(HOST_SUBDIR)/intl || exit 1; \ @@ -19933,9 +20153,9 @@ configure-stage3-intl: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 3 in $(HOST_SUBDIR)/intl ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ cd $(HOST_SUBDIR)/intl || exit 1; \ @@ -19964,9 +20184,9 @@ configure-stageb3g2-intl: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \ - LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS; \ echo Configuring stage b3g2 in $(HOST_SUBDIR)/intl ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ cd $(HOST_SUBDIR)/intl || exit 1; \ @@ -19995,9 +20215,9 @@ configure-stage4-intl: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 4 in $(HOST_SUBDIR)/intl ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ cd $(HOST_SUBDIR)/intl || exit 1; \ @@ -20026,9 +20246,9 @@ configure-stageprofile-intl: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \ - LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \ echo Configuring stage profile in $(HOST_SUBDIR)/intl ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ cd $(HOST_SUBDIR)/intl || exit 1; \ @@ -20057,9 +20277,9 @@ configure-stagefeedback-intl: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \ - LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \ echo Configuring stage feedback in $(HOST_SUBDIR)/intl ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ cd $(HOST_SUBDIR)/intl || exit 1; \ @@ -20094,7 +20314,8 @@ all-intl: configure-intl s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/intl && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-intl)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-intl)) @endif intl @@ -20113,8 +20334,11 @@ all-stage1-intl: configure-stage1-intl s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/intl && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \ + LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \ $(TARGET-stage1-intl) maybe-clean-stage1-intl: clean-stage1-intl @@ -20127,7 +20351,7 @@ clean-stage1-intl: $(MAKE) stage1-start; \ fi; \ cd $(HOST_SUBDIR)/intl && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ clean @endif intl-bootstrap @@ -20147,8 +20371,11 @@ all-stage2-intl: configure-stage2-intl $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/intl && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stage2-intl) maybe-clean-stage2-intl: clean-stage2-intl @@ -20161,7 +20388,7 @@ clean-stage2-intl: $(MAKE) stage2-start; \ fi; \ cd $(HOST_SUBDIR)/intl && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif intl-bootstrap @@ -20182,8 +20409,11 @@ all-stageb2g0-intl: configure-stageb2g0- $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/intl && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageb2g0-intl) maybe-clean-stageb2g0-intl: clean-stageb2g0-intl @@ -20196,7 +20426,7 @@ clean-stageb2g0-intl: $(MAKE) stageb2g0-start; \ fi; \ cd $(HOST_SUBDIR)/intl && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif intl-bootstrap @@ -20217,8 +20447,11 @@ all-stage3-intl: configure-stage3-intl $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/intl && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \ + LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stage3-intl) maybe-clean-stage3-intl: clean-stage3-intl @@ -20231,7 +20464,7 @@ clean-stage3-intl: $(MAKE) stage3-start; \ fi; \ cd $(HOST_SUBDIR)/intl && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif intl-bootstrap @@ -20252,8 +20485,11 @@ all-stageb3g2-intl: configure-stageb3g2- $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/intl && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \ + LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \ + CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \ + CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageb3g2-intl) maybe-clean-stageb3g2-intl: clean-stageb3g2-intl @@ -20266,7 +20502,7 @@ clean-stageb3g2-intl: $(MAKE) stageb3g2-start; \ fi; \ cd $(HOST_SUBDIR)/intl && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif intl-bootstrap @@ -20287,8 +20523,11 @@ all-stage4-intl: configure-stage4-intl $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/intl && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \ + LIBCFLAGS="$(STAGE4_CFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stage4-intl) maybe-clean-stage4-intl: clean-stage4-intl @@ -20301,7 +20540,7 @@ clean-stage4-intl: $(MAKE) stage4-start; \ fi; \ cd $(HOST_SUBDIR)/intl && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif intl-bootstrap @@ -20322,8 +20561,11 @@ all-stageprofile-intl: configure-stagepr $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/intl && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageprofile-intl) maybe-clean-stageprofile-intl: clean-stageprofile-intl @@ -20336,7 +20578,7 @@ clean-stageprofile-intl: $(MAKE) stageprofile-start; \ fi; \ cd $(HOST_SUBDIR)/intl && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif intl-bootstrap @@ -20357,8 +20599,11 @@ all-stagefeedback-intl: configure-stagef $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/intl && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \ + LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \ + CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \ + CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stagefeedback-intl) maybe-clean-stagefeedback-intl: clean-stagefeedback-intl @@ -20371,7 +20616,7 @@ clean-stagefeedback-intl: $(MAKE) stagefeedback-start; \ fi; \ cd $(HOST_SUBDIR)/intl && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif intl-bootstrap @@ -20785,7 +21030,8 @@ all-tcl: configure-tcl s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/tcl && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-tcl)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-tcl)) @endif tcl @@ -21194,7 +21440,8 @@ all-itcl: configure-itcl s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/itcl && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-itcl)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-itcl)) @endif itcl @@ -21611,9 +21858,9 @@ configure-stage1-ld: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 1 in $(HOST_SUBDIR)/ld ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ cd $(HOST_SUBDIR)/ld || exit 1; \ @@ -21642,9 +21889,9 @@ configure-stage2-ld: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 2 in $(HOST_SUBDIR)/ld ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ cd $(HOST_SUBDIR)/ld || exit 1; \ @@ -21673,9 +21920,9 @@ configure-stageb2g0-ld: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \ - LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS; \ echo Configuring stage b2g0 in $(HOST_SUBDIR)/ld ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ cd $(HOST_SUBDIR)/ld || exit 1; \ @@ -21704,9 +21951,9 @@ configure-stage3-ld: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 3 in $(HOST_SUBDIR)/ld ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ cd $(HOST_SUBDIR)/ld || exit 1; \ @@ -21735,9 +21982,9 @@ configure-stageb3g2-ld: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \ - LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS; \ echo Configuring stage b3g2 in $(HOST_SUBDIR)/ld ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ cd $(HOST_SUBDIR)/ld || exit 1; \ @@ -21766,9 +22013,9 @@ configure-stage4-ld: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 4 in $(HOST_SUBDIR)/ld ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ cd $(HOST_SUBDIR)/ld || exit 1; \ @@ -21797,9 +22044,9 @@ configure-stageprofile-ld: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \ - LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \ echo Configuring stage profile in $(HOST_SUBDIR)/ld ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ cd $(HOST_SUBDIR)/ld || exit 1; \ @@ -21828,9 +22075,9 @@ configure-stagefeedback-ld: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \ - LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \ echo Configuring stage feedback in $(HOST_SUBDIR)/ld ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ cd $(HOST_SUBDIR)/ld || exit 1; \ @@ -21865,7 +22112,8 @@ all-ld: configure-ld s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/ld && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-ld)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-ld)) @endif ld @@ -21884,8 +22132,11 @@ all-stage1-ld: configure-stage1-ld s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/ld && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \ + LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \ $(TARGET-stage1-ld) maybe-clean-stage1-ld: clean-stage1-ld @@ -21898,7 +22149,7 @@ clean-stage1-ld: $(MAKE) stage1-start; \ fi; \ cd $(HOST_SUBDIR)/ld && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ clean @endif ld-bootstrap @@ -21918,8 +22169,11 @@ all-stage2-ld: configure-stage2-ld $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/ld && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stage2-ld) maybe-clean-stage2-ld: clean-stage2-ld @@ -21932,7 +22186,7 @@ clean-stage2-ld: $(MAKE) stage2-start; \ fi; \ cd $(HOST_SUBDIR)/ld && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif ld-bootstrap @@ -21953,8 +22207,11 @@ all-stageb2g0-ld: configure-stageb2g0-ld $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/ld && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageb2g0-ld) maybe-clean-stageb2g0-ld: clean-stageb2g0-ld @@ -21967,7 +22224,7 @@ clean-stageb2g0-ld: $(MAKE) stageb2g0-start; \ fi; \ cd $(HOST_SUBDIR)/ld && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif ld-bootstrap @@ -21988,8 +22245,11 @@ all-stage3-ld: configure-stage3-ld $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/ld && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \ + LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stage3-ld) maybe-clean-stage3-ld: clean-stage3-ld @@ -22002,7 +22262,7 @@ clean-stage3-ld: $(MAKE) stage3-start; \ fi; \ cd $(HOST_SUBDIR)/ld && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif ld-bootstrap @@ -22023,8 +22283,11 @@ all-stageb3g2-ld: configure-stageb3g2-ld $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/ld && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \ + LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \ + CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \ + CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageb3g2-ld) maybe-clean-stageb3g2-ld: clean-stageb3g2-ld @@ -22037,7 +22300,7 @@ clean-stageb3g2-ld: $(MAKE) stageb3g2-start; \ fi; \ cd $(HOST_SUBDIR)/ld && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif ld-bootstrap @@ -22058,8 +22321,11 @@ all-stage4-ld: configure-stage4-ld $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/ld && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \ + LIBCFLAGS="$(STAGE4_CFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stage4-ld) maybe-clean-stage4-ld: clean-stage4-ld @@ -22072,7 +22338,7 @@ clean-stage4-ld: $(MAKE) stage4-start; \ fi; \ cd $(HOST_SUBDIR)/ld && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif ld-bootstrap @@ -22093,8 +22359,11 @@ all-stageprofile-ld: configure-stageprof $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/ld && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageprofile-ld) maybe-clean-stageprofile-ld: clean-stageprofile-ld @@ -22107,7 +22376,7 @@ clean-stageprofile-ld: $(MAKE) stageprofile-start; \ fi; \ cd $(HOST_SUBDIR)/ld && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif ld-bootstrap @@ -22128,8 +22397,11 @@ all-stagefeedback-ld: configure-stagefee $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/ld && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \ + LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \ + CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \ + CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stagefeedback-ld) maybe-clean-stagefeedback-ld: clean-stagefeedback-ld @@ -22142,7 +22414,7 @@ clean-stagefeedback-ld: $(MAKE) stagefeedback-start; \ fi; \ cd $(HOST_SUBDIR)/ld && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif ld-bootstrap @@ -22549,9 +22821,9 @@ configure-stage1-libcpp: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 1 in $(HOST_SUBDIR)/libcpp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ cd $(HOST_SUBDIR)/libcpp || exit 1; \ @@ -22580,9 +22852,9 @@ configure-stage2-libcpp: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 2 in $(HOST_SUBDIR)/libcpp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ cd $(HOST_SUBDIR)/libcpp || exit 1; \ @@ -22611,9 +22883,9 @@ configure-stageb2g0-libcpp: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \ - LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS; \ echo Configuring stage b2g0 in $(HOST_SUBDIR)/libcpp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ cd $(HOST_SUBDIR)/libcpp || exit 1; \ @@ -22642,9 +22914,9 @@ configure-stage3-libcpp: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 3 in $(HOST_SUBDIR)/libcpp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ cd $(HOST_SUBDIR)/libcpp || exit 1; \ @@ -22673,9 +22945,9 @@ configure-stageb3g2-libcpp: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \ - LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS; \ echo Configuring stage b3g2 in $(HOST_SUBDIR)/libcpp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ cd $(HOST_SUBDIR)/libcpp || exit 1; \ @@ -22704,9 +22976,9 @@ configure-stage4-libcpp: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 4 in $(HOST_SUBDIR)/libcpp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ cd $(HOST_SUBDIR)/libcpp || exit 1; \ @@ -22735,9 +23007,9 @@ configure-stageprofile-libcpp: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \ - LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \ echo Configuring stage profile in $(HOST_SUBDIR)/libcpp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ cd $(HOST_SUBDIR)/libcpp || exit 1; \ @@ -22766,9 +23038,9 @@ configure-stagefeedback-libcpp: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \ - LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \ echo Configuring stage feedback in $(HOST_SUBDIR)/libcpp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ cd $(HOST_SUBDIR)/libcpp || exit 1; \ @@ -22803,7 +23075,8 @@ all-libcpp: configure-libcpp s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/libcpp && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-libcpp)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-libcpp)) @endif libcpp @@ -22822,8 +23095,11 @@ all-stage1-libcpp: configure-stage1-libc s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libcpp && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \ + LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \ $(TARGET-stage1-libcpp) maybe-clean-stage1-libcpp: clean-stage1-libcpp @@ -22836,7 +23112,7 @@ clean-stage1-libcpp: $(MAKE) stage1-start; \ fi; \ cd $(HOST_SUBDIR)/libcpp && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ clean @endif libcpp-bootstrap @@ -22856,8 +23132,11 @@ all-stage2-libcpp: configure-stage2-libc $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libcpp && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stage2-libcpp) maybe-clean-stage2-libcpp: clean-stage2-libcpp @@ -22870,7 +23149,7 @@ clean-stage2-libcpp: $(MAKE) stage2-start; \ fi; \ cd $(HOST_SUBDIR)/libcpp && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libcpp-bootstrap @@ -22891,8 +23170,11 @@ all-stageb2g0-libcpp: configure-stageb2g $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libcpp && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageb2g0-libcpp) maybe-clean-stageb2g0-libcpp: clean-stageb2g0-libcpp @@ -22905,7 +23187,7 @@ clean-stageb2g0-libcpp: $(MAKE) stageb2g0-start; \ fi; \ cd $(HOST_SUBDIR)/libcpp && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libcpp-bootstrap @@ -22926,8 +23208,11 @@ all-stage3-libcpp: configure-stage3-libc $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libcpp && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \ + LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stage3-libcpp) maybe-clean-stage3-libcpp: clean-stage3-libcpp @@ -22940,7 +23225,7 @@ clean-stage3-libcpp: $(MAKE) stage3-start; \ fi; \ cd $(HOST_SUBDIR)/libcpp && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libcpp-bootstrap @@ -22961,8 +23246,11 @@ all-stageb3g2-libcpp: configure-stageb3g $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libcpp && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \ + LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \ + CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \ + CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageb3g2-libcpp) maybe-clean-stageb3g2-libcpp: clean-stageb3g2-libcpp @@ -22975,7 +23263,7 @@ clean-stageb3g2-libcpp: $(MAKE) stageb3g2-start; \ fi; \ cd $(HOST_SUBDIR)/libcpp && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libcpp-bootstrap @@ -22996,8 +23284,11 @@ all-stage4-libcpp: configure-stage4-libc $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libcpp && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \ + LIBCFLAGS="$(STAGE4_CFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stage4-libcpp) maybe-clean-stage4-libcpp: clean-stage4-libcpp @@ -23010,7 +23301,7 @@ clean-stage4-libcpp: $(MAKE) stage4-start; \ fi; \ cd $(HOST_SUBDIR)/libcpp && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libcpp-bootstrap @@ -23031,8 +23322,11 @@ all-stageprofile-libcpp: configure-stage $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libcpp && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageprofile-libcpp) maybe-clean-stageprofile-libcpp: clean-stageprofile-libcpp @@ -23045,7 +23339,7 @@ clean-stageprofile-libcpp: $(MAKE) stageprofile-start; \ fi; \ cd $(HOST_SUBDIR)/libcpp && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libcpp-bootstrap @@ -23066,8 +23360,11 @@ all-stagefeedback-libcpp: configure-stag $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libcpp && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \ + LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \ + CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \ + CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stagefeedback-libcpp) maybe-clean-stagefeedback-libcpp: clean-stagefeedback-libcpp @@ -23080,7 +23377,7 @@ clean-stagefeedback-libcpp: $(MAKE) stagefeedback-start; \ fi; \ cd $(HOST_SUBDIR)/libcpp && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libcpp-bootstrap @@ -23487,9 +23784,9 @@ configure-stage1-libdecnumber: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 1 in $(HOST_SUBDIR)/libdecnumber ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \ cd $(HOST_SUBDIR)/libdecnumber || exit 1; \ @@ -23518,9 +23815,9 @@ configure-stage2-libdecnumber: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 2 in $(HOST_SUBDIR)/libdecnumber ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \ cd $(HOST_SUBDIR)/libdecnumber || exit 1; \ @@ -23549,9 +23846,9 @@ configure-stageb2g0-libdecnumber: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \ - LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS; \ echo Configuring stage b2g0 in $(HOST_SUBDIR)/libdecnumber ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \ cd $(HOST_SUBDIR)/libdecnumber || exit 1; \ @@ -23580,9 +23877,9 @@ configure-stage3-libdecnumber: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 3 in $(HOST_SUBDIR)/libdecnumber ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \ cd $(HOST_SUBDIR)/libdecnumber || exit 1; \ @@ -23611,9 +23908,9 @@ configure-stageb3g2-libdecnumber: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \ - LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS; \ echo Configuring stage b3g2 in $(HOST_SUBDIR)/libdecnumber ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \ cd $(HOST_SUBDIR)/libdecnumber || exit 1; \ @@ -23642,9 +23939,9 @@ configure-stage4-libdecnumber: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 4 in $(HOST_SUBDIR)/libdecnumber ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \ cd $(HOST_SUBDIR)/libdecnumber || exit 1; \ @@ -23673,9 +23970,9 @@ configure-stageprofile-libdecnumber: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \ - LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \ echo Configuring stage profile in $(HOST_SUBDIR)/libdecnumber ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \ cd $(HOST_SUBDIR)/libdecnumber || exit 1; \ @@ -23704,9 +24001,9 @@ configure-stagefeedback-libdecnumber: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \ - LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \ echo Configuring stage feedback in $(HOST_SUBDIR)/libdecnumber ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \ cd $(HOST_SUBDIR)/libdecnumber || exit 1; \ @@ -23741,7 +24038,8 @@ all-libdecnumber: configure-libdecnumber s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/libdecnumber && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-libdecnumber)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-libdecnumber)) @endif libdecnumber @@ -23760,8 +24058,11 @@ all-stage1-libdecnumber: configure-stage s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libdecnumber && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \ + LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \ $(TARGET-stage1-libdecnumber) maybe-clean-stage1-libdecnumber: clean-stage1-libdecnumber @@ -23774,7 +24075,7 @@ clean-stage1-libdecnumber: $(MAKE) stage1-start; \ fi; \ cd $(HOST_SUBDIR)/libdecnumber && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ clean @endif libdecnumber-bootstrap @@ -23794,8 +24095,11 @@ all-stage2-libdecnumber: configure-stage $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libdecnumber && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stage2-libdecnumber) maybe-clean-stage2-libdecnumber: clean-stage2-libdecnumber @@ -23808,7 +24112,7 @@ clean-stage2-libdecnumber: $(MAKE) stage2-start; \ fi; \ cd $(HOST_SUBDIR)/libdecnumber && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libdecnumber-bootstrap @@ -23829,8 +24133,11 @@ all-stageb2g0-libdecnumber: configure-st $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libdecnumber && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageb2g0-libdecnumber) maybe-clean-stageb2g0-libdecnumber: clean-stageb2g0-libdecnumber @@ -23843,7 +24150,7 @@ clean-stageb2g0-libdecnumber: $(MAKE) stageb2g0-start; \ fi; \ cd $(HOST_SUBDIR)/libdecnumber && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libdecnumber-bootstrap @@ -23864,8 +24171,11 @@ all-stage3-libdecnumber: configure-stage $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libdecnumber && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \ + LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stage3-libdecnumber) maybe-clean-stage3-libdecnumber: clean-stage3-libdecnumber @@ -23878,7 +24188,7 @@ clean-stage3-libdecnumber: $(MAKE) stage3-start; \ fi; \ cd $(HOST_SUBDIR)/libdecnumber && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libdecnumber-bootstrap @@ -23899,8 +24209,11 @@ all-stageb3g2-libdecnumber: configure-st $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libdecnumber && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \ + LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \ + CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \ + CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageb3g2-libdecnumber) maybe-clean-stageb3g2-libdecnumber: clean-stageb3g2-libdecnumber @@ -23913,7 +24226,7 @@ clean-stageb3g2-libdecnumber: $(MAKE) stageb3g2-start; \ fi; \ cd $(HOST_SUBDIR)/libdecnumber && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libdecnumber-bootstrap @@ -23934,8 +24247,11 @@ all-stage4-libdecnumber: configure-stage $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libdecnumber && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \ + LIBCFLAGS="$(STAGE4_CFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stage4-libdecnumber) maybe-clean-stage4-libdecnumber: clean-stage4-libdecnumber @@ -23948,7 +24264,7 @@ clean-stage4-libdecnumber: $(MAKE) stage4-start; \ fi; \ cd $(HOST_SUBDIR)/libdecnumber && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libdecnumber-bootstrap @@ -23969,8 +24285,11 @@ all-stageprofile-libdecnumber: configure $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libdecnumber && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageprofile-libdecnumber) maybe-clean-stageprofile-libdecnumber: clean-stageprofile-libdecnumber @@ -23983,7 +24302,7 @@ clean-stageprofile-libdecnumber: $(MAKE) stageprofile-start; \ fi; \ cd $(HOST_SUBDIR)/libdecnumber && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libdecnumber-bootstrap @@ -24004,8 +24323,11 @@ all-stagefeedback-libdecnumber: configur $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libdecnumber && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \ + LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \ + CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \ + CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stagefeedback-libdecnumber) maybe-clean-stagefeedback-libdecnumber: clean-stagefeedback-libdecnumber @@ -24018,7 +24340,7 @@ clean-stagefeedback-libdecnumber: $(MAKE) stagefeedback-start; \ fi; \ cd $(HOST_SUBDIR)/libdecnumber && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libdecnumber-bootstrap @@ -24432,7 +24754,8 @@ all-libgui: configure-libgui s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/libgui && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-libgui)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-libgui)) @endif libgui @@ -24849,9 +25172,9 @@ configure-stage1-libiberty: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 1 in $(HOST_SUBDIR)/libiberty ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ cd $(HOST_SUBDIR)/libiberty || exit 1; \ @@ -24880,9 +25203,9 @@ configure-stage2-libiberty: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 2 in $(HOST_SUBDIR)/libiberty ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ cd $(HOST_SUBDIR)/libiberty || exit 1; \ @@ -24911,9 +25234,9 @@ configure-stageb2g0-libiberty: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \ - LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS; \ echo Configuring stage b2g0 in $(HOST_SUBDIR)/libiberty ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ cd $(HOST_SUBDIR)/libiberty || exit 1; \ @@ -24942,9 +25265,9 @@ configure-stage3-libiberty: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 3 in $(HOST_SUBDIR)/libiberty ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ cd $(HOST_SUBDIR)/libiberty || exit 1; \ @@ -24973,9 +25296,9 @@ configure-stageb3g2-libiberty: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \ - LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS; \ echo Configuring stage b3g2 in $(HOST_SUBDIR)/libiberty ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ cd $(HOST_SUBDIR)/libiberty || exit 1; \ @@ -25004,9 +25327,9 @@ configure-stage4-libiberty: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 4 in $(HOST_SUBDIR)/libiberty ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ cd $(HOST_SUBDIR)/libiberty || exit 1; \ @@ -25035,9 +25358,9 @@ configure-stageprofile-libiberty: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \ - LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \ echo Configuring stage profile in $(HOST_SUBDIR)/libiberty ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ cd $(HOST_SUBDIR)/libiberty || exit 1; \ @@ -25066,9 +25389,9 @@ configure-stagefeedback-libiberty: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \ - LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \ echo Configuring stage feedback in $(HOST_SUBDIR)/libiberty ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ cd $(HOST_SUBDIR)/libiberty || exit 1; \ @@ -25103,7 +25426,8 @@ all-libiberty: configure-libiberty s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/libiberty && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-libiberty)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-libiberty)) @endif libiberty @@ -25122,8 +25446,11 @@ all-stage1-libiberty: configure-stage1-l s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libiberty && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \ + LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \ $(TARGET-stage1-libiberty) maybe-clean-stage1-libiberty: clean-stage1-libiberty @@ -25136,7 +25463,7 @@ clean-stage1-libiberty: $(MAKE) stage1-start; \ fi; \ cd $(HOST_SUBDIR)/libiberty && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ clean @endif libiberty-bootstrap @@ -25156,8 +25483,11 @@ all-stage2-libiberty: configure-stage2-l $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libiberty && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stage2-libiberty) maybe-clean-stage2-libiberty: clean-stage2-libiberty @@ -25170,7 +25500,7 @@ clean-stage2-libiberty: $(MAKE) stage2-start; \ fi; \ cd $(HOST_SUBDIR)/libiberty && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libiberty-bootstrap @@ -25191,8 +25521,11 @@ all-stageb2g0-libiberty: configure-stage $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libiberty && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageb2g0-libiberty) maybe-clean-stageb2g0-libiberty: clean-stageb2g0-libiberty @@ -25205,7 +25538,7 @@ clean-stageb2g0-libiberty: $(MAKE) stageb2g0-start; \ fi; \ cd $(HOST_SUBDIR)/libiberty && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libiberty-bootstrap @@ -25226,8 +25559,11 @@ all-stage3-libiberty: configure-stage3-l $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libiberty && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \ + LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stage3-libiberty) maybe-clean-stage3-libiberty: clean-stage3-libiberty @@ -25240,7 +25576,7 @@ clean-stage3-libiberty: $(MAKE) stage3-start; \ fi; \ cd $(HOST_SUBDIR)/libiberty && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libiberty-bootstrap @@ -25261,8 +25597,11 @@ all-stageb3g2-libiberty: configure-stage $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libiberty && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \ + LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \ + CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \ + CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageb3g2-libiberty) maybe-clean-stageb3g2-libiberty: clean-stageb3g2-libiberty @@ -25275,7 +25614,7 @@ clean-stageb3g2-libiberty: $(MAKE) stageb3g2-start; \ fi; \ cd $(HOST_SUBDIR)/libiberty && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libiberty-bootstrap @@ -25296,8 +25635,11 @@ all-stage4-libiberty: configure-stage4-l $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libiberty && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \ + LIBCFLAGS="$(STAGE4_CFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stage4-libiberty) maybe-clean-stage4-libiberty: clean-stage4-libiberty @@ -25310,7 +25652,7 @@ clean-stage4-libiberty: $(MAKE) stage4-start; \ fi; \ cd $(HOST_SUBDIR)/libiberty && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libiberty-bootstrap @@ -25331,8 +25673,11 @@ all-stageprofile-libiberty: configure-st $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libiberty && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageprofile-libiberty) maybe-clean-stageprofile-libiberty: clean-stageprofile-libiberty @@ -25345,7 +25690,7 @@ clean-stageprofile-libiberty: $(MAKE) stageprofile-start; \ fi; \ cd $(HOST_SUBDIR)/libiberty && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libiberty-bootstrap @@ -25366,8 +25711,11 @@ all-stagefeedback-libiberty: configure-s $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libiberty && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \ + LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \ + CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \ + CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stagefeedback-libiberty) maybe-clean-stagefeedback-libiberty: clean-stagefeedback-libiberty @@ -25380,7 +25728,7 @@ clean-stagefeedback-libiberty: $(MAKE) stagefeedback-start; \ fi; \ cd $(HOST_SUBDIR)/libiberty && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libiberty-bootstrap @@ -25794,7 +26142,8 @@ all-libtool: configure-libtool s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/libtool && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-libtool)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-libtool)) @endif libtool @@ -26218,7 +26567,8 @@ all-m4: configure-m4 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/m4 && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-m4)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-m4)) @endif m4 @@ -26642,7 +26992,8 @@ all-make: configure-make s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/make && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-make)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-make)) @endif make @@ -27066,7 +27417,8 @@ all-mmalloc: configure-mmalloc s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/mmalloc && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-mmalloc)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-mmalloc)) @endif mmalloc @@ -27484,7 +27836,8 @@ all-patch: configure-patch s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/patch && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-patch)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-patch)) @endif patch @@ -27908,7 +28261,8 @@ all-perl: configure-perl s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/perl && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-perl)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-perl)) @endif perl @@ -28332,7 +28686,8 @@ all-prms: configure-prms s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/prms && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-prms)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-prms)) @endif prms @@ -28756,7 +29111,8 @@ all-rcs: configure-rcs s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/rcs && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-rcs)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-rcs)) @endif rcs @@ -29180,7 +29536,8 @@ all-readline: configure-readline s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/readline && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-readline)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-readline)) @endif readline @@ -29604,7 +29961,8 @@ all-release: configure-release s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/release && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-release)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-release)) @endif release @@ -30016,7 +30374,8 @@ all-recode: configure-recode s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/recode && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-recode)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-recode)) @endif recode @@ -30440,7 +30799,8 @@ all-sed: configure-sed s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/sed && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-sed)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-sed)) @endif sed @@ -30864,7 +31224,8 @@ all-send-pr: configure-send-pr s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/send-pr && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-send-pr)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-send-pr)) @endif send-pr @@ -31288,7 +31649,8 @@ all-shellutils: configure-shellutils s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/shellutils && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-shellutils)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-shellutils)) @endif shellutils @@ -31712,7 +32074,8 @@ all-sid: configure-sid s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/sid && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-sid)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-sid)) @endif sid @@ -32136,7 +32499,8 @@ all-sim: configure-sim s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/sim && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-sim)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-sim)) @endif sim @@ -32560,7 +32924,8 @@ all-tar: configure-tar s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/tar && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-tar)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-tar)) @endif tar @@ -32984,7 +33349,8 @@ all-texinfo: configure-texinfo s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/texinfo && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-texinfo)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-texinfo)) @endif texinfo @@ -33402,7 +33768,8 @@ all-textutils: configure-textutils s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/textutils && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-textutils)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-textutils)) @endif textutils @@ -33826,7 +34193,8 @@ all-time: configure-time s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/time && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-time)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-time)) @endif time @@ -34250,7 +34618,8 @@ all-uudecode: configure-uudecode s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/uudecode && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-uudecode)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-uudecode)) @endif uudecode @@ -34674,7 +35043,8 @@ all-wdiff: configure-wdiff s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/wdiff && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-wdiff)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-wdiff)) @endif wdiff @@ -35098,7 +35468,8 @@ all-zip: configure-zip s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/zip && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-zip)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-zip)) @endif zip @@ -35518,9 +35889,9 @@ configure-stage1-zlib: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 1 in $(HOST_SUBDIR)/zlib ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ cd $(HOST_SUBDIR)/zlib || exit 1; \ @@ -35549,9 +35920,9 @@ configure-stage2-zlib: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 2 in $(HOST_SUBDIR)/zlib ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ cd $(HOST_SUBDIR)/zlib || exit 1; \ @@ -35580,9 +35951,9 @@ configure-stageb2g0-zlib: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \ - LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS; \ echo Configuring stage b2g0 in $(HOST_SUBDIR)/zlib ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ cd $(HOST_SUBDIR)/zlib || exit 1; \ @@ -35611,9 +35982,9 @@ configure-stage3-zlib: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 3 in $(HOST_SUBDIR)/zlib ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ cd $(HOST_SUBDIR)/zlib || exit 1; \ @@ -35642,9 +36013,9 @@ configure-stageb3g2-zlib: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \ - LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS; \ echo Configuring stage b3g2 in $(HOST_SUBDIR)/zlib ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ cd $(HOST_SUBDIR)/zlib || exit 1; \ @@ -35673,9 +36044,9 @@ configure-stage4-zlib: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \ echo Configuring stage 4 in $(HOST_SUBDIR)/zlib ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ cd $(HOST_SUBDIR)/zlib || exit 1; \ @@ -35704,9 +36075,9 @@ configure-stageprofile-zlib: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \ - LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \ echo Configuring stage profile in $(HOST_SUBDIR)/zlib ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ cd $(HOST_SUBDIR)/zlib || exit 1; \ @@ -35735,9 +36106,9 @@ configure-stagefeedback-zlib: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \ - LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \ + CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \ echo Configuring stage feedback in $(HOST_SUBDIR)/zlib ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ cd $(HOST_SUBDIR)/zlib || exit 1; \ @@ -35772,7 +36143,8 @@ all-zlib: configure-zlib s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/zlib && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-zlib)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-zlib)) @endif zlib @@ -35791,8 +36163,11 @@ all-stage1-zlib: configure-stage1-zlib s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/zlib && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \ + LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \ $(TARGET-stage1-zlib) maybe-clean-stage1-zlib: clean-stage1-zlib @@ -35805,7 +36180,7 @@ clean-stage1-zlib: $(MAKE) stage1-start; \ fi; \ cd $(HOST_SUBDIR)/zlib && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ clean @endif zlib-bootstrap @@ -35825,8 +36200,11 @@ all-stage2-zlib: configure-stage2-zlib $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/zlib && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stage2-zlib) maybe-clean-stage2-zlib: clean-stage2-zlib @@ -35839,7 +36217,7 @@ clean-stage2-zlib: $(MAKE) stage2-start; \ fi; \ cd $(HOST_SUBDIR)/zlib && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif zlib-bootstrap @@ -35860,8 +36238,11 @@ all-stageb2g0-zlib: configure-stageb2g0- $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/zlib && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageb2g0-zlib) maybe-clean-stageb2g0-zlib: clean-stageb2g0-zlib @@ -35874,7 +36255,7 @@ clean-stageb2g0-zlib: $(MAKE) stageb2g0-start; \ fi; \ cd $(HOST_SUBDIR)/zlib && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif zlib-bootstrap @@ -35895,8 +36276,11 @@ all-stage3-zlib: configure-stage3-zlib $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/zlib && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \ + LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stage3-zlib) maybe-clean-stage3-zlib: clean-stage3-zlib @@ -35909,7 +36293,7 @@ clean-stage3-zlib: $(MAKE) stage3-start; \ fi; \ cd $(HOST_SUBDIR)/zlib && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif zlib-bootstrap @@ -35930,8 +36314,11 @@ all-stageb3g2-zlib: configure-stageb3g2- $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/zlib && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \ + LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \ + CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \ + CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageb3g2-zlib) maybe-clean-stageb3g2-zlib: clean-stageb3g2-zlib @@ -35944,7 +36331,7 @@ clean-stageb3g2-zlib: $(MAKE) stageb3g2-start; \ fi; \ cd $(HOST_SUBDIR)/zlib && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif zlib-bootstrap @@ -35965,8 +36352,11 @@ all-stage4-zlib: configure-stage4-zlib $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/zlib && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \ + LIBCFLAGS="$(STAGE4_CFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stage4-zlib) maybe-clean-stage4-zlib: clean-stage4-zlib @@ -35979,7 +36369,7 @@ clean-stage4-zlib: $(MAKE) stage4-start; \ fi; \ cd $(HOST_SUBDIR)/zlib && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif zlib-bootstrap @@ -36000,8 +36390,11 @@ all-stageprofile-zlib: configure-stagepr $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/zlib && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stageprofile-zlib) maybe-clean-stageprofile-zlib: clean-stageprofile-zlib @@ -36014,7 +36407,7 @@ clean-stageprofile-zlib: $(MAKE) stageprofile-start; \ fi; \ cd $(HOST_SUBDIR)/zlib && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif zlib-bootstrap @@ -36035,8 +36428,11 @@ all-stagefeedback-zlib: configure-stagef $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/zlib && \ - $(MAKE) $(FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \ + LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \ + CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \ + CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ $(TARGET-stagefeedback-zlib) maybe-clean-stagefeedback-zlib: clean-stagefeedback-zlib @@ -36049,7 +36445,7 @@ clean-stagefeedback-zlib: $(MAKE) stagefeedback-start; \ fi; \ cd $(HOST_SUBDIR)/zlib && \ - $(MAKE) $(FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif zlib-bootstrap @@ -36451,7 +36847,8 @@ all-gdb: configure-gdb s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/gdb && \ - $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) $(TARGET-gdb)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS) \ + $(TARGET-gdb)) @endif gdb @@ -36875,7 +37272,8 @@ all-expect: configure-expect s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/expect && \ - $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) $(TARGET-expect)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS) \ + $(TARGET-expect)) @endif expect @@ -37299,7 +37697,8 @@ all-guile: configure-guile s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/guile && \ - $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) $(TARGET-guile)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS) \ + $(TARGET-guile)) @endif guile @@ -37723,7 +38122,8 @@ all-tk: configure-tk s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/tk && \ - $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) $(TARGET-tk)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS) \ + $(TARGET-tk)) @endif tk @@ -38147,7 +38547,8 @@ all-libtermcap: configure-libtermcap s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/libtermcap && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-libtermcap)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-libtermcap)) @endif libtermcap @@ -38505,7 +38906,8 @@ all-utils: configure-utils s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/utils && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-utils)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-utils)) @endif utils @@ -38923,7 +39325,8 @@ all-gnattools: configure-gnattools s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/gnattools && \ - $(MAKE) $(FLAGS_TO_PASS) $(TARGET-gnattools)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \ + $(TARGET-gnattools)) @endif gnattools @@ -39368,7 +39771,8 @@ all-target-libstdc++-v3: configure-targe s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(RAW_CXX_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libstdc++-v3 && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' $(TARGET-target-libstdc++-v3)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ + $(TARGET-target-libstdc++-v3)) @endif target-libstdc++-v3 @@ -39809,7 +40213,8 @@ all-target-libmudflap: configure-target- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libmudflap && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libmudflap)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \ + $(TARGET-target-libmudflap)) @endif target-libmudflap @@ -40250,7 +40655,8 @@ all-target-libssp: configure-target-libs s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libssp && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libssp)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \ + $(TARGET-target-libssp)) @endif target-libssp @@ -40691,7 +41097,8 @@ all-target-newlib: configure-target-newl s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/newlib && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-newlib)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \ + $(TARGET-target-newlib)) @endif target-newlib @@ -41137,9 +41544,9 @@ configure-stage1-target-libgcc: mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \ fi; \ test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \ - $(NORMAL_TARGET_EXPORTS) \ - CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \ + $(NORMAL_TARGET_EXPORTS) \ + CFLAGS="$(STAGE1_LIBCFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="$(STAGE1_LIBCFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS; \ echo Configuring stage 1 in $(TARGET_SUBDIR)/libgcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \ cd $(TARGET_SUBDIR)/libgcc || exit 1; \ @@ -41180,9 +41587,9 @@ configure-stage2-target-libgcc: fi; \ test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ - \ - CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ + \ + CFLAGS="$(STAGE2_LIBCFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="$(STAGE2_LIBCFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS; \ echo Configuring stage 2 in $(TARGET_SUBDIR)/libgcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \ cd $(TARGET_SUBDIR)/libgcc || exit 1; \ @@ -41223,9 +41630,9 @@ configure-stageb2g0-target-libgcc: fi; \ test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ - \ - CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \ - LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \ + \ + CFLAGS="$(STAGE2_LIBCFLAGS) -g0 $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="$(STAGE2_LIBCFLAGS) -g0 $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS; \ echo Configuring stage b2g0 in $(TARGET_SUBDIR)/libgcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \ cd $(TARGET_SUBDIR)/libgcc || exit 1; \ @@ -41266,9 +41673,9 @@ configure-stage3-target-libgcc: fi; \ test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ - \ - CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ + \ + CFLAGS="$(STAGE3_LIBCFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="$(STAGE3_LIBCFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS; \ echo Configuring stage 3 in $(TARGET_SUBDIR)/libgcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \ cd $(TARGET_SUBDIR)/libgcc || exit 1; \ @@ -41309,9 +41716,9 @@ configure-stageb3g2-target-libgcc: fi; \ test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ - \ - CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \ - LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \ + \ + CFLAGS="$(STAGE3_LIBCFLAGS) -g2 $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="$(STAGE3_LIBCFLAGS) -g2 $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS; \ echo Configuring stage b3g2 in $(TARGET_SUBDIR)/libgcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \ cd $(TARGET_SUBDIR)/libgcc || exit 1; \ @@ -41352,9 +41759,9 @@ configure-stage4-target-libgcc: fi; \ test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ - \ - CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ - LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ + \ + CFLAGS="$(STAGE4_CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="$(STAGE4_CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS; \ echo Configuring stage 4 in $(TARGET_SUBDIR)/libgcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \ cd $(TARGET_SUBDIR)/libgcc || exit 1; \ @@ -41395,9 +41802,9 @@ configure-stageprofile-target-libgcc: fi; \ test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ - \ - CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \ - LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \ + \ + CFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS; \ echo Configuring stage profile in $(TARGET_SUBDIR)/libgcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \ cd $(TARGET_SUBDIR)/libgcc || exit 1; \ @@ -41438,9 +41845,9 @@ configure-stagefeedback-target-libgcc: fi; \ test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ - \ - CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \ - LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \ + \ + CFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS; \ echo Configuring stage feedback in $(TARGET_SUBDIR)/libgcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \ cd $(TARGET_SUBDIR)/libgcc || exit 1; \ @@ -41475,7 +41882,8 @@ all-target-libgcc: configure-target-libg s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libgcc && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libgcc)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \ + $(TARGET-target-libgcc)) @endif target-libgcc @@ -41494,8 +41902,11 @@ all-stage1-target-libgcc: configure-stag s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ cd $(TARGET_SUBDIR)/libgcc && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \ + LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_TARGET_FLAGS) \ $(TARGET-stage1-target-libgcc) maybe-clean-stage1-target-libgcc: clean-stage1-target-libgcc @@ -41508,7 +41919,7 @@ clean-stage1-target-libgcc: $(MAKE) stage1-start; \ fi; \ cd $(TARGET_SUBDIR)/libgcc && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_TARGET_FLAGS) \ clean @endif target-libgcc-bootstrap @@ -41528,8 +41939,11 @@ all-stage2-target-libgcc: configure-stag $(NORMAL_TARGET_EXPORTS) \ \ cd $(TARGET_SUBDIR)/libgcc && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_TARGET_FLAGS) \ $(TARGET-stage2-target-libgcc) maybe-clean-stage2-target-libgcc: clean-stage2-target-libgcc @@ -41542,7 +41956,7 @@ clean-stage2-target-libgcc: $(MAKE) stage2-start; \ fi; \ cd $(TARGET_SUBDIR)/libgcc && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_TARGET_FLAGS) \ \ clean @endif target-libgcc-bootstrap @@ -41563,8 +41977,11 @@ all-stageb2g0-target-libgcc: configure-s $(NORMAL_TARGET_EXPORTS) \ \ cd $(TARGET_SUBDIR)/libgcc && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_TARGET_FLAGS) \ $(TARGET-stageb2g0-target-libgcc) maybe-clean-stageb2g0-target-libgcc: clean-stageb2g0-target-libgcc @@ -41577,7 +41994,7 @@ clean-stageb2g0-target-libgcc: $(MAKE) stageb2g0-start; \ fi; \ cd $(TARGET_SUBDIR)/libgcc && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_TARGET_FLAGS) \ \ clean @endif target-libgcc-bootstrap @@ -41598,8 +42015,11 @@ all-stage3-target-libgcc: configure-stag $(NORMAL_TARGET_EXPORTS) \ \ cd $(TARGET_SUBDIR)/libgcc && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \ + LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_TARGET_FLAGS) \ $(TARGET-stage3-target-libgcc) maybe-clean-stage3-target-libgcc: clean-stage3-target-libgcc @@ -41612,7 +42032,7 @@ clean-stage3-target-libgcc: $(MAKE) stage3-start; \ fi; \ cd $(TARGET_SUBDIR)/libgcc && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_TARGET_FLAGS) \ \ clean @endif target-libgcc-bootstrap @@ -41633,8 +42053,11 @@ all-stageb3g2-target-libgcc: configure-s $(NORMAL_TARGET_EXPORTS) \ \ cd $(TARGET_SUBDIR)/libgcc && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \ + LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \ + CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \ + CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_TARGET_FLAGS) \ $(TARGET-stageb3g2-target-libgcc) maybe-clean-stageb3g2-target-libgcc: clean-stageb3g2-target-libgcc @@ -41647,7 +42070,7 @@ clean-stageb3g2-target-libgcc: $(MAKE) stageb3g2-start; \ fi; \ cd $(TARGET_SUBDIR)/libgcc && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_TARGET_FLAGS) \ \ clean @endif target-libgcc-bootstrap @@ -41668,8 +42091,11 @@ all-stage4-target-libgcc: configure-stag $(NORMAL_TARGET_EXPORTS) \ \ cd $(TARGET_SUBDIR)/libgcc && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \ + LIBCFLAGS="$(STAGE4_CFLAGS)" \ + CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \ + CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_TARGET_FLAGS) \ $(TARGET-stage4-target-libgcc) maybe-clean-stage4-target-libgcc: clean-stage4-target-libgcc @@ -41682,7 +42108,7 @@ clean-stage4-target-libgcc: $(MAKE) stage4-start; \ fi; \ cd $(TARGET_SUBDIR)/libgcc && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_TARGET_FLAGS) \ \ clean @endif target-libgcc-bootstrap @@ -41703,8 +42129,11 @@ all-stageprofile-target-libgcc: configur $(NORMAL_TARGET_EXPORTS) \ \ cd $(TARGET_SUBDIR)/libgcc && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \ + LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \ + CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \ + CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_TARGET_FLAGS) \ $(TARGET-stageprofile-target-libgcc) maybe-clean-stageprofile-target-libgcc: clean-stageprofile-target-libgcc @@ -41717,7 +42146,7 @@ clean-stageprofile-target-libgcc: $(MAKE) stageprofile-start; \ fi; \ cd $(TARGET_SUBDIR)/libgcc && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_TARGET_FLAGS) \ \ clean @endif target-libgcc-bootstrap @@ -41738,8 +42167,11 @@ all-stagefeedback-target-libgcc: configu $(NORMAL_TARGET_EXPORTS) \ \ cd $(TARGET_SUBDIR)/libgcc && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \ + LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \ + CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \ + CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_TARGET_FLAGS) \ $(TARGET-stagefeedback-target-libgcc) maybe-clean-stagefeedback-target-libgcc: clean-stagefeedback-target-libgcc @@ -41752,7 +42184,7 @@ clean-stagefeedback-target-libgcc: $(MAKE) stagefeedback-start; \ fi; \ cd $(TARGET_SUBDIR)/libgcc && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) \ + $(MAKE) $(EXTRA_TARGET_FLAGS) \ \ clean @endif target-libgcc-bootstrap @@ -42191,7 +42623,8 @@ all-target-libgfortran: configure-target s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libgfortran && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libgfortran)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \ + $(TARGET-target-libgfortran)) @endif target-libgfortran @@ -42632,7 +43065,8 @@ all-target-libobjc: configure-target-lib s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libobjc && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libobjc)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \ + $(TARGET-target-libobjc)) @endif target-libobjc @@ -43073,7 +43507,8 @@ all-target-libtermcap: configure-target- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libtermcap && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libtermcap)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \ + $(TARGET-target-libtermcap)) @endif target-libtermcap @@ -43449,7 +43884,8 @@ all-target-winsup: configure-target-wins s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/winsup && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-winsup)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \ + $(TARGET-target-winsup)) @endif target-winsup @@ -43890,7 +44326,8 @@ all-target-libgloss: configure-target-li s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libgloss && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libgloss)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \ + $(TARGET-target-libgloss)) @endif target-libgloss @@ -44326,7 +44763,8 @@ all-target-libiberty: configure-target-l s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libiberty && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libiberty)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \ + $(TARGET-target-libiberty)) @endif target-libiberty @@ -44767,7 +45205,8 @@ all-target-gperf: configure-target-gperf s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/gperf && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-gperf)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \ + $(TARGET-target-gperf)) @endif target-gperf @@ -45208,7 +45647,8 @@ all-target-examples: configure-target-ex s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/examples && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-examples)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \ + $(TARGET-target-examples)) @endif target-examples @@ -45639,7 +46079,8 @@ all-target-libffi: configure-target-libf s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libffi && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libffi)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \ + $(TARGET-target-libffi)) @endif target-libffi @@ -46080,7 +46521,8 @@ all-target-libjava: configure-target-lib s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(RAW_CXX_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libjava && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' $(TARGET-target-libjava)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ + $(TARGET-target-libjava)) @endif target-libjava @@ -46521,7 +46963,8 @@ all-target-zlib: configure-target-zlib s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/zlib && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-zlib)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \ + $(TARGET-target-zlib)) @endif target-zlib @@ -46962,7 +47405,8 @@ all-target-boehm-gc: configure-target-bo s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/boehm-gc && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-boehm-gc)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \ + $(TARGET-target-boehm-gc)) @endif target-boehm-gc @@ -47403,7 +47847,8 @@ all-target-qthreads: configure-target-qt s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/qthreads && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-qthreads)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \ + $(TARGET-target-qthreads)) @endif target-qthreads @@ -47844,7 +48289,8 @@ all-target-rda: configure-target-rda s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/rda && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-rda)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \ + $(TARGET-target-rda)) @endif target-rda @@ -48285,7 +48731,8 @@ all-target-libada: configure-target-liba s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libada && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libada)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \ + $(TARGET-target-libada)) @endif target-libada @@ -48726,7 +49173,8 @@ all-target-libgomp: configure-target-lib s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libgomp && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libgomp)) + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \ + $(TARGET-target-libgomp)) @endif target-libgomp @@ -49359,7 +49807,7 @@ stage1-end:: # Bubble a bug fix through all the stages up to stage 1. They are # remade, but not reconfigured. The next stage (if any) will not be -# reconfigured as well. +# reconfigured either. .PHONY: stage1-bubble stage1-bubble:: @r=`${PWD_COMMAND}`; export r; \ @@ -49570,7 +50018,7 @@ stage2-end:: # Bubble a bug fix through all the stages up to stage 2. They are # remade, but not reconfigured. The next stage (if any) will not be -# reconfigured as well. +# reconfigured either. .PHONY: stage2-bubble stage2-bubble:: stage1-bubble @r=`${PWD_COMMAND}`; export r; \ @@ -49802,7 +50250,7 @@ stageb2g0-end:: # 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 as well. +# reconfigured either. .PHONY: stageb2g0-bubble stageb2g0-bubble:: stage1-bubble @r=`${PWD_COMMAND}`; export r; \ @@ -50034,7 +50482,7 @@ stage3-end:: # Bubble a bug fix through all the stages up to stage 3. They are # remade, but not reconfigured. The next stage (if any) will not be -# reconfigured as well. +# reconfigured either. .PHONY: stage3-bubble stage3-bubble:: stage2-bubble @r=`${PWD_COMMAND}`; export r; \ @@ -50320,7 +50768,7 @@ stageb3g2-end:: # 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 as well. +# reconfigured either. .PHONY: stageb3g2-bubble stageb3g2-bubble:: stageb2g0-bubble @r=`${PWD_COMMAND}`; export r; \ @@ -50606,7 +51054,7 @@ stage4-end:: # Bubble a bug fix through all the stages up to stage 4. They are # remade, but not reconfigured. The next stage (if any) will not be -# reconfigured as well. +# reconfigured either. .PHONY: stage4-bubble stage4-bubble:: stage3-bubble @r=`${PWD_COMMAND}`; export r; \ @@ -50881,7 +51329,7 @@ stageprofile-end:: # Bubble a bug fix through all the stages up to stage profile. They are # remade, but not reconfigured. The next stage (if any) will not be -# reconfigured as well. +# reconfigured either. .PHONY: stageprofile-bubble stageprofile-bubble:: stage1-bubble @r=`${PWD_COMMAND}`; export r; \ @@ -51092,7 +51540,7 @@ stagefeedback-end:: # Bubble a bug fix through all the stages up to stage feedback. They are # remade, but not reconfigured. The next stage (if any) will not be -# reconfigured as well. +# reconfigured either. .PHONY: stagefeedback-bubble stagefeedback-bubble:: stageprofile-bubble @r=`${PWD_COMMAND}`; export r; \ @@ -51177,10 +51625,10 @@ stage_current: @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi .PHONY: restrap -restrap: +restrap:: @: $(MAKE); $(stage) rm -rf stage1-$(TARGET_SUBDIR) stage2-* stageb2g0-* stage3-* stageb3g2-* stage4-* stageprofile-* stagefeedback-* - $(MAKE) $(RECURSE_FLAGS_TO_PASS) all +restrap:: all @endif gcc-bootstrap # -------------------------------------- @@ -52006,7 +52454,8 @@ config.status: configure # Rebuilding configure. AUTOCONF = autoconf -$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac $(srcdir)/config/acx.m4 +$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac $(srcdir)/config/acx.m4 \ + $(srcdir)/config/override.m4 $(srcdir)/config/proginstall.m4 cd $(srcdir) && $(AUTOCONF) # ------------------------------ Index: gcc-4.3.4/configure =================================================================== --- gcc-4.3.4.orig/configure 2009-04-25 07:55:24.000000000 +0200 +++ gcc-4.3.4/configure 2009-08-10 09:10:47.130681348 +0200 @@ -272,7 +272,7 @@ PACKAGE_STRING= PACKAGE_BUGREPORT= ac_unique_file="move-if-change" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_noncanonical host_noncanonical target_noncanonical host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN LN_S TOPLEVEL_CONFIGURE_ARGUMENTS build_libsubdir build_subdir host_subdir target_subdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GNATBIND ac_ct_GNATBIND GNATMAKE ac_ct_GNATMAKE do_compare gmplibs gmpinc extra_mpfr_configure_flags stage1_languages SYSROOT_CFLAGS_FOR_TARGET DEBUG_PREFIX_CFLAGS_FOR_TARGET RPATH_ENVVAR tooldir build_tooldir CONFIGURE_GDB_TK GDB_TK INSTALL_GDB_TK build_configargs build_configdirs host_configargs configdirs target_configargs AR_FOR_BUILD AS_FOR_BUILD CC_FOR_BUILD CFLAGS_FOR_BUILD CXXFLAGS_FOR_BUILD CXX_FOR_BUILD DLLTOOL_FOR_BUILD GCJ_FOR_BUILD GFORTRAN_FOR_BUILD LDFLAGS_FOR_BUILD LD_FOR_BUILD NM_FOR_BUILD RANLIB_FOR_BUILD WINDMC_FOR_BUILD WINDRES_FOR_BUILD config_shell YACC BISON M4 LEX FLEX MAKEINFO EXPECT RUNTEST AR AS DLLTOOL LD LIPO NM RANLIB STRIP WINDRES WINDMC OBJCOPY OBJDUMP CC_FOR_TARGET CXX_FOR_TARGET GCC_FOR_TARGET GCJ_FOR_TARGET GFORTRAN_FOR_TARGET AR_FOR_TARGET AS_FOR_TARGET DLLTOOL_FOR_TARGET LD_FOR_TARGET LIPO_FOR_TARGET NM_FOR_TARGET OBJDUMP_FOR_TARGET RANLIB_FOR_TARGET STRIP_FOR_TARGET WINDRES_FOR_TARGET WINDMC_FOR_TARGET RAW_CXX_FOR_TARGET FLAGS_FOR_TARGET COMPILER_AS_FOR_TARGET COMPILER_LD_FOR_TARGET COMPILER_NM_FOR_TARGET MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT stage1_cflags stage1_checking stage2_werror_flag datarootdir docdir pdfdir htmldir LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_noncanonical host_noncanonical target_noncanonical host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN LN_S TOPLEVEL_CONFIGURE_ARGUMENTS build_libsubdir build_subdir host_subdir target_subdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GNATBIND ac_ct_GNATBIND GNATMAKE ac_ct_GNATMAKE do_compare gmplibs gmpinc extra_mpfr_configure_flags stage1_languages SYSROOT_CFLAGS_FOR_TARGET DEBUG_PREFIX_CFLAGS_FOR_TARGET CFLAGS_FOR_TARGET CXXFLAGS_FOR_TARGET RPATH_ENVVAR tooldir build_tooldir CONFIGURE_GDB_TK GDB_TK INSTALL_GDB_TK build_configargs build_configdirs host_configargs configdirs target_configargs AR_FOR_BUILD AS_FOR_BUILD CC_FOR_BUILD CFLAGS_FOR_BUILD CXXFLAGS_FOR_BUILD CXX_FOR_BUILD DLLTOOL_FOR_BUILD GCJ_FOR_BUILD GFORTRAN_FOR_BUILD LDFLAGS_FOR_BUILD LD_FOR_BUILD NM_FOR_BUILD RANLIB_FOR_BUILD WINDMC_FOR_BUILD WINDRES_FOR_BUILD config_shell YACC BISON M4 LEX FLEX MAKEINFO EXPECT RUNTEST AR AS DLLTOOL LD LIPO NM RANLIB STRIP WINDRES WINDMC OBJCOPY OBJDUMP CC_FOR_TARGET CXX_FOR_TARGET GCC_FOR_TARGET GCJ_FOR_TARGET GFORTRAN_FOR_TARGET AR_FOR_TARGET AS_FOR_TARGET DLLTOOL_FOR_TARGET LD_FOR_TARGET LIPO_FOR_TARGET NM_FOR_TARGET OBJDUMP_FOR_TARGET RANLIB_FOR_TARGET STRIP_FOR_TARGET WINDRES_FOR_TARGET WINDMC_FOR_TARGET RAW_CXX_FOR_TARGET FLAGS_FOR_TARGET COMPILER_AS_FOR_TARGET COMPILER_LD_FOR_TARGET COMPILER_NM_FOR_TARGET MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT stage1_cflags stage1_checking stage2_werror_flag datarootdir docdir pdfdir htmldir LIBOBJS LTLIBOBJS' ac_subst_files='serialization_dependencies host_makefile_frag target_makefile_frag alphaieee_frag ospace_frag' # Initialize some variables set by options. @@ -5149,6 +5149,38 @@ else fi; +# During gcc bootstrap, if we use some random cc for stage1 then CFLAGS +# might be empty or "-g". We don't require a C++ compiler, so CXXFLAGS +# might also be empty (or "-g", if a non-GCC C++ compiler is in the path). +# We want to ensure that TARGET libraries (which we know are built with +# gcc) are built with "-O2 -g", so include those options when setting +# CFLAGS_FOR_TARGET and CXXFLAGS_FOR_TARGET. +if test "x$CFLAGS_FOR_TARGET" = x; then + CFLAGS_FOR_TARGET=$CFLAGS + case " $CFLAGS " in + *" -O2 "*) ;; + *) CFLAGS_FOR_TARGET="-O2 $CFLAGS" ;; + esac + case " $CFLAGS " in + *" -g "* | *" -g3 "*) ;; + *) CFLAGS_FOR_TARGET="-g $CFLAGS" ;; + esac +fi + + +if test "x$CXXFLAGS_FOR_TARGET" = x; then + CXXFLAGS_FOR_TARGET=$CXXFLAGS + case " $CXXFLAGS " in + *" -O2 "*) ;; + *) CXXFLAGS_FOR_TARGET="-O2 $CXXFLAGS" ;; + esac + case " $CXXFLAGS " in + *" -g "* | *" -g3 "*) ;; + *) CXXFLAGS_FOR_TARGET="-g $CXXFLAGS" ;; + esac +fi + + # Handle --with-headers=XXX. If the value is not "yes", the contents of # the named directory are copied to $(tooldir)/sys-include. if test x"${with_headers}" != x && test x"${with_headers}" != xno ; then @@ -12828,6 +12860,8 @@ s,@extra_mpfr_configure_flags@,$extra_mp s,@stage1_languages@,$stage1_languages,;t t s,@SYSROOT_CFLAGS_FOR_TARGET@,$SYSROOT_CFLAGS_FOR_TARGET,;t t s,@DEBUG_PREFIX_CFLAGS_FOR_TARGET@,$DEBUG_PREFIX_CFLAGS_FOR_TARGET,;t t +s,@CFLAGS_FOR_TARGET@,$CFLAGS_FOR_TARGET,;t t +s,@CXXFLAGS_FOR_TARGET@,$CXXFLAGS_FOR_TARGET,;t t s,@RPATH_ENVVAR@,$RPATH_ENVVAR,;t t s,@tooldir@,$tooldir,;t t s,@build_tooldir@,$build_tooldir,;t t Index: gcc-4.3.4/libiberty/Makefile.in =================================================================== --- gcc-4.3.4.orig/libiberty/Makefile.in 2007-07-25 08:26:45.000000000 +0200 +++ gcc-4.3.4/libiberty/Makefile.in 2009-08-10 09:04:59.754847861 +0200 @@ -60,7 +60,7 @@ RANLIB = @RANLIB@ MAKEINFO = @MAKEINFO@ PERL = @PERL@ -PICFLAG = +PICFLAG = @PICFLAG@ MAKEOVERRIDES = @@ -143,10 +143,11 @@ CFILES = alloca.c argv.c asprintf.c atex pex-unix.c pex-win32.c \ physmem.c putenv.c \ random.c regex.c rename.c rindex.c \ - safe-ctype.c setenv.c sigsetmask.c snprintf.c sort.c spaces.c \ - splay-tree.c stpcpy.c stpncpy.c strcasecmp.c strchr.c strdup.c \ - strerror.c strncasecmp.c strncmp.c strrchr.c strsignal.c \ - strstr.c strtod.c strtol.c strtoul.c strndup.c strverscmp.c \ + safe-ctype.c setenv.c sigsetmask.c snprintf.c sort.c \ + spaces.c splay-tree.c stpcpy.c stpncpy.c strcasecmp.c \ + strchr.c strdup.c strerror.c strncasecmp.c strncmp.c \ + strrchr.c strsignal.c strstr.c strtod.c strtol.c strtoul.c \ + strndup.c strverscmp.c \ tmpnam.c \ unlink-if-ordinary.c \ vasprintf.c vfork.c vfprintf.c vprintf.c vsnprintf.c vsprintf.c \ @@ -156,7 +157,8 @@ CFILES = alloca.c argv.c asprintf.c atex # These are always included in the library. The first four are listed # first and by compile time to optimize parallel builds. -REQUIRED_OFILES = ./regex.o ./cplus-dem.o ./cp-demangle.o ./md5.o \ +REQUIRED_OFILES = \ + ./regex.o ./cplus-dem.o ./cp-demangle.o ./md5.o \ ./alloca.o ./argv.o \ ./choose-temp.o ./concat.o ./cp-demint.o \ ./dyn-string.o \ @@ -473,13 +475,13 @@ stamp-h: $(srcdir)/config.in config.stat config.status: $(srcdir)/configure $(SHELL) ./config.status --recheck -# Depending on stamp-h makes sure that config.status has been re-run +# Depending on config.h makes sure that config.status has been re-run # if needed. This prevents problems with parallel builds, in case # subdirectories need to run config.status also. all-subdir check-subdir installcheck-subdir info-subdir \ install-info-subdir clean-info-subdir dvi-subdir pdf-subdir install-subdir \ etags-subdir mostlyclean-subdir clean-subdir distclean-subdir \ -maintainer-clean-subdir: stamp-h +maintainer-clean-subdir: config.h @subdirs='$(SUBDIRS)'; \ target=`echo $@ | sed -e 's/-subdir//'`; \ for dir in $$subdirs ; do \ @@ -496,40 +498,41 @@ $(CONFIGURED_OFILES): stamp-picdir # The dependencies in the remainder of this file are automatically # generated by "make maint-deps". Manual edits will be lost. -./_doprnt.o: $(srcdir)/_doprnt.c stamp-h $(INCDIR)/ansidecl.h \ +./_doprnt.o: $(srcdir)/_doprnt.c config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/safe-ctype.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/_doprnt.c -o pic/$@; \ else true; fi $(COMPILE.c) $(srcdir)/_doprnt.c $(OUTPUT_OPTION) -./alloca.o: $(srcdir)/alloca.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h +./alloca.o: $(srcdir)/alloca.c config.h $(INCDIR)/ansidecl.h \ + $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/alloca.c -o pic/$@; \ else true; fi $(COMPILE.c) $(srcdir)/alloca.c $(OUTPUT_OPTION) -./argv.o: $(srcdir)/argv.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \ +./argv.o: $(srcdir)/argv.c config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \ $(INCDIR)/safe-ctype.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/argv.c -o pic/$@; \ else true; fi $(COMPILE.c) $(srcdir)/argv.c $(OUTPUT_OPTION) -./asprintf.o: $(srcdir)/asprintf.c stamp-h $(INCDIR)/ansidecl.h \ +./asprintf.o: $(srcdir)/asprintf.c config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/asprintf.c -o pic/$@; \ else true; fi $(COMPILE.c) $(srcdir)/asprintf.c $(OUTPUT_OPTION) -./atexit.o: $(srcdir)/atexit.c stamp-h +./atexit.o: $(srcdir)/atexit.c config.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/atexit.c -o pic/$@; \ else true; fi $(COMPILE.c) $(srcdir)/atexit.c $(OUTPUT_OPTION) -./basename.o: $(srcdir)/basename.c stamp-h $(INCDIR)/ansidecl.h \ +./basename.o: $(srcdir)/basename.c config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/basename.c -o pic/$@; \ @@ -548,7 +551,7 @@ $(CONFIGURED_OFILES): stamp-picdir else true; fi $(COMPILE.c) $(srcdir)/bcopy.c $(OUTPUT_OPTION) -./bsearch.o: $(srcdir)/bsearch.c stamp-h $(INCDIR)/ansidecl.h +./bsearch.o: $(srcdir)/bsearch.c config.h $(INCDIR)/ansidecl.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/bsearch.c -o pic/$@; \ else true; fi @@ -566,20 +569,21 @@ $(CONFIGURED_OFILES): stamp-picdir else true; fi $(COMPILE.c) $(srcdir)/calloc.c $(OUTPUT_OPTION) -./choose-temp.o: $(srcdir)/choose-temp.c stamp-h $(INCDIR)/ansidecl.h \ +./choose-temp.o: $(srcdir)/choose-temp.c config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/choose-temp.c -o pic/$@; \ else true; fi $(COMPILE.c) $(srcdir)/choose-temp.c $(OUTPUT_OPTION) -./clock.o: $(srcdir)/clock.c stamp-h +./clock.o: $(srcdir)/clock.c config.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/clock.c -o pic/$@; \ else true; fi $(COMPILE.c) $(srcdir)/clock.c $(OUTPUT_OPTION) -./concat.o: $(srcdir)/concat.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h +./concat.o: $(srcdir)/concat.c config.h $(INCDIR)/ansidecl.h \ + $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/concat.c -o pic/$@; \ else true; fi @@ -591,7 +595,7 @@ $(CONFIGURED_OFILES): stamp-picdir else true; fi $(COMPILE.c) $(srcdir)/copysign.c $(OUTPUT_OPTION) -./cp-demangle.o: $(srcdir)/cp-demangle.c stamp-h $(INCDIR)/ansidecl.h \ +./cp-demangle.o: $(srcdir)/cp-demangle.c config.h $(INCDIR)/ansidecl.h \ $(srcdir)/cp-demangle.h $(INCDIR)/demangle.h \ $(INCDIR)/dyn-string.h $(INCDIR)/getopt.h $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ @@ -599,7 +603,7 @@ $(CONFIGURED_OFILES): stamp-picdir else true; fi $(COMPILE.c) $(srcdir)/cp-demangle.c $(OUTPUT_OPTION) -./cp-demint.o: $(srcdir)/cp-demint.c stamp-h $(INCDIR)/ansidecl.h \ +./cp-demint.o: $(srcdir)/cp-demint.c config.h $(INCDIR)/ansidecl.h \ $(srcdir)/cp-demangle.h $(INCDIR)/demangle.h \ $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ @@ -607,7 +611,7 @@ $(CONFIGURED_OFILES): stamp-picdir else true; fi $(COMPILE.c) $(srcdir)/cp-demint.c $(OUTPUT_OPTION) -./cplus-dem.o: $(srcdir)/cplus-dem.c stamp-h $(INCDIR)/ansidecl.h \ +./cplus-dem.o: $(srcdir)/cplus-dem.c config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/demangle.h $(INCDIR)/libiberty.h \ $(INCDIR)/safe-ctype.h if [ x"$(PICFLAG)" != x ]; then \ @@ -615,14 +619,14 @@ $(CONFIGURED_OFILES): stamp-picdir else true; fi $(COMPILE.c) $(srcdir)/cplus-dem.c $(OUTPUT_OPTION) -./dyn-string.o: $(srcdir)/dyn-string.c stamp-h $(INCDIR)/ansidecl.h \ +./dyn-string.o: $(srcdir)/dyn-string.c config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/dyn-string.h $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/dyn-string.c -o pic/$@; \ else true; fi $(COMPILE.c) $(srcdir)/dyn-string.c $(OUTPUT_OPTION) -./fdmatch.o: $(srcdir)/fdmatch.c stamp-h $(INCDIR)/ansidecl.h \ +./fdmatch.o: $(srcdir)/fdmatch.c config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/fdmatch.c -o pic/$@; \ @@ -635,93 +639,94 @@ $(CONFIGURED_OFILES): stamp-picdir else true; fi $(COMPILE.c) $(srcdir)/ffs.c $(OUTPUT_OPTION) -./fibheap.o: $(srcdir)/fibheap.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/fibheap.h \ - $(INCDIR)/libiberty.h +./fibheap.o: $(srcdir)/fibheap.c config.h $(INCDIR)/ansidecl.h \ + $(INCDIR)/fibheap.h $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/fibheap.c -o pic/$@; \ else true; fi $(COMPILE.c) $(srcdir)/fibheap.c $(OUTPUT_OPTION) -./filename_cmp.o: $(srcdir)/filename_cmp.c stamp-h $(INCDIR)/filenames.h \ +./filename_cmp.o: $(srcdir)/filename_cmp.c config.h $(INCDIR)/filenames.h \ $(INCDIR)/safe-ctype.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/filename_cmp.c -o pic/$@; \ else true; fi $(COMPILE.c) $(srcdir)/filename_cmp.c $(OUTPUT_OPTION) -./floatformat.o: $(srcdir)/floatformat.c stamp-h $(INCDIR)/ansidecl.h \ +./floatformat.o: $(srcdir)/floatformat.c config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/floatformat.h $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/floatformat.c -o pic/$@; \ else true; fi $(COMPILE.c) $(srcdir)/floatformat.c $(OUTPUT_OPTION) -./fnmatch.o: $(srcdir)/fnmatch.c stamp-h $(INCDIR)/fnmatch.h \ +./fnmatch.o: $(srcdir)/fnmatch.c config.h $(INCDIR)/fnmatch.h \ $(INCDIR)/safe-ctype.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/fnmatch.c -o pic/$@; \ else true; fi $(COMPILE.c) $(srcdir)/fnmatch.c $(OUTPUT_OPTION) -./fopen_unlocked.o: $(srcdir)/fopen_unlocked.c stamp-h $(INCDIR)/ansidecl.h \ +./fopen_unlocked.o: $(srcdir)/fopen_unlocked.c config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/fopen_unlocked.c -o pic/$@; \ else true; fi $(COMPILE.c) $(srcdir)/fopen_unlocked.c $(OUTPUT_OPTION) -./getcwd.o: $(srcdir)/getcwd.c stamp-h +./getcwd.o: $(srcdir)/getcwd.c config.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/getcwd.c -o pic/$@; \ else true; fi $(COMPILE.c) $(srcdir)/getcwd.c $(OUTPUT_OPTION) -./getopt.o: $(srcdir)/getopt.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/getopt.h +./getopt.o: $(srcdir)/getopt.c config.h $(INCDIR)/ansidecl.h $(INCDIR)/getopt.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/getopt.c -o pic/$@; \ else true; fi $(COMPILE.c) $(srcdir)/getopt.c $(OUTPUT_OPTION) -./getopt1.o: $(srcdir)/getopt1.c stamp-h $(INCDIR)/getopt.h +./getopt1.o: $(srcdir)/getopt1.c config.h $(INCDIR)/getopt.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/getopt1.c -o pic/$@; \ else true; fi $(COMPILE.c) $(srcdir)/getopt1.c $(OUTPUT_OPTION) -./getpagesize.o: $(srcdir)/getpagesize.c stamp-h +./getpagesize.o: $(srcdir)/getpagesize.c config.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/getpagesize.c -o pic/$@; \ else true; fi $(COMPILE.c) $(srcdir)/getpagesize.c $(OUTPUT_OPTION) -./getpwd.o: $(srcdir)/getpwd.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h +./getpwd.o: $(srcdir)/getpwd.c config.h $(INCDIR)/ansidecl.h \ + $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/getpwd.c -o pic/$@; \ else true; fi $(COMPILE.c) $(srcdir)/getpwd.c $(OUTPUT_OPTION) -./getruntime.o: $(srcdir)/getruntime.c stamp-h $(INCDIR)/ansidecl.h \ +./getruntime.o: $(srcdir)/getruntime.c config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/getruntime.c -o pic/$@; \ else true; fi $(COMPILE.c) $(srcdir)/getruntime.c $(OUTPUT_OPTION) -./gettimeofday.o: $(srcdir)/gettimeofday.c stamp-h $(INCDIR)/ansidecl.h \ +./gettimeofday.o: $(srcdir)/gettimeofday.c config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/gettimeofday.c -o pic/$@; \ else true; fi $(COMPILE.c) $(srcdir)/gettimeofday.c $(OUTPUT_OPTION) -./hashtab.o: $(srcdir)/hashtab.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/hashtab.h \ - $(INCDIR)/libiberty.h +./hashtab.o: $(srcdir)/hashtab.c config.h $(INCDIR)/ansidecl.h \ + $(INCDIR)/hashtab.h $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/hashtab.c -o pic/$@; \ else true; fi $(COMPILE.c) $(srcdir)/hashtab.c $(OUTPUT_OPTION) -./hex.o: $(srcdir)/hex.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \ +./hex.o: $(srcdir)/hex.c config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \ $(INCDIR)/safe-ctype.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/hex.c -o pic/$@; \ @@ -740,7 +745,7 @@ $(CONFIGURED_OFILES): stamp-picdir else true; fi $(COMPILE.c) $(srcdir)/insque.c $(OUTPUT_OPTION) -./lbasename.o: $(srcdir)/lbasename.c stamp-h $(INCDIR)/ansidecl.h \ +./lbasename.o: $(srcdir)/lbasename.c config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/filenames.h $(INCDIR)/libiberty.h \ $(INCDIR)/safe-ctype.h if [ x"$(PICFLAG)" != x ]; then \ @@ -748,28 +753,28 @@ $(CONFIGURED_OFILES): stamp-picdir else true; fi $(COMPILE.c) $(srcdir)/lbasename.c $(OUTPUT_OPTION) -./lrealpath.o: $(srcdir)/lrealpath.c stamp-h $(INCDIR)/ansidecl.h \ +./lrealpath.o: $(srcdir)/lrealpath.c config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/lrealpath.c -o pic/$@; \ else true; fi $(COMPILE.c) $(srcdir)/lrealpath.c $(OUTPUT_OPTION) -./make-relative-prefix.o: $(srcdir)/make-relative-prefix.c stamp-h \ +./make-relative-prefix.o: $(srcdir)/make-relative-prefix.c config.h \ $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/make-relative-prefix.c -o pic/$@; \ else true; fi $(COMPILE.c) $(srcdir)/make-relative-prefix.c $(OUTPUT_OPTION) -./make-temp-file.o: $(srcdir)/make-temp-file.c stamp-h $(INCDIR)/ansidecl.h \ +./make-temp-file.o: $(srcdir)/make-temp-file.c config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/make-temp-file.c -o pic/$@; \ else true; fi $(COMPILE.c) $(srcdir)/make-temp-file.c $(OUTPUT_OPTION) -./md5.o: $(srcdir)/md5.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/md5.h +./md5.o: $(srcdir)/md5.c config.h $(INCDIR)/ansidecl.h $(INCDIR)/md5.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/md5.c -o pic/$@; \ else true; fi @@ -811,7 +816,7 @@ $(CONFIGURED_OFILES): stamp-picdir else true; fi $(COMPILE.c) $(srcdir)/memset.c $(OUTPUT_OPTION) -./mkstemps.o: $(srcdir)/mkstemps.c stamp-h $(INCDIR)/ansidecl.h +./mkstemps.o: $(srcdir)/mkstemps.c config.h $(INCDIR)/ansidecl.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/mkstemps.c -o pic/$@; \ else true; fi @@ -823,41 +828,41 @@ $(CONFIGURED_OFILES): stamp-picdir else true; fi $(COMPILE.c) $(srcdir)/msdos.c $(OUTPUT_OPTION) -./objalloc.o: $(srcdir)/objalloc.c stamp-h $(INCDIR)/ansidecl.h \ +./objalloc.o: $(srcdir)/objalloc.c config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/objalloc.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/objalloc.c -o pic/$@; \ else true; fi $(COMPILE.c) $(srcdir)/objalloc.c $(OUTPUT_OPTION) -./obstack.o: $(srcdir)/obstack.c stamp-h $(INCDIR)/obstack.h +./obstack.o: $(srcdir)/obstack.c config.h $(INCDIR)/obstack.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/obstack.c -o pic/$@; \ else true; fi $(COMPILE.c) $(srcdir)/obstack.c $(OUTPUT_OPTION) -./partition.o: $(srcdir)/partition.c stamp-h $(INCDIR)/ansidecl.h \ +./partition.o: $(srcdir)/partition.c config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/libiberty.h $(INCDIR)/partition.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/partition.c -o pic/$@; \ else true; fi $(COMPILE.c) $(srcdir)/partition.c $(OUTPUT_OPTION) -./pex-common.o: $(srcdir)/pex-common.c stamp-h $(INCDIR)/ansidecl.h \ +./pex-common.o: $(srcdir)/pex-common.c config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/libiberty.h $(srcdir)/pex-common.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/pex-common.c -o pic/$@; \ else true; fi $(COMPILE.c) $(srcdir)/pex-common.c $(OUTPUT_OPTION) -./pex-djgpp.o: $(srcdir)/pex-djgpp.c stamp-h $(INCDIR)/ansidecl.h \ +./pex-djgpp.o: $(srcdir)/pex-djgpp.c config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/libiberty.h $(srcdir)/pex-common.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/pex-djgpp.c -o pic/$@; \ else true; fi $(COMPILE.c) $(srcdir)/pex-djgpp.c $(OUTPUT_OPTION) -./pex-msdos.o: $(srcdir)/pex-msdos.c stamp-h $(INCDIR)/ansidecl.h \ +./pex-msdos.o: $(srcdir)/pex-msdos.c config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/libiberty.h $(srcdir)/pex-common.h \ $(INCDIR)/safe-ctype.h if [ x"$(PICFLAG)" != x ]; then \ @@ -865,42 +870,42 @@ $(CONFIGURED_OFILES): stamp-picdir else true; fi $(COMPILE.c) $(srcdir)/pex-msdos.c $(OUTPUT_OPTION) -./pex-one.o: $(srcdir)/pex-one.c stamp-h $(INCDIR)/ansidecl.h \ +./pex-one.o: $(srcdir)/pex-one.c config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/pex-one.c -o pic/$@; \ else true; fi $(COMPILE.c) $(srcdir)/pex-one.c $(OUTPUT_OPTION) -./pex-unix.o: $(srcdir)/pex-unix.c stamp-h $(INCDIR)/ansidecl.h \ +./pex-unix.o: $(srcdir)/pex-unix.c config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/libiberty.h $(srcdir)/pex-common.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/pex-unix.c -o pic/$@; \ else true; fi $(COMPILE.c) $(srcdir)/pex-unix.c $(OUTPUT_OPTION) -./pex-win32.o: $(srcdir)/pex-win32.c stamp-h $(INCDIR)/ansidecl.h \ +./pex-win32.o: $(srcdir)/pex-win32.c config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/libiberty.h $(srcdir)/pex-common.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/pex-win32.c -o pic/$@; \ else true; fi $(COMPILE.c) $(srcdir)/pex-win32.c $(OUTPUT_OPTION) -./pexecute.o: $(srcdir)/pexecute.c stamp-h $(INCDIR)/ansidecl.h \ +./pexecute.o: $(srcdir)/pexecute.c config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/pexecute.c -o pic/$@; \ else true; fi $(COMPILE.c) $(srcdir)/pexecute.c $(OUTPUT_OPTION) -./physmem.o: $(srcdir)/physmem.c stamp-h $(INCDIR)/ansidecl.h \ +./physmem.o: $(srcdir)/physmem.c config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/physmem.c -o pic/$@; \ else true; fi $(COMPILE.c) $(srcdir)/physmem.c $(OUTPUT_OPTION) -./putenv.o: $(srcdir)/putenv.c stamp-h $(INCDIR)/ansidecl.h +./putenv.o: $(srcdir)/putenv.c config.h $(INCDIR)/ansidecl.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/putenv.c -o pic/$@; \ else true; fi @@ -912,14 +917,14 @@ $(CONFIGURED_OFILES): stamp-picdir else true; fi $(COMPILE.c) $(srcdir)/random.c $(OUTPUT_OPTION) -./regex.o: $(srcdir)/regex.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/xregex.h \ +./regex.o: $(srcdir)/regex.c config.h $(INCDIR)/ansidecl.h $(INCDIR)/xregex.h \ $(INCDIR)/xregex2.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/regex.c -o pic/$@; \ else true; fi $(COMPILE.c) $(srcdir)/regex.c $(OUTPUT_OPTION) -./rename.o: $(srcdir)/rename.c stamp-h $(INCDIR)/ansidecl.h +./rename.o: $(srcdir)/rename.c config.h $(INCDIR)/ansidecl.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/rename.c -o pic/$@; \ else true; fi @@ -938,7 +943,7 @@ $(CONFIGURED_OFILES): stamp-picdir else true; fi $(COMPILE.c) $(srcdir)/safe-ctype.c $(OUTPUT_OPTION) -./setenv.o: $(srcdir)/setenv.c stamp-h $(INCDIR)/ansidecl.h +./setenv.o: $(srcdir)/setenv.c config.h $(INCDIR)/ansidecl.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/setenv.c -o pic/$@; \ else true; fi @@ -956,20 +961,21 @@ $(CONFIGURED_OFILES): stamp-picdir else true; fi $(COMPILE.c) $(srcdir)/snprintf.c $(OUTPUT_OPTION) -./sort.o: $(srcdir)/sort.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \ +./sort.o: $(srcdir)/sort.c config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \ $(INCDIR)/sort.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/sort.c -o pic/$@; \ else true; fi $(COMPILE.c) $(srcdir)/sort.c $(OUTPUT_OPTION) -./spaces.o: $(srcdir)/spaces.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h +./spaces.o: $(srcdir)/spaces.c config.h $(INCDIR)/ansidecl.h \ + $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/spaces.c -o pic/$@; \ else true; fi $(COMPILE.c) $(srcdir)/spaces.c $(OUTPUT_OPTION) -./splay-tree.o: $(srcdir)/splay-tree.c stamp-h $(INCDIR)/ansidecl.h \ +./splay-tree.o: $(srcdir)/splay-tree.c config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/libiberty.h $(INCDIR)/splay-tree.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/splay-tree.c -o pic/$@; \ @@ -1006,7 +1012,7 @@ $(CONFIGURED_OFILES): stamp-picdir else true; fi $(COMPILE.c) $(srcdir)/strdup.c $(OUTPUT_OPTION) -./strerror.o: $(srcdir)/strerror.c stamp-h $(INCDIR)/ansidecl.h \ +./strerror.o: $(srcdir)/strerror.c config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/strerror.c -o pic/$@; \ @@ -1037,7 +1043,7 @@ $(CONFIGURED_OFILES): stamp-picdir else true; fi $(COMPILE.c) $(srcdir)/strrchr.c $(OUTPUT_OPTION) -./strsignal.o: $(srcdir)/strsignal.c stamp-h $(INCDIR)/ansidecl.h \ +./strsignal.o: $(srcdir)/strsignal.c config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/strsignal.c -o pic/$@; \ @@ -1056,13 +1062,13 @@ $(CONFIGURED_OFILES): stamp-picdir else true; fi $(COMPILE.c) $(srcdir)/strtod.c $(OUTPUT_OPTION) -./strtol.o: $(srcdir)/strtol.c stamp-h $(INCDIR)/safe-ctype.h +./strtol.o: $(srcdir)/strtol.c config.h $(INCDIR)/safe-ctype.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/strtol.c -o pic/$@; \ else true; fi $(COMPILE.c) $(srcdir)/strtol.c $(OUTPUT_OPTION) -./strtoul.o: $(srcdir)/strtoul.c stamp-h $(INCDIR)/ansidecl.h \ +./strtoul.o: $(srcdir)/strtoul.c config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/safe-ctype.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/strtoul.c -o pic/$@; \ @@ -1082,14 +1088,14 @@ $(CONFIGURED_OFILES): stamp-picdir else true; fi $(COMPILE.c) $(srcdir)/tmpnam.c $(OUTPUT_OPTION) -./unlink-if-ordinary.o: $(srcdir)/unlink-if-ordinary.c stamp-h \ +./unlink-if-ordinary.o: $(srcdir)/unlink-if-ordinary.c config.h \ $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/unlink-if-ordinary.c -o pic/$@; \ else true; fi $(COMPILE.c) $(srcdir)/unlink-if-ordinary.c $(OUTPUT_OPTION) -./vasprintf.o: $(srcdir)/vasprintf.c stamp-h $(INCDIR)/ansidecl.h \ +./vasprintf.o: $(srcdir)/vasprintf.c config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/vasprintf.c -o pic/$@; \ @@ -1114,7 +1120,7 @@ $(CONFIGURED_OFILES): stamp-picdir else true; fi $(COMPILE.c) $(srcdir)/vprintf.c $(OUTPUT_OPTION) -./vsnprintf.o: $(srcdir)/vsnprintf.c stamp-h $(INCDIR)/ansidecl.h \ +./vsnprintf.o: $(srcdir)/vsnprintf.c config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/vsnprintf.c -o pic/$@; \ @@ -1127,54 +1133,54 @@ $(CONFIGURED_OFILES): stamp-picdir else true; fi $(COMPILE.c) $(srcdir)/vsprintf.c $(OUTPUT_OPTION) -./waitpid.o: $(srcdir)/waitpid.c stamp-h $(INCDIR)/ansidecl.h +./waitpid.o: $(srcdir)/waitpid.c config.h $(INCDIR)/ansidecl.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/waitpid.c -o pic/$@; \ else true; fi $(COMPILE.c) $(srcdir)/waitpid.c $(OUTPUT_OPTION) -./xatexit.o: $(srcdir)/xatexit.c stamp-h $(INCDIR)/ansidecl.h \ +./xatexit.o: $(srcdir)/xatexit.c config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/xatexit.c -o pic/$@; \ else true; fi $(COMPILE.c) $(srcdir)/xatexit.c $(OUTPUT_OPTION) -./xexit.o: $(srcdir)/xexit.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h +./xexit.o: $(srcdir)/xexit.c config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/xexit.c -o pic/$@; \ else true; fi $(COMPILE.c) $(srcdir)/xexit.c $(OUTPUT_OPTION) -./xmalloc.o: $(srcdir)/xmalloc.c stamp-h $(INCDIR)/ansidecl.h \ +./xmalloc.o: $(srcdir)/xmalloc.c config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/xmalloc.c -o pic/$@; \ else true; fi $(COMPILE.c) $(srcdir)/xmalloc.c $(OUTPUT_OPTION) -./xmemdup.o: $(srcdir)/xmemdup.c stamp-h $(INCDIR)/ansidecl.h \ +./xmemdup.o: $(srcdir)/xmemdup.c config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/xmemdup.c -o pic/$@; \ else true; fi $(COMPILE.c) $(srcdir)/xmemdup.c $(OUTPUT_OPTION) -./xstrdup.o: $(srcdir)/xstrdup.c stamp-h $(INCDIR)/ansidecl.h \ +./xstrdup.o: $(srcdir)/xstrdup.c config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/xstrdup.c -o pic/$@; \ else true; fi $(COMPILE.c) $(srcdir)/xstrdup.c $(OUTPUT_OPTION) -./xstrerror.o: $(srcdir)/xstrerror.c stamp-h $(INCDIR)/ansidecl.h \ +./xstrerror.o: $(srcdir)/xstrerror.c config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/xstrerror.c -o pic/$@; \ else true; fi $(COMPILE.c) $(srcdir)/xstrerror.c $(OUTPUT_OPTION) -./xstrndup.o: $(srcdir)/xstrndup.c stamp-h $(INCDIR)/ansidecl.h \ +./xstrndup.o: $(srcdir)/xstrndup.c config.h $(INCDIR)/ansidecl.h \ $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/xstrndup.c -o pic/$@; \ Index: gcc-4.3.4/libiberty/configure =================================================================== --- gcc-4.3.4.orig/libiberty/configure 2009-07-29 13:45:30.000000000 +0200 +++ gcc-4.3.4/libiberty/configure 2009-08-10 09:04:59.762852147 +0200 @@ -309,7 +309,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS libiberty_topdir MAINT NOTMAINT MAKEINFO BUILD_INFO PERL HAVE_PERL build build_cpu build_vendor build_os host host_cpu host_vendor host_os AR ac_ct_AR RANLIB ac_ct_RANLIB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP ac_libiberty_warn_cflags NO_MINUS_C_MINUS_O OUTPUT_OPTION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA EGREP LIBOBJS CHECK target_header_dir pexecute INSTALL_DEST datarootdir docdir htmldir LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS libiberty_topdir MAINT NOTMAINT MAKEINFO BUILD_INFO PERL HAVE_PERL build build_cpu build_vendor build_os host host_cpu host_vendor host_os AR ac_ct_AR RANLIB ac_ct_RANLIB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP ac_libiberty_warn_cflags NO_MINUS_C_MINUS_O OUTPUT_OPTION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PICFLAG EGREP LIBOBJS CHECK target_header_dir pexecute INSTALL_DEST datarootdir docdir htmldir LTLIBOBJS' ac_subst_files='host_makefile_frag' # Initialize some variables set by options. @@ -3699,9 +3699,7 @@ case "${host}" in esac if [ -n "${frag}" ]; then - frags=${libiberty_topdir}/libiberty/config/$frag -else - frags= + frag=${libiberty_topdir}/libiberty/config/$frag fi # If they didn't specify --enable-shared, don't generate shared libs. @@ -3712,34 +3710,35 @@ case "${enable_shared}" in *) shared=yes ;; esac if [ "${shared}" = "yes" ]; then - frag= case "${host}" in *-*-cygwin*) ;; - alpha*-*-linux*) frag=mh-elfalphapic ;; - arm*-*-*) frag=mh-armpic ;; - hppa*-*-*) frag=mh-papic ;; + alpha*-*-linux*) PICFLAG=-fPIC ;; + arm*-*-*) PICFLAG=-fPIC ;; + hppa*-*-*) PICFLAG=-fPIC ;; + i370-*-*) PICFLAG=-fPIC ;; + ia64-*-*) PICFLAG=-fpic ;; i[34567]86-*-* | x86_64-*-*) - frag=mh-x86pic ;; + PICFLAG=-fpic ;; + m68k-*-*) PICFLAG=-fpic ;; + mips*-*-linux) PICFLAG=-fPIC ;; powerpc*-*-aix*) ;; - powerpc*-*-*) frag=mh-ppcpic ;; - sparc*-*-*) frag=mh-sparcpic ;; - s390*-*-*) frag=mh-s390pic ;; - *) frag=mh-${host_cpu}pic ;; + powerpc*-*-*) PICFLAG=-fPIC ;; + sparc*-*-*) case "${CFLAGS}" in + *-fpic* ) PICFLAG=-fpic ;; + * ) PICFLAG=-fPIC ;; + esac ;; + s390*-*-*) PICFLAG=-fpic ;; esac - if [ -n "${frag}" ]; then - frags="${frags} ${libiberty_topdir}/config/${frag}" - fi fi + echo "# Warning: this fragment is automatically generated" > temp-frag -for frag in ${frags}; do - if [ -f ${frag} ]; then - echo "Appending ${frag} to xhost-mkfrag" - echo "# Following fragment copied from ${frag}" >> temp-frag - cat ${frag} >> temp-frag - fi -done +if [ -n "${frag}" ] && [ -f "${frag}" ]; then + echo "Appending ${frag} to xhost-mkfrag" + echo "# Following fragment copied from ${frag}" >> temp-frag + cat ${frag} >> temp-frag +fi # record if we want to build shared libs. if [ "${shared}" = "yes" ]; then @@ -9641,6 +9640,7 @@ s,@OUTPUT_OPTION@,$OUTPUT_OPTION,;t t s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s,@INSTALL_DATA@,$INSTALL_DATA,;t t +s,@PICFLAG@,$PICFLAG,;t t s,@EGREP@,$EGREP,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@CHECK@,$CHECK,;t t Index: gcc-4.3.4/libiberty/configure.ac =================================================================== --- gcc-4.3.4.orig/libiberty/configure.ac 2009-07-29 13:45:30.000000000 +0200 +++ gcc-4.3.4/libiberty/configure.ac 2009-08-10 09:04:59.762852147 +0200 @@ -187,9 +187,7 @@ case "${host}" in esac if [[ -n "${frag}" ]]; then - frags=${libiberty_topdir}/libiberty/config/$frag -else - frags= + frag=${libiberty_topdir}/libiberty/config/$frag fi # If they didn't specify --enable-shared, don't generate shared libs. @@ -200,34 +198,35 @@ case "${enable_shared}" in *) shared=yes ;; esac if [[ "${shared}" = "yes" ]]; then - frag= case "${host}" in *-*-cygwin*) ;; - alpha*-*-linux*) frag=mh-elfalphapic ;; - arm*-*-*) frag=mh-armpic ;; - hppa*-*-*) frag=mh-papic ;; + alpha*-*-linux*) PICFLAG=-fPIC ;; + arm*-*-*) PICFLAG=-fPIC ;; + hppa*-*-*) PICFLAG=-fPIC ;; + i370-*-*) PICFLAG=-fPIC ;; + ia64-*-*) PICFLAG=-fpic ;; i[[34567]]86-*-* | x86_64-*-*) - frag=mh-x86pic ;; + PICFLAG=-fpic ;; + m68k-*-*) PICFLAG=-fpic ;; + mips*-*-linux) PICFLAG=-fPIC ;; powerpc*-*-aix*) ;; - powerpc*-*-*) frag=mh-ppcpic ;; - sparc*-*-*) frag=mh-sparcpic ;; - s390*-*-*) frag=mh-s390pic ;; - *) frag=mh-${host_cpu}pic ;; + powerpc*-*-*) PICFLAG=-fPIC ;; + sparc*-*-*) case "${CFLAGS}" in + *-fpic* ) PICFLAG=-fpic ;; + * ) PICFLAG=-fPIC ;; + esac ;; + s390*-*-*) PICFLAG=-fpic ;; esac - if [[ -n "${frag}" ]]; then - frags="${frags} ${libiberty_topdir}/config/${frag}" - fi fi +AC_SUBST(PICFLAG) echo "# Warning: this fragment is automatically generated" > temp-frag -for frag in ${frags}; do - if [[ -f ${frag} ]]; then - echo "Appending ${frag} to xhost-mkfrag" - echo "# Following fragment copied from ${frag}" >> temp-frag - cat ${frag} >> temp-frag - fi -done +if [[ -n "${frag}" ]] && [[ -f "${frag}" ]]; then + echo "Appending ${frag} to xhost-mkfrag" + echo "# Following fragment copied from ${frag}" >> temp-frag + cat ${frag} >> temp-frag +fi # record if we want to build shared libs. if [[ "${shared}" = "yes" ]]; then Index: gcc-4.3.4/gcc/Makefile.in =================================================================== --- gcc-4.3.4.orig/gcc/Makefile.in 2009-08-10 09:04:01.000000000 +0200 +++ gcc-4.3.4/gcc/Makefile.in 2009-08-10 09:04:59.766854609 +0200 @@ -689,7 +689,7 @@ CC_FOR_BUILD = @CC_FOR_BUILD@ BUILD_CFLAGS= @BUILD_CFLAGS@ -DGENERATOR_FILE # Native linker and preprocessor flags. For x-fragment overrides. -BUILD_LDFLAGS=$(LDFLAGS) +BUILD_LDFLAGS=@BUILD_LDFLAGS@ BUILD_CPPFLAGS=$(ALL_CPPFLAGS) # Actual name to use when installing a native compiler. Index: gcc-4.3.4/gcc/configure =================================================================== --- gcc-4.3.4.orig/gcc/configure 2009-08-10 09:04:06.000000000 +0200 +++ gcc-4.3.4/gcc/configure 2009-08-10 09:04:59.778510085 +0200 @@ -458,7 +458,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical build_libsubdir build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP loose_warn cxx_compat_warn strict_warn warn_cflags nocommon_flag TREEBROWSER valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_decimal_float enable_fixed_point enable_shared TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI datarootdir docdir htmldir SET_MAKE AWK LN_S LN RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON NM AR COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file extra_opt_files USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT host_cc_for_libada CROSS ALL SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS STMP_FIXINC STMP_FIXPROTO collect2 LIBTOOL SED FGREP GREP LD DUMPBIN ac_ct_DUMPBIN ac_ct_AR STRIP ac_ct_STRIP lt_ECHO objdir enable_fast_install gcc_cv_as ORIGINAL_AS_FOR_TARGET gcc_cv_ld ORIGINAL_LD_FOR_TARGET gcc_cv_nm ORIGINAL_NM_FOR_TARGET gcc_cv_objdump libgcc_visibility GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir subdirs srcdir all_compilers all_gtfiles all_lang_makefrags all_lang_makefiles all_languages all_selected_languages build_exeext build_install_headers_dir build_xm_file_list build_xm_include_list build_xm_defines build_file_translate check_languages cpp_install_dir xmake_file tmake_file extra_gcc_objs extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir host_exeext host_xm_file_list host_xm_include_list host_xm_defines out_host_hook_obj install lang_opt_files lang_specs_files lang_tree_files local_prefix md_file objc_boehm_gc out_file out_object_file thread_file tm_file_list tm_include_list tm_defines tm_p_file_list tm_p_include_list xm_file_list xm_include_list xm_defines c_target_objs cxx_target_objs target_cpu_default GMPLIBS GMPINC LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical build_libsubdir build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP loose_warn cxx_compat_warn strict_warn warn_cflags nocommon_flag TREEBROWSER valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_decimal_float enable_fixed_point enable_shared TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI datarootdir docdir htmldir SET_MAKE AWK LN_S LN RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON NM AR COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file extra_opt_files USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT host_cc_for_libada CROSS ALL SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS BUILD_LDFLAGS STMP_FIXINC STMP_FIXPROTO collect2 LIBTOOL SED FGREP GREP LD DUMPBIN ac_ct_DUMPBIN ac_ct_AR STRIP ac_ct_STRIP lt_ECHO objdir enable_fast_install gcc_cv_as ORIGINAL_AS_FOR_TARGET gcc_cv_ld ORIGINAL_LD_FOR_TARGET gcc_cv_nm ORIGINAL_NM_FOR_TARGET gcc_cv_objdump libgcc_visibility GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir subdirs srcdir all_compilers all_gtfiles all_lang_makefrags all_lang_makefiles all_languages all_selected_languages build_exeext build_install_headers_dir build_xm_file_list build_xm_include_list build_xm_defines build_file_translate check_languages cpp_install_dir xmake_file tmake_file extra_gcc_objs extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir host_exeext host_xm_file_list host_xm_include_list host_xm_defines out_host_hook_obj install lang_opt_files lang_specs_files lang_tree_files local_prefix md_file objc_boehm_gc out_file out_object_file thread_file tm_file_list tm_include_list tm_defines tm_p_file_list tm_p_include_list xm_file_list xm_include_list xm_defines c_target_objs cxx_target_objs target_cpu_default GMPLIBS GMPINC LIBOBJS LTLIBOBJS' ac_subst_files='language_hooks' # Initialize some variables set by options. @@ -12972,6 +12972,7 @@ else esac saved_CFLAGS="${CFLAGS}" CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \ + LDFLAGS="${LDFLAGS_FOR_BUILD}" \ CONFIG_SITE= ${realsrcdir}/configure --cache-file=./other.cache \ --enable-languages=${enable_languages-all} \ --target=$target_alias --host=$build_alias --build=$build_alias @@ -13469,6 +13470,7 @@ fi # These are the normal (build=host) settings: CC_FOR_BUILD='$(CC)' BUILD_CFLAGS='$(ALL_CFLAGS)' +BUILD_LDFLAGS='$(LDFLAGS)' STMP_FIXINC=stmp-fixinc # Possibly disable fixproto, on a per-target basis. @@ -13486,6 +13488,7 @@ esac if test x$build != x$host || test "x$coverage_flags" != x then BUILD_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)' + BUILD_LDFLAGS='$(LDFLAGS_FOR_BUILD)' if test "x$TARGET_SYSTEM_ROOT" = x; then if test "x$STMP_FIXPROTO" != x; then @@ -14064,13 +14067,13 @@ if test "${lt_cv_nm_interface+set}" = se else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:14067: $ac_compile\"" >&5) + (eval echo "\"\$as_me:14070: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:14070: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:14073: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:14073: output\"" >&5) + (eval echo "\"\$as_me:14076: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -15125,7 +15128,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 15128 "configure"' > conftest.$ac_ext + echo '#line 15131 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -15745,11 +15748,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:15748: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15751: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15752: \$? = $ac_status" >&5 + echo "$as_me:15755: \$? = $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. @@ -16067,11 +16070,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:16070: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16073: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16074: \$? = $ac_status" >&5 + echo "$as_me:16077: \$? = $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. @@ -16172,11 +16175,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:16175: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16178: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16179: \$? = $ac_status" >&5 + echo "$as_me:16182: \$? = $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 @@ -16227,11 +16230,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:16230: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16233: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16234: \$? = $ac_status" >&5 + echo "$as_me:16237: \$? = $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 @@ -19024,7 +19027,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 19027 "configure" +#line 19030 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -19124,7 +19127,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 19127 "configure" +#line 19130 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -23934,6 +23937,7 @@ s,@SYSTEM_HEADER_DIR@,$SYSTEM_HEADER_DIR s,@inhibit_libc@,$inhibit_libc,;t t s,@CC_FOR_BUILD@,$CC_FOR_BUILD,;t t s,@BUILD_CFLAGS@,$BUILD_CFLAGS,;t t +s,@BUILD_LDFLAGS@,$BUILD_LDFLAGS,;t t s,@STMP_FIXINC@,$STMP_FIXINC,;t t s,@STMP_FIXPROTO@,$STMP_FIXPROTO,;t t s,@collect2@,$collect2,;t t Index: gcc-4.3.4/gcc/configure.ac =================================================================== --- gcc-4.3.4.orig/gcc/configure.ac 2009-08-10 09:04:06.000000000 +0200 +++ gcc-4.3.4/gcc/configure.ac 2009-08-10 09:04:59.782862445 +0200 @@ -1480,6 +1480,7 @@ else esac saved_CFLAGS="${CFLAGS}" CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \ + LDFLAGS="${LDFLAGS_FOR_BUILD}" \ CONFIG_SITE= ${realsrcdir}/configure --cache-file=./other.cache \ --enable-languages=${enable_languages-all} \ --target=$target_alias --host=$build_alias --build=$build_alias @@ -1776,6 +1777,7 @@ AC_SUBST(inhibit_libc) # These are the normal (build=host) settings: CC_FOR_BUILD='$(CC)' AC_SUBST(CC_FOR_BUILD) BUILD_CFLAGS='$(ALL_CFLAGS)' AC_SUBST(BUILD_CFLAGS) +BUILD_LDFLAGS='$(LDFLAGS)' AC_SUBST(BUILD_LDFLAGS) STMP_FIXINC=stmp-fixinc AC_SUBST(STMP_FIXINC) # Possibly disable fixproto, on a per-target basis. @@ -1793,6 +1795,7 @@ AC_SUBST(STMP_FIXPROTO) if test x$build != x$host || test "x$coverage_flags" != x then BUILD_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)' + BUILD_LDFLAGS='$(LDFLAGS_FOR_BUILD)' if test "x$TARGET_SYSTEM_ROOT" = x; then if test "x$STMP_FIXPROTO" != x; then