diff options
author | Alexandre Oliva <aoliva@redhat.com> | 2009-05-12 18:16:01 +0000 |
---|---|---|
committer | Alexandre Oliva <aoliva@redhat.com> | 2009-05-12 18:16:01 +0000 |
commit | 1b05fbbd2c03bb2c042be654aa2378bbfd2f845a (patch) | |
tree | 08e60116e2843cad8eb407b874fb35c586adfb1a /config | |
parent | cbe54154ef7b3915c5ef2c20bddf78463ed6b566 (diff) | |
download | binutils-1b05fbbd2c03bb2c042be654aa2378bbfd2f845a.tar.gz binutils-1b05fbbd2c03bb2c042be654aa2378bbfd2f845a.tar.bz2 binutils-1b05fbbd2c03bb2c042be654aa2378bbfd2f845a.zip |
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.
Diffstat (limited to 'config')
-rw-r--r-- | config/ChangeLog | 8 | ||||
-rw-r--r-- | config/bootstrap-O1.mk | 1 | ||||
-rw-r--r-- | config/bootstrap-O3.mk | 1 | ||||
-rw-r--r-- | config/bootstrap-debug.mk | 2 | ||||
-rw-r--r-- | config/mt-gnu | 3 | ||||
-rw-r--r-- | config/multi.m4 | 7 |
6 files changed, 18 insertions, 4 deletions
diff --git a/config/ChangeLog b/config/ChangeLog index b762abfb804..743da73bbe2 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,11 @@ +2009-05-12 Alexandre Oliva <aoliva@redhat.com> + + * multi.m4: Save CXX, GFORTRAN and GCJ in config.status. + * mt-gnu (CXXFLAGS_FOR_TARGET): Adjust. + * bootstrap-O1.mk: New. + * bootstrap-O3.mk: New. + * bootstrap-debug.mk: New. + 2009-02-02 Doug Evans <dje@google.com> * tcl.m4 (SC_PATH_TCLCONFIG): Don't exit 0 if tclconfig fails. diff --git a/config/bootstrap-O1.mk b/config/bootstrap-O1.mk new file mode 100644 index 00000000000..031645a1251 --- /dev/null +++ b/config/bootstrap-O1.mk @@ -0,0 +1 @@ +BOOT_CFLAGS := -O1 $(filter-out -O%, $(BOOT_CFLAGS)) diff --git a/config/bootstrap-O3.mk b/config/bootstrap-O3.mk new file mode 100644 index 00000000000..b269a3f7e12 --- /dev/null +++ b/config/bootstrap-O3.mk @@ -0,0 +1 @@ +BOOT_CFLAGS := -O3 $(filter-out -O%, $(BOOT_CFLAGS)) diff --git a/config/bootstrap-debug.mk b/config/bootstrap-debug.mk new file mode 100644 index 00000000000..521be824194 --- /dev/null +++ b/config/bootstrap-debug.mk @@ -0,0 +1,2 @@ +STAGE2_CFLAGS += -g0 +do-compare = $(SHELL) $(srcdir)/contrib/compare-debug $$f1 $$f2 diff --git a/config/mt-gnu b/config/mt-gnu index 2400fa44e55..15bf4171603 100644 --- a/config/mt-gnu +++ b/config/mt-gnu @@ -1,2 +1 @@ -CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) \ - $(DEBUG_PREFIX_CFLAGS_FOR_TARGET) -D_GNU_SOURCE +CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -D_GNU_SOURCE diff --git a/config/multi.m4 b/config/multi.m4 index 98417679f51..5b62ecc0aa0 100644 --- a/config/multi.m4 +++ b/config/multi.m4 @@ -1,5 +1,5 @@ ## -*- Autoconf -*- -# Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006 +# Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation @@ -62,4 +62,7 @@ with_target_subdir="$with_target_subdir" ac_configure_args="${multilib_arg} ${ac_configure_args}" multi_basedir="$multi_basedir" CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -CC="$CC"])])dnl +CC="$CC" +CXX="$CXX" +GFORTRAN="$GFORTRAN" +GCJ="$GCJ"])])dnl |