diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Makefile.def | 1 | ||||
| -rw-r--r-- | Makefile.in | 21 | ||||
| -rw-r--r-- | Makefile.tpl | 9 | ||||
| -rw-r--r-- | config/ChangeLog | 5 | ||||
| -rw-r--r-- | config/mh-mingw | 2 |
6 files changed, 38 insertions, 8 deletions
@@ -1,3 +1,11 @@ +2008-06-08 Joseph Myers <joseph@codesourcery.com> + + PR tree-optimization/36218 + * Makefile.def (flags_to_pass): Add LDFLAGS_FOR_BUILD. + * Makefile.tpl (EXTRA_BUILD_FLAGS): Define. + (all prefix="build-"): Pass them to build-system sub-makes. + * Makefile.in: Regenerate. + 2008-05-16 Daniel Jacobowitz <dan@codesourcery.com> * src-release (DEVO_SUPPORT): Add ChangeLog, MAINTAINERS, diff --git a/Makefile.def b/Makefile.def index 203dd1d46..3924617eb 100644 --- a/Makefile.def +++ b/Makefile.def @@ -215,6 +215,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 ; }; diff --git a/Makefile.in b/Makefile.in index 16b94cfee..1bd87fd52 100644 --- a/Makefile.in +++ b/Makefile.in @@ -144,6 +144,12 @@ 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)" + # 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 @@ -499,6 +505,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)" \ @@ -2762,7 +2769,7 @@ all-build-libiberty: configure-build-libiberty s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ (cd $(BUILD_SUBDIR)/libiberty && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS) \ $(TARGET-build-libiberty)) @endif build-libiberty @@ -2818,7 +2825,7 @@ all-build-bison: configure-build-bison s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ (cd $(BUILD_SUBDIR)/bison && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS) \ $(TARGET-build-bison)) @endif build-bison @@ -2874,7 +2881,7 @@ all-build-byacc: configure-build-byacc s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ (cd $(BUILD_SUBDIR)/byacc && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS) \ $(TARGET-build-byacc)) @endif build-byacc @@ -2930,7 +2937,7 @@ all-build-flex: configure-build-flex s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ (cd $(BUILD_SUBDIR)/flex && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS) \ $(TARGET-build-flex)) @endif build-flex @@ -2986,7 +2993,7 @@ all-build-m4: configure-build-m4 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ (cd $(BUILD_SUBDIR)/m4 && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS) \ $(TARGET-build-m4)) @endif build-m4 @@ -3042,7 +3049,7 @@ all-build-texinfo: configure-build-texinfo s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ (cd $(BUILD_SUBDIR)/texinfo && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS) \ $(TARGET-build-texinfo)) @endif build-texinfo @@ -3098,7 +3105,7 @@ all-build-fixincludes: configure-build-fixincludes s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ (cd $(BUILD_SUBDIR)/fixincludes && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS) \ $(TARGET-build-fixincludes)) @endif build-fixincludes diff --git a/Makefile.tpl b/Makefile.tpl index ea2676fce..c9b34eda2 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -147,6 +147,12 @@ 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)" + # 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 @@ -955,7 +961,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 +] # -------------------------------------- diff --git a/config/ChangeLog b/config/ChangeLog index f7548c3fa..55d74f668 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,8 @@ +2008-06-08 Joseph Myers <joseph@codesourcery.com> + + PR tree-optimization/36218 + * config/mh-mingw (LDFLAGS): Define. + 2008-06-05 Danny Smith <dannysmith@users.sourceforge.net> PR driver/35916 diff --git a/config/mh-mingw b/config/mh-mingw index 5a38cdb45..e31bfd323 100644 --- a/config/mh-mingw +++ b/config/mh-mingw @@ -2,3 +2,5 @@ # Vista (see PR33281 for details). BOOT_CFLAGS += -D__USE_MINGW_ACCESS CFLAGS += -D__USE_MINGW_ACCESS +# Increase stack limit to same as Linux default. +LDFLAGS = -Wl,--stack,8388608 |