ChangeLog:

[pf3gnuchains/gcc-fork.git] / Makefile.def

diff --git a/Makefile.def b/Makefile.def
index ceee555..86cf758 100644 (file)
--- 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 ; };