From c91ae28fd27ea0319810caa2dda187555dc31a84 Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Tue, 12 May 2009 18:16:01 +0000 Subject: ChangeLog: PR target/37137 * Makefile.def (flags_to_pass): Remove redundant and incomplete STAGE1_CFLAGS, STAGE2_CFLAGS, STAGE3_CFLAGS, and STAGE4_CFLAGS. Add FLAGS_FOR_TARGET and BUILD_CONFIG. (bootstrap_stage): Remove bootstrap-debug custom stages. Turn stage_configureflags, stage_cflags and stage_libcflags into explicit Makefile macros. * Makefile.tpl (HOST_EXPORTS, EXTRA_HOST_FLAGS): Pass GCJ and GFORTRAN. (POSTSTAGE1_HOST_EXPORTS): Add XGCC_FLAGS_FOR_TARGET and TFLAGS to CC. Set CC_FOR_BUILD from CC. (BASE_TARGET_EXPORTS, RAW_CXX_TARGET_EXPORTS, NORMAL_TARGET_EXPORTS): Move SYSROOT_CFLAGS_FOR_TARGET and DEBUG_PREFIX_CFLAGS_FOR_TARGET from CFLAGS and CXXFLAGS to XGCC_FLAGS_FOR_TARGET. Add it along with TFLAGS to CC, CXX, GCJ, and GFORTRAN. (TFLAGS, STAGE_CFLAGS, STAGE_TFLAGS, STAGE_CONFIGURE_FLAGS): New. (_LIBCFLAGS): Renamed to _TFLAGS. (do-compare-debug, do-compare3-debug): Drop. (CC, GCC_FOR_TARGET, CXX_FOR_TARGET, RAW_CXX_FOR_TARGET, GCJ_FOR_TARGET, GFORTRAN_FOR_TARGET): Remove FLAGS_FOR_TARGET. (FLAGS_FOR_TARGET, SYSROOT_CFLAGS_FOR_TARGET, DEBUG_PREFIX_CFLAGS_FOR_TARGET): Move down. (XGCC_FLAGS_FOR_TARGET): New. (BASE_FLAGS_TO_PASS): Pass STAGEid_CFLAGS, STAGEid_TFLAGS and TFLAGS. (EXTRA_HOST_FLAGS): Pass GCJ and GFORTRAN. (POSTSTAGE1_FLAGS_TO_PASS): Move SYSROOT_CFLAGS_FOR_TARGET and DEBUG_PREFIX_CFLAGS_FOR_TARGET from CFLAGS, CXXFLAGS, LIBCFLAGS, LIBCXXFLAGS to XGCC_FLAGS_FOR_TARGET. Add it along with TFLAGS to CC, CXX, GCJ, and GFORTRAN. Pass XGCC_FLAGS_FOR_TARGET and TFLAGS. (BUILD_CONFIG): Include if requested. (all): Set TFLAGS on bootstrap. (configure-stageid-prefixmodule): Pass TFLAGS, adjust FLAGS. (all-stageid-prefixmodule): Likewise. (do-clean, distclean-stageid): Set TFLAGS. (restrap): Fix whitespace. * Makefile.in: Rebuilt. config/ChangeLog: * multi.m4: Save CXX, GFORTRAN and GCJ in config.status. * mt-gnu (CXXFLAGS_FOR_TARGET): Adjust. * bootstrap-O1.mk: New. * bootstrap-O3.mk: New. * bootstrap-debug.mk: New. --- Makefile.def | 59 ++++++++--------------------------------------------------- 1 file changed, 8 insertions(+), 51 deletions(-) (limited to 'Makefile.def') diff --git a/Makefile.def b/Makefile.def index c6a929135..30d4d1723 100644 --- a/Makefile.def +++ b/Makefile.def @@ -255,12 +255,8 @@ flags_to_pass = { flag= CXXFLAGS ; }; flags_to_pass = { flag= LDFLAGS ; }; flags_to_pass = { flag= LIBCFLAGS ; }; flags_to_pass = { flag= LIBCXXFLAGS ; }; -flags_to_pass = { flag= STAGE1_CFLAGS ; }; flags_to_pass = { flag= STAGE1_CHECKING ; }; flags_to_pass = { flag= STAGE1_LANGUAGES ; }; -flags_to_pass = { flag= STAGE2_CFLAGS ; }; -flags_to_pass = { flag= STAGE3_CFLAGS ; }; -flags_to_pass = { flag= STAGE4_CFLAGS ; }; flags_to_pass = { flag= GNATBIND ; }; flags_to_pass = { flag= GNATMAKE ; }; @@ -273,6 +269,7 @@ flags_to_pass = { flag= CPPFLAGS_FOR_TARGET ; }; flags_to_pass = { flag= CXX_FOR_TARGET ; }; flags_to_pass = { flag= CXXFLAGS_FOR_TARGET ; }; flags_to_pass = { flag= DLLTOOL_FOR_TARGET ; }; +flags_to_pass = { flag= FLAGS_FOR_TARGET ; }; flags_to_pass = { flag= GCJ_FOR_TARGET ; }; flags_to_pass = { flag= GFORTRAN_FOR_TARGET ; }; flags_to_pass = { flag= LD_FOR_TARGET ; }; @@ -288,6 +285,7 @@ flags_to_pass = { flag= WINDRES_FOR_TARGET ; }; flags_to_pass = { flag= WINDMC_FOR_TARGET ; }; // Miscellaneous +flags_to_pass = { flag= BUILD_CONFIG ; }; flags_to_pass = { flag= LANGUAGES ; optional=true ; }; flags_to_pass = { flag= LEAN ; }; @@ -555,62 +553,21 @@ languages = { language=objc; gcc-check-target=check-objc; languages = { language=obj-c++; gcc-check-target=check-obj-c++; }; // Toplevel bootstrap -bootstrap_stage = { - id=1 ; - - // * We force-disable intermodule optimizations, even if - // --enable-intermodule was passed, since the installed compiler - // probably can't handle them. Luckily, autoconf always respects - // the last argument when conflicting --enable arguments are passed. - // * Likewise, we force-disable coverage flags, since the installed - // compiler probably has never heard of them. - stage_configure_flags='--disable-intermodule $(STAGE1_CHECKING) \ - --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"' ; - stage_cflags='$(STAGE1_CFLAGS)' ; - stage_libcflags='$(STAGE1_LIBCFLAGS)' ; }; +bootstrap_stage = { id=1 ; }; bootstrap_stage = { id=2 ; prev=1 ; - bootstrap_target=bootstrap2 ; - stage_configure_flags="@stage2_werror_flag@" ; - stage_cflags="$(STAGE2_CFLAGS)" ; - stage_libcflags="$(STAGE2_LIBCFLAGS)" ; }; -bootstrap_stage = { - id=b2g0 ; prev=1 ; - bootstrap_target=bootstrap2-debug ; - stage_configure_flags="@stage2_werror_flag@" ; - stage_cflags="$(STAGE2_CFLAGS) -g0" ; - stage_libcflags="$(STAGE2_LIBCFLAGS) -g0" ; }; + bootstrap_target=bootstrap2 ; }; bootstrap_stage = { id=3 ; prev=2 ; lean=1 ; compare_target=compare ; bootstrap_target=bootstrap ; - cleanstrap_target=cleanstrap ; - stage_configure_flags="@stage2_werror_flag@" ; - stage_cflags="$(STAGE3_CFLAGS)" ; - stage_libcflags="$(STAGE3_LIBCFLAGS)" ; }; -bootstrap_stage = { - id=b3g2 ; prev=b2g0 ; lean=1 ; - compare_target=compare-debug ; - bootstrap_target=bootstrap-debug ; - cleanstrap_target=cleanstrap-debug ; - stage_configure_flags="@stage2_werror_flag@" ; - stage_cflags="$(STAGE3_CFLAGS) -g2" ; - stage_libcflags="$(STAGE3_LIBCFLAGS) -g2" ; }; + cleanstrap_target=cleanstrap ; }; bootstrap_stage = { id=4 ; prev=3 ; lean=2 ; compare_target=compare3 ; - bootstrap_target=bootstrap4 ; - stage_configure_flags="@stage2_werror_flag@" ; - stage_cflags="$(STAGE4_CFLAGS)" ; - stage_libcflags="$(STAGE4_CFLAGS)" ; }; + bootstrap_target=bootstrap4 ; }; bootstrap_stage = { - id=profile ; prev=1 ; - stage_configure_flags="@stage2_werror_flag@" ; - stage_cflags='$(STAGE2_CFLAGS) -fprofile-generate' ; - stage_libcflags='$(STAGE2_LIBCFLAGS)' ; }; + id=profile ; prev=1 ; }; bootstrap_stage = { id=feedback ; prev=profile ; - bootstrap_target=profiledbootstrap ; - stage_configure_flags="@stage2_werror_flag@" ; - stage_cflags='$(STAGE3_CFLAGS) -fprofile-use' ; - stage_libcflags='$(STAGE3_LIBCFLAGS) -fprofile-use' ; }; + bootstrap_target=profiledbootstrap ; }; -- cgit v1.2.3