summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-10-06 15:58:29 +0000
committerRichard Purdie <richard@openedhand.com>2008-10-06 15:58:29 +0000
commit8a76c9c70552a8d8d37e473be1b50ca908f0edf7 (patch)
tree57f3c92439f9e517418ad32ba24cedc2d30e989f
parent4d2a3b6a3d2f6d95f60ac787a990672de69904f5 (diff)
downloadpoky-8a76c9c70552a8d8d37e473be1b50ca908f0edf7.tar.gz
gcc-cross-sdl 4.3.1: Merge in two fixes from OE, DEPEND on mpfr-sdk and gmp-sdk, use LD_LIBRBARY_PATH to fine libmpfr
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5417 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat
-rw-r--r--meta/packages/gcc/gcc-4.3.1.inc2
-rw-r--r--meta/packages/gcc/gcc-4.3.1/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch31
-rw-r--r--meta/packages/gcc/gcc-4.3.1/gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch5466
-rw-r--r--meta/packages/gcc/gcc-cross-sdk_4.3.1.bb8
4 files changed, 5505 insertions, 2 deletions
diff --git a/meta/packages/gcc/gcc-4.3.1.inc b/meta/packages/gcc/gcc-4.3.1.inc
index 3784727d9b..fb1b0a2f74 100644
--- a/meta/packages/gcc/gcc-4.3.1.inc
+++ b/meta/packages/gcc/gcc-4.3.1.inc
@@ -59,6 +59,8 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
59# file://intermask-bigendian.patch;patch=1 \ 59# file://intermask-bigendian.patch;patch=1 \
60 file://gcc-arm-frename-registers.patch;patch=1 \ 60 file://gcc-arm-frename-registers.patch;patch=1 \
61 file://gcc-release-branch/PR-36500-fix-neon.patch;patch=1 \ 61 file://gcc-release-branch/PR-36500-fix-neon.patch;patch=1 \
62 file://gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch;patch=1 \
63 file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch;patch=1 \
62" 64"
63 65
64SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 " 66SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 "
diff --git a/meta/packages/gcc/gcc-4.3.1/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch b/meta/packages/gcc/gcc-4.3.1/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
new file mode 100644
index 0000000000..f33e6c1ea6
--- /dev/null
+++ b/meta/packages/gcc/gcc-4.3.1/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
@@ -0,0 +1,31 @@
1---
2 configure | 2 +-
3 configure.ac | 2 +-
4 2 files changed, 2 insertions(+), 2 deletions(-)
5
6Index: gcc-4.3.1/configure.ac
7===================================================================
8--- gcc-4.3.1.orig/configure.ac 2008-07-21 12:29:18.000000000 -0700
9+++ gcc-4.3.1/configure.ac 2008-07-21 12:29:35.000000000 -0700
10@@ -2352,7 +2352,7 @@ fi
11 # for target_alias and gcc doesn't manage it consistently.
12 target_configargs="--cache-file=./config.cache ${target_configargs}"
13
14-FLAGS_FOR_TARGET=
15+FLAGS_FOR_TARGET="$ARCH_FLAGS_FOR_TARGET"
16 case " $target_configdirs " in
17 *" newlib "*)
18 case " $target_configargs " in
19Index: gcc-4.3.1/configure
20===================================================================
21--- gcc-4.3.1.orig/configure 2008-07-21 12:29:48.000000000 -0700
22+++ gcc-4.3.1/configure 2008-07-21 12:29:59.000000000 -0700
23@@ -5841,7 +5841,7 @@ fi
24 # for target_alias and gcc doesn't manage it consistently.
25 target_configargs="--cache-file=./config.cache ${target_configargs}"
26
27-FLAGS_FOR_TARGET=
28+FLAGS_FOR_TARGET="$ARCH_FLAGS_FOR_TARGET"
29 case " $target_configdirs " in
30 *" newlib "*)
31 case " $target_configargs " in
diff --git a/meta/packages/gcc/gcc-4.3.1/gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch b/meta/packages/gcc/gcc-4.3.1/gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch
new file mode 100644
index 0000000000..2a9605c3d6
--- /dev/null
+++ b/meta/packages/gcc/gcc-4.3.1/gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch
@@ -0,0 +1,5466 @@
1Before committing, I noticed that PR/32161 was marked as a dup of PR/32009, but my previous patch did not fix it.
2
3This alternative patch is better because it lets you just use CFLAGS_FOR_TARGET to set the compilation flags for libgcc. Since bootstrapped target libraries are never compiled with the native compiler, it makes little sense to use different flags for stage1 and later stages. And it also makes little sense to use a different variable than CFLAGS_FOR_TARGET.
4
5Other changes I had to do include:
6
7- moving the creation of default CFLAGS_FOR_TARGET from Makefile.am to configure.ac, because otherwise the BOOT_CFLAGS are substituted into CFLAGS_FOR_TARGET (which is "-O2 -g $(CFLAGS)") via $(CFLAGS). It is also cleaner this way though.
8
9- passing the right CFLAGS to configure scripts as exported environment variables
10
11I also stopped passing LIBCFLAGS to configure scripts since they are unused in the whole src tree. And I updated the documentation as H-P reminded me to do.
12
13Bootstrapped/regtested i686-pc-linux-gnu, will commit to 4.4 shortly. Ok for 4.3?
14
15Paolo
16
172008-02-19 Paolo Bonzini <bonzini@gnu.org>
18
19 PR bootstrap/32009
20 PR bootstrap/32161
21
22 * configure.ac (CFLAGS_FOR_TARGET, CXXFLAGS_FOR_TARGET): Compute here.
23 * configure: Regenerate.
24
25 * Makefile.def: Define stage_libcflags for all bootstrap stages.
26 * Makefile.tpl (BOOT_LIBCFLAGS, STAGE2_LIBCFLAGS, STAGE3_LIBCFLAGS,
27 STAGE4_LIBCFLAGS): New.
28 (CFLAGS_FOR_TARGET, CXXFLAGS_FOR_TARGET): Subst from autoconf, without
29 $(SYSROOT_CFLAGS_FOR_TARGET) and $(DEBUG_PREFIX_CFLAGS_FOR_TARGET).
30 (BASE_TARGET_EXPORTS): Append them here to C{,XX}FLAGS.
31 (EXTRA_TARGET_FLAGS): Append them here to {LIB,}C{,XX}FLAGS.
32 (configure-stage[+id+]-[+prefix+][+module+]): Pass stage_libcflags
33 for target modules. Don't export LIBCFLAGS.
34 (all-stage[+id+]-[+prefix+][+module+]): Pass stage_libcflags; pass
35 $(BASE_FLAGS_TO_PASS) where [+args+] was passed, and [+args+] after
36 the overridden CFLAGS_FOR_TARGET and CXXFLAGS_FOR_TARGET.
37 (invocations of `all'): Replace $(TARGET_FLAGS_TO_PASS) with
38 $(EXTRA_TARGET_FLAGS), $(FLAGS_TO_PASS) with $(EXTRA_HOST_FLAGS).
39 * Makefile.in: Regenerate.
40
41config:
422008-02-19 Paolo Bonzini <bonzini@gnu.org>
43
44 PR bootstrap/32009
45 * mh-ppc-darwin (BOOT_CFLAGS): Reenable.
46
47gcc:
482008-02-19 Paolo Bonzini <bonzini@gnu.org>
49
50 PR bootstrap/32009
51 * doc/install.texi: Correct references to CFLAGS, replacing them
52 with BOOT_CFLAGS. Document flags used during bootstrap for
53 target libraries.
54
55
56---
57 Makefile.def | 24
58 Makefile.in | 1802 +++++++++++++++++++++++++++++++--------------------
59 Makefile.tpl | 57 -
60 config/mh-ppc-darwin | 3
61 configure | 36 -
62 configure.ac | 32
63 gcc/doc/install.texi | 56 -
64 7 files changed, 1261 insertions(+), 749 deletions(-)
65
66Index: gcc-4.3.1/configure.ac
67===================================================================
68--- gcc-4.3.1.orig/configure.ac 2008-02-01 19:29:30.000000000 -0800
69+++ gcc-4.3.1/configure.ac 2008-07-21 10:56:15.000000000 -0700
70@@ -1667,6 +1667,38 @@ AC_ARG_WITH([debug-prefix-map],
71 [DEBUG_PREFIX_CFLAGS_FOR_TARGET=])
72 AC_SUBST(DEBUG_PREFIX_CFLAGS_FOR_TARGET)
73
74+# During gcc bootstrap, if we use some random cc for stage1 then CFLAGS
75+# might be empty or "-g". We don't require a C++ compiler, so CXXFLAGS
76+# might also be empty (or "-g", if a non-GCC C++ compiler is in the path).
77+# We want to ensure that TARGET libraries (which we know are built with
78+# gcc) are built with "-O2 -g", so include those options when setting
79+# CFLAGS_FOR_TARGET and CXXFLAGS_FOR_TARGET.
80+if test "x$CFLAGS_FOR_TARGET" = x; then
81+ CFLAGS_FOR_TARGET=$CFLAGS
82+ case " $CFLAGS " in
83+ *" -O2 "*) ;;
84+ *) CFLAGS_FOR_TARGET="-O2 $CFLAGS" ;;
85+ esac
86+ case " $CFLAGS " in
87+ *" -g "* | *" -g3 "*) ;;
88+ *) CFLAGS_FOR_TARGET="-g $CFLAGS" ;;
89+ esac
90+fi
91+AC_SUBST(CFLAGS_FOR_TARGET)
92+
93+if test "x$CXXFLAGS_FOR_TARGET" = x; then
94+ CXXFLAGS_FOR_TARGET=$CXXFLAGS
95+ case " $CXXFLAGS " in
96+ *" -O2 "*) ;;
97+ *) CXXFLAGS_FOR_TARGET="-O2 $CXXFLAGS" ;;
98+ esac
99+ case " $CXXFLAGS " in
100+ *" -g "* | *" -g3 "*) ;;
101+ *) CXXFLAGS_FOR_TARGET="-g $CXXFLAGS" ;;
102+ esac
103+fi
104+AC_SUBST(CXXFLAGS_FOR_TARGET)
105+
106 # Handle --with-headers=XXX. If the value is not "yes", the contents of
107 # the named directory are copied to $(tooldir)/sys-include.
108 if test x"${with_headers}" != x && test x"${with_headers}" != xno ; then
109Index: gcc-4.3.1/Makefile.def
110===================================================================
111--- gcc-4.3.1.orig/Makefile.def 2007-10-23 08:53:18.000000000 -0700
112+++ gcc-4.3.1/Makefile.def 2008-07-21 10:56:15.000000000 -0700
113@@ -511,43 +511,51 @@ bootstrap_stage = {
114 // compiler probably has never heard of them.
115 stage_configure_flags='--disable-intermodule $(STAGE1_CHECKING) \
116 --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"' ;
117- stage_cflags='$(STAGE1_CFLAGS)' ; };
118+ stage_cflags='$(STAGE1_CFLAGS)' ;
119+ stage_libcflags='$(STAGE1_LIBCFLAGS)' ; };
120 bootstrap_stage = {
121 id=2 ; prev=1 ;
122 bootstrap_target=bootstrap2 ;
123 stage_configure_flags="@stage2_werror_flag@" ;
124- stage_cflags="$(STAGE2_CFLAGS)" ; };
125+ stage_cflags="$(STAGE2_CFLAGS)" ;
126+ stage_libcflags="$(STAGE2_LIBCFLAGS)" ; };
127 bootstrap_stage = {
128 id=b2g0 ; prev=1 ;
129 bootstrap_target=bootstrap2-debug ;
130 stage_configure_flags="@stage2_werror_flag@" ;
131- stage_cflags="$(STAGE2_CFLAGS) -g0" ; };
132+ stage_cflags="$(STAGE2_CFLAGS) -g0" ;
133+ stage_libcflags="$(STAGE2_LIBCFLAGS) -g0" ; };
134 bootstrap_stage = {
135 id=3 ; prev=2 ; lean=1 ;
136 compare_target=compare ;
137 bootstrap_target=bootstrap ;
138 cleanstrap_target=cleanstrap ;
139 stage_configure_flags="@stage2_werror_flag@" ;
140- stage_cflags="$(STAGE3_CFLAGS)" ; };
141+ stage_cflags="$(STAGE3_CFLAGS)" ;
142+ stage_libcflags="$(STAGE3_LIBCFLAGS)" ; };
143 bootstrap_stage = {
144 id=b3g2 ; prev=b2g0 ; lean=1 ;
145 compare_target=compare-debug ;
146 bootstrap_target=bootstrap-debug ;
147 cleanstrap_target=cleanstrap-debug ;
148 stage_configure_flags="@stage2_werror_flag@" ;
149- stage_cflags="$(STAGE3_CFLAGS) -g2" ; };
150+ stage_cflags="$(STAGE3_CFLAGS) -g2" ;
151+ stage_libcflags="$(STAGE3_LIBCFLAGS) -g2" ; };
152 bootstrap_stage = {
153 id=4 ; prev=3 ; lean=2 ;
154 compare_target=compare3 ;
155 bootstrap_target=bootstrap4 ;
156 stage_configure_flags="@stage2_werror_flag@" ;
157- stage_cflags="$(STAGE4_CFLAGS)" ; };
158+ stage_cflags="$(STAGE4_CFLAGS)" ;
159+ stage_libcflags="$(STAGE4_CFLAGS)" ; };
160 bootstrap_stage = {
161 id=profile ; prev=1 ;
162 stage_configure_flags="@stage2_werror_flag@" ;
163- stage_cflags='$(STAGE2_CFLAGS) -fprofile-generate' ; };
164+ stage_cflags='$(STAGE2_CFLAGS) -fprofile-generate' ;
165+ stage_libcflags='$(STAGE2_LIBCFLAGS) -fprofile-generate' ; };
166 bootstrap_stage = {
167 id=feedback ; prev=profile ;
168 bootstrap_target=profiledbootstrap ;
169 stage_configure_flags="@stage2_werror_flag@" ;
170- stage_cflags='$(STAGE3_CFLAGS) -fprofile-use' ; };
171+ stage_cflags='$(STAGE3_CFLAGS) -fprofile-use' ;
172+ stage_libcflags='$(STAGE3_LIBCFLAGS) -fprofile-use' ; };
173Index: gcc-4.3.1/Makefile.tpl
174===================================================================
175--- gcc-4.3.1.orig/Makefile.tpl 2008-07-21 10:56:14.000000000 -0700
176+++ gcc-4.3.1/Makefile.tpl 2008-07-21 10:56:15.000000000 -0700
177@@ -207,10 +207,10 @@ BASE_TARGET_EXPORTS = \
178 AR="$(AR_FOR_TARGET)"; export AR; \
179 AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
180 CC="$(CC_FOR_TARGET)"; export CC; \
181- CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
182+ CFLAGS="$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
183 CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
184 CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
185- CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
186+ CXXFLAGS="$(CXXFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS; \
187 GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
188 GFORTRAN="$(GFORTRAN_FOR_TARGET)"; export GFORTRAN; \
189 DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
190@@ -330,14 +330,19 @@ PICFLAG =
191 # MAKEINFO and MAKEINFOFLAGS are explicitly passed here to make them
192 # overrideable (for a bootstrap build stage1 also builds gcc.info).
193
194-STAGE1_CFLAGS=@stage1_cflags@
195 STAGE1_CHECKING=@stage1_checking@
196 STAGE1_LANGUAGES=@stage1_languages@
197
198+STAGE1_CFLAGS=@stage1_cflags@
199 STAGE2_CFLAGS=$(BOOT_CFLAGS)
200 STAGE3_CFLAGS=$(BOOT_CFLAGS)
201 STAGE4_CFLAGS=$(BOOT_CFLAGS)
202
203+STAGE1_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
204+STAGE2_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
205+STAGE3_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
206+STAGE4_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
207+
208 do-compare = @do_compare@
209 do-compare3 = $(do-compare)
210 do-compare-debug = $(SHELL) $(srcdir)/contrib/compare-debug $$f1 $$f2
211@@ -376,18 +381,11 @@ COMPILER_AS_FOR_TARGET=@COMPILER_AS_FOR_
212 COMPILER_LD_FOR_TARGET=@COMPILER_LD_FOR_TARGET@
213 COMPILER_NM_FOR_TARGET=@COMPILER_NM_FOR_TARGET@
214
215-# During gcc bootstrap, if we use some random cc for stage1 then CFLAGS
216-# might be empty or "-g". We don't require a C++ compiler, so CXXFLAGS
217-# might also be empty (or "-g", if a non-GCC C++ compiler is in the path).
218-# We want to ensure that TARGET libraries (which we know are built with
219-# gcc) are built with "-O2 -g", so prepend those options when setting
220-# CFLAGS_FOR_TARGET and CXXFLAGS_FOR_TARGET.
221-CFLAGS_FOR_TARGET = -O2 -g $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) \
222- $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)
223+CFLAGS_FOR_TARGET = @CFLAGS_FOR_TARGET@
224+CXXFLAGS_FOR_TARGET = @CXXFLAGS_FOR_TARGET@
225 SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
226 DEBUG_PREFIX_CFLAGS_FOR_TARGET = @DEBUG_PREFIX_CFLAGS_FOR_TARGET@
227-CXXFLAGS_FOR_TARGET = -O2 -g $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) \
228- $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)
229+
230 LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
231 LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
232 LDFLAGS_FOR_TARGET = @LDFLAGS@
233@@ -491,19 +489,20 @@ POSTSTAGE1_FLAGS_TO_PASS = \
234 # Flags to pass down to makes which are built with the target environment.
235 # The double $ decreases the length of the command line; those variables
236 # are set in BASE_FLAGS_TO_PASS, and the sub-make will expand them. The
237-# COMPILER_ prefixed variables are not passed down so we expand them here.
238+# *_CFLAGS_FOR_TARGET variables are not passed down and most often empty,
239+# so we expand them here.
240 EXTRA_TARGET_FLAGS = \
241 'AR=$$(AR_FOR_TARGET)' \
242 'AS=$(COMPILER_AS_FOR_TARGET)' \
243 'CC=$$(CC_FOR_TARGET)' \
244- 'CFLAGS=$$(CFLAGS_FOR_TARGET)' \
245+ 'CFLAGS=$$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \
246 'CXX=$$(CXX_FOR_TARGET)' \
247- 'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \
248+ 'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \
249 'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
250 'LD=$(COMPILER_LD_FOR_TARGET)' \
251 'LDFLAGS=$$(LDFLAGS_FOR_TARGET)' \
252- 'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \
253- 'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \
254+ 'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \
255+ 'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \
256 'NM=$(COMPILER_NM_FOR_TARGET)' \
257 'OBJDUMP=$$(OBJDUMP_FOR_TARGET)' \
258 'RANLIB=$$(RANLIB_FOR_TARGET)' \
259@@ -851,9 +850,11 @@ configure-stage[+id+]-[+prefix+][+module
260 fi; \
261 [+ ENDIF check_multilibs +]test ! -f [+subdir+]/[+module+]/Makefile || exit 0; \
262 [+exports+][+ IF prev +] \
263- [+poststage1_exports+][+ ENDIF prev +] \
264+ [+poststage1_exports+][+ ENDIF prev +] [+ IF prefix +] \
265+ CFLAGS="[+stage_libcflags+] $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
266+ CXXFLAGS="[+stage_libcflags+] $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS; [+ ELSE +] \
267 CFLAGS="[+stage_cflags+]"; export CFLAGS; \
268- LIBCFLAGS="[+stage_cflags+]"; export LIBCFLAGS; \
269+ CXXFLAGS="[+stage_cflags+]"; export CXXFLAGS; [+ ENDIF +] \
270 echo Configuring stage [+id+] in [+subdir+]/[+module+] ; \
271 $(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+] ; \
272 cd [+subdir+]/[+module+] || exit 1; \
273@@ -890,7 +891,8 @@ all-[+prefix+][+module+]: configure-[+pr
274 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
275 [+exports+] \
276 (cd [+subdir+]/[+module+] && \
277- $(MAKE) [+args+] [+extra_make_flags+] $(TARGET-[+prefix+][+module+]))
278+ $(MAKE) $(BASE_FLAGS_TO_PASS) [+args+] [+extra_make_flags+] \
279+ $(TARGET-[+prefix+][+module+]))
280 @endif [+prefix+][+module+]
281
282 [+ IF bootstrap +]
283@@ -910,8 +912,11 @@ all-stage[+id+]-[+prefix+][+module+]: co
284 [+exports+][+ IF prev +] \
285 [+poststage1_exports+][+ ENDIF prev +] \
286 cd [+subdir+]/[+module+] && \
287- $(MAKE) [+args+] \
288- CFLAGS="[+stage_cflags+]" LIBCFLAGS="[+stage_cflags+]" [+
289+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
290+ CFLAGS="[+stage_cflags+]" CXXFLAGS="[+stage_cflags+]" \
291+ LIBCFLAGS="[+stage_libcflags+]" \
292+ CFLAGS_FOR_TARGET="[+stage_libcflags+]" \
293+ CXXFLAGS_FOR_TARGET="[+stage_libcflags+]" [+args+] [+
294 IF prev +][+poststage1_args+][+ ENDIF prev
295 +] [+extra_make_flags+] \
296 $(TARGET-stage[+id+]-[+prefix+][+module+])
297@@ -961,7 +966,7 @@ clean-stage[+id+]-[+prefix+][+module+]:
298 [+ all prefix="" subdir="$(HOST_SUBDIR)"
299 exports="$(HOST_EXPORTS)"
300 poststage1_exports="$(POSTSTAGE1_HOST_EXPORTS)"
301- args="$(FLAGS_TO_PASS)"
302+ args="$(EXTRA_HOST_FLAGS)"
303 poststage1_args="$(POSTSTAGE1_FLAGS_TO_PASS)" +]
304
305 .PHONY: check-[+module+] maybe-check-[+module+]
306@@ -1059,7 +1064,7 @@ maybe-[+make_target+]-[+module+]: [+make
307
308 [+ all prefix="target-" subdir="$(TARGET_SUBDIR)"
309 exports="$(RAW_CXX_TARGET_EXPORTS)"
310- args="$(TARGET_FLAGS_TO_PASS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'" +]
311+ args="$(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'" +]
312 [+ ELSE +]
313 [+ configure prefix="target-" subdir="$(TARGET_SUBDIR)"
314 check_multilibs=true
315@@ -1070,7 +1075,7 @@ maybe-[+make_target+]-[+module+]: [+make
316
317 [+ all prefix="target-" subdir="$(TARGET_SUBDIR)"
318 exports="$(NORMAL_TARGET_EXPORTS)"
319- args="$(TARGET_FLAGS_TO_PASS)" +]
320+ args="$(EXTRA_TARGET_FLAGS)" +]
321 [+ ENDIF +]
322
323 .PHONY: check-target-[+module+] maybe-check-target-[+module+]
324Index: gcc-4.3.1/config/mh-ppc-darwin
325===================================================================
326--- gcc-4.3.1.orig/config/mh-ppc-darwin 2007-05-23 07:26:31.000000000 -0700
327+++ gcc-4.3.1/config/mh-ppc-darwin 2008-07-21 10:56:15.000000000 -0700
328@@ -2,5 +2,4 @@
329 # position-independent-code -- the usual default on Darwin. This fix speeds
330 # compiles by 3-5%.
331
332-# Broken because of PR32009.
333-# BOOT_CFLAGS=-g -O2 -mdynamic-no-pic
334+BOOT_CFLAGS=-g -O2 -mdynamic-no-pic
335Index: gcc-4.3.1/gcc/doc/install.texi
336===================================================================
337--- gcc-4.3.1.orig/gcc/doc/install.texi 2008-05-22 23:58:10.000000000 -0700
338+++ gcc-4.3.1/gcc/doc/install.texi 2008-07-21 10:56:15.000000000 -0700
339@@ -1772,33 +1772,35 @@ same described above, but object files f
340 stage2 of the 3-stage bootstrap of the compiler are deleted as
341 soon as they are no longer needed.
342
343-If you want to save additional space during the bootstrap and in
344-the final installation as well, you can build the compiler binaries
345-without debugging information as in the following example. This will save
346-roughly 40% of disk space both for the bootstrap and the final installation.
347-(Libraries will still contain debugging information.)
348-
349-@smallexample
350- make CFLAGS='-O' LIBCFLAGS='-g -O2' \
351- LIBCXXFLAGS='-g -O2 -fno-implicit-templates' bootstrap
352-@end smallexample
353-
354-If you wish to use non-default GCC flags when compiling the stage2 and
355-stage3 compilers, set @code{BOOT_CFLAGS} on the command line when doing
356-@samp{make}. Non-default optimization flags are less well
357-tested here than the default of @samp{-g -O2}, but should still work.
358-In a few cases, you may find that you need to specify special flags such
359-as @option{-msoft-float} here to complete the bootstrap; or, if the
360-native compiler miscompiles the stage1 compiler, you may need to work
361-around this, by choosing @code{BOOT_CFLAGS} to avoid the parts of the
362-stage1 compiler that were miscompiled, or by using @samp{make
363+If you wish to use non-default GCC flags when compiling the stage2
364+and stage3 compilers, set @code{BOOT_CFLAGS} on the command line when
365+doing @samp{make}. For example, if you want to save additional space
366+during the bootstrap and in the final installation as well, you can
367+build the compiler binaries without debugging information as in the
368+following example. This will save roughly 40% of disk space both for
369+the bootstrap and the final installation. (Libraries will still contain
370+debugging information.)
371+
372+@smallexample
373+ make BOOT_CFLAGS='-O' bootstrap
374+@end smallexample
375+
376+You can place non-default optimization flags into @code{BOOT_CFLAGS}; they
377+are less well tested here than the default of @samp{-g -O2}, but should
378+still work. In a few cases, you may find that you need to specify special
379+flags such as @option{-msoft-float} here to complete the bootstrap; or,
380+if the native compiler miscompiles the stage1 compiler, you may need
381+to work around this, by choosing @code{BOOT_CFLAGS} to avoid the parts
382+of the stage1 compiler that were miscompiled, or by using @samp{make
383 bootstrap4} to increase the number of stages of bootstrap.
384
385-Note that using non-standard @code{CFLAGS} can cause bootstrap to fail
386-if these trigger a warning with the new compiler. For example using
387-@samp{-O2 -g -mcpu=i686} on @code{i686-pc-linux-gnu} will cause bootstrap
388-failure as @option{-mcpu=} is deprecated in 3.4.0 and above.
389-
390+@code{BOOT_CFLAGS} does not apply to bootstrapped target libraries.
391+Since these are always compiled with the compiler currently being
392+bootstrapped, you can use @code{CFLAGS_FOR_TARGET} to modify their
393+compilation flags, as for non-bootstrapped target libraries.
394+Again, if the native compiler miscompiles the stage1 compiler, you may
395+need to work around this by avoiding non-working parts of the stage1
396+compiler. Use @code{STAGE1_LIBCFLAGS} to this end.
397
398 If you used the flag @option{--enable-languages=@dots{}} to restrict
399 the compilers to be built, only those you've actually enabled will be
400@@ -2689,8 +2691,8 @@ cross-compilers on the Alpha for 32-bit
401 a few cases and may not work properly.
402
403 @samp{make compare} may fail on old versions of DEC Unix unless you add
404-@option{-save-temps} to @code{CFLAGS}. On these systems, the name of the
405-assembler input file is stored in the object file, and that makes
406+@option{-save-temps} to @code{BOOT_CFLAGS}. On these systems, the name
407+of the assembler input file is stored in the object file, and that makes
408 comparison fail if it differs between the @code{stage1} and
409 @code{stage2} compilations. The option @option{-save-temps} forces a
410 fixed name to be used for the assembler input file, instead of a
411Index: gcc-4.3.1/Makefile.in
412===================================================================
413--- gcc-4.3.1.orig/Makefile.in 2008-07-21 10:56:14.000000000 -0700
414+++ gcc-4.3.1/Makefile.in 2008-07-21 10:56:15.000000000 -0700
415@@ -204,11 +204,10 @@ BASE_TARGET_EXPORTS = \
416 AR="$(AR_FOR_TARGET)"; export AR; \
417 AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
418 CC="$(CC_FOR_TARGET)"; export CC; \
419- CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
420- CPP="$(CC_FOR_TARGET) -E"; export CPP; \
421+ CFLAGS="$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
422 CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
423 CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
424- CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
425+ CXXFLAGS="$(CXXFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS; \
426 GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
427 GFORTRAN="$(GFORTRAN_FOR_TARGET)"; export GFORTRAN; \
428 DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
429@@ -328,14 +327,19 @@ PICFLAG =
430 # MAKEINFO and MAKEINFOFLAGS are explicitly passed here to make them
431 # overrideable (for a bootstrap build stage1 also builds gcc.info).
432
433-STAGE1_CFLAGS=@stage1_cflags@
434 STAGE1_CHECKING=@stage1_checking@
435 STAGE1_LANGUAGES=@stage1_languages@
436
437+STAGE1_CFLAGS=@stage1_cflags@
438 STAGE2_CFLAGS=$(BOOT_CFLAGS)
439 STAGE3_CFLAGS=$(BOOT_CFLAGS)
440 STAGE4_CFLAGS=$(BOOT_CFLAGS)
441
442+STAGE1_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
443+STAGE2_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
444+STAGE3_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
445+STAGE4_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
446+
447 do-compare = @do_compare@
448 do-compare3 = $(do-compare)
449 do-compare-debug = $(SHELL) $(srcdir)/contrib/compare-debug $$f1 $$f2
450@@ -374,18 +378,11 @@ COMPILER_AS_FOR_TARGET=@COMPILER_AS_FOR_
451 COMPILER_LD_FOR_TARGET=@COMPILER_LD_FOR_TARGET@
452 COMPILER_NM_FOR_TARGET=@COMPILER_NM_FOR_TARGET@
453
454-# During gcc bootstrap, if we use some random cc for stage1 then CFLAGS
455-# might be empty or "-g". We don't require a C++ compiler, so CXXFLAGS
456-# might also be empty (or "-g", if a non-GCC C++ compiler is in the path).
457-# We want to ensure that TARGET libraries (which we know are built with
458-# gcc) are built with "-O2 -g", so prepend those options when setting
459-# CFLAGS_FOR_TARGET and CXXFLAGS_FOR_TARGET.
460-CFLAGS_FOR_TARGET = -O2 -g $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) \
461- $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)
462+CFLAGS_FOR_TARGET = @CFLAGS_FOR_TARGET@
463+CXXFLAGS_FOR_TARGET = @CXXFLAGS_FOR_TARGET@
464 SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
465 DEBUG_PREFIX_CFLAGS_FOR_TARGET = @DEBUG_PREFIX_CFLAGS_FOR_TARGET@
466-CXXFLAGS_FOR_TARGET = -O2 -g $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) \
467- $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)
468+
469 LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
470 LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
471 LDFLAGS_FOR_TARGET = @LDFLAGS@
472@@ -592,19 +589,20 @@ POSTSTAGE1_FLAGS_TO_PASS = \
473 # Flags to pass down to makes which are built with the target environment.
474 # The double $ decreases the length of the command line; those variables
475 # are set in BASE_FLAGS_TO_PASS, and the sub-make will expand them. The
476-# COMPILER_ prefixed variables are not passed down so we expand them here.
477+# *_CFLAGS_FOR_TARGET variables are not passed down and most often empty,
478+# so we expand them here.
479 EXTRA_TARGET_FLAGS = \
480 'AR=$$(AR_FOR_TARGET)' \
481 'AS=$(COMPILER_AS_FOR_TARGET)' \
482 'CC=$$(CC_FOR_TARGET)' \
483- 'CFLAGS=$$(CFLAGS_FOR_TARGET)' \
484+ 'CFLAGS=$$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \
485 'CXX=$$(CXX_FOR_TARGET)' \
486- 'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \
487+ 'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \
488 'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
489 'LD=$(COMPILER_LD_FOR_TARGET)' \
490 'LDFLAGS=$$(LDFLAGS_FOR_TARGET)' \
491- 'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \
492- 'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \
493+ 'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \
494+ 'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \
495 'NM=$(COMPILER_NM_FOR_TARGET)' \
496 'OBJDUMP=$$(OBJDUMP_FOR_TARGET)' \
497 'RANLIB=$$(RANLIB_FOR_TARGET)' \
498@@ -2738,7 +2736,8 @@ all-build-libiberty: configure-build-lib
499 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
500 $(BUILD_EXPORTS) \
501 (cd $(BUILD_SUBDIR)/libiberty && \
502- $(MAKE) $(TARGET-build-libiberty))
503+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
504+ $(TARGET-build-libiberty))
505 @endif build-libiberty
506
507
508@@ -2793,7 +2792,8 @@ all-build-bison: configure-build-bison
509 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
510 $(BUILD_EXPORTS) \
511 (cd $(BUILD_SUBDIR)/bison && \
512- $(MAKE) $(TARGET-build-bison))
513+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
514+ $(TARGET-build-bison))
515 @endif build-bison
516
517
518@@ -2848,7 +2848,8 @@ all-build-byacc: configure-build-byacc
519 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
520 $(BUILD_EXPORTS) \
521 (cd $(BUILD_SUBDIR)/byacc && \
522- $(MAKE) $(TARGET-build-byacc))
523+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
524+ $(TARGET-build-byacc))
525 @endif build-byacc
526
527
528@@ -2903,7 +2904,8 @@ all-build-flex: configure-build-flex
529 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
530 $(BUILD_EXPORTS) \
531 (cd $(BUILD_SUBDIR)/flex && \
532- $(MAKE) $(TARGET-build-flex))
533+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
534+ $(TARGET-build-flex))
535 @endif build-flex
536
537
538@@ -2958,7 +2960,8 @@ all-build-m4: configure-build-m4
539 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
540 $(BUILD_EXPORTS) \
541 (cd $(BUILD_SUBDIR)/m4 && \
542- $(MAKE) $(TARGET-build-m4))
543+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
544+ $(TARGET-build-m4))
545 @endif build-m4
546
547
548@@ -3013,7 +3016,8 @@ all-build-texinfo: configure-build-texin
549 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
550 $(BUILD_EXPORTS) \
551 (cd $(BUILD_SUBDIR)/texinfo && \
552- $(MAKE) $(TARGET-build-texinfo))
553+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
554+ $(TARGET-build-texinfo))
555 @endif build-texinfo
556
557
558@@ -3068,7 +3072,8 @@ all-build-fixincludes: configure-build-f
559 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
560 $(BUILD_EXPORTS) \
561 (cd $(BUILD_SUBDIR)/fixincludes && \
562- $(MAKE) $(TARGET-build-fixincludes))
563+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
564+ $(TARGET-build-fixincludes))
565 @endif build-fixincludes
566
567
568@@ -3127,7 +3132,8 @@ all-ash: configure-ash
569 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
570 $(HOST_EXPORTS) \
571 (cd $(HOST_SUBDIR)/ash && \
572- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-ash))
573+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
574+ $(TARGET-ash))
575 @endif ash
576
577
578@@ -3551,7 +3557,8 @@ all-autoconf: configure-autoconf
579 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
580 $(HOST_EXPORTS) \
581 (cd $(HOST_SUBDIR)/autoconf && \
582- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-autoconf))
583+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
584+ $(TARGET-autoconf))
585 @endif autoconf
586
587
588@@ -3975,7 +3982,8 @@ all-automake: configure-automake
589 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
590 $(HOST_EXPORTS) \
591 (cd $(HOST_SUBDIR)/automake && \
592- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-automake))
593+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
594+ $(TARGET-automake))
595 @endif automake
596
597
598@@ -4399,7 +4407,8 @@ all-bash: configure-bash
599 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
600 $(HOST_EXPORTS) \
601 (cd $(HOST_SUBDIR)/bash && \
602- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-bash))
603+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
604+ $(TARGET-bash))
605 @endif bash
606
607
608@@ -4816,9 +4825,9 @@ configure-stage1-bfd:
609 @r=`${PWD_COMMAND}`; export r; \
610 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
611 test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
612- $(HOST_EXPORTS) \
613+ $(HOST_EXPORTS) \
614 CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
615- LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
616+ CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \
617 echo Configuring stage 1 in $(HOST_SUBDIR)/bfd ; \
618 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
619 cd $(HOST_SUBDIR)/bfd || exit 1; \
620@@ -4847,9 +4856,9 @@ configure-stage2-bfd:
621 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
622 test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
623 $(HOST_EXPORTS) \
624- $(POSTSTAGE1_HOST_EXPORTS) \
625+ $(POSTSTAGE1_HOST_EXPORTS) \
626 CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
627- LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
628+ CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \
629 echo Configuring stage 2 in $(HOST_SUBDIR)/bfd ; \
630 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
631 cd $(HOST_SUBDIR)/bfd || exit 1; \
632@@ -4878,9 +4887,9 @@ configure-stageb2g0-bfd:
633 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
634 test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
635 $(HOST_EXPORTS) \
636- $(POSTSTAGE1_HOST_EXPORTS) \
637+ $(POSTSTAGE1_HOST_EXPORTS) \
638 CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
639- LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
640+ CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS; \
641 echo Configuring stage b2g0 in $(HOST_SUBDIR)/bfd ; \
642 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
643 cd $(HOST_SUBDIR)/bfd || exit 1; \
644@@ -4909,9 +4918,9 @@ configure-stage3-bfd:
645 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
646 test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
647 $(HOST_EXPORTS) \
648- $(POSTSTAGE1_HOST_EXPORTS) \
649+ $(POSTSTAGE1_HOST_EXPORTS) \
650 CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
651- LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
652+ CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \
653 echo Configuring stage 3 in $(HOST_SUBDIR)/bfd ; \
654 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
655 cd $(HOST_SUBDIR)/bfd || exit 1; \
656@@ -4940,9 +4949,9 @@ configure-stageb3g2-bfd:
657 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
658 test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
659 $(HOST_EXPORTS) \
660- $(POSTSTAGE1_HOST_EXPORTS) \
661+ $(POSTSTAGE1_HOST_EXPORTS) \
662 CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
663- LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
664+ CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS; \
665 echo Configuring stage b3g2 in $(HOST_SUBDIR)/bfd ; \
666 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
667 cd $(HOST_SUBDIR)/bfd || exit 1; \
668@@ -4971,9 +4980,9 @@ configure-stage4-bfd:
669 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
670 test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
671 $(HOST_EXPORTS) \
672- $(POSTSTAGE1_HOST_EXPORTS) \
673+ $(POSTSTAGE1_HOST_EXPORTS) \
674 CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
675- LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
676+ CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \
677 echo Configuring stage 4 in $(HOST_SUBDIR)/bfd ; \
678 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
679 cd $(HOST_SUBDIR)/bfd || exit 1; \
680@@ -5002,9 +5011,9 @@ configure-stageprofile-bfd:
681 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
682 test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
683 $(HOST_EXPORTS) \
684- $(POSTSTAGE1_HOST_EXPORTS) \
685+ $(POSTSTAGE1_HOST_EXPORTS) \
686 CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
687- LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
688+ CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \
689 echo Configuring stage profile in $(HOST_SUBDIR)/bfd ; \
690 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
691 cd $(HOST_SUBDIR)/bfd || exit 1; \
692@@ -5033,9 +5042,9 @@ configure-stagefeedback-bfd:
693 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
694 test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
695 $(HOST_EXPORTS) \
696- $(POSTSTAGE1_HOST_EXPORTS) \
697+ $(POSTSTAGE1_HOST_EXPORTS) \
698 CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
699- LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
700+ CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \
701 echo Configuring stage feedback in $(HOST_SUBDIR)/bfd ; \
702 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
703 cd $(HOST_SUBDIR)/bfd || exit 1; \
704@@ -5070,7 +5079,8 @@ all-bfd: configure-bfd
705 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
706 $(HOST_EXPORTS) \
707 (cd $(HOST_SUBDIR)/bfd && \
708- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-bfd))
709+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
710+ $(TARGET-bfd))
711 @endif bfd
712
713
714@@ -5089,8 +5099,11 @@ all-stage1-bfd: configure-stage1-bfd
715 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
716 $(HOST_EXPORTS) \
717 cd $(HOST_SUBDIR)/bfd && \
718- $(MAKE) $(FLAGS_TO_PASS) \
719- CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \
720+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
721+ CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
722+ LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
723+ CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
724+ CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \
725 $(TARGET-stage1-bfd)
726
727 maybe-clean-stage1-bfd: clean-stage1-bfd
728@@ -5103,7 +5116,7 @@ clean-stage1-bfd:
729 $(MAKE) stage1-start; \
730 fi; \
731 cd $(HOST_SUBDIR)/bfd && \
732- $(MAKE) $(FLAGS_TO_PASS) \
733+ $(MAKE) $(EXTRA_HOST_FLAGS) \
734 clean
735 @endif bfd-bootstrap
736
737@@ -5123,8 +5136,11 @@ all-stage2-bfd: configure-stage2-bfd
738 $(HOST_EXPORTS) \
739 $(POSTSTAGE1_HOST_EXPORTS) \
740 cd $(HOST_SUBDIR)/bfd && \
741- $(MAKE) $(FLAGS_TO_PASS) \
742- CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
743+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
744+ CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
745+ LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
746+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
747+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
748 $(TARGET-stage2-bfd)
749
750 maybe-clean-stage2-bfd: clean-stage2-bfd
751@@ -5137,7 +5153,7 @@ clean-stage2-bfd:
752 $(MAKE) stage2-start; \
753 fi; \
754 cd $(HOST_SUBDIR)/bfd && \
755- $(MAKE) $(FLAGS_TO_PASS) \
756+ $(MAKE) $(EXTRA_HOST_FLAGS) \
757 $(POSTSTAGE1_FLAGS_TO_PASS) \
758 clean
759 @endif bfd-bootstrap
760@@ -5158,8 +5174,11 @@ all-stageb2g0-bfd: configure-stageb2g0-b
761 $(HOST_EXPORTS) \
762 $(POSTSTAGE1_HOST_EXPORTS) \
763 cd $(HOST_SUBDIR)/bfd && \
764- $(MAKE) $(FLAGS_TO_PASS) \
765- CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS) \
766+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
767+ CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
768+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
769+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
770+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
771 $(TARGET-stageb2g0-bfd)
772
773 maybe-clean-stageb2g0-bfd: clean-stageb2g0-bfd
774@@ -5172,7 +5191,7 @@ clean-stageb2g0-bfd:
775 $(MAKE) stageb2g0-start; \
776 fi; \
777 cd $(HOST_SUBDIR)/bfd && \
778- $(MAKE) $(FLAGS_TO_PASS) \
779+ $(MAKE) $(EXTRA_HOST_FLAGS) \
780 $(POSTSTAGE1_FLAGS_TO_PASS) \
781 clean
782 @endif bfd-bootstrap
783@@ -5193,8 +5212,11 @@ all-stage3-bfd: configure-stage3-bfd
784 $(HOST_EXPORTS) \
785 $(POSTSTAGE1_HOST_EXPORTS) \
786 cd $(HOST_SUBDIR)/bfd && \
787- $(MAKE) $(FLAGS_TO_PASS) \
788- CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
789+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
790+ CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
791+ LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
792+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
793+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
794 $(TARGET-stage3-bfd)
795
796 maybe-clean-stage3-bfd: clean-stage3-bfd
797@@ -5207,7 +5229,7 @@ clean-stage3-bfd:
798 $(MAKE) stage3-start; \
799 fi; \
800 cd $(HOST_SUBDIR)/bfd && \
801- $(MAKE) $(FLAGS_TO_PASS) \
802+ $(MAKE) $(EXTRA_HOST_FLAGS) \
803 $(POSTSTAGE1_FLAGS_TO_PASS) \
804 clean
805 @endif bfd-bootstrap
806@@ -5228,8 +5250,11 @@ all-stageb3g2-bfd: configure-stageb3g2-b
807 $(HOST_EXPORTS) \
808 $(POSTSTAGE1_HOST_EXPORTS) \
809 cd $(HOST_SUBDIR)/bfd && \
810- $(MAKE) $(FLAGS_TO_PASS) \
811- CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS) \
812+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
813+ CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
814+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
815+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
816+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
817 $(TARGET-stageb3g2-bfd)
818
819 maybe-clean-stageb3g2-bfd: clean-stageb3g2-bfd
820@@ -5242,7 +5267,7 @@ clean-stageb3g2-bfd:
821 $(MAKE) stageb3g2-start; \
822 fi; \
823 cd $(HOST_SUBDIR)/bfd && \
824- $(MAKE) $(FLAGS_TO_PASS) \
825+ $(MAKE) $(EXTRA_HOST_FLAGS) \
826 $(POSTSTAGE1_FLAGS_TO_PASS) \
827 clean
828 @endif bfd-bootstrap
829@@ -5263,8 +5288,11 @@ all-stage4-bfd: configure-stage4-bfd
830 $(HOST_EXPORTS) \
831 $(POSTSTAGE1_HOST_EXPORTS) \
832 cd $(HOST_SUBDIR)/bfd && \
833- $(MAKE) $(FLAGS_TO_PASS) \
834- CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
835+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
836+ CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
837+ LIBCFLAGS="$(STAGE4_CFLAGS)" \
838+ CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
839+ CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
840 $(TARGET-stage4-bfd)
841
842 maybe-clean-stage4-bfd: clean-stage4-bfd
843@@ -5277,7 +5305,7 @@ clean-stage4-bfd:
844 $(MAKE) stage4-start; \
845 fi; \
846 cd $(HOST_SUBDIR)/bfd && \
847- $(MAKE) $(FLAGS_TO_PASS) \
848+ $(MAKE) $(EXTRA_HOST_FLAGS) \
849 $(POSTSTAGE1_FLAGS_TO_PASS) \
850 clean
851 @endif bfd-bootstrap
852@@ -5298,8 +5326,11 @@ all-stageprofile-bfd: configure-stagepro
853 $(HOST_EXPORTS) \
854 $(POSTSTAGE1_HOST_EXPORTS) \
855 cd $(HOST_SUBDIR)/bfd && \
856- $(MAKE) $(FLAGS_TO_PASS) \
857- CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS) \
858+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
859+ CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
860+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
861+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
862+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
863 $(TARGET-stageprofile-bfd)
864
865 maybe-clean-stageprofile-bfd: clean-stageprofile-bfd
866@@ -5312,7 +5343,7 @@ clean-stageprofile-bfd:
867 $(MAKE) stageprofile-start; \
868 fi; \
869 cd $(HOST_SUBDIR)/bfd && \
870- $(MAKE) $(FLAGS_TO_PASS) \
871+ $(MAKE) $(EXTRA_HOST_FLAGS) \
872 $(POSTSTAGE1_FLAGS_TO_PASS) \
873 clean
874 @endif bfd-bootstrap
875@@ -5333,8 +5364,11 @@ all-stagefeedback-bfd: configure-stagefe
876 $(HOST_EXPORTS) \
877 $(POSTSTAGE1_HOST_EXPORTS) \
878 cd $(HOST_SUBDIR)/bfd && \
879- $(MAKE) $(FLAGS_TO_PASS) \
880- CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS) \
881+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
882+ CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
883+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
884+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
885+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
886 $(TARGET-stagefeedback-bfd)
887
888 maybe-clean-stagefeedback-bfd: clean-stagefeedback-bfd
889@@ -5347,7 +5381,7 @@ clean-stagefeedback-bfd:
890 $(MAKE) stagefeedback-start; \
891 fi; \
892 cd $(HOST_SUBDIR)/bfd && \
893- $(MAKE) $(FLAGS_TO_PASS) \
894+ $(MAKE) $(EXTRA_HOST_FLAGS) \
895 $(POSTSTAGE1_FLAGS_TO_PASS) \
896 clean
897 @endif bfd-bootstrap
898@@ -5754,9 +5788,9 @@ configure-stage1-opcodes:
899 @r=`${PWD_COMMAND}`; export r; \
900 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
901 test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
902- $(HOST_EXPORTS) \
903+ $(HOST_EXPORTS) \
904 CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
905- LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
906+ CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \
907 echo Configuring stage 1 in $(HOST_SUBDIR)/opcodes ; \
908 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
909 cd $(HOST_SUBDIR)/opcodes || exit 1; \
910@@ -5785,9 +5819,9 @@ configure-stage2-opcodes:
911 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
912 test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
913 $(HOST_EXPORTS) \
914- $(POSTSTAGE1_HOST_EXPORTS) \
915+ $(POSTSTAGE1_HOST_EXPORTS) \
916 CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
917- LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
918+ CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \
919 echo Configuring stage 2 in $(HOST_SUBDIR)/opcodes ; \
920 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
921 cd $(HOST_SUBDIR)/opcodes || exit 1; \
922@@ -5816,9 +5850,9 @@ configure-stageb2g0-opcodes:
923 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
924 test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
925 $(HOST_EXPORTS) \
926- $(POSTSTAGE1_HOST_EXPORTS) \
927+ $(POSTSTAGE1_HOST_EXPORTS) \
928 CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
929- LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
930+ CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS; \
931 echo Configuring stage b2g0 in $(HOST_SUBDIR)/opcodes ; \
932 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
933 cd $(HOST_SUBDIR)/opcodes || exit 1; \
934@@ -5847,9 +5881,9 @@ configure-stage3-opcodes:
935 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
936 test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
937 $(HOST_EXPORTS) \
938- $(POSTSTAGE1_HOST_EXPORTS) \
939+ $(POSTSTAGE1_HOST_EXPORTS) \
940 CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
941- LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
942+ CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \
943 echo Configuring stage 3 in $(HOST_SUBDIR)/opcodes ; \
944 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
945 cd $(HOST_SUBDIR)/opcodes || exit 1; \
946@@ -5878,9 +5912,9 @@ configure-stageb3g2-opcodes:
947 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
948 test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
949 $(HOST_EXPORTS) \
950- $(POSTSTAGE1_HOST_EXPORTS) \
951+ $(POSTSTAGE1_HOST_EXPORTS) \
952 CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
953- LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
954+ CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS; \
955 echo Configuring stage b3g2 in $(HOST_SUBDIR)/opcodes ; \
956 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
957 cd $(HOST_SUBDIR)/opcodes || exit 1; \
958@@ -5909,9 +5943,9 @@ configure-stage4-opcodes:
959 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
960 test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
961 $(HOST_EXPORTS) \
962- $(POSTSTAGE1_HOST_EXPORTS) \
963+ $(POSTSTAGE1_HOST_EXPORTS) \
964 CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
965- LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
966+ CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \
967 echo Configuring stage 4 in $(HOST_SUBDIR)/opcodes ; \
968 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
969 cd $(HOST_SUBDIR)/opcodes || exit 1; \
970@@ -5940,9 +5974,9 @@ configure-stageprofile-opcodes:
971 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
972 test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
973 $(HOST_EXPORTS) \
974- $(POSTSTAGE1_HOST_EXPORTS) \
975+ $(POSTSTAGE1_HOST_EXPORTS) \
976 CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
977- LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
978+ CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \
979 echo Configuring stage profile in $(HOST_SUBDIR)/opcodes ; \
980 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
981 cd $(HOST_SUBDIR)/opcodes || exit 1; \
982@@ -5971,9 +6005,9 @@ configure-stagefeedback-opcodes:
983 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
984 test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
985 $(HOST_EXPORTS) \
986- $(POSTSTAGE1_HOST_EXPORTS) \
987+ $(POSTSTAGE1_HOST_EXPORTS) \
988 CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
989- LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
990+ CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \
991 echo Configuring stage feedback in $(HOST_SUBDIR)/opcodes ; \
992 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
993 cd $(HOST_SUBDIR)/opcodes || exit 1; \
994@@ -6008,7 +6042,8 @@ all-opcodes: configure-opcodes
995 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
996 $(HOST_EXPORTS) \
997 (cd $(HOST_SUBDIR)/opcodes && \
998- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-opcodes))
999+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
1000+ $(TARGET-opcodes))
1001 @endif opcodes
1002
1003
1004@@ -6027,8 +6062,11 @@ all-stage1-opcodes: configure-stage1-opc
1005 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1006 $(HOST_EXPORTS) \
1007 cd $(HOST_SUBDIR)/opcodes && \
1008- $(MAKE) $(FLAGS_TO_PASS) \
1009- CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \
1010+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1011+ CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
1012+ LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
1013+ CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
1014+ CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \
1015 $(TARGET-stage1-opcodes)
1016
1017 maybe-clean-stage1-opcodes: clean-stage1-opcodes
1018@@ -6041,7 +6079,7 @@ clean-stage1-opcodes:
1019 $(MAKE) stage1-start; \
1020 fi; \
1021 cd $(HOST_SUBDIR)/opcodes && \
1022- $(MAKE) $(FLAGS_TO_PASS) \
1023+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1024 clean
1025 @endif opcodes-bootstrap
1026
1027@@ -6061,8 +6099,11 @@ all-stage2-opcodes: configure-stage2-opc
1028 $(HOST_EXPORTS) \
1029 $(POSTSTAGE1_HOST_EXPORTS) \
1030 cd $(HOST_SUBDIR)/opcodes && \
1031- $(MAKE) $(FLAGS_TO_PASS) \
1032- CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
1033+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1034+ CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
1035+ LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
1036+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
1037+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
1038 $(TARGET-stage2-opcodes)
1039
1040 maybe-clean-stage2-opcodes: clean-stage2-opcodes
1041@@ -6075,7 +6116,7 @@ clean-stage2-opcodes:
1042 $(MAKE) stage2-start; \
1043 fi; \
1044 cd $(HOST_SUBDIR)/opcodes && \
1045- $(MAKE) $(FLAGS_TO_PASS) \
1046+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1047 $(POSTSTAGE1_FLAGS_TO_PASS) \
1048 clean
1049 @endif opcodes-bootstrap
1050@@ -6096,8 +6137,11 @@ all-stageb2g0-opcodes: configure-stageb2
1051 $(HOST_EXPORTS) \
1052 $(POSTSTAGE1_HOST_EXPORTS) \
1053 cd $(HOST_SUBDIR)/opcodes && \
1054- $(MAKE) $(FLAGS_TO_PASS) \
1055- CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS) \
1056+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1057+ CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
1058+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
1059+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
1060+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
1061 $(TARGET-stageb2g0-opcodes)
1062
1063 maybe-clean-stageb2g0-opcodes: clean-stageb2g0-opcodes
1064@@ -6110,7 +6154,7 @@ clean-stageb2g0-opcodes:
1065 $(MAKE) stageb2g0-start; \
1066 fi; \
1067 cd $(HOST_SUBDIR)/opcodes && \
1068- $(MAKE) $(FLAGS_TO_PASS) \
1069+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1070 $(POSTSTAGE1_FLAGS_TO_PASS) \
1071 clean
1072 @endif opcodes-bootstrap
1073@@ -6131,8 +6175,11 @@ all-stage3-opcodes: configure-stage3-opc
1074 $(HOST_EXPORTS) \
1075 $(POSTSTAGE1_HOST_EXPORTS) \
1076 cd $(HOST_SUBDIR)/opcodes && \
1077- $(MAKE) $(FLAGS_TO_PASS) \
1078- CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
1079+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1080+ CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
1081+ LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
1082+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
1083+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
1084 $(TARGET-stage3-opcodes)
1085
1086 maybe-clean-stage3-opcodes: clean-stage3-opcodes
1087@@ -6145,7 +6192,7 @@ clean-stage3-opcodes:
1088 $(MAKE) stage3-start; \
1089 fi; \
1090 cd $(HOST_SUBDIR)/opcodes && \
1091- $(MAKE) $(FLAGS_TO_PASS) \
1092+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1093 $(POSTSTAGE1_FLAGS_TO_PASS) \
1094 clean
1095 @endif opcodes-bootstrap
1096@@ -6166,8 +6213,11 @@ all-stageb3g2-opcodes: configure-stageb3
1097 $(HOST_EXPORTS) \
1098 $(POSTSTAGE1_HOST_EXPORTS) \
1099 cd $(HOST_SUBDIR)/opcodes && \
1100- $(MAKE) $(FLAGS_TO_PASS) \
1101- CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS) \
1102+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1103+ CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
1104+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
1105+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
1106+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
1107 $(TARGET-stageb3g2-opcodes)
1108
1109 maybe-clean-stageb3g2-opcodes: clean-stageb3g2-opcodes
1110@@ -6180,7 +6230,7 @@ clean-stageb3g2-opcodes:
1111 $(MAKE) stageb3g2-start; \
1112 fi; \
1113 cd $(HOST_SUBDIR)/opcodes && \
1114- $(MAKE) $(FLAGS_TO_PASS) \
1115+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1116 $(POSTSTAGE1_FLAGS_TO_PASS) \
1117 clean
1118 @endif opcodes-bootstrap
1119@@ -6201,8 +6251,11 @@ all-stage4-opcodes: configure-stage4-opc
1120 $(HOST_EXPORTS) \
1121 $(POSTSTAGE1_HOST_EXPORTS) \
1122 cd $(HOST_SUBDIR)/opcodes && \
1123- $(MAKE) $(FLAGS_TO_PASS) \
1124- CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
1125+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1126+ CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
1127+ LIBCFLAGS="$(STAGE4_CFLAGS)" \
1128+ CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
1129+ CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
1130 $(TARGET-stage4-opcodes)
1131
1132 maybe-clean-stage4-opcodes: clean-stage4-opcodes
1133@@ -6215,7 +6268,7 @@ clean-stage4-opcodes:
1134 $(MAKE) stage4-start; \
1135 fi; \
1136 cd $(HOST_SUBDIR)/opcodes && \
1137- $(MAKE) $(FLAGS_TO_PASS) \
1138+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1139 $(POSTSTAGE1_FLAGS_TO_PASS) \
1140 clean
1141 @endif opcodes-bootstrap
1142@@ -6236,8 +6289,11 @@ all-stageprofile-opcodes: configure-stag
1143 $(HOST_EXPORTS) \
1144 $(POSTSTAGE1_HOST_EXPORTS) \
1145 cd $(HOST_SUBDIR)/opcodes && \
1146- $(MAKE) $(FLAGS_TO_PASS) \
1147- CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS) \
1148+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1149+ CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
1150+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
1151+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
1152+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
1153 $(TARGET-stageprofile-opcodes)
1154
1155 maybe-clean-stageprofile-opcodes: clean-stageprofile-opcodes
1156@@ -6250,7 +6306,7 @@ clean-stageprofile-opcodes:
1157 $(MAKE) stageprofile-start; \
1158 fi; \
1159 cd $(HOST_SUBDIR)/opcodes && \
1160- $(MAKE) $(FLAGS_TO_PASS) \
1161+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1162 $(POSTSTAGE1_FLAGS_TO_PASS) \
1163 clean
1164 @endif opcodes-bootstrap
1165@@ -6271,8 +6327,11 @@ all-stagefeedback-opcodes: configure-sta
1166 $(HOST_EXPORTS) \
1167 $(POSTSTAGE1_HOST_EXPORTS) \
1168 cd $(HOST_SUBDIR)/opcodes && \
1169- $(MAKE) $(FLAGS_TO_PASS) \
1170- CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS) \
1171+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1172+ CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
1173+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
1174+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
1175+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
1176 $(TARGET-stagefeedback-opcodes)
1177
1178 maybe-clean-stagefeedback-opcodes: clean-stagefeedback-opcodes
1179@@ -6285,7 +6344,7 @@ clean-stagefeedback-opcodes:
1180 $(MAKE) stagefeedback-start; \
1181 fi; \
1182 cd $(HOST_SUBDIR)/opcodes && \
1183- $(MAKE) $(FLAGS_TO_PASS) \
1184+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1185 $(POSTSTAGE1_FLAGS_TO_PASS) \
1186 clean
1187 @endif opcodes-bootstrap
1188@@ -6692,9 +6751,9 @@ configure-stage1-binutils:
1189 @r=`${PWD_COMMAND}`; export r; \
1190 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1191 test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
1192- $(HOST_EXPORTS) \
1193+ $(HOST_EXPORTS) \
1194 CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
1195- LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
1196+ CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \
1197 echo Configuring stage 1 in $(HOST_SUBDIR)/binutils ; \
1198 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
1199 cd $(HOST_SUBDIR)/binutils || exit 1; \
1200@@ -6723,9 +6782,9 @@ configure-stage2-binutils:
1201 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1202 test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
1203 $(HOST_EXPORTS) \
1204- $(POSTSTAGE1_HOST_EXPORTS) \
1205+ $(POSTSTAGE1_HOST_EXPORTS) \
1206 CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
1207- LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
1208+ CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \
1209 echo Configuring stage 2 in $(HOST_SUBDIR)/binutils ; \
1210 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
1211 cd $(HOST_SUBDIR)/binutils || exit 1; \
1212@@ -6754,9 +6813,9 @@ configure-stageb2g0-binutils:
1213 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1214 test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
1215 $(HOST_EXPORTS) \
1216- $(POSTSTAGE1_HOST_EXPORTS) \
1217+ $(POSTSTAGE1_HOST_EXPORTS) \
1218 CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
1219- LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
1220+ CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS; \
1221 echo Configuring stage b2g0 in $(HOST_SUBDIR)/binutils ; \
1222 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
1223 cd $(HOST_SUBDIR)/binutils || exit 1; \
1224@@ -6785,9 +6844,9 @@ configure-stage3-binutils:
1225 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1226 test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
1227 $(HOST_EXPORTS) \
1228- $(POSTSTAGE1_HOST_EXPORTS) \
1229+ $(POSTSTAGE1_HOST_EXPORTS) \
1230 CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
1231- LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
1232+ CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \
1233 echo Configuring stage 3 in $(HOST_SUBDIR)/binutils ; \
1234 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
1235 cd $(HOST_SUBDIR)/binutils || exit 1; \
1236@@ -6816,9 +6875,9 @@ configure-stageb3g2-binutils:
1237 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1238 test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
1239 $(HOST_EXPORTS) \
1240- $(POSTSTAGE1_HOST_EXPORTS) \
1241+ $(POSTSTAGE1_HOST_EXPORTS) \
1242 CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
1243- LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
1244+ CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS; \
1245 echo Configuring stage b3g2 in $(HOST_SUBDIR)/binutils ; \
1246 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
1247 cd $(HOST_SUBDIR)/binutils || exit 1; \
1248@@ -6847,9 +6906,9 @@ configure-stage4-binutils:
1249 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1250 test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
1251 $(HOST_EXPORTS) \
1252- $(POSTSTAGE1_HOST_EXPORTS) \
1253+ $(POSTSTAGE1_HOST_EXPORTS) \
1254 CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
1255- LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
1256+ CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \
1257 echo Configuring stage 4 in $(HOST_SUBDIR)/binutils ; \
1258 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
1259 cd $(HOST_SUBDIR)/binutils || exit 1; \
1260@@ -6878,9 +6937,9 @@ configure-stageprofile-binutils:
1261 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1262 test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
1263 $(HOST_EXPORTS) \
1264- $(POSTSTAGE1_HOST_EXPORTS) \
1265+ $(POSTSTAGE1_HOST_EXPORTS) \
1266 CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
1267- LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
1268+ CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \
1269 echo Configuring stage profile in $(HOST_SUBDIR)/binutils ; \
1270 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
1271 cd $(HOST_SUBDIR)/binutils || exit 1; \
1272@@ -6909,9 +6968,9 @@ configure-stagefeedback-binutils:
1273 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1274 test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
1275 $(HOST_EXPORTS) \
1276- $(POSTSTAGE1_HOST_EXPORTS) \
1277+ $(POSTSTAGE1_HOST_EXPORTS) \
1278 CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
1279- LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
1280+ CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \
1281 echo Configuring stage feedback in $(HOST_SUBDIR)/binutils ; \
1282 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
1283 cd $(HOST_SUBDIR)/binutils || exit 1; \
1284@@ -6946,7 +7005,8 @@ all-binutils: configure-binutils
1285 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1286 $(HOST_EXPORTS) \
1287 (cd $(HOST_SUBDIR)/binutils && \
1288- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-binutils))
1289+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
1290+ $(TARGET-binutils))
1291 @endif binutils
1292
1293
1294@@ -6965,8 +7025,11 @@ all-stage1-binutils: configure-stage1-bi
1295 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1296 $(HOST_EXPORTS) \
1297 cd $(HOST_SUBDIR)/binutils && \
1298- $(MAKE) $(FLAGS_TO_PASS) \
1299- CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \
1300+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1301+ CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
1302+ LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
1303+ CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
1304+ CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \
1305 $(TARGET-stage1-binutils)
1306
1307 maybe-clean-stage1-binutils: clean-stage1-binutils
1308@@ -6979,7 +7042,7 @@ clean-stage1-binutils:
1309 $(MAKE) stage1-start; \
1310 fi; \
1311 cd $(HOST_SUBDIR)/binutils && \
1312- $(MAKE) $(FLAGS_TO_PASS) \
1313+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1314 clean
1315 @endif binutils-bootstrap
1316
1317@@ -6999,8 +7062,11 @@ all-stage2-binutils: configure-stage2-bi
1318 $(HOST_EXPORTS) \
1319 $(POSTSTAGE1_HOST_EXPORTS) \
1320 cd $(HOST_SUBDIR)/binutils && \
1321- $(MAKE) $(FLAGS_TO_PASS) \
1322- CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
1323+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1324+ CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
1325+ LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
1326+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
1327+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
1328 $(TARGET-stage2-binutils)
1329
1330 maybe-clean-stage2-binutils: clean-stage2-binutils
1331@@ -7013,7 +7079,7 @@ clean-stage2-binutils:
1332 $(MAKE) stage2-start; \
1333 fi; \
1334 cd $(HOST_SUBDIR)/binutils && \
1335- $(MAKE) $(FLAGS_TO_PASS) \
1336+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1337 $(POSTSTAGE1_FLAGS_TO_PASS) \
1338 clean
1339 @endif binutils-bootstrap
1340@@ -7034,8 +7100,11 @@ all-stageb2g0-binutils: configure-stageb
1341 $(HOST_EXPORTS) \
1342 $(POSTSTAGE1_HOST_EXPORTS) \
1343 cd $(HOST_SUBDIR)/binutils && \
1344- $(MAKE) $(FLAGS_TO_PASS) \
1345- CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS) \
1346+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1347+ CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
1348+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
1349+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
1350+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
1351 $(TARGET-stageb2g0-binutils)
1352
1353 maybe-clean-stageb2g0-binutils: clean-stageb2g0-binutils
1354@@ -7048,7 +7117,7 @@ clean-stageb2g0-binutils:
1355 $(MAKE) stageb2g0-start; \
1356 fi; \
1357 cd $(HOST_SUBDIR)/binutils && \
1358- $(MAKE) $(FLAGS_TO_PASS) \
1359+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1360 $(POSTSTAGE1_FLAGS_TO_PASS) \
1361 clean
1362 @endif binutils-bootstrap
1363@@ -7069,8 +7138,11 @@ all-stage3-binutils: configure-stage3-bi
1364 $(HOST_EXPORTS) \
1365 $(POSTSTAGE1_HOST_EXPORTS) \
1366 cd $(HOST_SUBDIR)/binutils && \
1367- $(MAKE) $(FLAGS_TO_PASS) \
1368- CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
1369+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1370+ CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
1371+ LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
1372+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
1373+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
1374 $(TARGET-stage3-binutils)
1375
1376 maybe-clean-stage3-binutils: clean-stage3-binutils
1377@@ -7083,7 +7155,7 @@ clean-stage3-binutils:
1378 $(MAKE) stage3-start; \
1379 fi; \
1380 cd $(HOST_SUBDIR)/binutils && \
1381- $(MAKE) $(FLAGS_TO_PASS) \
1382+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1383 $(POSTSTAGE1_FLAGS_TO_PASS) \
1384 clean
1385 @endif binutils-bootstrap
1386@@ -7104,8 +7176,11 @@ all-stageb3g2-binutils: configure-stageb
1387 $(HOST_EXPORTS) \
1388 $(POSTSTAGE1_HOST_EXPORTS) \
1389 cd $(HOST_SUBDIR)/binutils && \
1390- $(MAKE) $(FLAGS_TO_PASS) \
1391- CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS) \
1392+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1393+ CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
1394+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
1395+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
1396+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
1397 $(TARGET-stageb3g2-binutils)
1398
1399 maybe-clean-stageb3g2-binutils: clean-stageb3g2-binutils
1400@@ -7118,7 +7193,7 @@ clean-stageb3g2-binutils:
1401 $(MAKE) stageb3g2-start; \
1402 fi; \
1403 cd $(HOST_SUBDIR)/binutils && \
1404- $(MAKE) $(FLAGS_TO_PASS) \
1405+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1406 $(POSTSTAGE1_FLAGS_TO_PASS) \
1407 clean
1408 @endif binutils-bootstrap
1409@@ -7139,8 +7214,11 @@ all-stage4-binutils: configure-stage4-bi
1410 $(HOST_EXPORTS) \
1411 $(POSTSTAGE1_HOST_EXPORTS) \
1412 cd $(HOST_SUBDIR)/binutils && \
1413- $(MAKE) $(FLAGS_TO_PASS) \
1414- CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
1415+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1416+ CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
1417+ LIBCFLAGS="$(STAGE4_CFLAGS)" \
1418+ CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
1419+ CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
1420 $(TARGET-stage4-binutils)
1421
1422 maybe-clean-stage4-binutils: clean-stage4-binutils
1423@@ -7153,7 +7231,7 @@ clean-stage4-binutils:
1424 $(MAKE) stage4-start; \
1425 fi; \
1426 cd $(HOST_SUBDIR)/binutils && \
1427- $(MAKE) $(FLAGS_TO_PASS) \
1428+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1429 $(POSTSTAGE1_FLAGS_TO_PASS) \
1430 clean
1431 @endif binutils-bootstrap
1432@@ -7174,8 +7252,11 @@ all-stageprofile-binutils: configure-sta
1433 $(HOST_EXPORTS) \
1434 $(POSTSTAGE1_HOST_EXPORTS) \
1435 cd $(HOST_SUBDIR)/binutils && \
1436- $(MAKE) $(FLAGS_TO_PASS) \
1437- CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS) \
1438+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1439+ CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
1440+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
1441+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
1442+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
1443 $(TARGET-stageprofile-binutils)
1444
1445 maybe-clean-stageprofile-binutils: clean-stageprofile-binutils
1446@@ -7188,7 +7269,7 @@ clean-stageprofile-binutils:
1447 $(MAKE) stageprofile-start; \
1448 fi; \
1449 cd $(HOST_SUBDIR)/binutils && \
1450- $(MAKE) $(FLAGS_TO_PASS) \
1451+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1452 $(POSTSTAGE1_FLAGS_TO_PASS) \
1453 clean
1454 @endif binutils-bootstrap
1455@@ -7209,8 +7290,11 @@ all-stagefeedback-binutils: configure-st
1456 $(HOST_EXPORTS) \
1457 $(POSTSTAGE1_HOST_EXPORTS) \
1458 cd $(HOST_SUBDIR)/binutils && \
1459- $(MAKE) $(FLAGS_TO_PASS) \
1460- CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS) \
1461+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1462+ CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
1463+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
1464+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
1465+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
1466 $(TARGET-stagefeedback-binutils)
1467
1468 maybe-clean-stagefeedback-binutils: clean-stagefeedback-binutils
1469@@ -7223,7 +7307,7 @@ clean-stagefeedback-binutils:
1470 $(MAKE) stagefeedback-start; \
1471 fi; \
1472 cd $(HOST_SUBDIR)/binutils && \
1473- $(MAKE) $(FLAGS_TO_PASS) \
1474+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1475 $(POSTSTAGE1_FLAGS_TO_PASS) \
1476 clean
1477 @endif binutils-bootstrap
1478@@ -7637,7 +7721,8 @@ all-bison: configure-bison
1479 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1480 $(HOST_EXPORTS) \
1481 (cd $(HOST_SUBDIR)/bison && \
1482- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-bison))
1483+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
1484+ $(TARGET-bison))
1485 @endif bison
1486
1487
1488@@ -8064,7 +8149,8 @@ all-byacc: configure-byacc
1489 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1490 $(HOST_EXPORTS) \
1491 (cd $(HOST_SUBDIR)/byacc && \
1492- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-byacc))
1493+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
1494+ $(TARGET-byacc))
1495 @endif byacc
1496
1497
1498@@ -8491,7 +8577,8 @@ all-bzip2: configure-bzip2
1499 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1500 $(HOST_EXPORTS) \
1501 (cd $(HOST_SUBDIR)/bzip2 && \
1502- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-bzip2))
1503+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
1504+ $(TARGET-bzip2))
1505 @endif bzip2
1506
1507
1508@@ -8915,7 +9002,8 @@ all-dejagnu: configure-dejagnu
1509 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1510 $(HOST_EXPORTS) \
1511 (cd $(HOST_SUBDIR)/dejagnu && \
1512- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-dejagnu))
1513+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
1514+ $(TARGET-dejagnu))
1515 @endif dejagnu
1516
1517
1518@@ -9339,7 +9427,8 @@ all-diff: configure-diff
1519 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1520 $(HOST_EXPORTS) \
1521 (cd $(HOST_SUBDIR)/diff && \
1522- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-diff))
1523+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
1524+ $(TARGET-diff))
1525 @endif diff
1526
1527
1528@@ -9763,7 +9852,8 @@ all-dosutils: configure-dosutils
1529 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1530 $(HOST_EXPORTS) \
1531 (cd $(HOST_SUBDIR)/dosutils && \
1532- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-dosutils))
1533+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
1534+ $(TARGET-dosutils))
1535 @endif dosutils
1536
1537
1538@@ -10181,7 +10271,8 @@ all-etc: configure-etc
1539 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1540 $(HOST_EXPORTS) \
1541 (cd $(HOST_SUBDIR)/etc && \
1542- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-etc))
1543+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
1544+ $(TARGET-etc))
1545 @endif etc
1546
1547
1548@@ -10605,7 +10696,8 @@ all-fastjar: configure-fastjar
1549 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1550 $(HOST_EXPORTS) \
1551 (cd $(HOST_SUBDIR)/fastjar && \
1552- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-fastjar))
1553+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
1554+ $(TARGET-fastjar))
1555 @endif fastjar
1556
1557
1558@@ -11032,7 +11124,8 @@ all-fileutils: configure-fileutils
1559 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1560 $(HOST_EXPORTS) \
1561 (cd $(HOST_SUBDIR)/fileutils && \
1562- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-fileutils))
1563+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
1564+ $(TARGET-fileutils))
1565 @endif fileutils
1566
1567
1568@@ -11456,7 +11549,8 @@ all-findutils: configure-findutils
1569 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1570 $(HOST_EXPORTS) \
1571 (cd $(HOST_SUBDIR)/findutils && \
1572- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-findutils))
1573+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
1574+ $(TARGET-findutils))
1575 @endif findutils
1576
1577
1578@@ -11880,7 +11974,8 @@ all-find: configure-find
1579 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1580 $(HOST_EXPORTS) \
1581 (cd $(HOST_SUBDIR)/find && \
1582- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-find))
1583+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
1584+ $(TARGET-find))
1585 @endif find
1586
1587
1588@@ -12304,7 +12399,8 @@ all-fixincludes: configure-fixincludes
1589 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1590 $(HOST_EXPORTS) \
1591 (cd $(HOST_SUBDIR)/fixincludes && \
1592- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-fixincludes))
1593+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
1594+ $(TARGET-fixincludes))
1595 @endif fixincludes
1596
1597
1598@@ -12712,7 +12808,8 @@ all-flex: configure-flex
1599 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1600 $(HOST_EXPORTS) \
1601 (cd $(HOST_SUBDIR)/flex && \
1602- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-flex))
1603+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
1604+ $(TARGET-flex))
1605 @endif flex
1606
1607
1608@@ -13132,9 +13229,9 @@ configure-stage1-gas:
1609 @r=`${PWD_COMMAND}`; export r; \
1610 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1611 test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
1612- $(HOST_EXPORTS) \
1613+ $(HOST_EXPORTS) \
1614 CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
1615- LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
1616+ CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \
1617 echo Configuring stage 1 in $(HOST_SUBDIR)/gas ; \
1618 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
1619 cd $(HOST_SUBDIR)/gas || exit 1; \
1620@@ -13163,9 +13260,9 @@ configure-stage2-gas:
1621 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1622 test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
1623 $(HOST_EXPORTS) \
1624- $(POSTSTAGE1_HOST_EXPORTS) \
1625+ $(POSTSTAGE1_HOST_EXPORTS) \
1626 CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
1627- LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
1628+ CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \
1629 echo Configuring stage 2 in $(HOST_SUBDIR)/gas ; \
1630 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
1631 cd $(HOST_SUBDIR)/gas || exit 1; \
1632@@ -13194,9 +13291,9 @@ configure-stageb2g0-gas:
1633 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1634 test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
1635 $(HOST_EXPORTS) \
1636- $(POSTSTAGE1_HOST_EXPORTS) \
1637+ $(POSTSTAGE1_HOST_EXPORTS) \
1638 CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
1639- LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
1640+ CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS; \
1641 echo Configuring stage b2g0 in $(HOST_SUBDIR)/gas ; \
1642 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
1643 cd $(HOST_SUBDIR)/gas || exit 1; \
1644@@ -13225,9 +13322,9 @@ configure-stage3-gas:
1645 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1646 test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
1647 $(HOST_EXPORTS) \
1648- $(POSTSTAGE1_HOST_EXPORTS) \
1649+ $(POSTSTAGE1_HOST_EXPORTS) \
1650 CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
1651- LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
1652+ CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \
1653 echo Configuring stage 3 in $(HOST_SUBDIR)/gas ; \
1654 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
1655 cd $(HOST_SUBDIR)/gas || exit 1; \
1656@@ -13256,9 +13353,9 @@ configure-stageb3g2-gas:
1657 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1658 test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
1659 $(HOST_EXPORTS) \
1660- $(POSTSTAGE1_HOST_EXPORTS) \
1661+ $(POSTSTAGE1_HOST_EXPORTS) \
1662 CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
1663- LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
1664+ CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS; \
1665 echo Configuring stage b3g2 in $(HOST_SUBDIR)/gas ; \
1666 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
1667 cd $(HOST_SUBDIR)/gas || exit 1; \
1668@@ -13287,9 +13384,9 @@ configure-stage4-gas:
1669 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1670 test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
1671 $(HOST_EXPORTS) \
1672- $(POSTSTAGE1_HOST_EXPORTS) \
1673+ $(POSTSTAGE1_HOST_EXPORTS) \
1674 CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
1675- LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
1676+ CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \
1677 echo Configuring stage 4 in $(HOST_SUBDIR)/gas ; \
1678 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
1679 cd $(HOST_SUBDIR)/gas || exit 1; \
1680@@ -13318,9 +13415,9 @@ configure-stageprofile-gas:
1681 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1682 test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
1683 $(HOST_EXPORTS) \
1684- $(POSTSTAGE1_HOST_EXPORTS) \
1685+ $(POSTSTAGE1_HOST_EXPORTS) \
1686 CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
1687- LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
1688+ CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \
1689 echo Configuring stage profile in $(HOST_SUBDIR)/gas ; \
1690 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
1691 cd $(HOST_SUBDIR)/gas || exit 1; \
1692@@ -13349,9 +13446,9 @@ configure-stagefeedback-gas:
1693 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1694 test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
1695 $(HOST_EXPORTS) \
1696- $(POSTSTAGE1_HOST_EXPORTS) \
1697+ $(POSTSTAGE1_HOST_EXPORTS) \
1698 CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
1699- LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
1700+ CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \
1701 echo Configuring stage feedback in $(HOST_SUBDIR)/gas ; \
1702 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
1703 cd $(HOST_SUBDIR)/gas || exit 1; \
1704@@ -13386,7 +13483,8 @@ all-gas: configure-gas
1705 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1706 $(HOST_EXPORTS) \
1707 (cd $(HOST_SUBDIR)/gas && \
1708- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-gas))
1709+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
1710+ $(TARGET-gas))
1711 @endif gas
1712
1713
1714@@ -13405,8 +13503,11 @@ all-stage1-gas: configure-stage1-gas
1715 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1716 $(HOST_EXPORTS) \
1717 cd $(HOST_SUBDIR)/gas && \
1718- $(MAKE) $(FLAGS_TO_PASS) \
1719- CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \
1720+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1721+ CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
1722+ LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
1723+ CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
1724+ CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \
1725 $(TARGET-stage1-gas)
1726
1727 maybe-clean-stage1-gas: clean-stage1-gas
1728@@ -13419,7 +13520,7 @@ clean-stage1-gas:
1729 $(MAKE) stage1-start; \
1730 fi; \
1731 cd $(HOST_SUBDIR)/gas && \
1732- $(MAKE) $(FLAGS_TO_PASS) \
1733+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1734 clean
1735 @endif gas-bootstrap
1736
1737@@ -13439,8 +13540,11 @@ all-stage2-gas: configure-stage2-gas
1738 $(HOST_EXPORTS) \
1739 $(POSTSTAGE1_HOST_EXPORTS) \
1740 cd $(HOST_SUBDIR)/gas && \
1741- $(MAKE) $(FLAGS_TO_PASS) \
1742- CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
1743+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1744+ CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
1745+ LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
1746+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
1747+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
1748 $(TARGET-stage2-gas)
1749
1750 maybe-clean-stage2-gas: clean-stage2-gas
1751@@ -13453,7 +13557,7 @@ clean-stage2-gas:
1752 $(MAKE) stage2-start; \
1753 fi; \
1754 cd $(HOST_SUBDIR)/gas && \
1755- $(MAKE) $(FLAGS_TO_PASS) \
1756+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1757 $(POSTSTAGE1_FLAGS_TO_PASS) \
1758 clean
1759 @endif gas-bootstrap
1760@@ -13474,8 +13578,11 @@ all-stageb2g0-gas: configure-stageb2g0-g
1761 $(HOST_EXPORTS) \
1762 $(POSTSTAGE1_HOST_EXPORTS) \
1763 cd $(HOST_SUBDIR)/gas && \
1764- $(MAKE) $(FLAGS_TO_PASS) \
1765- CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS) \
1766+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1767+ CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
1768+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
1769+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
1770+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
1771 $(TARGET-stageb2g0-gas)
1772
1773 maybe-clean-stageb2g0-gas: clean-stageb2g0-gas
1774@@ -13488,7 +13595,7 @@ clean-stageb2g0-gas:
1775 $(MAKE) stageb2g0-start; \
1776 fi; \
1777 cd $(HOST_SUBDIR)/gas && \
1778- $(MAKE) $(FLAGS_TO_PASS) \
1779+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1780 $(POSTSTAGE1_FLAGS_TO_PASS) \
1781 clean
1782 @endif gas-bootstrap
1783@@ -13509,8 +13616,11 @@ all-stage3-gas: configure-stage3-gas
1784 $(HOST_EXPORTS) \
1785 $(POSTSTAGE1_HOST_EXPORTS) \
1786 cd $(HOST_SUBDIR)/gas && \
1787- $(MAKE) $(FLAGS_TO_PASS) \
1788- CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
1789+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1790+ CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
1791+ LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
1792+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
1793+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
1794 $(TARGET-stage3-gas)
1795
1796 maybe-clean-stage3-gas: clean-stage3-gas
1797@@ -13523,7 +13633,7 @@ clean-stage3-gas:
1798 $(MAKE) stage3-start; \
1799 fi; \
1800 cd $(HOST_SUBDIR)/gas && \
1801- $(MAKE) $(FLAGS_TO_PASS) \
1802+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1803 $(POSTSTAGE1_FLAGS_TO_PASS) \
1804 clean
1805 @endif gas-bootstrap
1806@@ -13544,8 +13654,11 @@ all-stageb3g2-gas: configure-stageb3g2-g
1807 $(HOST_EXPORTS) \
1808 $(POSTSTAGE1_HOST_EXPORTS) \
1809 cd $(HOST_SUBDIR)/gas && \
1810- $(MAKE) $(FLAGS_TO_PASS) \
1811- CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS) \
1812+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1813+ CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
1814+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
1815+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
1816+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
1817 $(TARGET-stageb3g2-gas)
1818
1819 maybe-clean-stageb3g2-gas: clean-stageb3g2-gas
1820@@ -13558,7 +13671,7 @@ clean-stageb3g2-gas:
1821 $(MAKE) stageb3g2-start; \
1822 fi; \
1823 cd $(HOST_SUBDIR)/gas && \
1824- $(MAKE) $(FLAGS_TO_PASS) \
1825+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1826 $(POSTSTAGE1_FLAGS_TO_PASS) \
1827 clean
1828 @endif gas-bootstrap
1829@@ -13579,8 +13692,11 @@ all-stage4-gas: configure-stage4-gas
1830 $(HOST_EXPORTS) \
1831 $(POSTSTAGE1_HOST_EXPORTS) \
1832 cd $(HOST_SUBDIR)/gas && \
1833- $(MAKE) $(FLAGS_TO_PASS) \
1834- CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
1835+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1836+ CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
1837+ LIBCFLAGS="$(STAGE4_CFLAGS)" \
1838+ CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
1839+ CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
1840 $(TARGET-stage4-gas)
1841
1842 maybe-clean-stage4-gas: clean-stage4-gas
1843@@ -13593,7 +13709,7 @@ clean-stage4-gas:
1844 $(MAKE) stage4-start; \
1845 fi; \
1846 cd $(HOST_SUBDIR)/gas && \
1847- $(MAKE) $(FLAGS_TO_PASS) \
1848+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1849 $(POSTSTAGE1_FLAGS_TO_PASS) \
1850 clean
1851 @endif gas-bootstrap
1852@@ -13614,8 +13730,11 @@ all-stageprofile-gas: configure-stagepro
1853 $(HOST_EXPORTS) \
1854 $(POSTSTAGE1_HOST_EXPORTS) \
1855 cd $(HOST_SUBDIR)/gas && \
1856- $(MAKE) $(FLAGS_TO_PASS) \
1857- CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS) \
1858+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1859+ CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
1860+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
1861+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
1862+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
1863 $(TARGET-stageprofile-gas)
1864
1865 maybe-clean-stageprofile-gas: clean-stageprofile-gas
1866@@ -13628,7 +13747,7 @@ clean-stageprofile-gas:
1867 $(MAKE) stageprofile-start; \
1868 fi; \
1869 cd $(HOST_SUBDIR)/gas && \
1870- $(MAKE) $(FLAGS_TO_PASS) \
1871+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1872 $(POSTSTAGE1_FLAGS_TO_PASS) \
1873 clean
1874 @endif gas-bootstrap
1875@@ -13649,8 +13768,11 @@ all-stagefeedback-gas: configure-stagefe
1876 $(HOST_EXPORTS) \
1877 $(POSTSTAGE1_HOST_EXPORTS) \
1878 cd $(HOST_SUBDIR)/gas && \
1879- $(MAKE) $(FLAGS_TO_PASS) \
1880- CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS) \
1881+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1882+ CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
1883+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
1884+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
1885+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
1886 $(TARGET-stagefeedback-gas)
1887
1888 maybe-clean-stagefeedback-gas: clean-stagefeedback-gas
1889@@ -13663,7 +13785,7 @@ clean-stagefeedback-gas:
1890 $(MAKE) stagefeedback-start; \
1891 fi; \
1892 cd $(HOST_SUBDIR)/gas && \
1893- $(MAKE) $(FLAGS_TO_PASS) \
1894+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1895 $(POSTSTAGE1_FLAGS_TO_PASS) \
1896 clean
1897 @endif gas-bootstrap
1898@@ -14070,9 +14192,9 @@ configure-stage1-gcc:
1899 @r=`${PWD_COMMAND}`; export r; \
1900 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1901 test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
1902- $(HOST_EXPORTS) \
1903+ $(HOST_EXPORTS) \
1904 CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
1905- LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
1906+ CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \
1907 echo Configuring stage 1 in $(HOST_SUBDIR)/gcc ; \
1908 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
1909 cd $(HOST_SUBDIR)/gcc || exit 1; \
1910@@ -14101,9 +14223,9 @@ configure-stage2-gcc:
1911 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1912 test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
1913 $(HOST_EXPORTS) \
1914- $(POSTSTAGE1_HOST_EXPORTS) \
1915+ $(POSTSTAGE1_HOST_EXPORTS) \
1916 CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
1917- LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
1918+ CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \
1919 echo Configuring stage 2 in $(HOST_SUBDIR)/gcc ; \
1920 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
1921 cd $(HOST_SUBDIR)/gcc || exit 1; \
1922@@ -14132,9 +14254,9 @@ configure-stageb2g0-gcc:
1923 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1924 test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
1925 $(HOST_EXPORTS) \
1926- $(POSTSTAGE1_HOST_EXPORTS) \
1927+ $(POSTSTAGE1_HOST_EXPORTS) \
1928 CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
1929- LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
1930+ CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS; \
1931 echo Configuring stage b2g0 in $(HOST_SUBDIR)/gcc ; \
1932 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
1933 cd $(HOST_SUBDIR)/gcc || exit 1; \
1934@@ -14163,9 +14285,9 @@ configure-stage3-gcc:
1935 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1936 test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
1937 $(HOST_EXPORTS) \
1938- $(POSTSTAGE1_HOST_EXPORTS) \
1939+ $(POSTSTAGE1_HOST_EXPORTS) \
1940 CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
1941- LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
1942+ CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \
1943 echo Configuring stage 3 in $(HOST_SUBDIR)/gcc ; \
1944 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
1945 cd $(HOST_SUBDIR)/gcc || exit 1; \
1946@@ -14194,9 +14316,9 @@ configure-stageb3g2-gcc:
1947 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1948 test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
1949 $(HOST_EXPORTS) \
1950- $(POSTSTAGE1_HOST_EXPORTS) \
1951+ $(POSTSTAGE1_HOST_EXPORTS) \
1952 CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
1953- LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
1954+ CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS; \
1955 echo Configuring stage b3g2 in $(HOST_SUBDIR)/gcc ; \
1956 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
1957 cd $(HOST_SUBDIR)/gcc || exit 1; \
1958@@ -14225,9 +14347,9 @@ configure-stage4-gcc:
1959 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1960 test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
1961 $(HOST_EXPORTS) \
1962- $(POSTSTAGE1_HOST_EXPORTS) \
1963+ $(POSTSTAGE1_HOST_EXPORTS) \
1964 CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
1965- LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
1966+ CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \
1967 echo Configuring stage 4 in $(HOST_SUBDIR)/gcc ; \
1968 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
1969 cd $(HOST_SUBDIR)/gcc || exit 1; \
1970@@ -14256,9 +14378,9 @@ configure-stageprofile-gcc:
1971 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1972 test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
1973 $(HOST_EXPORTS) \
1974- $(POSTSTAGE1_HOST_EXPORTS) \
1975+ $(POSTSTAGE1_HOST_EXPORTS) \
1976 CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
1977- LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
1978+ CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \
1979 echo Configuring stage profile in $(HOST_SUBDIR)/gcc ; \
1980 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
1981 cd $(HOST_SUBDIR)/gcc || exit 1; \
1982@@ -14287,9 +14409,9 @@ configure-stagefeedback-gcc:
1983 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1984 test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
1985 $(HOST_EXPORTS) \
1986- $(POSTSTAGE1_HOST_EXPORTS) \
1987+ $(POSTSTAGE1_HOST_EXPORTS) \
1988 CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
1989- LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
1990+ CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \
1991 echo Configuring stage feedback in $(HOST_SUBDIR)/gcc ; \
1992 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
1993 cd $(HOST_SUBDIR)/gcc || exit 1; \
1994@@ -14324,7 +14446,8 @@ all-gcc: configure-gcc
1995 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1996 $(HOST_EXPORTS) \
1997 (cd $(HOST_SUBDIR)/gcc && \
1998- $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) $(TARGET-gcc))
1999+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS) \
2000+ $(TARGET-gcc))
2001 @endif gcc
2002
2003
2004@@ -14343,8 +14466,11 @@ all-stage1-gcc: configure-stage1-gcc
2005 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2006 $(HOST_EXPORTS) \
2007 cd $(HOST_SUBDIR)/gcc && \
2008- $(MAKE) $(FLAGS_TO_PASS) \
2009- CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" $(EXTRA_GCC_FLAGS) \
2010+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2011+ CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
2012+ LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
2013+ CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
2014+ CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS) \
2015 $(TARGET-stage1-gcc)
2016
2017 maybe-clean-stage1-gcc: clean-stage1-gcc
2018@@ -14357,7 +14483,7 @@ clean-stage1-gcc:
2019 $(MAKE) stage1-start; \
2020 fi; \
2021 cd $(HOST_SUBDIR)/gcc && \
2022- $(MAKE) $(FLAGS_TO_PASS) \
2023+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2024 $(EXTRA_GCC_FLAGS) clean
2025 @endif gcc-bootstrap
2026
2027@@ -14377,8 +14503,11 @@ all-stage2-gcc: configure-stage2-gcc
2028 $(HOST_EXPORTS) \
2029 $(POSTSTAGE1_HOST_EXPORTS) \
2030 cd $(HOST_SUBDIR)/gcc && \
2031- $(MAKE) $(FLAGS_TO_PASS) \
2032- CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
2033+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2034+ CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
2035+ LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
2036+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
2037+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
2038 $(TARGET-stage2-gcc)
2039
2040 maybe-clean-stage2-gcc: clean-stage2-gcc
2041@@ -14391,7 +14520,7 @@ clean-stage2-gcc:
2042 $(MAKE) stage2-start; \
2043 fi; \
2044 cd $(HOST_SUBDIR)/gcc && \
2045- $(MAKE) $(FLAGS_TO_PASS) \
2046+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2047 $(POSTSTAGE1_FLAGS_TO_PASS) \
2048 $(EXTRA_GCC_FLAGS) clean
2049 @endif gcc-bootstrap
2050@@ -14412,8 +14541,11 @@ all-stageb2g0-gcc: configure-stageb2g0-g
2051 $(HOST_EXPORTS) \
2052 $(POSTSTAGE1_HOST_EXPORTS) \
2053 cd $(HOST_SUBDIR)/gcc && \
2054- $(MAKE) $(FLAGS_TO_PASS) \
2055- CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
2056+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2057+ CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
2058+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
2059+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
2060+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
2061 $(TARGET-stageb2g0-gcc)
2062
2063 maybe-clean-stageb2g0-gcc: clean-stageb2g0-gcc
2064@@ -14426,7 +14558,7 @@ clean-stageb2g0-gcc:
2065 $(MAKE) stageb2g0-start; \
2066 fi; \
2067 cd $(HOST_SUBDIR)/gcc && \
2068- $(MAKE) $(FLAGS_TO_PASS) \
2069+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2070 $(POSTSTAGE1_FLAGS_TO_PASS) \
2071 $(EXTRA_GCC_FLAGS) clean
2072 @endif gcc-bootstrap
2073@@ -14447,8 +14579,11 @@ all-stage3-gcc: configure-stage3-gcc
2074 $(HOST_EXPORTS) \
2075 $(POSTSTAGE1_HOST_EXPORTS) \
2076 cd $(HOST_SUBDIR)/gcc && \
2077- $(MAKE) $(FLAGS_TO_PASS) \
2078- CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
2079+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2080+ CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
2081+ LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
2082+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
2083+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
2084 $(TARGET-stage3-gcc)
2085
2086 maybe-clean-stage3-gcc: clean-stage3-gcc
2087@@ -14461,7 +14596,7 @@ clean-stage3-gcc:
2088 $(MAKE) stage3-start; \
2089 fi; \
2090 cd $(HOST_SUBDIR)/gcc && \
2091- $(MAKE) $(FLAGS_TO_PASS) \
2092+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2093 $(POSTSTAGE1_FLAGS_TO_PASS) \
2094 $(EXTRA_GCC_FLAGS) clean
2095 @endif gcc-bootstrap
2096@@ -14482,8 +14617,11 @@ all-stageb3g2-gcc: configure-stageb3g2-g
2097 $(HOST_EXPORTS) \
2098 $(POSTSTAGE1_HOST_EXPORTS) \
2099 cd $(HOST_SUBDIR)/gcc && \
2100- $(MAKE) $(FLAGS_TO_PASS) \
2101- CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
2102+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2103+ CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
2104+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
2105+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
2106+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
2107 $(TARGET-stageb3g2-gcc)
2108
2109 maybe-clean-stageb3g2-gcc: clean-stageb3g2-gcc
2110@@ -14496,7 +14634,7 @@ clean-stageb3g2-gcc:
2111 $(MAKE) stageb3g2-start; \
2112 fi; \
2113 cd $(HOST_SUBDIR)/gcc && \
2114- $(MAKE) $(FLAGS_TO_PASS) \
2115+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2116 $(POSTSTAGE1_FLAGS_TO_PASS) \
2117 $(EXTRA_GCC_FLAGS) clean
2118 @endif gcc-bootstrap
2119@@ -14517,8 +14655,11 @@ all-stage4-gcc: configure-stage4-gcc
2120 $(HOST_EXPORTS) \
2121 $(POSTSTAGE1_HOST_EXPORTS) \
2122 cd $(HOST_SUBDIR)/gcc && \
2123- $(MAKE) $(FLAGS_TO_PASS) \
2124- CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
2125+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2126+ CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
2127+ LIBCFLAGS="$(STAGE4_CFLAGS)" \
2128+ CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
2129+ CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
2130 $(TARGET-stage4-gcc)
2131
2132 maybe-clean-stage4-gcc: clean-stage4-gcc
2133@@ -14531,7 +14672,7 @@ clean-stage4-gcc:
2134 $(MAKE) stage4-start; \
2135 fi; \
2136 cd $(HOST_SUBDIR)/gcc && \
2137- $(MAKE) $(FLAGS_TO_PASS) \
2138+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2139 $(POSTSTAGE1_FLAGS_TO_PASS) \
2140 $(EXTRA_GCC_FLAGS) clean
2141 @endif gcc-bootstrap
2142@@ -14552,8 +14693,11 @@ all-stageprofile-gcc: configure-stagepro
2143 $(HOST_EXPORTS) \
2144 $(POSTSTAGE1_HOST_EXPORTS) \
2145 cd $(HOST_SUBDIR)/gcc && \
2146- $(MAKE) $(FLAGS_TO_PASS) \
2147- CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
2148+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2149+ CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
2150+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
2151+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
2152+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
2153 $(TARGET-stageprofile-gcc)
2154
2155 maybe-clean-stageprofile-gcc: clean-stageprofile-gcc
2156@@ -14566,7 +14710,7 @@ clean-stageprofile-gcc:
2157 $(MAKE) stageprofile-start; \
2158 fi; \
2159 cd $(HOST_SUBDIR)/gcc && \
2160- $(MAKE) $(FLAGS_TO_PASS) \
2161+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2162 $(POSTSTAGE1_FLAGS_TO_PASS) \
2163 $(EXTRA_GCC_FLAGS) clean
2164 @endif gcc-bootstrap
2165@@ -14587,8 +14731,11 @@ all-stagefeedback-gcc: configure-stagefe
2166 $(HOST_EXPORTS) \
2167 $(POSTSTAGE1_HOST_EXPORTS) \
2168 cd $(HOST_SUBDIR)/gcc && \
2169- $(MAKE) $(FLAGS_TO_PASS) \
2170- CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
2171+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2172+ CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
2173+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
2174+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
2175+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
2176 $(TARGET-stagefeedback-gcc)
2177
2178 maybe-clean-stagefeedback-gcc: clean-stagefeedback-gcc
2179@@ -14601,7 +14748,7 @@ clean-stagefeedback-gcc:
2180 $(MAKE) stagefeedback-start; \
2181 fi; \
2182 cd $(HOST_SUBDIR)/gcc && \
2183- $(MAKE) $(FLAGS_TO_PASS) \
2184+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2185 $(POSTSTAGE1_FLAGS_TO_PASS) \
2186 $(EXTRA_GCC_FLAGS) clean
2187 @endif gcc-bootstrap
2188@@ -15015,7 +15162,8 @@ all-gawk: configure-gawk
2189 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2190 $(HOST_EXPORTS) \
2191 (cd $(HOST_SUBDIR)/gawk && \
2192- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-gawk))
2193+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
2194+ $(TARGET-gawk))
2195 @endif gawk
2196
2197
2198@@ -15439,7 +15587,8 @@ all-gettext: configure-gettext
2199 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2200 $(HOST_EXPORTS) \
2201 (cd $(HOST_SUBDIR)/gettext && \
2202- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-gettext))
2203+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
2204+ $(TARGET-gettext))
2205 @endif gettext
2206
2207
2208@@ -15856,9 +16005,9 @@ configure-stage1-gmp:
2209 @r=`${PWD_COMMAND}`; export r; \
2210 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2211 test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
2212- $(HOST_EXPORTS) \
2213+ $(HOST_EXPORTS) \
2214 CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
2215- LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
2216+ CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \
2217 echo Configuring stage 1 in $(HOST_SUBDIR)/gmp ; \
2218 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
2219 cd $(HOST_SUBDIR)/gmp || exit 1; \
2220@@ -15887,9 +16036,9 @@ configure-stage2-gmp:
2221 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2222 test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
2223 $(HOST_EXPORTS) \
2224- $(POSTSTAGE1_HOST_EXPORTS) \
2225+ $(POSTSTAGE1_HOST_EXPORTS) \
2226 CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
2227- LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
2228+ CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \
2229 echo Configuring stage 2 in $(HOST_SUBDIR)/gmp ; \
2230 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
2231 cd $(HOST_SUBDIR)/gmp || exit 1; \
2232@@ -15918,9 +16067,9 @@ configure-stageb2g0-gmp:
2233 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2234 test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
2235 $(HOST_EXPORTS) \
2236- $(POSTSTAGE1_HOST_EXPORTS) \
2237+ $(POSTSTAGE1_HOST_EXPORTS) \
2238 CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
2239- LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
2240+ CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS; \
2241 echo Configuring stage b2g0 in $(HOST_SUBDIR)/gmp ; \
2242 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
2243 cd $(HOST_SUBDIR)/gmp || exit 1; \
2244@@ -15949,9 +16098,9 @@ configure-stage3-gmp:
2245 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2246 test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
2247 $(HOST_EXPORTS) \
2248- $(POSTSTAGE1_HOST_EXPORTS) \
2249+ $(POSTSTAGE1_HOST_EXPORTS) \
2250 CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
2251- LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
2252+ CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \
2253 echo Configuring stage 3 in $(HOST_SUBDIR)/gmp ; \
2254 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
2255 cd $(HOST_SUBDIR)/gmp || exit 1; \
2256@@ -15980,9 +16129,9 @@ configure-stageb3g2-gmp:
2257 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2258 test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
2259 $(HOST_EXPORTS) \
2260- $(POSTSTAGE1_HOST_EXPORTS) \
2261+ $(POSTSTAGE1_HOST_EXPORTS) \
2262 CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
2263- LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
2264+ CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS; \
2265 echo Configuring stage b3g2 in $(HOST_SUBDIR)/gmp ; \
2266 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
2267 cd $(HOST_SUBDIR)/gmp || exit 1; \
2268@@ -16011,9 +16160,9 @@ configure-stage4-gmp:
2269 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2270 test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
2271 $(HOST_EXPORTS) \
2272- $(POSTSTAGE1_HOST_EXPORTS) \
2273+ $(POSTSTAGE1_HOST_EXPORTS) \
2274 CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
2275- LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
2276+ CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \
2277 echo Configuring stage 4 in $(HOST_SUBDIR)/gmp ; \
2278 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
2279 cd $(HOST_SUBDIR)/gmp || exit 1; \
2280@@ -16042,9 +16191,9 @@ configure-stageprofile-gmp:
2281 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2282 test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
2283 $(HOST_EXPORTS) \
2284- $(POSTSTAGE1_HOST_EXPORTS) \
2285+ $(POSTSTAGE1_HOST_EXPORTS) \
2286 CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
2287- LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
2288+ CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \
2289 echo Configuring stage profile in $(HOST_SUBDIR)/gmp ; \
2290 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
2291 cd $(HOST_SUBDIR)/gmp || exit 1; \
2292@@ -16073,9 +16222,9 @@ configure-stagefeedback-gmp:
2293 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2294 test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
2295 $(HOST_EXPORTS) \
2296- $(POSTSTAGE1_HOST_EXPORTS) \
2297+ $(POSTSTAGE1_HOST_EXPORTS) \
2298 CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
2299- LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
2300+ CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \
2301 echo Configuring stage feedback in $(HOST_SUBDIR)/gmp ; \
2302 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
2303 cd $(HOST_SUBDIR)/gmp || exit 1; \
2304@@ -16110,7 +16259,8 @@ all-gmp: configure-gmp
2305 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2306 $(HOST_EXPORTS) \
2307 (cd $(HOST_SUBDIR)/gmp && \
2308- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-gmp))
2309+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
2310+ $(TARGET-gmp))
2311 @endif gmp
2312
2313
2314@@ -16129,8 +16279,11 @@ all-stage1-gmp: configure-stage1-gmp
2315 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2316 $(HOST_EXPORTS) \
2317 cd $(HOST_SUBDIR)/gmp && \
2318- $(MAKE) $(FLAGS_TO_PASS) \
2319- CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \
2320+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2321+ CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
2322+ LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
2323+ CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
2324+ CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \
2325 $(TARGET-stage1-gmp)
2326
2327 maybe-clean-stage1-gmp: clean-stage1-gmp
2328@@ -16143,7 +16296,7 @@ clean-stage1-gmp:
2329 $(MAKE) stage1-start; \
2330 fi; \
2331 cd $(HOST_SUBDIR)/gmp && \
2332- $(MAKE) $(FLAGS_TO_PASS) \
2333+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2334 clean
2335 @endif gmp-bootstrap
2336
2337@@ -16163,8 +16316,11 @@ all-stage2-gmp: configure-stage2-gmp
2338 $(HOST_EXPORTS) \
2339 $(POSTSTAGE1_HOST_EXPORTS) \
2340 cd $(HOST_SUBDIR)/gmp && \
2341- $(MAKE) $(FLAGS_TO_PASS) \
2342- CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
2343+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2344+ CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
2345+ LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
2346+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
2347+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
2348 $(TARGET-stage2-gmp)
2349
2350 maybe-clean-stage2-gmp: clean-stage2-gmp
2351@@ -16177,7 +16333,7 @@ clean-stage2-gmp:
2352 $(MAKE) stage2-start; \
2353 fi; \
2354 cd $(HOST_SUBDIR)/gmp && \
2355- $(MAKE) $(FLAGS_TO_PASS) \
2356+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2357 $(POSTSTAGE1_FLAGS_TO_PASS) \
2358 clean
2359 @endif gmp-bootstrap
2360@@ -16198,8 +16354,11 @@ all-stageb2g0-gmp: configure-stageb2g0-g
2361 $(HOST_EXPORTS) \
2362 $(POSTSTAGE1_HOST_EXPORTS) \
2363 cd $(HOST_SUBDIR)/gmp && \
2364- $(MAKE) $(FLAGS_TO_PASS) \
2365- CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS) \
2366+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2367+ CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
2368+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
2369+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
2370+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
2371 $(TARGET-stageb2g0-gmp)
2372
2373 maybe-clean-stageb2g0-gmp: clean-stageb2g0-gmp
2374@@ -16212,7 +16371,7 @@ clean-stageb2g0-gmp:
2375 $(MAKE) stageb2g0-start; \
2376 fi; \
2377 cd $(HOST_SUBDIR)/gmp && \
2378- $(MAKE) $(FLAGS_TO_PASS) \
2379+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2380 $(POSTSTAGE1_FLAGS_TO_PASS) \
2381 clean
2382 @endif gmp-bootstrap
2383@@ -16233,8 +16392,11 @@ all-stage3-gmp: configure-stage3-gmp
2384 $(HOST_EXPORTS) \
2385 $(POSTSTAGE1_HOST_EXPORTS) \
2386 cd $(HOST_SUBDIR)/gmp && \
2387- $(MAKE) $(FLAGS_TO_PASS) \
2388- CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
2389+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2390+ CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
2391+ LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
2392+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
2393+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
2394 $(TARGET-stage3-gmp)
2395
2396 maybe-clean-stage3-gmp: clean-stage3-gmp
2397@@ -16247,7 +16409,7 @@ clean-stage3-gmp:
2398 $(MAKE) stage3-start; \
2399 fi; \
2400 cd $(HOST_SUBDIR)/gmp && \
2401- $(MAKE) $(FLAGS_TO_PASS) \
2402+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2403 $(POSTSTAGE1_FLAGS_TO_PASS) \
2404 clean
2405 @endif gmp-bootstrap
2406@@ -16268,8 +16430,11 @@ all-stageb3g2-gmp: configure-stageb3g2-g
2407 $(HOST_EXPORTS) \
2408 $(POSTSTAGE1_HOST_EXPORTS) \
2409 cd $(HOST_SUBDIR)/gmp && \
2410- $(MAKE) $(FLAGS_TO_PASS) \
2411- CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS) \
2412+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2413+ CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
2414+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
2415+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
2416+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
2417 $(TARGET-stageb3g2-gmp)
2418
2419 maybe-clean-stageb3g2-gmp: clean-stageb3g2-gmp
2420@@ -16282,7 +16447,7 @@ clean-stageb3g2-gmp:
2421 $(MAKE) stageb3g2-start; \
2422 fi; \
2423 cd $(HOST_SUBDIR)/gmp && \
2424- $(MAKE) $(FLAGS_TO_PASS) \
2425+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2426 $(POSTSTAGE1_FLAGS_TO_PASS) \
2427 clean
2428 @endif gmp-bootstrap
2429@@ -16303,8 +16468,11 @@ all-stage4-gmp: configure-stage4-gmp
2430 $(HOST_EXPORTS) \
2431 $(POSTSTAGE1_HOST_EXPORTS) \
2432 cd $(HOST_SUBDIR)/gmp && \
2433- $(MAKE) $(FLAGS_TO_PASS) \
2434- CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
2435+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2436+ CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
2437+ LIBCFLAGS="$(STAGE4_CFLAGS)" \
2438+ CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
2439+ CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
2440 $(TARGET-stage4-gmp)
2441
2442 maybe-clean-stage4-gmp: clean-stage4-gmp
2443@@ -16317,7 +16485,7 @@ clean-stage4-gmp:
2444 $(MAKE) stage4-start; \
2445 fi; \
2446 cd $(HOST_SUBDIR)/gmp && \
2447- $(MAKE) $(FLAGS_TO_PASS) \
2448+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2449 $(POSTSTAGE1_FLAGS_TO_PASS) \
2450 clean
2451 @endif gmp-bootstrap
2452@@ -16338,8 +16506,11 @@ all-stageprofile-gmp: configure-stagepro
2453 $(HOST_EXPORTS) \
2454 $(POSTSTAGE1_HOST_EXPORTS) \
2455 cd $(HOST_SUBDIR)/gmp && \
2456- $(MAKE) $(FLAGS_TO_PASS) \
2457- CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS) \
2458+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2459+ CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
2460+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
2461+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
2462+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
2463 $(TARGET-stageprofile-gmp)
2464
2465 maybe-clean-stageprofile-gmp: clean-stageprofile-gmp
2466@@ -16352,7 +16523,7 @@ clean-stageprofile-gmp:
2467 $(MAKE) stageprofile-start; \
2468 fi; \
2469 cd $(HOST_SUBDIR)/gmp && \
2470- $(MAKE) $(FLAGS_TO_PASS) \
2471+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2472 $(POSTSTAGE1_FLAGS_TO_PASS) \
2473 clean
2474 @endif gmp-bootstrap
2475@@ -16373,8 +16544,11 @@ all-stagefeedback-gmp: configure-stagefe
2476 $(HOST_EXPORTS) \
2477 $(POSTSTAGE1_HOST_EXPORTS) \
2478 cd $(HOST_SUBDIR)/gmp && \
2479- $(MAKE) $(FLAGS_TO_PASS) \
2480- CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS) \
2481+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2482+ CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
2483+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
2484+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
2485+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
2486 $(TARGET-stagefeedback-gmp)
2487
2488 maybe-clean-stagefeedback-gmp: clean-stagefeedback-gmp
2489@@ -16387,7 +16561,7 @@ clean-stagefeedback-gmp:
2490 $(MAKE) stagefeedback-start; \
2491 fi; \
2492 cd $(HOST_SUBDIR)/gmp && \
2493- $(MAKE) $(FLAGS_TO_PASS) \
2494+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2495 $(POSTSTAGE1_FLAGS_TO_PASS) \
2496 clean
2497 @endif gmp-bootstrap
2498@@ -16788,9 +16962,9 @@ configure-stage1-mpfr:
2499 @r=`${PWD_COMMAND}`; export r; \
2500 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2501 test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
2502- $(HOST_EXPORTS) \
2503+ $(HOST_EXPORTS) \
2504 CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
2505- LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
2506+ CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \
2507 echo Configuring stage 1 in $(HOST_SUBDIR)/mpfr ; \
2508 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
2509 cd $(HOST_SUBDIR)/mpfr || exit 1; \
2510@@ -16819,9 +16993,9 @@ configure-stage2-mpfr:
2511 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2512 test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
2513 $(HOST_EXPORTS) \
2514- $(POSTSTAGE1_HOST_EXPORTS) \
2515+ $(POSTSTAGE1_HOST_EXPORTS) \
2516 CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
2517- LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
2518+ CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \
2519 echo Configuring stage 2 in $(HOST_SUBDIR)/mpfr ; \
2520 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
2521 cd $(HOST_SUBDIR)/mpfr || exit 1; \
2522@@ -16850,9 +17024,9 @@ configure-stageb2g0-mpfr:
2523 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2524 test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
2525 $(HOST_EXPORTS) \
2526- $(POSTSTAGE1_HOST_EXPORTS) \
2527+ $(POSTSTAGE1_HOST_EXPORTS) \
2528 CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
2529- LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
2530+ CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS; \
2531 echo Configuring stage b2g0 in $(HOST_SUBDIR)/mpfr ; \
2532 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
2533 cd $(HOST_SUBDIR)/mpfr || exit 1; \
2534@@ -16881,9 +17055,9 @@ configure-stage3-mpfr:
2535 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2536 test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
2537 $(HOST_EXPORTS) \
2538- $(POSTSTAGE1_HOST_EXPORTS) \
2539+ $(POSTSTAGE1_HOST_EXPORTS) \
2540 CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
2541- LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
2542+ CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \
2543 echo Configuring stage 3 in $(HOST_SUBDIR)/mpfr ; \
2544 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
2545 cd $(HOST_SUBDIR)/mpfr || exit 1; \
2546@@ -16912,9 +17086,9 @@ configure-stageb3g2-mpfr:
2547 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2548 test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
2549 $(HOST_EXPORTS) \
2550- $(POSTSTAGE1_HOST_EXPORTS) \
2551+ $(POSTSTAGE1_HOST_EXPORTS) \
2552 CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
2553- LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
2554+ CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS; \
2555 echo Configuring stage b3g2 in $(HOST_SUBDIR)/mpfr ; \
2556 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
2557 cd $(HOST_SUBDIR)/mpfr || exit 1; \
2558@@ -16943,9 +17117,9 @@ configure-stage4-mpfr:
2559 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2560 test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
2561 $(HOST_EXPORTS) \
2562- $(POSTSTAGE1_HOST_EXPORTS) \
2563+ $(POSTSTAGE1_HOST_EXPORTS) \
2564 CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
2565- LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
2566+ CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \
2567 echo Configuring stage 4 in $(HOST_SUBDIR)/mpfr ; \
2568 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
2569 cd $(HOST_SUBDIR)/mpfr || exit 1; \
2570@@ -16974,9 +17148,9 @@ configure-stageprofile-mpfr:
2571 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2572 test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
2573 $(HOST_EXPORTS) \
2574- $(POSTSTAGE1_HOST_EXPORTS) \
2575+ $(POSTSTAGE1_HOST_EXPORTS) \
2576 CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
2577- LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
2578+ CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \
2579 echo Configuring stage profile in $(HOST_SUBDIR)/mpfr ; \
2580 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
2581 cd $(HOST_SUBDIR)/mpfr || exit 1; \
2582@@ -17005,9 +17179,9 @@ configure-stagefeedback-mpfr:
2583 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2584 test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
2585 $(HOST_EXPORTS) \
2586- $(POSTSTAGE1_HOST_EXPORTS) \
2587+ $(POSTSTAGE1_HOST_EXPORTS) \
2588 CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
2589- LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
2590+ CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \
2591 echo Configuring stage feedback in $(HOST_SUBDIR)/mpfr ; \
2592 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
2593 cd $(HOST_SUBDIR)/mpfr || exit 1; \
2594@@ -17042,7 +17216,8 @@ all-mpfr: configure-mpfr
2595 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2596 $(HOST_EXPORTS) \
2597 (cd $(HOST_SUBDIR)/mpfr && \
2598- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-mpfr))
2599+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
2600+ $(TARGET-mpfr))
2601 @endif mpfr
2602
2603
2604@@ -17061,8 +17236,11 @@ all-stage1-mpfr: configure-stage1-mpfr
2605 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2606 $(HOST_EXPORTS) \
2607 cd $(HOST_SUBDIR)/mpfr && \
2608- $(MAKE) $(FLAGS_TO_PASS) \
2609- CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \
2610+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2611+ CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
2612+ LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
2613+ CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
2614+ CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \
2615 $(TARGET-stage1-mpfr)
2616
2617 maybe-clean-stage1-mpfr: clean-stage1-mpfr
2618@@ -17075,7 +17253,7 @@ clean-stage1-mpfr:
2619 $(MAKE) stage1-start; \
2620 fi; \
2621 cd $(HOST_SUBDIR)/mpfr && \
2622- $(MAKE) $(FLAGS_TO_PASS) \
2623+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2624 clean
2625 @endif mpfr-bootstrap
2626
2627@@ -17095,8 +17273,11 @@ all-stage2-mpfr: configure-stage2-mpfr
2628 $(HOST_EXPORTS) \
2629 $(POSTSTAGE1_HOST_EXPORTS) \
2630 cd $(HOST_SUBDIR)/mpfr && \
2631- $(MAKE) $(FLAGS_TO_PASS) \
2632- CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
2633+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2634+ CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
2635+ LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
2636+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
2637+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
2638 $(TARGET-stage2-mpfr)
2639
2640 maybe-clean-stage2-mpfr: clean-stage2-mpfr
2641@@ -17109,7 +17290,7 @@ clean-stage2-mpfr:
2642 $(MAKE) stage2-start; \
2643 fi; \
2644 cd $(HOST_SUBDIR)/mpfr && \
2645- $(MAKE) $(FLAGS_TO_PASS) \
2646+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2647 $(POSTSTAGE1_FLAGS_TO_PASS) \
2648 clean
2649 @endif mpfr-bootstrap
2650@@ -17130,8 +17311,11 @@ all-stageb2g0-mpfr: configure-stageb2g0-
2651 $(HOST_EXPORTS) \
2652 $(POSTSTAGE1_HOST_EXPORTS) \
2653 cd $(HOST_SUBDIR)/mpfr && \
2654- $(MAKE) $(FLAGS_TO_PASS) \
2655- CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS) \
2656+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2657+ CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
2658+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
2659+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
2660+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
2661 $(TARGET-stageb2g0-mpfr)
2662
2663 maybe-clean-stageb2g0-mpfr: clean-stageb2g0-mpfr
2664@@ -17144,7 +17328,7 @@ clean-stageb2g0-mpfr:
2665 $(MAKE) stageb2g0-start; \
2666 fi; \
2667 cd $(HOST_SUBDIR)/mpfr && \
2668- $(MAKE) $(FLAGS_TO_PASS) \
2669+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2670 $(POSTSTAGE1_FLAGS_TO_PASS) \
2671 clean
2672 @endif mpfr-bootstrap
2673@@ -17165,8 +17349,11 @@ all-stage3-mpfr: configure-stage3-mpfr
2674 $(HOST_EXPORTS) \
2675 $(POSTSTAGE1_HOST_EXPORTS) \
2676 cd $(HOST_SUBDIR)/mpfr && \
2677- $(MAKE) $(FLAGS_TO_PASS) \
2678- CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
2679+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2680+ CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
2681+ LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
2682+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
2683+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
2684 $(TARGET-stage3-mpfr)
2685
2686 maybe-clean-stage3-mpfr: clean-stage3-mpfr
2687@@ -17179,7 +17366,7 @@ clean-stage3-mpfr:
2688 $(MAKE) stage3-start; \
2689 fi; \
2690 cd $(HOST_SUBDIR)/mpfr && \
2691- $(MAKE) $(FLAGS_TO_PASS) \
2692+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2693 $(POSTSTAGE1_FLAGS_TO_PASS) \
2694 clean
2695 @endif mpfr-bootstrap
2696@@ -17200,8 +17387,11 @@ all-stageb3g2-mpfr: configure-stageb3g2-
2697 $(HOST_EXPORTS) \
2698 $(POSTSTAGE1_HOST_EXPORTS) \
2699 cd $(HOST_SUBDIR)/mpfr && \
2700- $(MAKE) $(FLAGS_TO_PASS) \
2701- CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS) \
2702+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2703+ CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
2704+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
2705+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
2706+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
2707 $(TARGET-stageb3g2-mpfr)
2708
2709 maybe-clean-stageb3g2-mpfr: clean-stageb3g2-mpfr
2710@@ -17214,7 +17404,7 @@ clean-stageb3g2-mpfr:
2711 $(MAKE) stageb3g2-start; \
2712 fi; \
2713 cd $(HOST_SUBDIR)/mpfr && \
2714- $(MAKE) $(FLAGS_TO_PASS) \
2715+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2716 $(POSTSTAGE1_FLAGS_TO_PASS) \
2717 clean
2718 @endif mpfr-bootstrap
2719@@ -17235,8 +17425,11 @@ all-stage4-mpfr: configure-stage4-mpfr
2720 $(HOST_EXPORTS) \
2721 $(POSTSTAGE1_HOST_EXPORTS) \
2722 cd $(HOST_SUBDIR)/mpfr && \
2723- $(MAKE) $(FLAGS_TO_PASS) \
2724- CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
2725+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2726+ CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
2727+ LIBCFLAGS="$(STAGE4_CFLAGS)" \
2728+ CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
2729+ CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
2730 $(TARGET-stage4-mpfr)
2731
2732 maybe-clean-stage4-mpfr: clean-stage4-mpfr
2733@@ -17249,7 +17442,7 @@ clean-stage4-mpfr:
2734 $(MAKE) stage4-start; \
2735 fi; \
2736 cd $(HOST_SUBDIR)/mpfr && \
2737- $(MAKE) $(FLAGS_TO_PASS) \
2738+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2739 $(POSTSTAGE1_FLAGS_TO_PASS) \
2740 clean
2741 @endif mpfr-bootstrap
2742@@ -17270,8 +17463,11 @@ all-stageprofile-mpfr: configure-stagepr
2743 $(HOST_EXPORTS) \
2744 $(POSTSTAGE1_HOST_EXPORTS) \
2745 cd $(HOST_SUBDIR)/mpfr && \
2746- $(MAKE) $(FLAGS_TO_PASS) \
2747- CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS) \
2748+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2749+ CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
2750+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
2751+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
2752+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
2753 $(TARGET-stageprofile-mpfr)
2754
2755 maybe-clean-stageprofile-mpfr: clean-stageprofile-mpfr
2756@@ -17284,7 +17480,7 @@ clean-stageprofile-mpfr:
2757 $(MAKE) stageprofile-start; \
2758 fi; \
2759 cd $(HOST_SUBDIR)/mpfr && \
2760- $(MAKE) $(FLAGS_TO_PASS) \
2761+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2762 $(POSTSTAGE1_FLAGS_TO_PASS) \
2763 clean
2764 @endif mpfr-bootstrap
2765@@ -17305,8 +17501,11 @@ all-stagefeedback-mpfr: configure-stagef
2766 $(HOST_EXPORTS) \
2767 $(POSTSTAGE1_HOST_EXPORTS) \
2768 cd $(HOST_SUBDIR)/mpfr && \
2769- $(MAKE) $(FLAGS_TO_PASS) \
2770- CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS) \
2771+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2772+ CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
2773+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
2774+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
2775+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
2776 $(TARGET-stagefeedback-mpfr)
2777
2778 maybe-clean-stagefeedback-mpfr: clean-stagefeedback-mpfr
2779@@ -17319,7 +17518,7 @@ clean-stagefeedback-mpfr:
2780 $(MAKE) stagefeedback-start; \
2781 fi; \
2782 cd $(HOST_SUBDIR)/mpfr && \
2783- $(MAKE) $(FLAGS_TO_PASS) \
2784+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2785 $(POSTSTAGE1_FLAGS_TO_PASS) \
2786 clean
2787 @endif mpfr-bootstrap
2788@@ -17727,7 +17926,8 @@ all-gnuserv: configure-gnuserv
2789 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2790 $(HOST_EXPORTS) \
2791 (cd $(HOST_SUBDIR)/gnuserv && \
2792- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-gnuserv))
2793+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
2794+ $(TARGET-gnuserv))
2795 @endif gnuserv
2796
2797
2798@@ -18151,7 +18351,8 @@ all-gprof: configure-gprof
2799 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2800 $(HOST_EXPORTS) \
2801 (cd $(HOST_SUBDIR)/gprof && \
2802- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-gprof))
2803+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
2804+ $(TARGET-gprof))
2805 @endif gprof
2806
2807
2808@@ -18575,7 +18776,8 @@ all-gzip: configure-gzip
2809 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2810 $(HOST_EXPORTS) \
2811 (cd $(HOST_SUBDIR)/gzip && \
2812- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-gzip))
2813+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
2814+ $(TARGET-gzip))
2815 @endif gzip
2816
2817
2818@@ -18999,7 +19201,8 @@ all-hello: configure-hello
2819 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2820 $(HOST_EXPORTS) \
2821 (cd $(HOST_SUBDIR)/hello && \
2822- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-hello))
2823+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
2824+ $(TARGET-hello))
2825 @endif hello
2826
2827
2828@@ -19423,7 +19626,8 @@ all-indent: configure-indent
2829 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2830 $(HOST_EXPORTS) \
2831 (cd $(HOST_SUBDIR)/indent && \
2832- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-indent))
2833+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
2834+ $(TARGET-indent))
2835 @endif indent
2836
2837
2838@@ -19840,9 +20044,9 @@ configure-stage1-intl:
2839 @r=`${PWD_COMMAND}`; export r; \
2840 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2841 test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
2842- $(HOST_EXPORTS) \
2843+ $(HOST_EXPORTS) \
2844 CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
2845- LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
2846+ CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \
2847 echo Configuring stage 1 in $(HOST_SUBDIR)/intl ; \
2848 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
2849 cd $(HOST_SUBDIR)/intl || exit 1; \
2850@@ -19871,9 +20075,9 @@ configure-stage2-intl:
2851 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2852 test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
2853 $(HOST_EXPORTS) \
2854- $(POSTSTAGE1_HOST_EXPORTS) \
2855+ $(POSTSTAGE1_HOST_EXPORTS) \
2856 CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
2857- LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
2858+ CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \
2859 echo Configuring stage 2 in $(HOST_SUBDIR)/intl ; \
2860 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
2861 cd $(HOST_SUBDIR)/intl || exit 1; \
2862@@ -19902,9 +20106,9 @@ configure-stageb2g0-intl:
2863 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2864 test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
2865 $(HOST_EXPORTS) \
2866- $(POSTSTAGE1_HOST_EXPORTS) \
2867+ $(POSTSTAGE1_HOST_EXPORTS) \
2868 CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
2869- LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
2870+ CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS; \
2871 echo Configuring stage b2g0 in $(HOST_SUBDIR)/intl ; \
2872 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
2873 cd $(HOST_SUBDIR)/intl || exit 1; \
2874@@ -19933,9 +20137,9 @@ configure-stage3-intl:
2875 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2876 test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
2877 $(HOST_EXPORTS) \
2878- $(POSTSTAGE1_HOST_EXPORTS) \
2879+ $(POSTSTAGE1_HOST_EXPORTS) \
2880 CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
2881- LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
2882+ CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \
2883 echo Configuring stage 3 in $(HOST_SUBDIR)/intl ; \
2884 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
2885 cd $(HOST_SUBDIR)/intl || exit 1; \
2886@@ -19964,9 +20168,9 @@ configure-stageb3g2-intl:
2887 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2888 test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
2889 $(HOST_EXPORTS) \
2890- $(POSTSTAGE1_HOST_EXPORTS) \
2891+ $(POSTSTAGE1_HOST_EXPORTS) \
2892 CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
2893- LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
2894+ CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS; \
2895 echo Configuring stage b3g2 in $(HOST_SUBDIR)/intl ; \
2896 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
2897 cd $(HOST_SUBDIR)/intl || exit 1; \
2898@@ -19995,9 +20199,9 @@ configure-stage4-intl:
2899 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2900 test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
2901 $(HOST_EXPORTS) \
2902- $(POSTSTAGE1_HOST_EXPORTS) \
2903+ $(POSTSTAGE1_HOST_EXPORTS) \
2904 CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
2905- LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
2906+ CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \
2907 echo Configuring stage 4 in $(HOST_SUBDIR)/intl ; \
2908 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
2909 cd $(HOST_SUBDIR)/intl || exit 1; \
2910@@ -20026,9 +20230,9 @@ configure-stageprofile-intl:
2911 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2912 test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
2913 $(HOST_EXPORTS) \
2914- $(POSTSTAGE1_HOST_EXPORTS) \
2915+ $(POSTSTAGE1_HOST_EXPORTS) \
2916 CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
2917- LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
2918+ CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \
2919 echo Configuring stage profile in $(HOST_SUBDIR)/intl ; \
2920 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
2921 cd $(HOST_SUBDIR)/intl || exit 1; \
2922@@ -20057,9 +20261,9 @@ configure-stagefeedback-intl:
2923 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2924 test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
2925 $(HOST_EXPORTS) \
2926- $(POSTSTAGE1_HOST_EXPORTS) \
2927+ $(POSTSTAGE1_HOST_EXPORTS) \
2928 CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
2929- LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
2930+ CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \
2931 echo Configuring stage feedback in $(HOST_SUBDIR)/intl ; \
2932 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
2933 cd $(HOST_SUBDIR)/intl || exit 1; \
2934@@ -20094,7 +20298,8 @@ all-intl: configure-intl
2935 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2936 $(HOST_EXPORTS) \
2937 (cd $(HOST_SUBDIR)/intl && \
2938- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-intl))
2939+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
2940+ $(TARGET-intl))
2941 @endif intl
2942
2943
2944@@ -20113,8 +20318,11 @@ all-stage1-intl: configure-stage1-intl
2945 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2946 $(HOST_EXPORTS) \
2947 cd $(HOST_SUBDIR)/intl && \
2948- $(MAKE) $(FLAGS_TO_PASS) \
2949- CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \
2950+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2951+ CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
2952+ LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
2953+ CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
2954+ CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \
2955 $(TARGET-stage1-intl)
2956
2957 maybe-clean-stage1-intl: clean-stage1-intl
2958@@ -20127,7 +20335,7 @@ clean-stage1-intl:
2959 $(MAKE) stage1-start; \
2960 fi; \
2961 cd $(HOST_SUBDIR)/intl && \
2962- $(MAKE) $(FLAGS_TO_PASS) \
2963+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2964 clean
2965 @endif intl-bootstrap
2966
2967@@ -20147,8 +20355,11 @@ all-stage2-intl: configure-stage2-intl
2968 $(HOST_EXPORTS) \
2969 $(POSTSTAGE1_HOST_EXPORTS) \
2970 cd $(HOST_SUBDIR)/intl && \
2971- $(MAKE) $(FLAGS_TO_PASS) \
2972- CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
2973+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2974+ CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
2975+ LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
2976+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
2977+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
2978 $(TARGET-stage2-intl)
2979
2980 maybe-clean-stage2-intl: clean-stage2-intl
2981@@ -20161,7 +20372,7 @@ clean-stage2-intl:
2982 $(MAKE) stage2-start; \
2983 fi; \
2984 cd $(HOST_SUBDIR)/intl && \
2985- $(MAKE) $(FLAGS_TO_PASS) \
2986+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2987 $(POSTSTAGE1_FLAGS_TO_PASS) \
2988 clean
2989 @endif intl-bootstrap
2990@@ -20182,8 +20393,11 @@ all-stageb2g0-intl: configure-stageb2g0-
2991 $(HOST_EXPORTS) \
2992 $(POSTSTAGE1_HOST_EXPORTS) \
2993 cd $(HOST_SUBDIR)/intl && \
2994- $(MAKE) $(FLAGS_TO_PASS) \
2995- CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS) \
2996+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2997+ CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
2998+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
2999+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
3000+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3001 $(TARGET-stageb2g0-intl)
3002
3003 maybe-clean-stageb2g0-intl: clean-stageb2g0-intl
3004@@ -20196,7 +20410,7 @@ clean-stageb2g0-intl:
3005 $(MAKE) stageb2g0-start; \
3006 fi; \
3007 cd $(HOST_SUBDIR)/intl && \
3008- $(MAKE) $(FLAGS_TO_PASS) \
3009+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3010 $(POSTSTAGE1_FLAGS_TO_PASS) \
3011 clean
3012 @endif intl-bootstrap
3013@@ -20217,8 +20431,11 @@ all-stage3-intl: configure-stage3-intl
3014 $(HOST_EXPORTS) \
3015 $(POSTSTAGE1_HOST_EXPORTS) \
3016 cd $(HOST_SUBDIR)/intl && \
3017- $(MAKE) $(FLAGS_TO_PASS) \
3018- CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
3019+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3020+ CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
3021+ LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
3022+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
3023+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3024 $(TARGET-stage3-intl)
3025
3026 maybe-clean-stage3-intl: clean-stage3-intl
3027@@ -20231,7 +20448,7 @@ clean-stage3-intl:
3028 $(MAKE) stage3-start; \
3029 fi; \
3030 cd $(HOST_SUBDIR)/intl && \
3031- $(MAKE) $(FLAGS_TO_PASS) \
3032+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3033 $(POSTSTAGE1_FLAGS_TO_PASS) \
3034 clean
3035 @endif intl-bootstrap
3036@@ -20252,8 +20469,11 @@ all-stageb3g2-intl: configure-stageb3g2-
3037 $(HOST_EXPORTS) \
3038 $(POSTSTAGE1_HOST_EXPORTS) \
3039 cd $(HOST_SUBDIR)/intl && \
3040- $(MAKE) $(FLAGS_TO_PASS) \
3041- CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS) \
3042+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3043+ CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
3044+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
3045+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
3046+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3047 $(TARGET-stageb3g2-intl)
3048
3049 maybe-clean-stageb3g2-intl: clean-stageb3g2-intl
3050@@ -20266,7 +20486,7 @@ clean-stageb3g2-intl:
3051 $(MAKE) stageb3g2-start; \
3052 fi; \
3053 cd $(HOST_SUBDIR)/intl && \
3054- $(MAKE) $(FLAGS_TO_PASS) \
3055+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3056 $(POSTSTAGE1_FLAGS_TO_PASS) \
3057 clean
3058 @endif intl-bootstrap
3059@@ -20287,8 +20507,11 @@ all-stage4-intl: configure-stage4-intl
3060 $(HOST_EXPORTS) \
3061 $(POSTSTAGE1_HOST_EXPORTS) \
3062 cd $(HOST_SUBDIR)/intl && \
3063- $(MAKE) $(FLAGS_TO_PASS) \
3064- CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
3065+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3066+ CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
3067+ LIBCFLAGS="$(STAGE4_CFLAGS)" \
3068+ CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
3069+ CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3070 $(TARGET-stage4-intl)
3071
3072 maybe-clean-stage4-intl: clean-stage4-intl
3073@@ -20301,7 +20524,7 @@ clean-stage4-intl:
3074 $(MAKE) stage4-start; \
3075 fi; \
3076 cd $(HOST_SUBDIR)/intl && \
3077- $(MAKE) $(FLAGS_TO_PASS) \
3078+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3079 $(POSTSTAGE1_FLAGS_TO_PASS) \
3080 clean
3081 @endif intl-bootstrap
3082@@ -20322,8 +20545,11 @@ all-stageprofile-intl: configure-stagepr
3083 $(HOST_EXPORTS) \
3084 $(POSTSTAGE1_HOST_EXPORTS) \
3085 cd $(HOST_SUBDIR)/intl && \
3086- $(MAKE) $(FLAGS_TO_PASS) \
3087- CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS) \
3088+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3089+ CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
3090+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
3091+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
3092+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3093 $(TARGET-stageprofile-intl)
3094
3095 maybe-clean-stageprofile-intl: clean-stageprofile-intl
3096@@ -20336,7 +20562,7 @@ clean-stageprofile-intl:
3097 $(MAKE) stageprofile-start; \
3098 fi; \
3099 cd $(HOST_SUBDIR)/intl && \
3100- $(MAKE) $(FLAGS_TO_PASS) \
3101+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3102 $(POSTSTAGE1_FLAGS_TO_PASS) \
3103 clean
3104 @endif intl-bootstrap
3105@@ -20357,8 +20583,11 @@ all-stagefeedback-intl: configure-stagef
3106 $(HOST_EXPORTS) \
3107 $(POSTSTAGE1_HOST_EXPORTS) \
3108 cd $(HOST_SUBDIR)/intl && \
3109- $(MAKE) $(FLAGS_TO_PASS) \
3110- CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS) \
3111+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3112+ CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
3113+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
3114+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
3115+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3116 $(TARGET-stagefeedback-intl)
3117
3118 maybe-clean-stagefeedback-intl: clean-stagefeedback-intl
3119@@ -20371,7 +20600,7 @@ clean-stagefeedback-intl:
3120 $(MAKE) stagefeedback-start; \
3121 fi; \
3122 cd $(HOST_SUBDIR)/intl && \
3123- $(MAKE) $(FLAGS_TO_PASS) \
3124+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3125 $(POSTSTAGE1_FLAGS_TO_PASS) \
3126 clean
3127 @endif intl-bootstrap
3128@@ -20785,7 +21014,8 @@ all-tcl: configure-tcl
3129 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3130 $(HOST_EXPORTS) \
3131 (cd $(HOST_SUBDIR)/tcl && \
3132- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-tcl))
3133+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
3134+ $(TARGET-tcl))
3135 @endif tcl
3136
3137
3138@@ -21194,7 +21424,8 @@ all-itcl: configure-itcl
3139 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3140 $(HOST_EXPORTS) \
3141 (cd $(HOST_SUBDIR)/itcl && \
3142- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-itcl))
3143+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
3144+ $(TARGET-itcl))
3145 @endif itcl
3146
3147
3148@@ -21611,9 +21842,9 @@ configure-stage1-ld:
3149 @r=`${PWD_COMMAND}`; export r; \
3150 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3151 test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
3152- $(HOST_EXPORTS) \
3153+ $(HOST_EXPORTS) \
3154 CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
3155- LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
3156+ CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \
3157 echo Configuring stage 1 in $(HOST_SUBDIR)/ld ; \
3158 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
3159 cd $(HOST_SUBDIR)/ld || exit 1; \
3160@@ -21642,9 +21873,9 @@ configure-stage2-ld:
3161 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3162 test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
3163 $(HOST_EXPORTS) \
3164- $(POSTSTAGE1_HOST_EXPORTS) \
3165+ $(POSTSTAGE1_HOST_EXPORTS) \
3166 CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
3167- LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
3168+ CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \
3169 echo Configuring stage 2 in $(HOST_SUBDIR)/ld ; \
3170 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
3171 cd $(HOST_SUBDIR)/ld || exit 1; \
3172@@ -21673,9 +21904,9 @@ configure-stageb2g0-ld:
3173 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3174 test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
3175 $(HOST_EXPORTS) \
3176- $(POSTSTAGE1_HOST_EXPORTS) \
3177+ $(POSTSTAGE1_HOST_EXPORTS) \
3178 CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
3179- LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
3180+ CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS; \
3181 echo Configuring stage b2g0 in $(HOST_SUBDIR)/ld ; \
3182 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
3183 cd $(HOST_SUBDIR)/ld || exit 1; \
3184@@ -21704,9 +21935,9 @@ configure-stage3-ld:
3185 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3186 test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
3187 $(HOST_EXPORTS) \
3188- $(POSTSTAGE1_HOST_EXPORTS) \
3189+ $(POSTSTAGE1_HOST_EXPORTS) \
3190 CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
3191- LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
3192+ CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \
3193 echo Configuring stage 3 in $(HOST_SUBDIR)/ld ; \
3194 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
3195 cd $(HOST_SUBDIR)/ld || exit 1; \
3196@@ -21735,9 +21966,9 @@ configure-stageb3g2-ld:
3197 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3198 test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
3199 $(HOST_EXPORTS) \
3200- $(POSTSTAGE1_HOST_EXPORTS) \
3201+ $(POSTSTAGE1_HOST_EXPORTS) \
3202 CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
3203- LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
3204+ CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS; \
3205 echo Configuring stage b3g2 in $(HOST_SUBDIR)/ld ; \
3206 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
3207 cd $(HOST_SUBDIR)/ld || exit 1; \
3208@@ -21766,9 +21997,9 @@ configure-stage4-ld:
3209 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3210 test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
3211 $(HOST_EXPORTS) \
3212- $(POSTSTAGE1_HOST_EXPORTS) \
3213+ $(POSTSTAGE1_HOST_EXPORTS) \
3214 CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
3215- LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
3216+ CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \
3217 echo Configuring stage 4 in $(HOST_SUBDIR)/ld ; \
3218 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
3219 cd $(HOST_SUBDIR)/ld || exit 1; \
3220@@ -21797,9 +22028,9 @@ configure-stageprofile-ld:
3221 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3222 test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
3223 $(HOST_EXPORTS) \
3224- $(POSTSTAGE1_HOST_EXPORTS) \
3225+ $(POSTSTAGE1_HOST_EXPORTS) \
3226 CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
3227- LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
3228+ CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \
3229 echo Configuring stage profile in $(HOST_SUBDIR)/ld ; \
3230 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
3231 cd $(HOST_SUBDIR)/ld || exit 1; \
3232@@ -21828,9 +22059,9 @@ configure-stagefeedback-ld:
3233 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3234 test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
3235 $(HOST_EXPORTS) \
3236- $(POSTSTAGE1_HOST_EXPORTS) \
3237+ $(POSTSTAGE1_HOST_EXPORTS) \
3238 CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
3239- LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
3240+ CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \
3241 echo Configuring stage feedback in $(HOST_SUBDIR)/ld ; \
3242 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
3243 cd $(HOST_SUBDIR)/ld || exit 1; \
3244@@ -21865,7 +22096,8 @@ all-ld: configure-ld
3245 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3246 $(HOST_EXPORTS) \
3247 (cd $(HOST_SUBDIR)/ld && \
3248- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-ld))
3249+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
3250+ $(TARGET-ld))
3251 @endif ld
3252
3253
3254@@ -21884,8 +22116,11 @@ all-stage1-ld: configure-stage1-ld
3255 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3256 $(HOST_EXPORTS) \
3257 cd $(HOST_SUBDIR)/ld && \
3258- $(MAKE) $(FLAGS_TO_PASS) \
3259- CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \
3260+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3261+ CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
3262+ LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
3263+ CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
3264+ CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \
3265 $(TARGET-stage1-ld)
3266
3267 maybe-clean-stage1-ld: clean-stage1-ld
3268@@ -21898,7 +22133,7 @@ clean-stage1-ld:
3269 $(MAKE) stage1-start; \
3270 fi; \
3271 cd $(HOST_SUBDIR)/ld && \
3272- $(MAKE) $(FLAGS_TO_PASS) \
3273+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3274 clean
3275 @endif ld-bootstrap
3276
3277@@ -21918,8 +22153,11 @@ all-stage2-ld: configure-stage2-ld
3278 $(HOST_EXPORTS) \
3279 $(POSTSTAGE1_HOST_EXPORTS) \
3280 cd $(HOST_SUBDIR)/ld && \
3281- $(MAKE) $(FLAGS_TO_PASS) \
3282- CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
3283+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3284+ CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
3285+ LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
3286+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
3287+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3288 $(TARGET-stage2-ld)
3289
3290 maybe-clean-stage2-ld: clean-stage2-ld
3291@@ -21932,7 +22170,7 @@ clean-stage2-ld:
3292 $(MAKE) stage2-start; \
3293 fi; \
3294 cd $(HOST_SUBDIR)/ld && \
3295- $(MAKE) $(FLAGS_TO_PASS) \
3296+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3297 $(POSTSTAGE1_FLAGS_TO_PASS) \
3298 clean
3299 @endif ld-bootstrap
3300@@ -21953,8 +22191,11 @@ all-stageb2g0-ld: configure-stageb2g0-ld
3301 $(HOST_EXPORTS) \
3302 $(POSTSTAGE1_HOST_EXPORTS) \
3303 cd $(HOST_SUBDIR)/ld && \
3304- $(MAKE) $(FLAGS_TO_PASS) \
3305- CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS) \
3306+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3307+ CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
3308+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
3309+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
3310+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3311 $(TARGET-stageb2g0-ld)
3312
3313 maybe-clean-stageb2g0-ld: clean-stageb2g0-ld
3314@@ -21967,7 +22208,7 @@ clean-stageb2g0-ld:
3315 $(MAKE) stageb2g0-start; \
3316 fi; \
3317 cd $(HOST_SUBDIR)/ld && \
3318- $(MAKE) $(FLAGS_TO_PASS) \
3319+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3320 $(POSTSTAGE1_FLAGS_TO_PASS) \
3321 clean
3322 @endif ld-bootstrap
3323@@ -21988,8 +22229,11 @@ all-stage3-ld: configure-stage3-ld
3324 $(HOST_EXPORTS) \
3325 $(POSTSTAGE1_HOST_EXPORTS) \
3326 cd $(HOST_SUBDIR)/ld && \
3327- $(MAKE) $(FLAGS_TO_PASS) \
3328- CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
3329+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3330+ CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
3331+ LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
3332+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
3333+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3334 $(TARGET-stage3-ld)
3335
3336 maybe-clean-stage3-ld: clean-stage3-ld
3337@@ -22002,7 +22246,7 @@ clean-stage3-ld:
3338 $(MAKE) stage3-start; \
3339 fi; \
3340 cd $(HOST_SUBDIR)/ld && \
3341- $(MAKE) $(FLAGS_TO_PASS) \
3342+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3343 $(POSTSTAGE1_FLAGS_TO_PASS) \
3344 clean
3345 @endif ld-bootstrap
3346@@ -22023,8 +22267,11 @@ all-stageb3g2-ld: configure-stageb3g2-ld
3347 $(HOST_EXPORTS) \
3348 $(POSTSTAGE1_HOST_EXPORTS) \
3349 cd $(HOST_SUBDIR)/ld && \
3350- $(MAKE) $(FLAGS_TO_PASS) \
3351- CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS) \
3352+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3353+ CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
3354+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
3355+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
3356+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3357 $(TARGET-stageb3g2-ld)
3358
3359 maybe-clean-stageb3g2-ld: clean-stageb3g2-ld
3360@@ -22037,7 +22284,7 @@ clean-stageb3g2-ld:
3361 $(MAKE) stageb3g2-start; \
3362 fi; \
3363 cd $(HOST_SUBDIR)/ld && \
3364- $(MAKE) $(FLAGS_TO_PASS) \
3365+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3366 $(POSTSTAGE1_FLAGS_TO_PASS) \
3367 clean
3368 @endif ld-bootstrap
3369@@ -22058,8 +22305,11 @@ all-stage4-ld: configure-stage4-ld
3370 $(HOST_EXPORTS) \
3371 $(POSTSTAGE1_HOST_EXPORTS) \
3372 cd $(HOST_SUBDIR)/ld && \
3373- $(MAKE) $(FLAGS_TO_PASS) \
3374- CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
3375+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3376+ CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
3377+ LIBCFLAGS="$(STAGE4_CFLAGS)" \
3378+ CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
3379+ CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3380 $(TARGET-stage4-ld)
3381
3382 maybe-clean-stage4-ld: clean-stage4-ld
3383@@ -22072,7 +22322,7 @@ clean-stage4-ld:
3384 $(MAKE) stage4-start; \
3385 fi; \
3386 cd $(HOST_SUBDIR)/ld && \
3387- $(MAKE) $(FLAGS_TO_PASS) \
3388+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3389 $(POSTSTAGE1_FLAGS_TO_PASS) \
3390 clean
3391 @endif ld-bootstrap
3392@@ -22093,8 +22343,11 @@ all-stageprofile-ld: configure-stageprof
3393 $(HOST_EXPORTS) \
3394 $(POSTSTAGE1_HOST_EXPORTS) \
3395 cd $(HOST_SUBDIR)/ld && \
3396- $(MAKE) $(FLAGS_TO_PASS) \
3397- CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS) \
3398+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3399+ CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
3400+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
3401+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
3402+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3403 $(TARGET-stageprofile-ld)
3404
3405 maybe-clean-stageprofile-ld: clean-stageprofile-ld
3406@@ -22107,7 +22360,7 @@ clean-stageprofile-ld:
3407 $(MAKE) stageprofile-start; \
3408 fi; \
3409 cd $(HOST_SUBDIR)/ld && \
3410- $(MAKE) $(FLAGS_TO_PASS) \
3411+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3412 $(POSTSTAGE1_FLAGS_TO_PASS) \
3413 clean
3414 @endif ld-bootstrap
3415@@ -22128,8 +22381,11 @@ all-stagefeedback-ld: configure-stagefee
3416 $(HOST_EXPORTS) \
3417 $(POSTSTAGE1_HOST_EXPORTS) \
3418 cd $(HOST_SUBDIR)/ld && \
3419- $(MAKE) $(FLAGS_TO_PASS) \
3420- CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS) \
3421+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3422+ CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
3423+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
3424+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
3425+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3426 $(TARGET-stagefeedback-ld)
3427
3428 maybe-clean-stagefeedback-ld: clean-stagefeedback-ld
3429@@ -22142,7 +22398,7 @@ clean-stagefeedback-ld:
3430 $(MAKE) stagefeedback-start; \
3431 fi; \
3432 cd $(HOST_SUBDIR)/ld && \
3433- $(MAKE) $(FLAGS_TO_PASS) \
3434+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3435 $(POSTSTAGE1_FLAGS_TO_PASS) \
3436 clean
3437 @endif ld-bootstrap
3438@@ -22549,9 +22805,9 @@ configure-stage1-libcpp:
3439 @r=`${PWD_COMMAND}`; export r; \
3440 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3441 test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
3442- $(HOST_EXPORTS) \
3443+ $(HOST_EXPORTS) \
3444 CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
3445- LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
3446+ CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \
3447 echo Configuring stage 1 in $(HOST_SUBDIR)/libcpp ; \
3448 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
3449 cd $(HOST_SUBDIR)/libcpp || exit 1; \
3450@@ -22580,9 +22836,9 @@ configure-stage2-libcpp:
3451 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3452 test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
3453 $(HOST_EXPORTS) \
3454- $(POSTSTAGE1_HOST_EXPORTS) \
3455+ $(POSTSTAGE1_HOST_EXPORTS) \
3456 CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
3457- LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
3458+ CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \
3459 echo Configuring stage 2 in $(HOST_SUBDIR)/libcpp ; \
3460 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
3461 cd $(HOST_SUBDIR)/libcpp || exit 1; \
3462@@ -22611,9 +22867,9 @@ configure-stageb2g0-libcpp:
3463 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3464 test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
3465 $(HOST_EXPORTS) \
3466- $(POSTSTAGE1_HOST_EXPORTS) \
3467+ $(POSTSTAGE1_HOST_EXPORTS) \
3468 CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
3469- LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
3470+ CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS; \
3471 echo Configuring stage b2g0 in $(HOST_SUBDIR)/libcpp ; \
3472 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
3473 cd $(HOST_SUBDIR)/libcpp || exit 1; \
3474@@ -22642,9 +22898,9 @@ configure-stage3-libcpp:
3475 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3476 test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
3477 $(HOST_EXPORTS) \
3478- $(POSTSTAGE1_HOST_EXPORTS) \
3479+ $(POSTSTAGE1_HOST_EXPORTS) \
3480 CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
3481- LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
3482+ CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \
3483 echo Configuring stage 3 in $(HOST_SUBDIR)/libcpp ; \
3484 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
3485 cd $(HOST_SUBDIR)/libcpp || exit 1; \
3486@@ -22673,9 +22929,9 @@ configure-stageb3g2-libcpp:
3487 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3488 test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
3489 $(HOST_EXPORTS) \
3490- $(POSTSTAGE1_HOST_EXPORTS) \
3491+ $(POSTSTAGE1_HOST_EXPORTS) \
3492 CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
3493- LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
3494+ CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS; \
3495 echo Configuring stage b3g2 in $(HOST_SUBDIR)/libcpp ; \
3496 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
3497 cd $(HOST_SUBDIR)/libcpp || exit 1; \
3498@@ -22704,9 +22960,9 @@ configure-stage4-libcpp:
3499 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3500 test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
3501 $(HOST_EXPORTS) \
3502- $(POSTSTAGE1_HOST_EXPORTS) \
3503+ $(POSTSTAGE1_HOST_EXPORTS) \
3504 CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
3505- LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
3506+ CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \
3507 echo Configuring stage 4 in $(HOST_SUBDIR)/libcpp ; \
3508 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
3509 cd $(HOST_SUBDIR)/libcpp || exit 1; \
3510@@ -22735,9 +22991,9 @@ configure-stageprofile-libcpp:
3511 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3512 test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
3513 $(HOST_EXPORTS) \
3514- $(POSTSTAGE1_HOST_EXPORTS) \
3515+ $(POSTSTAGE1_HOST_EXPORTS) \
3516 CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
3517- LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
3518+ CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \
3519 echo Configuring stage profile in $(HOST_SUBDIR)/libcpp ; \
3520 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
3521 cd $(HOST_SUBDIR)/libcpp || exit 1; \
3522@@ -22766,9 +23022,9 @@ configure-stagefeedback-libcpp:
3523 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3524 test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
3525 $(HOST_EXPORTS) \
3526- $(POSTSTAGE1_HOST_EXPORTS) \
3527+ $(POSTSTAGE1_HOST_EXPORTS) \
3528 CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
3529- LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
3530+ CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \
3531 echo Configuring stage feedback in $(HOST_SUBDIR)/libcpp ; \
3532 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
3533 cd $(HOST_SUBDIR)/libcpp || exit 1; \
3534@@ -22803,7 +23059,8 @@ all-libcpp: configure-libcpp
3535 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3536 $(HOST_EXPORTS) \
3537 (cd $(HOST_SUBDIR)/libcpp && \
3538- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-libcpp))
3539+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
3540+ $(TARGET-libcpp))
3541 @endif libcpp
3542
3543
3544@@ -22822,8 +23079,11 @@ all-stage1-libcpp: configure-stage1-libc
3545 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3546 $(HOST_EXPORTS) \
3547 cd $(HOST_SUBDIR)/libcpp && \
3548- $(MAKE) $(FLAGS_TO_PASS) \
3549- CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \
3550+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3551+ CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
3552+ LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
3553+ CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
3554+ CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \
3555 $(TARGET-stage1-libcpp)
3556
3557 maybe-clean-stage1-libcpp: clean-stage1-libcpp
3558@@ -22836,7 +23096,7 @@ clean-stage1-libcpp:
3559 $(MAKE) stage1-start; \
3560 fi; \
3561 cd $(HOST_SUBDIR)/libcpp && \
3562- $(MAKE) $(FLAGS_TO_PASS) \
3563+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3564 clean
3565 @endif libcpp-bootstrap
3566
3567@@ -22856,8 +23116,11 @@ all-stage2-libcpp: configure-stage2-libc
3568 $(HOST_EXPORTS) \
3569 $(POSTSTAGE1_HOST_EXPORTS) \
3570 cd $(HOST_SUBDIR)/libcpp && \
3571- $(MAKE) $(FLAGS_TO_PASS) \
3572- CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
3573+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3574+ CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
3575+ LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
3576+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
3577+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3578 $(TARGET-stage2-libcpp)
3579
3580 maybe-clean-stage2-libcpp: clean-stage2-libcpp
3581@@ -22870,7 +23133,7 @@ clean-stage2-libcpp:
3582 $(MAKE) stage2-start; \
3583 fi; \
3584 cd $(HOST_SUBDIR)/libcpp && \
3585- $(MAKE) $(FLAGS_TO_PASS) \
3586+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3587 $(POSTSTAGE1_FLAGS_TO_PASS) \
3588 clean
3589 @endif libcpp-bootstrap
3590@@ -22891,8 +23154,11 @@ all-stageb2g0-libcpp: configure-stageb2g
3591 $(HOST_EXPORTS) \
3592 $(POSTSTAGE1_HOST_EXPORTS) \
3593 cd $(HOST_SUBDIR)/libcpp && \
3594- $(MAKE) $(FLAGS_TO_PASS) \
3595- CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS) \
3596+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3597+ CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
3598+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
3599+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
3600+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3601 $(TARGET-stageb2g0-libcpp)
3602
3603 maybe-clean-stageb2g0-libcpp: clean-stageb2g0-libcpp
3604@@ -22905,7 +23171,7 @@ clean-stageb2g0-libcpp:
3605 $(MAKE) stageb2g0-start; \
3606 fi; \
3607 cd $(HOST_SUBDIR)/libcpp && \
3608- $(MAKE) $(FLAGS_TO_PASS) \
3609+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3610 $(POSTSTAGE1_FLAGS_TO_PASS) \
3611 clean
3612 @endif libcpp-bootstrap
3613@@ -22926,8 +23192,11 @@ all-stage3-libcpp: configure-stage3-libc
3614 $(HOST_EXPORTS) \
3615 $(POSTSTAGE1_HOST_EXPORTS) \
3616 cd $(HOST_SUBDIR)/libcpp && \
3617- $(MAKE) $(FLAGS_TO_PASS) \
3618- CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
3619+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3620+ CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
3621+ LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
3622+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
3623+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3624 $(TARGET-stage3-libcpp)
3625
3626 maybe-clean-stage3-libcpp: clean-stage3-libcpp
3627@@ -22940,7 +23209,7 @@ clean-stage3-libcpp:
3628 $(MAKE) stage3-start; \
3629 fi; \
3630 cd $(HOST_SUBDIR)/libcpp && \
3631- $(MAKE) $(FLAGS_TO_PASS) \
3632+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3633 $(POSTSTAGE1_FLAGS_TO_PASS) \
3634 clean
3635 @endif libcpp-bootstrap
3636@@ -22961,8 +23230,11 @@ all-stageb3g2-libcpp: configure-stageb3g
3637 $(HOST_EXPORTS) \
3638 $(POSTSTAGE1_HOST_EXPORTS) \
3639 cd $(HOST_SUBDIR)/libcpp && \
3640- $(MAKE) $(FLAGS_TO_PASS) \
3641- CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS) \
3642+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3643+ CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
3644+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
3645+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
3646+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3647 $(TARGET-stageb3g2-libcpp)
3648
3649 maybe-clean-stageb3g2-libcpp: clean-stageb3g2-libcpp
3650@@ -22975,7 +23247,7 @@ clean-stageb3g2-libcpp:
3651 $(MAKE) stageb3g2-start; \
3652 fi; \
3653 cd $(HOST_SUBDIR)/libcpp && \
3654- $(MAKE) $(FLAGS_TO_PASS) \
3655+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3656 $(POSTSTAGE1_FLAGS_TO_PASS) \
3657 clean
3658 @endif libcpp-bootstrap
3659@@ -22996,8 +23268,11 @@ all-stage4-libcpp: configure-stage4-libc
3660 $(HOST_EXPORTS) \
3661 $(POSTSTAGE1_HOST_EXPORTS) \
3662 cd $(HOST_SUBDIR)/libcpp && \
3663- $(MAKE) $(FLAGS_TO_PASS) \
3664- CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
3665+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3666+ CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
3667+ LIBCFLAGS="$(STAGE4_CFLAGS)" \
3668+ CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
3669+ CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3670 $(TARGET-stage4-libcpp)
3671
3672 maybe-clean-stage4-libcpp: clean-stage4-libcpp
3673@@ -23010,7 +23285,7 @@ clean-stage4-libcpp:
3674 $(MAKE) stage4-start; \
3675 fi; \
3676 cd $(HOST_SUBDIR)/libcpp && \
3677- $(MAKE) $(FLAGS_TO_PASS) \
3678+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3679 $(POSTSTAGE1_FLAGS_TO_PASS) \
3680 clean
3681 @endif libcpp-bootstrap
3682@@ -23031,8 +23306,11 @@ all-stageprofile-libcpp: configure-stage
3683 $(HOST_EXPORTS) \
3684 $(POSTSTAGE1_HOST_EXPORTS) \
3685 cd $(HOST_SUBDIR)/libcpp && \
3686- $(MAKE) $(FLAGS_TO_PASS) \
3687- CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS) \
3688+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3689+ CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
3690+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
3691+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
3692+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3693 $(TARGET-stageprofile-libcpp)
3694
3695 maybe-clean-stageprofile-libcpp: clean-stageprofile-libcpp
3696@@ -23045,7 +23323,7 @@ clean-stageprofile-libcpp:
3697 $(MAKE) stageprofile-start; \
3698 fi; \
3699 cd $(HOST_SUBDIR)/libcpp && \
3700- $(MAKE) $(FLAGS_TO_PASS) \
3701+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3702 $(POSTSTAGE1_FLAGS_TO_PASS) \
3703 clean
3704 @endif libcpp-bootstrap
3705@@ -23066,8 +23344,11 @@ all-stagefeedback-libcpp: configure-stag
3706 $(HOST_EXPORTS) \
3707 $(POSTSTAGE1_HOST_EXPORTS) \
3708 cd $(HOST_SUBDIR)/libcpp && \
3709- $(MAKE) $(FLAGS_TO_PASS) \
3710- CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS) \
3711+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3712+ CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
3713+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
3714+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
3715+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3716 $(TARGET-stagefeedback-libcpp)
3717
3718 maybe-clean-stagefeedback-libcpp: clean-stagefeedback-libcpp
3719@@ -23080,7 +23361,7 @@ clean-stagefeedback-libcpp:
3720 $(MAKE) stagefeedback-start; \
3721 fi; \
3722 cd $(HOST_SUBDIR)/libcpp && \
3723- $(MAKE) $(FLAGS_TO_PASS) \
3724+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3725 $(POSTSTAGE1_FLAGS_TO_PASS) \
3726 clean
3727 @endif libcpp-bootstrap
3728@@ -23487,9 +23768,9 @@ configure-stage1-libdecnumber:
3729 @r=`${PWD_COMMAND}`; export r; \
3730 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3731 test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
3732- $(HOST_EXPORTS) \
3733+ $(HOST_EXPORTS) \
3734 CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
3735- LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
3736+ CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \
3737 echo Configuring stage 1 in $(HOST_SUBDIR)/libdecnumber ; \
3738 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
3739 cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
3740@@ -23518,9 +23799,9 @@ configure-stage2-libdecnumber:
3741 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3742 test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
3743 $(HOST_EXPORTS) \
3744- $(POSTSTAGE1_HOST_EXPORTS) \
3745+ $(POSTSTAGE1_HOST_EXPORTS) \
3746 CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
3747- LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
3748+ CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \
3749 echo Configuring stage 2 in $(HOST_SUBDIR)/libdecnumber ; \
3750 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
3751 cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
3752@@ -23549,9 +23830,9 @@ configure-stageb2g0-libdecnumber:
3753 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3754 test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
3755 $(HOST_EXPORTS) \
3756- $(POSTSTAGE1_HOST_EXPORTS) \
3757+ $(POSTSTAGE1_HOST_EXPORTS) \
3758 CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
3759- LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
3760+ CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS; \
3761 echo Configuring stage b2g0 in $(HOST_SUBDIR)/libdecnumber ; \
3762 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
3763 cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
3764@@ -23580,9 +23861,9 @@ configure-stage3-libdecnumber:
3765 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3766 test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
3767 $(HOST_EXPORTS) \
3768- $(POSTSTAGE1_HOST_EXPORTS) \
3769+ $(POSTSTAGE1_HOST_EXPORTS) \
3770 CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
3771- LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
3772+ CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \
3773 echo Configuring stage 3 in $(HOST_SUBDIR)/libdecnumber ; \
3774 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
3775 cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
3776@@ -23611,9 +23892,9 @@ configure-stageb3g2-libdecnumber:
3777 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3778 test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
3779 $(HOST_EXPORTS) \
3780- $(POSTSTAGE1_HOST_EXPORTS) \
3781+ $(POSTSTAGE1_HOST_EXPORTS) \
3782 CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
3783- LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
3784+ CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS; \
3785 echo Configuring stage b3g2 in $(HOST_SUBDIR)/libdecnumber ; \
3786 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
3787 cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
3788@@ -23642,9 +23923,9 @@ configure-stage4-libdecnumber:
3789 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3790 test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
3791 $(HOST_EXPORTS) \
3792- $(POSTSTAGE1_HOST_EXPORTS) \
3793+ $(POSTSTAGE1_HOST_EXPORTS) \
3794 CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
3795- LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
3796+ CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \
3797 echo Configuring stage 4 in $(HOST_SUBDIR)/libdecnumber ; \
3798 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
3799 cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
3800@@ -23673,9 +23954,9 @@ configure-stageprofile-libdecnumber:
3801 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3802 test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
3803 $(HOST_EXPORTS) \
3804- $(POSTSTAGE1_HOST_EXPORTS) \
3805+ $(POSTSTAGE1_HOST_EXPORTS) \
3806 CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
3807- LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
3808+ CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \
3809 echo Configuring stage profile in $(HOST_SUBDIR)/libdecnumber ; \
3810 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
3811 cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
3812@@ -23704,9 +23985,9 @@ configure-stagefeedback-libdecnumber:
3813 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3814 test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
3815 $(HOST_EXPORTS) \
3816- $(POSTSTAGE1_HOST_EXPORTS) \
3817+ $(POSTSTAGE1_HOST_EXPORTS) \
3818 CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
3819- LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
3820+ CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \
3821 echo Configuring stage feedback in $(HOST_SUBDIR)/libdecnumber ; \
3822 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
3823 cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
3824@@ -23741,7 +24022,8 @@ all-libdecnumber: configure-libdecnumber
3825 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3826 $(HOST_EXPORTS) \
3827 (cd $(HOST_SUBDIR)/libdecnumber && \
3828- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-libdecnumber))
3829+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
3830+ $(TARGET-libdecnumber))
3831 @endif libdecnumber
3832
3833
3834@@ -23760,8 +24042,11 @@ all-stage1-libdecnumber: configure-stage
3835 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3836 $(HOST_EXPORTS) \
3837 cd $(HOST_SUBDIR)/libdecnumber && \
3838- $(MAKE) $(FLAGS_TO_PASS) \
3839- CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \
3840+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3841+ CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
3842+ LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
3843+ CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
3844+ CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \
3845 $(TARGET-stage1-libdecnumber)
3846
3847 maybe-clean-stage1-libdecnumber: clean-stage1-libdecnumber
3848@@ -23774,7 +24059,7 @@ clean-stage1-libdecnumber:
3849 $(MAKE) stage1-start; \
3850 fi; \
3851 cd $(HOST_SUBDIR)/libdecnumber && \
3852- $(MAKE) $(FLAGS_TO_PASS) \
3853+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3854 clean
3855 @endif libdecnumber-bootstrap
3856
3857@@ -23794,8 +24079,11 @@ all-stage2-libdecnumber: configure-stage
3858 $(HOST_EXPORTS) \
3859 $(POSTSTAGE1_HOST_EXPORTS) \
3860 cd $(HOST_SUBDIR)/libdecnumber && \
3861- $(MAKE) $(FLAGS_TO_PASS) \
3862- CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
3863+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3864+ CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
3865+ LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
3866+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
3867+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3868 $(TARGET-stage2-libdecnumber)
3869
3870 maybe-clean-stage2-libdecnumber: clean-stage2-libdecnumber
3871@@ -23808,7 +24096,7 @@ clean-stage2-libdecnumber:
3872 $(MAKE) stage2-start; \
3873 fi; \
3874 cd $(HOST_SUBDIR)/libdecnumber && \
3875- $(MAKE) $(FLAGS_TO_PASS) \
3876+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3877 $(POSTSTAGE1_FLAGS_TO_PASS) \
3878 clean
3879 @endif libdecnumber-bootstrap
3880@@ -23829,8 +24117,11 @@ all-stageb2g0-libdecnumber: configure-st
3881 $(HOST_EXPORTS) \
3882 $(POSTSTAGE1_HOST_EXPORTS) \
3883 cd $(HOST_SUBDIR)/libdecnumber && \
3884- $(MAKE) $(FLAGS_TO_PASS) \
3885- CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS) \
3886+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3887+ CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
3888+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
3889+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
3890+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3891 $(TARGET-stageb2g0-libdecnumber)
3892
3893 maybe-clean-stageb2g0-libdecnumber: clean-stageb2g0-libdecnumber
3894@@ -23843,7 +24134,7 @@ clean-stageb2g0-libdecnumber:
3895 $(MAKE) stageb2g0-start; \
3896 fi; \
3897 cd $(HOST_SUBDIR)/libdecnumber && \
3898- $(MAKE) $(FLAGS_TO_PASS) \
3899+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3900 $(POSTSTAGE1_FLAGS_TO_PASS) \
3901 clean
3902 @endif libdecnumber-bootstrap
3903@@ -23864,8 +24155,11 @@ all-stage3-libdecnumber: configure-stage
3904 $(HOST_EXPORTS) \
3905 $(POSTSTAGE1_HOST_EXPORTS) \
3906 cd $(HOST_SUBDIR)/libdecnumber && \
3907- $(MAKE) $(FLAGS_TO_PASS) \
3908- CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
3909+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3910+ CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
3911+ LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
3912+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
3913+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3914 $(TARGET-stage3-libdecnumber)
3915
3916 maybe-clean-stage3-libdecnumber: clean-stage3-libdecnumber
3917@@ -23878,7 +24172,7 @@ clean-stage3-libdecnumber:
3918 $(MAKE) stage3-start; \
3919 fi; \
3920 cd $(HOST_SUBDIR)/libdecnumber && \
3921- $(MAKE) $(FLAGS_TO_PASS) \
3922+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3923 $(POSTSTAGE1_FLAGS_TO_PASS) \
3924 clean
3925 @endif libdecnumber-bootstrap
3926@@ -23899,8 +24193,11 @@ all-stageb3g2-libdecnumber: configure-st
3927 $(HOST_EXPORTS) \
3928 $(POSTSTAGE1_HOST_EXPORTS) \
3929 cd $(HOST_SUBDIR)/libdecnumber && \
3930- $(MAKE) $(FLAGS_TO_PASS) \
3931- CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS) \
3932+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3933+ CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
3934+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
3935+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
3936+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3937 $(TARGET-stageb3g2-libdecnumber)
3938
3939 maybe-clean-stageb3g2-libdecnumber: clean-stageb3g2-libdecnumber
3940@@ -23913,7 +24210,7 @@ clean-stageb3g2-libdecnumber:
3941 $(MAKE) stageb3g2-start; \
3942 fi; \
3943 cd $(HOST_SUBDIR)/libdecnumber && \
3944- $(MAKE) $(FLAGS_TO_PASS) \
3945+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3946 $(POSTSTAGE1_FLAGS_TO_PASS) \
3947 clean
3948 @endif libdecnumber-bootstrap
3949@@ -23934,8 +24231,11 @@ all-stage4-libdecnumber: configure-stage
3950 $(HOST_EXPORTS) \
3951 $(POSTSTAGE1_HOST_EXPORTS) \
3952 cd $(HOST_SUBDIR)/libdecnumber && \
3953- $(MAKE) $(FLAGS_TO_PASS) \
3954- CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
3955+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3956+ CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
3957+ LIBCFLAGS="$(STAGE4_CFLAGS)" \
3958+ CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
3959+ CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3960 $(TARGET-stage4-libdecnumber)
3961
3962 maybe-clean-stage4-libdecnumber: clean-stage4-libdecnumber
3963@@ -23948,7 +24248,7 @@ clean-stage4-libdecnumber:
3964 $(MAKE) stage4-start; \
3965 fi; \
3966 cd $(HOST_SUBDIR)/libdecnumber && \
3967- $(MAKE) $(FLAGS_TO_PASS) \
3968+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3969 $(POSTSTAGE1_FLAGS_TO_PASS) \
3970 clean
3971 @endif libdecnumber-bootstrap
3972@@ -23969,8 +24269,11 @@ all-stageprofile-libdecnumber: configure
3973 $(HOST_EXPORTS) \
3974 $(POSTSTAGE1_HOST_EXPORTS) \
3975 cd $(HOST_SUBDIR)/libdecnumber && \
3976- $(MAKE) $(FLAGS_TO_PASS) \
3977- CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS) \
3978+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3979+ CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
3980+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
3981+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
3982+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3983 $(TARGET-stageprofile-libdecnumber)
3984
3985 maybe-clean-stageprofile-libdecnumber: clean-stageprofile-libdecnumber
3986@@ -23983,7 +24286,7 @@ clean-stageprofile-libdecnumber:
3987 $(MAKE) stageprofile-start; \
3988 fi; \
3989 cd $(HOST_SUBDIR)/libdecnumber && \
3990- $(MAKE) $(FLAGS_TO_PASS) \
3991+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3992 $(POSTSTAGE1_FLAGS_TO_PASS) \
3993 clean
3994 @endif libdecnumber-bootstrap
3995@@ -24004,8 +24307,11 @@ all-stagefeedback-libdecnumber: configur
3996 $(HOST_EXPORTS) \
3997 $(POSTSTAGE1_HOST_EXPORTS) \
3998 cd $(HOST_SUBDIR)/libdecnumber && \
3999- $(MAKE) $(FLAGS_TO_PASS) \
4000- CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS) \
4001+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
4002+ CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
4003+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
4004+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
4005+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
4006 $(TARGET-stagefeedback-libdecnumber)
4007
4008 maybe-clean-stagefeedback-libdecnumber: clean-stagefeedback-libdecnumber
4009@@ -24018,7 +24324,7 @@ clean-stagefeedback-libdecnumber:
4010 $(MAKE) stagefeedback-start; \
4011 fi; \
4012 cd $(HOST_SUBDIR)/libdecnumber && \
4013- $(MAKE) $(FLAGS_TO_PASS) \
4014+ $(MAKE) $(EXTRA_HOST_FLAGS) \
4015 $(POSTSTAGE1_FLAGS_TO_PASS) \
4016 clean
4017 @endif libdecnumber-bootstrap
4018@@ -24432,7 +24738,8 @@ all-libgui: configure-libgui
4019 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4020 $(HOST_EXPORTS) \
4021 (cd $(HOST_SUBDIR)/libgui && \
4022- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-libgui))
4023+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4024+ $(TARGET-libgui))
4025 @endif libgui
4026
4027
4028@@ -24849,9 +25156,9 @@ configure-stage1-libiberty:
4029 @r=`${PWD_COMMAND}`; export r; \
4030 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4031 test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
4032- $(HOST_EXPORTS) \
4033+ $(HOST_EXPORTS) \
4034 CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
4035- LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
4036+ CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \
4037 echo Configuring stage 1 in $(HOST_SUBDIR)/libiberty ; \
4038 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
4039 cd $(HOST_SUBDIR)/libiberty || exit 1; \
4040@@ -24880,9 +25187,9 @@ configure-stage2-libiberty:
4041 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4042 test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
4043 $(HOST_EXPORTS) \
4044- $(POSTSTAGE1_HOST_EXPORTS) \
4045+ $(POSTSTAGE1_HOST_EXPORTS) \
4046 CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
4047- LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
4048+ CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \
4049 echo Configuring stage 2 in $(HOST_SUBDIR)/libiberty ; \
4050 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
4051 cd $(HOST_SUBDIR)/libiberty || exit 1; \
4052@@ -24911,9 +25218,9 @@ configure-stageb2g0-libiberty:
4053 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4054 test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
4055 $(HOST_EXPORTS) \
4056- $(POSTSTAGE1_HOST_EXPORTS) \
4057+ $(POSTSTAGE1_HOST_EXPORTS) \
4058 CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
4059- LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
4060+ CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS; \
4061 echo Configuring stage b2g0 in $(HOST_SUBDIR)/libiberty ; \
4062 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
4063 cd $(HOST_SUBDIR)/libiberty || exit 1; \
4064@@ -24942,9 +25249,9 @@ configure-stage3-libiberty:
4065 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4066 test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
4067 $(HOST_EXPORTS) \
4068- $(POSTSTAGE1_HOST_EXPORTS) \
4069+ $(POSTSTAGE1_HOST_EXPORTS) \
4070 CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
4071- LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
4072+ CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \
4073 echo Configuring stage 3 in $(HOST_SUBDIR)/libiberty ; \
4074 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
4075 cd $(HOST_SUBDIR)/libiberty || exit 1; \
4076@@ -24973,9 +25280,9 @@ configure-stageb3g2-libiberty:
4077 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4078 test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
4079 $(HOST_EXPORTS) \
4080- $(POSTSTAGE1_HOST_EXPORTS) \
4081+ $(POSTSTAGE1_HOST_EXPORTS) \
4082 CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
4083- LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
4084+ CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS; \
4085 echo Configuring stage b3g2 in $(HOST_SUBDIR)/libiberty ; \
4086 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
4087 cd $(HOST_SUBDIR)/libiberty || exit 1; \
4088@@ -25004,9 +25311,9 @@ configure-stage4-libiberty:
4089 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4090 test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
4091 $(HOST_EXPORTS) \
4092- $(POSTSTAGE1_HOST_EXPORTS) \
4093+ $(POSTSTAGE1_HOST_EXPORTS) \
4094 CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
4095- LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
4096+ CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \
4097 echo Configuring stage 4 in $(HOST_SUBDIR)/libiberty ; \
4098 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
4099 cd $(HOST_SUBDIR)/libiberty || exit 1; \
4100@@ -25035,9 +25342,9 @@ configure-stageprofile-libiberty:
4101 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4102 test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
4103 $(HOST_EXPORTS) \
4104- $(POSTSTAGE1_HOST_EXPORTS) \
4105+ $(POSTSTAGE1_HOST_EXPORTS) \
4106 CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
4107- LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
4108+ CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \
4109 echo Configuring stage profile in $(HOST_SUBDIR)/libiberty ; \
4110 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
4111 cd $(HOST_SUBDIR)/libiberty || exit 1; \
4112@@ -25066,9 +25373,9 @@ configure-stagefeedback-libiberty:
4113 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4114 test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
4115 $(HOST_EXPORTS) \
4116- $(POSTSTAGE1_HOST_EXPORTS) \
4117+ $(POSTSTAGE1_HOST_EXPORTS) \
4118 CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
4119- LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
4120+ CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \
4121 echo Configuring stage feedback in $(HOST_SUBDIR)/libiberty ; \
4122 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
4123 cd $(HOST_SUBDIR)/libiberty || exit 1; \
4124@@ -25103,7 +25410,8 @@ all-libiberty: configure-libiberty
4125 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4126 $(HOST_EXPORTS) \
4127 (cd $(HOST_SUBDIR)/libiberty && \
4128- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-libiberty))
4129+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4130+ $(TARGET-libiberty))
4131 @endif libiberty
4132
4133
4134@@ -25122,8 +25430,11 @@ all-stage1-libiberty: configure-stage1-l
4135 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4136 $(HOST_EXPORTS) \
4137 cd $(HOST_SUBDIR)/libiberty && \
4138- $(MAKE) $(FLAGS_TO_PASS) \
4139- CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \
4140+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
4141+ CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
4142+ LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
4143+ CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
4144+ CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \
4145 $(TARGET-stage1-libiberty)
4146
4147 maybe-clean-stage1-libiberty: clean-stage1-libiberty
4148@@ -25136,7 +25447,7 @@ clean-stage1-libiberty:
4149 $(MAKE) stage1-start; \
4150 fi; \
4151 cd $(HOST_SUBDIR)/libiberty && \
4152- $(MAKE) $(FLAGS_TO_PASS) \
4153+ $(MAKE) $(EXTRA_HOST_FLAGS) \
4154 clean
4155 @endif libiberty-bootstrap
4156
4157@@ -25156,8 +25467,11 @@ all-stage2-libiberty: configure-stage2-l
4158 $(HOST_EXPORTS) \
4159 $(POSTSTAGE1_HOST_EXPORTS) \
4160 cd $(HOST_SUBDIR)/libiberty && \
4161- $(MAKE) $(FLAGS_TO_PASS) \
4162- CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
4163+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
4164+ CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
4165+ LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
4166+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
4167+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
4168 $(TARGET-stage2-libiberty)
4169
4170 maybe-clean-stage2-libiberty: clean-stage2-libiberty
4171@@ -25170,7 +25484,7 @@ clean-stage2-libiberty:
4172 $(MAKE) stage2-start; \
4173 fi; \
4174 cd $(HOST_SUBDIR)/libiberty && \
4175- $(MAKE) $(FLAGS_TO_PASS) \
4176+ $(MAKE) $(EXTRA_HOST_FLAGS) \
4177 $(POSTSTAGE1_FLAGS_TO_PASS) \
4178 clean
4179 @endif libiberty-bootstrap
4180@@ -25191,8 +25505,11 @@ all-stageb2g0-libiberty: configure-stage
4181 $(HOST_EXPORTS) \
4182 $(POSTSTAGE1_HOST_EXPORTS) \
4183 cd $(HOST_SUBDIR)/libiberty && \
4184- $(MAKE) $(FLAGS_TO_PASS) \
4185- CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS) \
4186+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
4187+ CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
4188+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
4189+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
4190+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
4191 $(TARGET-stageb2g0-libiberty)
4192
4193 maybe-clean-stageb2g0-libiberty: clean-stageb2g0-libiberty
4194@@ -25205,7 +25522,7 @@ clean-stageb2g0-libiberty:
4195 $(MAKE) stageb2g0-start; \
4196 fi; \
4197 cd $(HOST_SUBDIR)/libiberty && \
4198- $(MAKE) $(FLAGS_TO_PASS) \
4199+ $(MAKE) $(EXTRA_HOST_FLAGS) \
4200 $(POSTSTAGE1_FLAGS_TO_PASS) \
4201 clean
4202 @endif libiberty-bootstrap
4203@@ -25226,8 +25543,11 @@ all-stage3-libiberty: configure-stage3-l
4204 $(HOST_EXPORTS) \
4205 $(POSTSTAGE1_HOST_EXPORTS) \
4206 cd $(HOST_SUBDIR)/libiberty && \
4207- $(MAKE) $(FLAGS_TO_PASS) \
4208- CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
4209+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
4210+ CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
4211+ LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
4212+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
4213+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
4214 $(TARGET-stage3-libiberty)
4215
4216 maybe-clean-stage3-libiberty: clean-stage3-libiberty
4217@@ -25240,7 +25560,7 @@ clean-stage3-libiberty:
4218 $(MAKE) stage3-start; \
4219 fi; \
4220 cd $(HOST_SUBDIR)/libiberty && \
4221- $(MAKE) $(FLAGS_TO_PASS) \
4222+ $(MAKE) $(EXTRA_HOST_FLAGS) \
4223 $(POSTSTAGE1_FLAGS_TO_PASS) \
4224 clean
4225 @endif libiberty-bootstrap
4226@@ -25261,8 +25581,11 @@ all-stageb3g2-libiberty: configure-stage
4227 $(HOST_EXPORTS) \
4228 $(POSTSTAGE1_HOST_EXPORTS) \
4229 cd $(HOST_SUBDIR)/libiberty && \
4230- $(MAKE) $(FLAGS_TO_PASS) \
4231- CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS) \
4232+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
4233+ CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
4234+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
4235+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
4236+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
4237 $(TARGET-stageb3g2-libiberty)
4238
4239 maybe-clean-stageb3g2-libiberty: clean-stageb3g2-libiberty
4240@@ -25275,7 +25598,7 @@ clean-stageb3g2-libiberty:
4241 $(MAKE) stageb3g2-start; \
4242 fi; \
4243 cd $(HOST_SUBDIR)/libiberty && \
4244- $(MAKE) $(FLAGS_TO_PASS) \
4245+ $(MAKE) $(EXTRA_HOST_FLAGS) \
4246 $(POSTSTAGE1_FLAGS_TO_PASS) \
4247 clean
4248 @endif libiberty-bootstrap
4249@@ -25296,8 +25619,11 @@ all-stage4-libiberty: configure-stage4-l
4250 $(HOST_EXPORTS) \
4251 $(POSTSTAGE1_HOST_EXPORTS) \
4252 cd $(HOST_SUBDIR)/libiberty && \
4253- $(MAKE) $(FLAGS_TO_PASS) \
4254- CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
4255+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
4256+ CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
4257+ LIBCFLAGS="$(STAGE4_CFLAGS)" \
4258+ CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
4259+ CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
4260 $(TARGET-stage4-libiberty)
4261
4262 maybe-clean-stage4-libiberty: clean-stage4-libiberty
4263@@ -25310,7 +25636,7 @@ clean-stage4-libiberty:
4264 $(MAKE) stage4-start; \
4265 fi; \
4266 cd $(HOST_SUBDIR)/libiberty && \
4267- $(MAKE) $(FLAGS_TO_PASS) \
4268+ $(MAKE) $(EXTRA_HOST_FLAGS) \
4269 $(POSTSTAGE1_FLAGS_TO_PASS) \
4270 clean
4271 @endif libiberty-bootstrap
4272@@ -25331,8 +25657,11 @@ all-stageprofile-libiberty: configure-st
4273 $(HOST_EXPORTS) \
4274 $(POSTSTAGE1_HOST_EXPORTS) \
4275 cd $(HOST_SUBDIR)/libiberty && \
4276- $(MAKE) $(FLAGS_TO_PASS) \
4277- CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS) \
4278+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
4279+ CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
4280+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
4281+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
4282+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
4283 $(TARGET-stageprofile-libiberty)
4284
4285 maybe-clean-stageprofile-libiberty: clean-stageprofile-libiberty
4286@@ -25345,7 +25674,7 @@ clean-stageprofile-libiberty:
4287 $(MAKE) stageprofile-start; \
4288 fi; \
4289 cd $(HOST_SUBDIR)/libiberty && \
4290- $(MAKE) $(FLAGS_TO_PASS) \
4291+ $(MAKE) $(EXTRA_HOST_FLAGS) \
4292 $(POSTSTAGE1_FLAGS_TO_PASS) \
4293 clean
4294 @endif libiberty-bootstrap
4295@@ -25366,8 +25695,11 @@ all-stagefeedback-libiberty: configure-s
4296 $(HOST_EXPORTS) \
4297 $(POSTSTAGE1_HOST_EXPORTS) \
4298 cd $(HOST_SUBDIR)/libiberty && \
4299- $(MAKE) $(FLAGS_TO_PASS) \
4300- CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS) \
4301+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
4302+ CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
4303+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
4304+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
4305+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
4306 $(TARGET-stagefeedback-libiberty)
4307
4308 maybe-clean-stagefeedback-libiberty: clean-stagefeedback-libiberty
4309@@ -25380,7 +25712,7 @@ clean-stagefeedback-libiberty:
4310 $(MAKE) stagefeedback-start; \
4311 fi; \
4312 cd $(HOST_SUBDIR)/libiberty && \
4313- $(MAKE) $(FLAGS_TO_PASS) \
4314+ $(MAKE) $(EXTRA_HOST_FLAGS) \
4315 $(POSTSTAGE1_FLAGS_TO_PASS) \
4316 clean
4317 @endif libiberty-bootstrap
4318@@ -25794,7 +26126,8 @@ all-libtool: configure-libtool
4319 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4320 $(HOST_EXPORTS) \
4321 (cd $(HOST_SUBDIR)/libtool && \
4322- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-libtool))
4323+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4324+ $(TARGET-libtool))
4325 @endif libtool
4326
4327
4328@@ -26218,7 +26551,8 @@ all-m4: configure-m4
4329 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4330 $(HOST_EXPORTS) \
4331 (cd $(HOST_SUBDIR)/m4 && \
4332- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-m4))
4333+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4334+ $(TARGET-m4))
4335 @endif m4
4336
4337
4338@@ -26642,7 +26976,8 @@ all-make: configure-make
4339 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4340 $(HOST_EXPORTS) \
4341 (cd $(HOST_SUBDIR)/make && \
4342- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-make))
4343+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4344+ $(TARGET-make))
4345 @endif make
4346
4347
4348@@ -27066,7 +27401,8 @@ all-mmalloc: configure-mmalloc
4349 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4350 $(HOST_EXPORTS) \
4351 (cd $(HOST_SUBDIR)/mmalloc && \
4352- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-mmalloc))
4353+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4354+ $(TARGET-mmalloc))
4355 @endif mmalloc
4356
4357
4358@@ -27484,7 +27820,8 @@ all-patch: configure-patch
4359 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4360 $(HOST_EXPORTS) \
4361 (cd $(HOST_SUBDIR)/patch && \
4362- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-patch))
4363+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4364+ $(TARGET-patch))
4365 @endif patch
4366
4367
4368@@ -27908,7 +28245,8 @@ all-perl: configure-perl
4369 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4370 $(HOST_EXPORTS) \
4371 (cd $(HOST_SUBDIR)/perl && \
4372- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-perl))
4373+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4374+ $(TARGET-perl))
4375 @endif perl
4376
4377
4378@@ -28332,7 +28670,8 @@ all-prms: configure-prms
4379 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4380 $(HOST_EXPORTS) \
4381 (cd $(HOST_SUBDIR)/prms && \
4382- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-prms))
4383+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4384+ $(TARGET-prms))
4385 @endif prms
4386
4387
4388@@ -28756,7 +29095,8 @@ all-rcs: configure-rcs
4389 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4390 $(HOST_EXPORTS) \
4391 (cd $(HOST_SUBDIR)/rcs && \
4392- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-rcs))
4393+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4394+ $(TARGET-rcs))
4395 @endif rcs
4396
4397
4398@@ -29180,7 +29520,8 @@ all-readline: configure-readline
4399 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4400 $(HOST_EXPORTS) \
4401 (cd $(HOST_SUBDIR)/readline && \
4402- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-readline))
4403+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4404+ $(TARGET-readline))
4405 @endif readline
4406
4407
4408@@ -29604,7 +29945,8 @@ all-release: configure-release
4409 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4410 $(HOST_EXPORTS) \
4411 (cd $(HOST_SUBDIR)/release && \
4412- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-release))
4413+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4414+ $(TARGET-release))
4415 @endif release
4416
4417
4418@@ -30016,7 +30358,8 @@ all-recode: configure-recode
4419 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4420 $(HOST_EXPORTS) \
4421 (cd $(HOST_SUBDIR)/recode && \
4422- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-recode))
4423+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4424+ $(TARGET-recode))
4425 @endif recode
4426
4427
4428@@ -30440,7 +30783,8 @@ all-sed: configure-sed
4429 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4430 $(HOST_EXPORTS) \
4431 (cd $(HOST_SUBDIR)/sed && \
4432- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-sed))
4433+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4434+ $(TARGET-sed))
4435 @endif sed
4436
4437
4438@@ -30864,7 +31208,8 @@ all-send-pr: configure-send-pr
4439 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4440 $(HOST_EXPORTS) \
4441 (cd $(HOST_SUBDIR)/send-pr && \
4442- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-send-pr))
4443+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4444+ $(TARGET-send-pr))
4445 @endif send-pr
4446
4447
4448@@ -31288,7 +31633,8 @@ all-shellutils: configure-shellutils
4449 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4450 $(HOST_EXPORTS) \
4451 (cd $(HOST_SUBDIR)/shellutils && \
4452- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-shellutils))
4453+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4454+ $(TARGET-shellutils))
4455 @endif shellutils
4456
4457
4458@@ -31712,7 +32058,8 @@ all-sid: configure-sid
4459 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4460 $(HOST_EXPORTS) \
4461 (cd $(HOST_SUBDIR)/sid && \
4462- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-sid))
4463+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4464+ $(TARGET-sid))
4465 @endif sid
4466
4467
4468@@ -32136,7 +32483,8 @@ all-sim: configure-sim
4469 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4470 $(HOST_EXPORTS) \
4471 (cd $(HOST_SUBDIR)/sim && \
4472- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-sim))
4473+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4474+ $(TARGET-sim))
4475 @endif sim
4476
4477
4478@@ -32560,7 +32908,8 @@ all-tar: configure-tar
4479 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4480 $(HOST_EXPORTS) \
4481 (cd $(HOST_SUBDIR)/tar && \
4482- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-tar))
4483+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4484+ $(TARGET-tar))
4485 @endif tar
4486
4487
4488@@ -32984,7 +33333,8 @@ all-texinfo: configure-texinfo
4489 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4490 $(HOST_EXPORTS) \
4491 (cd $(HOST_SUBDIR)/texinfo && \
4492- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-texinfo))
4493+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4494+ $(TARGET-texinfo))
4495 @endif texinfo
4496
4497
4498@@ -33402,7 +33752,8 @@ all-textutils: configure-textutils
4499 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4500 $(HOST_EXPORTS) \
4501 (cd $(HOST_SUBDIR)/textutils && \
4502- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-textutils))
4503+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4504+ $(TARGET-textutils))
4505 @endif textutils
4506
4507
4508@@ -33826,7 +34177,8 @@ all-time: configure-time
4509 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4510 $(HOST_EXPORTS) \
4511 (cd $(HOST_SUBDIR)/time && \
4512- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-time))
4513+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4514+ $(TARGET-time))
4515 @endif time
4516
4517
4518@@ -34250,7 +34602,8 @@ all-uudecode: configure-uudecode
4519 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4520 $(HOST_EXPORTS) \
4521 (cd $(HOST_SUBDIR)/uudecode && \
4522- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-uudecode))
4523+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4524+ $(TARGET-uudecode))
4525 @endif uudecode
4526
4527
4528@@ -34674,7 +35027,8 @@ all-wdiff: configure-wdiff
4529 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4530 $(HOST_EXPORTS) \
4531 (cd $(HOST_SUBDIR)/wdiff && \
4532- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-wdiff))
4533+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4534+ $(TARGET-wdiff))
4535 @endif wdiff
4536
4537
4538@@ -35098,7 +35452,8 @@ all-zip: configure-zip
4539 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4540 $(HOST_EXPORTS) \
4541 (cd $(HOST_SUBDIR)/zip && \
4542- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-zip))
4543+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4544+ $(TARGET-zip))
4545 @endif zip
4546
4547
4548@@ -35518,9 +35873,9 @@ configure-stage1-zlib:
4549 @r=`${PWD_COMMAND}`; export r; \
4550 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4551 test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
4552- $(HOST_EXPORTS) \
4553+ $(HOST_EXPORTS) \
4554 CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
4555- LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
4556+ CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \
4557 echo Configuring stage 1 in $(HOST_SUBDIR)/zlib ; \
4558 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
4559 cd $(HOST_SUBDIR)/zlib || exit 1; \
4560@@ -35549,9 +35904,9 @@ configure-stage2-zlib:
4561 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4562 test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
4563 $(HOST_EXPORTS) \
4564- $(POSTSTAGE1_HOST_EXPORTS) \
4565+ $(POSTSTAGE1_HOST_EXPORTS) \
4566 CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
4567- LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
4568+ CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \
4569 echo Configuring stage 2 in $(HOST_SUBDIR)/zlib ; \
4570 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
4571 cd $(HOST_SUBDIR)/zlib || exit 1; \
4572@@ -35580,9 +35935,9 @@ configure-stageb2g0-zlib:
4573 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4574 test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
4575 $(HOST_EXPORTS) \
4576- $(POSTSTAGE1_HOST_EXPORTS) \
4577+ $(POSTSTAGE1_HOST_EXPORTS) \
4578 CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
4579- LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
4580+ CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS; \
4581 echo Configuring stage b2g0 in $(HOST_SUBDIR)/zlib ; \
4582 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
4583 cd $(HOST_SUBDIR)/zlib || exit 1; \
4584@@ -35611,9 +35966,9 @@ configure-stage3-zlib:
4585 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4586 test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
4587 $(HOST_EXPORTS) \
4588- $(POSTSTAGE1_HOST_EXPORTS) \
4589+ $(POSTSTAGE1_HOST_EXPORTS) \
4590 CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
4591- LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
4592+ CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \
4593 echo Configuring stage 3 in $(HOST_SUBDIR)/zlib ; \
4594 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
4595 cd $(HOST_SUBDIR)/zlib || exit 1; \
4596@@ -35642,9 +35997,9 @@ configure-stageb3g2-zlib:
4597 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4598 test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
4599 $(HOST_EXPORTS) \
4600- $(POSTSTAGE1_HOST_EXPORTS) \
4601+ $(POSTSTAGE1_HOST_EXPORTS) \
4602 CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
4603- LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
4604+ CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS; \
4605 echo Configuring stage b3g2 in $(HOST_SUBDIR)/zlib ; \
4606 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
4607 cd $(HOST_SUBDIR)/zlib || exit 1; \
4608@@ -35673,9 +36028,9 @@ configure-stage4-zlib:
4609 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4610 test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
4611 $(HOST_EXPORTS) \
4612- $(POSTSTAGE1_HOST_EXPORTS) \
4613+ $(POSTSTAGE1_HOST_EXPORTS) \
4614 CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
4615- LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
4616+ CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \
4617 echo Configuring stage 4 in $(HOST_SUBDIR)/zlib ; \
4618 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
4619 cd $(HOST_SUBDIR)/zlib || exit 1; \
4620@@ -35704,9 +36059,9 @@ configure-stageprofile-zlib:
4621 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4622 test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
4623 $(HOST_EXPORTS) \
4624- $(POSTSTAGE1_HOST_EXPORTS) \
4625+ $(POSTSTAGE1_HOST_EXPORTS) \
4626 CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
4627- LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
4628+ CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \
4629 echo Configuring stage profile in $(HOST_SUBDIR)/zlib ; \
4630 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
4631 cd $(HOST_SUBDIR)/zlib || exit 1; \
4632@@ -35735,9 +36090,9 @@ configure-stagefeedback-zlib:
4633 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4634 test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
4635 $(HOST_EXPORTS) \
4636- $(POSTSTAGE1_HOST_EXPORTS) \
4637+ $(POSTSTAGE1_HOST_EXPORTS) \
4638 CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
4639- LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
4640+ CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \
4641 echo Configuring stage feedback in $(HOST_SUBDIR)/zlib ; \
4642 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
4643 cd $(HOST_SUBDIR)/zlib || exit 1; \
4644@@ -35772,7 +36127,8 @@ all-zlib: configure-zlib
4645 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4646 $(HOST_EXPORTS) \
4647 (cd $(HOST_SUBDIR)/zlib && \
4648- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-zlib))
4649+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4650+ $(TARGET-zlib))
4651 @endif zlib
4652
4653
4654@@ -35791,8 +36147,11 @@ all-stage1-zlib: configure-stage1-zlib
4655 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4656 $(HOST_EXPORTS) \
4657 cd $(HOST_SUBDIR)/zlib && \
4658- $(MAKE) $(FLAGS_TO_PASS) \
4659- CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \
4660+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
4661+ CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
4662+ LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
4663+ CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
4664+ CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \
4665 $(TARGET-stage1-zlib)
4666
4667 maybe-clean-stage1-zlib: clean-stage1-zlib
4668@@ -35805,7 +36164,7 @@ clean-stage1-zlib:
4669 $(MAKE) stage1-start; \
4670 fi; \
4671 cd $(HOST_SUBDIR)/zlib && \
4672- $(MAKE) $(FLAGS_TO_PASS) \
4673+ $(MAKE) $(EXTRA_HOST_FLAGS) \
4674 clean
4675 @endif zlib-bootstrap
4676
4677@@ -35825,8 +36184,11 @@ all-stage2-zlib: configure-stage2-zlib
4678 $(HOST_EXPORTS) \
4679 $(POSTSTAGE1_HOST_EXPORTS) \
4680 cd $(HOST_SUBDIR)/zlib && \
4681- $(MAKE) $(FLAGS_TO_PASS) \
4682- CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
4683+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
4684+ CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
4685+ LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
4686+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
4687+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
4688 $(TARGET-stage2-zlib)
4689
4690 maybe-clean-stage2-zlib: clean-stage2-zlib
4691@@ -35839,7 +36201,7 @@ clean-stage2-zlib:
4692 $(MAKE) stage2-start; \
4693 fi; \
4694 cd $(HOST_SUBDIR)/zlib && \
4695- $(MAKE) $(FLAGS_TO_PASS) \
4696+ $(MAKE) $(EXTRA_HOST_FLAGS) \
4697 $(POSTSTAGE1_FLAGS_TO_PASS) \
4698 clean
4699 @endif zlib-bootstrap
4700@@ -35860,8 +36222,11 @@ all-stageb2g0-zlib: configure-stageb2g0-
4701 $(HOST_EXPORTS) \
4702 $(POSTSTAGE1_HOST_EXPORTS) \
4703 cd $(HOST_SUBDIR)/zlib && \
4704- $(MAKE) $(FLAGS_TO_PASS) \
4705- CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS) \
4706+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
4707+ CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
4708+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
4709+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
4710+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
4711 $(TARGET-stageb2g0-zlib)
4712
4713 maybe-clean-stageb2g0-zlib: clean-stageb2g0-zlib
4714@@ -35874,7 +36239,7 @@ clean-stageb2g0-zlib:
4715 $(MAKE) stageb2g0-start; \
4716 fi; \
4717 cd $(HOST_SUBDIR)/zlib && \
4718- $(MAKE) $(FLAGS_TO_PASS) \
4719+ $(MAKE) $(EXTRA_HOST_FLAGS) \
4720 $(POSTSTAGE1_FLAGS_TO_PASS) \
4721 clean
4722 @endif zlib-bootstrap
4723@@ -35895,8 +36260,11 @@ all-stage3-zlib: configure-stage3-zlib
4724 $(HOST_EXPORTS) \
4725 $(POSTSTAGE1_HOST_EXPORTS) \
4726 cd $(HOST_SUBDIR)/zlib && \
4727- $(MAKE) $(FLAGS_TO_PASS) \
4728- CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
4729+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
4730+ CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
4731+ LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
4732+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
4733+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
4734 $(TARGET-stage3-zlib)
4735
4736 maybe-clean-stage3-zlib: clean-stage3-zlib
4737@@ -35909,7 +36277,7 @@ clean-stage3-zlib:
4738 $(MAKE) stage3-start; \
4739 fi; \
4740 cd $(HOST_SUBDIR)/zlib && \
4741- $(MAKE) $(FLAGS_TO_PASS) \
4742+ $(MAKE) $(EXTRA_HOST_FLAGS) \
4743 $(POSTSTAGE1_FLAGS_TO_PASS) \
4744 clean
4745 @endif zlib-bootstrap
4746@@ -35930,8 +36298,11 @@ all-stageb3g2-zlib: configure-stageb3g2-
4747 $(HOST_EXPORTS) \
4748 $(POSTSTAGE1_HOST_EXPORTS) \
4749 cd $(HOST_SUBDIR)/zlib && \
4750- $(MAKE) $(FLAGS_TO_PASS) \
4751- CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS) \
4752+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
4753+ CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
4754+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
4755+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
4756+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
4757 $(TARGET-stageb3g2-zlib)
4758
4759 maybe-clean-stageb3g2-zlib: clean-stageb3g2-zlib
4760@@ -35944,7 +36315,7 @@ clean-stageb3g2-zlib:
4761 $(MAKE) stageb3g2-start; \
4762 fi; \
4763 cd $(HOST_SUBDIR)/zlib && \
4764- $(MAKE) $(FLAGS_TO_PASS) \
4765+ $(MAKE) $(EXTRA_HOST_FLAGS) \
4766 $(POSTSTAGE1_FLAGS_TO_PASS) \
4767 clean
4768 @endif zlib-bootstrap
4769@@ -35965,8 +36336,11 @@ all-stage4-zlib: configure-stage4-zlib
4770 $(HOST_EXPORTS) \
4771 $(POSTSTAGE1_HOST_EXPORTS) \
4772 cd $(HOST_SUBDIR)/zlib && \
4773- $(MAKE) $(FLAGS_TO_PASS) \
4774- CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
4775+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
4776+ CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
4777+ LIBCFLAGS="$(STAGE4_CFLAGS)" \
4778+ CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
4779+ CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
4780 $(TARGET-stage4-zlib)
4781
4782 maybe-clean-stage4-zlib: clean-stage4-zlib
4783@@ -35979,7 +36353,7 @@ clean-stage4-zlib:
4784 $(MAKE) stage4-start; \
4785 fi; \
4786 cd $(HOST_SUBDIR)/zlib && \
4787- $(MAKE) $(FLAGS_TO_PASS) \
4788+ $(MAKE) $(EXTRA_HOST_FLAGS) \
4789 $(POSTSTAGE1_FLAGS_TO_PASS) \
4790 clean
4791 @endif zlib-bootstrap
4792@@ -36000,8 +36374,11 @@ all-stageprofile-zlib: configure-stagepr
4793 $(HOST_EXPORTS) \
4794 $(POSTSTAGE1_HOST_EXPORTS) \
4795 cd $(HOST_SUBDIR)/zlib && \
4796- $(MAKE) $(FLAGS_TO_PASS) \
4797- CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS) \
4798+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
4799+ CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
4800+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
4801+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
4802+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
4803 $(TARGET-stageprofile-zlib)
4804
4805 maybe-clean-stageprofile-zlib: clean-stageprofile-zlib
4806@@ -36014,7 +36391,7 @@ clean-stageprofile-zlib:
4807 $(MAKE) stageprofile-start; \
4808 fi; \
4809 cd $(HOST_SUBDIR)/zlib && \
4810- $(MAKE) $(FLAGS_TO_PASS) \
4811+ $(MAKE) $(EXTRA_HOST_FLAGS) \
4812 $(POSTSTAGE1_FLAGS_TO_PASS) \
4813 clean
4814 @endif zlib-bootstrap
4815@@ -36035,8 +36412,11 @@ all-stagefeedback-zlib: configure-stagef
4816 $(HOST_EXPORTS) \
4817 $(POSTSTAGE1_HOST_EXPORTS) \
4818 cd $(HOST_SUBDIR)/zlib && \
4819- $(MAKE) $(FLAGS_TO_PASS) \
4820- CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS) \
4821+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
4822+ CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
4823+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
4824+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
4825+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
4826 $(TARGET-stagefeedback-zlib)
4827
4828 maybe-clean-stagefeedback-zlib: clean-stagefeedback-zlib
4829@@ -36049,7 +36429,7 @@ clean-stagefeedback-zlib:
4830 $(MAKE) stagefeedback-start; \
4831 fi; \
4832 cd $(HOST_SUBDIR)/zlib && \
4833- $(MAKE) $(FLAGS_TO_PASS) \
4834+ $(MAKE) $(EXTRA_HOST_FLAGS) \
4835 $(POSTSTAGE1_FLAGS_TO_PASS) \
4836 clean
4837 @endif zlib-bootstrap
4838@@ -36451,7 +36831,8 @@ all-gdb: configure-gdb
4839 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4840 $(HOST_EXPORTS) \
4841 (cd $(HOST_SUBDIR)/gdb && \
4842- $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) $(TARGET-gdb))
4843+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS) \
4844+ $(TARGET-gdb))
4845 @endif gdb
4846
4847
4848@@ -36875,7 +37256,8 @@ all-expect: configure-expect
4849 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4850 $(HOST_EXPORTS) \
4851 (cd $(HOST_SUBDIR)/expect && \
4852- $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) $(TARGET-expect))
4853+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS) \
4854+ $(TARGET-expect))
4855 @endif expect
4856
4857
4858@@ -37299,7 +37681,8 @@ all-guile: configure-guile
4859 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4860 $(HOST_EXPORTS) \
4861 (cd $(HOST_SUBDIR)/guile && \
4862- $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) $(TARGET-guile))
4863+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS) \
4864+ $(TARGET-guile))
4865 @endif guile
4866
4867
4868@@ -37723,7 +38106,8 @@ all-tk: configure-tk
4869 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4870 $(HOST_EXPORTS) \
4871 (cd $(HOST_SUBDIR)/tk && \
4872- $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) $(TARGET-tk))
4873+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS) \
4874+ $(TARGET-tk))
4875 @endif tk
4876
4877
4878@@ -38147,7 +38531,8 @@ all-libtermcap: configure-libtermcap
4879 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4880 $(HOST_EXPORTS) \
4881 (cd $(HOST_SUBDIR)/libtermcap && \
4882- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-libtermcap))
4883+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4884+ $(TARGET-libtermcap))
4885 @endif libtermcap
4886
4887
4888@@ -38505,7 +38890,8 @@ all-utils: configure-utils
4889 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4890 $(HOST_EXPORTS) \
4891 (cd $(HOST_SUBDIR)/utils && \
4892- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-utils))
4893+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4894+ $(TARGET-utils))
4895 @endif utils
4896
4897
4898@@ -38923,7 +39309,8 @@ all-gnattools: configure-gnattools
4899 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4900 $(HOST_EXPORTS) \
4901 (cd $(HOST_SUBDIR)/gnattools && \
4902- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-gnattools))
4903+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4904+ $(TARGET-gnattools))
4905 @endif gnattools
4906
4907
4908@@ -39368,7 +39755,8 @@ all-target-libstdc++-v3: configure-targe
4909 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4910 $(RAW_CXX_TARGET_EXPORTS) \
4911 (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
4912- $(MAKE) $(TARGET_FLAGS_TO_PASS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' $(TARGET-target-libstdc++-v3))
4913+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \
4914+ $(TARGET-target-libstdc++-v3))
4915 @endif target-libstdc++-v3
4916
4917
4918@@ -39809,7 +40197,8 @@ all-target-libmudflap: configure-target-
4919 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4920 $(NORMAL_TARGET_EXPORTS) \
4921 (cd $(TARGET_SUBDIR)/libmudflap && \
4922- $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libmudflap))
4923+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \
4924+ $(TARGET-target-libmudflap))
4925 @endif target-libmudflap
4926
4927
4928@@ -40250,7 +40639,8 @@ all-target-libssp: configure-target-libs
4929 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4930 $(NORMAL_TARGET_EXPORTS) \
4931 (cd $(TARGET_SUBDIR)/libssp && \
4932- $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libssp))
4933+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \
4934+ $(TARGET-target-libssp))
4935 @endif target-libssp
4936
4937
4938@@ -40691,7 +41081,8 @@ all-target-newlib: configure-target-newl
4939 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4940 $(NORMAL_TARGET_EXPORTS) \
4941 (cd $(TARGET_SUBDIR)/newlib && \
4942- $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-newlib))
4943+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \
4944+ $(TARGET-target-newlib))
4945 @endif target-newlib
4946
4947
4948@@ -41137,9 +41528,9 @@ configure-stage1-target-libgcc:
4949 mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
4950 fi; \
4951 test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
4952- $(NORMAL_TARGET_EXPORTS) \
4953- CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
4954- LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
4955+ $(NORMAL_TARGET_EXPORTS) \
4956+ CFLAGS="$(STAGE1_LIBCFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
4957+ CXXFLAGS="$(STAGE1_LIBCFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS; \
4958 echo Configuring stage 1 in $(TARGET_SUBDIR)/libgcc ; \
4959 $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
4960 cd $(TARGET_SUBDIR)/libgcc || exit 1; \
4961@@ -41180,9 +41571,9 @@ configure-stage2-target-libgcc:
4962 fi; \
4963 test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
4964 $(NORMAL_TARGET_EXPORTS) \
4965- \
4966- CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
4967- LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
4968+ \
4969+ CFLAGS="$(STAGE2_LIBCFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
4970+ CXXFLAGS="$(STAGE2_LIBCFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS; \
4971 echo Configuring stage 2 in $(TARGET_SUBDIR)/libgcc ; \
4972 $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
4973 cd $(TARGET_SUBDIR)/libgcc || exit 1; \
4974@@ -41223,9 +41614,9 @@ configure-stageb2g0-target-libgcc:
4975 fi; \
4976 test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
4977 $(NORMAL_TARGET_EXPORTS) \
4978- \
4979- CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
4980- LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
4981+ \
4982+ CFLAGS="$(STAGE2_LIBCFLAGS) -g0 $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
4983+ CXXFLAGS="$(STAGE2_LIBCFLAGS) -g0 $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS; \
4984 echo Configuring stage b2g0 in $(TARGET_SUBDIR)/libgcc ; \
4985 $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
4986 cd $(TARGET_SUBDIR)/libgcc || exit 1; \
4987@@ -41266,9 +41657,9 @@ configure-stage3-target-libgcc:
4988 fi; \
4989 test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
4990 $(NORMAL_TARGET_EXPORTS) \
4991- \
4992- CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
4993- LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
4994+ \
4995+ CFLAGS="$(STAGE3_LIBCFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
4996+ CXXFLAGS="$(STAGE3_LIBCFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS; \
4997 echo Configuring stage 3 in $(TARGET_SUBDIR)/libgcc ; \
4998 $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
4999 cd $(TARGET_SUBDIR)/libgcc || exit 1; \
5000@@ -41309,9 +41700,9 @@ configure-stageb3g2-target-libgcc:
5001 fi; \
5002 test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
5003 $(NORMAL_TARGET_EXPORTS) \
5004- \
5005- CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
5006- LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
5007+ \
5008+ CFLAGS="$(STAGE3_LIBCFLAGS) -g2 $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
5009+ CXXFLAGS="$(STAGE3_LIBCFLAGS) -g2 $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS; \
5010 echo Configuring stage b3g2 in $(TARGET_SUBDIR)/libgcc ; \
5011 $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
5012 cd $(TARGET_SUBDIR)/libgcc || exit 1; \
5013@@ -41352,9 +41743,9 @@ configure-stage4-target-libgcc:
5014 fi; \
5015 test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
5016 $(NORMAL_TARGET_EXPORTS) \
5017- \
5018- CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
5019- LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
5020+ \
5021+ CFLAGS="$(STAGE4_CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
5022+ CXXFLAGS="$(STAGE4_CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS; \
5023 echo Configuring stage 4 in $(TARGET_SUBDIR)/libgcc ; \
5024 $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
5025 cd $(TARGET_SUBDIR)/libgcc || exit 1; \
5026@@ -41395,9 +41786,9 @@ configure-stageprofile-target-libgcc:
5027 fi; \
5028 test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
5029 $(NORMAL_TARGET_EXPORTS) \
5030- \
5031- CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
5032- LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
5033+ \
5034+ CFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
5035+ CXXFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS; \
5036 echo Configuring stage profile in $(TARGET_SUBDIR)/libgcc ; \
5037 $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
5038 cd $(TARGET_SUBDIR)/libgcc || exit 1; \
5039@@ -41438,9 +41829,9 @@ configure-stagefeedback-target-libgcc:
5040 fi; \
5041 test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
5042 $(NORMAL_TARGET_EXPORTS) \
5043- \
5044- CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
5045- LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
5046+ \
5047+ CFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
5048+ CXXFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS; \
5049 echo Configuring stage feedback in $(TARGET_SUBDIR)/libgcc ; \
5050 $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
5051 cd $(TARGET_SUBDIR)/libgcc || exit 1; \
5052@@ -41475,7 +41866,8 @@ all-target-libgcc: configure-target-libg
5053 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5054 $(NORMAL_TARGET_EXPORTS) \
5055 (cd $(TARGET_SUBDIR)/libgcc && \
5056- $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libgcc))
5057+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \
5058+ $(TARGET-target-libgcc))
5059 @endif target-libgcc
5060
5061
5062@@ -41494,8 +41886,11 @@ all-stage1-target-libgcc: configure-stag
5063 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5064 $(NORMAL_TARGET_EXPORTS) \
5065 cd $(TARGET_SUBDIR)/libgcc && \
5066- $(MAKE) $(TARGET_FLAGS_TO_PASS) \
5067- CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \
5068+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
5069+ CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
5070+ LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
5071+ CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
5072+ CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_TARGET_FLAGS) \
5073 $(TARGET-stage1-target-libgcc)
5074
5075 maybe-clean-stage1-target-libgcc: clean-stage1-target-libgcc
5076@@ -41508,7 +41903,7 @@ clean-stage1-target-libgcc:
5077 $(MAKE) stage1-start; \
5078 fi; \
5079 cd $(TARGET_SUBDIR)/libgcc && \
5080- $(MAKE) $(TARGET_FLAGS_TO_PASS) \
5081+ $(MAKE) $(EXTRA_TARGET_FLAGS) \
5082 clean
5083 @endif target-libgcc-bootstrap
5084
5085@@ -41528,8 +41923,11 @@ all-stage2-target-libgcc: configure-stag
5086 $(NORMAL_TARGET_EXPORTS) \
5087 \
5088 cd $(TARGET_SUBDIR)/libgcc && \
5089- $(MAKE) $(TARGET_FLAGS_TO_PASS) \
5090- CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" \
5091+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
5092+ CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
5093+ LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
5094+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
5095+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_TARGET_FLAGS) \
5096 $(TARGET-stage2-target-libgcc)
5097
5098 maybe-clean-stage2-target-libgcc: clean-stage2-target-libgcc
5099@@ -41542,7 +41940,7 @@ clean-stage2-target-libgcc:
5100 $(MAKE) stage2-start; \
5101 fi; \
5102 cd $(TARGET_SUBDIR)/libgcc && \
5103- $(MAKE) $(TARGET_FLAGS_TO_PASS) \
5104+ $(MAKE) $(EXTRA_TARGET_FLAGS) \
5105 \
5106 clean
5107 @endif target-libgcc-bootstrap
5108@@ -41563,8 +41961,11 @@ all-stageb2g0-target-libgcc: configure-s
5109 $(NORMAL_TARGET_EXPORTS) \
5110 \
5111 cd $(TARGET_SUBDIR)/libgcc && \
5112- $(MAKE) $(TARGET_FLAGS_TO_PASS) \
5113- CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" \
5114+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
5115+ CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
5116+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
5117+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
5118+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_TARGET_FLAGS) \
5119 $(TARGET-stageb2g0-target-libgcc)
5120
5121 maybe-clean-stageb2g0-target-libgcc: clean-stageb2g0-target-libgcc
5122@@ -41577,7 +41978,7 @@ clean-stageb2g0-target-libgcc:
5123 $(MAKE) stageb2g0-start; \
5124 fi; \
5125 cd $(TARGET_SUBDIR)/libgcc && \
5126- $(MAKE) $(TARGET_FLAGS_TO_PASS) \
5127+ $(MAKE) $(EXTRA_TARGET_FLAGS) \
5128 \
5129 clean
5130 @endif target-libgcc-bootstrap
5131@@ -41598,8 +41999,11 @@ all-stage3-target-libgcc: configure-stag
5132 $(NORMAL_TARGET_EXPORTS) \
5133 \
5134 cd $(TARGET_SUBDIR)/libgcc && \
5135- $(MAKE) $(TARGET_FLAGS_TO_PASS) \
5136- CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" \
5137+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
5138+ CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
5139+ LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
5140+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
5141+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_TARGET_FLAGS) \
5142 $(TARGET-stage3-target-libgcc)
5143
5144 maybe-clean-stage3-target-libgcc: clean-stage3-target-libgcc
5145@@ -41612,7 +42016,7 @@ clean-stage3-target-libgcc:
5146 $(MAKE) stage3-start; \
5147 fi; \
5148 cd $(TARGET_SUBDIR)/libgcc && \
5149- $(MAKE) $(TARGET_FLAGS_TO_PASS) \
5150+ $(MAKE) $(EXTRA_TARGET_FLAGS) \
5151 \
5152 clean
5153 @endif target-libgcc-bootstrap
5154@@ -41633,8 +42037,11 @@ all-stageb3g2-target-libgcc: configure-s
5155 $(NORMAL_TARGET_EXPORTS) \
5156 \
5157 cd $(TARGET_SUBDIR)/libgcc && \
5158- $(MAKE) $(TARGET_FLAGS_TO_PASS) \
5159- CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" \
5160+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
5161+ CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
5162+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
5163+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
5164+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_TARGET_FLAGS) \
5165 $(TARGET-stageb3g2-target-libgcc)
5166
5167 maybe-clean-stageb3g2-target-libgcc: clean-stageb3g2-target-libgcc
5168@@ -41647,7 +42054,7 @@ clean-stageb3g2-target-libgcc:
5169 $(MAKE) stageb3g2-start; \
5170 fi; \
5171 cd $(TARGET_SUBDIR)/libgcc && \
5172- $(MAKE) $(TARGET_FLAGS_TO_PASS) \
5173+ $(MAKE) $(EXTRA_TARGET_FLAGS) \
5174 \
5175 clean
5176 @endif target-libgcc-bootstrap
5177@@ -41668,8 +42075,11 @@ all-stage4-target-libgcc: configure-stag
5178 $(NORMAL_TARGET_EXPORTS) \
5179 \
5180 cd $(TARGET_SUBDIR)/libgcc && \
5181- $(MAKE) $(TARGET_FLAGS_TO_PASS) \
5182- CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" \
5183+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
5184+ CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
5185+ LIBCFLAGS="$(STAGE4_CFLAGS)" \
5186+ CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
5187+ CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_TARGET_FLAGS) \
5188 $(TARGET-stage4-target-libgcc)
5189
5190 maybe-clean-stage4-target-libgcc: clean-stage4-target-libgcc
5191@@ -41682,7 +42092,7 @@ clean-stage4-target-libgcc:
5192 $(MAKE) stage4-start; \
5193 fi; \
5194 cd $(TARGET_SUBDIR)/libgcc && \
5195- $(MAKE) $(TARGET_FLAGS_TO_PASS) \
5196+ $(MAKE) $(EXTRA_TARGET_FLAGS) \
5197 \
5198 clean
5199 @endif target-libgcc-bootstrap
5200@@ -41703,8 +42113,11 @@ all-stageprofile-target-libgcc: configur
5201 $(NORMAL_TARGET_EXPORTS) \
5202 \
5203 cd $(TARGET_SUBDIR)/libgcc && \
5204- $(MAKE) $(TARGET_FLAGS_TO_PASS) \
5205- CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
5206+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
5207+ CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
5208+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
5209+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
5210+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_TARGET_FLAGS) \
5211 $(TARGET-stageprofile-target-libgcc)
5212
5213 maybe-clean-stageprofile-target-libgcc: clean-stageprofile-target-libgcc
5214@@ -41717,7 +42130,7 @@ clean-stageprofile-target-libgcc:
5215 $(MAKE) stageprofile-start; \
5216 fi; \
5217 cd $(TARGET_SUBDIR)/libgcc && \
5218- $(MAKE) $(TARGET_FLAGS_TO_PASS) \
5219+ $(MAKE) $(EXTRA_TARGET_FLAGS) \
5220 \
5221 clean
5222 @endif target-libgcc-bootstrap
5223@@ -41738,8 +42151,11 @@ all-stagefeedback-target-libgcc: configu
5224 $(NORMAL_TARGET_EXPORTS) \
5225 \
5226 cd $(TARGET_SUBDIR)/libgcc && \
5227- $(MAKE) $(TARGET_FLAGS_TO_PASS) \
5228- CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
5229+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
5230+ CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
5231+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
5232+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
5233+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_TARGET_FLAGS) \
5234 $(TARGET-stagefeedback-target-libgcc)
5235
5236 maybe-clean-stagefeedback-target-libgcc: clean-stagefeedback-target-libgcc
5237@@ -41752,7 +42168,7 @@ clean-stagefeedback-target-libgcc:
5238 $(MAKE) stagefeedback-start; \
5239 fi; \
5240 cd $(TARGET_SUBDIR)/libgcc && \
5241- $(MAKE) $(TARGET_FLAGS_TO_PASS) \
5242+ $(MAKE) $(EXTRA_TARGET_FLAGS) \
5243 \
5244 clean
5245 @endif target-libgcc-bootstrap
5246@@ -42191,7 +42607,8 @@ all-target-libgfortran: configure-target
5247 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5248 $(NORMAL_TARGET_EXPORTS) \
5249 (cd $(TARGET_SUBDIR)/libgfortran && \
5250- $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libgfortran))
5251+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \
5252+ $(TARGET-target-libgfortran))
5253 @endif target-libgfortran
5254
5255
5256@@ -42632,7 +43049,8 @@ all-target-libobjc: configure-target-lib
5257 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5258 $(NORMAL_TARGET_EXPORTS) \
5259 (cd $(TARGET_SUBDIR)/libobjc && \
5260- $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libobjc))
5261+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \
5262+ $(TARGET-target-libobjc))
5263 @endif target-libobjc
5264
5265
5266@@ -43073,7 +43491,8 @@ all-target-libtermcap: configure-target-
5267 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5268 $(NORMAL_TARGET_EXPORTS) \
5269 (cd $(TARGET_SUBDIR)/libtermcap && \
5270- $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libtermcap))
5271+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \
5272+ $(TARGET-target-libtermcap))
5273 @endif target-libtermcap
5274
5275
5276@@ -43449,7 +43868,8 @@ all-target-winsup: configure-target-wins
5277 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5278 $(NORMAL_TARGET_EXPORTS) \
5279 (cd $(TARGET_SUBDIR)/winsup && \
5280- $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-winsup))
5281+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \
5282+ $(TARGET-target-winsup))
5283 @endif target-winsup
5284
5285
5286@@ -43890,7 +44310,8 @@ all-target-libgloss: configure-target-li
5287 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5288 $(NORMAL_TARGET_EXPORTS) \
5289 (cd $(TARGET_SUBDIR)/libgloss && \
5290- $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libgloss))
5291+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \
5292+ $(TARGET-target-libgloss))
5293 @endif target-libgloss
5294
5295
5296@@ -44326,7 +44747,8 @@ all-target-libiberty: configure-target-l
5297 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5298 $(NORMAL_TARGET_EXPORTS) \
5299 (cd $(TARGET_SUBDIR)/libiberty && \
5300- $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libiberty))
5301+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \
5302+ $(TARGET-target-libiberty))
5303 @endif target-libiberty
5304
5305
5306@@ -44767,7 +45189,8 @@ all-target-gperf: configure-target-gperf
5307 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5308 $(NORMAL_TARGET_EXPORTS) \
5309 (cd $(TARGET_SUBDIR)/gperf && \
5310- $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-gperf))
5311+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \
5312+ $(TARGET-target-gperf))
5313 @endif target-gperf
5314
5315
5316@@ -45208,7 +45631,8 @@ all-target-examples: configure-target-ex
5317 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5318 $(NORMAL_TARGET_EXPORTS) \
5319 (cd $(TARGET_SUBDIR)/examples && \
5320- $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-examples))
5321+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \
5322+ $(TARGET-target-examples))
5323 @endif target-examples
5324
5325
5326@@ -45639,7 +46063,8 @@ all-target-libffi: configure-target-libf
5327 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5328 $(NORMAL_TARGET_EXPORTS) \
5329 (cd $(TARGET_SUBDIR)/libffi && \
5330- $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libffi))
5331+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \
5332+ $(TARGET-target-libffi))
5333 @endif target-libffi
5334
5335
5336@@ -46080,7 +46505,8 @@ all-target-libjava: configure-target-lib
5337 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5338 $(RAW_CXX_TARGET_EXPORTS) \
5339 (cd $(TARGET_SUBDIR)/libjava && \
5340- $(MAKE) $(TARGET_FLAGS_TO_PASS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' $(TARGET-target-libjava))
5341+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \
5342+ $(TARGET-target-libjava))
5343 @endif target-libjava
5344
5345
5346@@ -46521,7 +46947,8 @@ all-target-zlib: configure-target-zlib
5347 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5348 $(NORMAL_TARGET_EXPORTS) \
5349 (cd $(TARGET_SUBDIR)/zlib && \
5350- $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-zlib))
5351+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \
5352+ $(TARGET-target-zlib))
5353 @endif target-zlib
5354
5355
5356@@ -46962,7 +47389,8 @@ all-target-boehm-gc: configure-target-bo
5357 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5358 $(NORMAL_TARGET_EXPORTS) \
5359 (cd $(TARGET_SUBDIR)/boehm-gc && \
5360- $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-boehm-gc))
5361+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \
5362+ $(TARGET-target-boehm-gc))
5363 @endif target-boehm-gc
5364
5365
5366@@ -47403,7 +47831,8 @@ all-target-qthreads: configure-target-qt
5367 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5368 $(NORMAL_TARGET_EXPORTS) \
5369 (cd $(TARGET_SUBDIR)/qthreads && \
5370- $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-qthreads))
5371+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \
5372+ $(TARGET-target-qthreads))
5373 @endif target-qthreads
5374
5375
5376@@ -47844,7 +48273,8 @@ all-target-rda: configure-target-rda
5377 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5378 $(NORMAL_TARGET_EXPORTS) \
5379 (cd $(TARGET_SUBDIR)/rda && \
5380- $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-rda))
5381+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \
5382+ $(TARGET-target-rda))
5383 @endif target-rda
5384
5385
5386@@ -48285,7 +48715,8 @@ all-target-libada: configure-target-liba
5387 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5388 $(NORMAL_TARGET_EXPORTS) \
5389 (cd $(TARGET_SUBDIR)/libada && \
5390- $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libada))
5391+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \
5392+ $(TARGET-target-libada))
5393 @endif target-libada
5394
5395
5396@@ -48726,7 +49157,8 @@ all-target-libgomp: configure-target-lib
5397 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5398 $(NORMAL_TARGET_EXPORTS) \
5399 (cd $(TARGET_SUBDIR)/libgomp && \
5400- $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libgomp))
5401+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \
5402+ $(TARGET-target-libgomp))
5403 @endif target-libgomp
5404
5405
5406Index: gcc-4.3.1/configure
5407===================================================================
5408--- gcc-4.3.1.orig/configure 2008-02-01 19:29:30.000000000 -0800
5409+++ gcc-4.3.1/configure 2008-07-21 11:22:34.000000000 -0700
5410@@ -272,7 +272,7 @@ PACKAGE_STRING=
5411 PACKAGE_BUGREPORT=
5412
5413 ac_unique_file="move-if-change"
5414-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 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'
5415+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 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'
5416 ac_subst_files='serialization_dependencies host_makefile_frag target_makefile_frag alphaieee_frag ospace_frag'
5417
5418 # Initialize some variables set by options.
5419@@ -5147,6 +5147,38 @@ else
5420 fi;
5421
5422
5423+# During gcc bootstrap, if we use some random cc for stage1 then CFLAGS
5424+# might be empty or "-g". We don't require a C++ compiler, so CXXFLAGS
5425+# might also be empty (or "-g", if a non-GCC C++ compiler is in the path).
5426+# We want to ensure that TARGET libraries (which we know are built with
5427+# gcc) are built with "-O2 -g", so include those options when setting
5428+# CFLAGS_FOR_TARGET and CXXFLAGS_FOR_TARGET.
5429+if test "x$CFLAGS_FOR_TARGET" = x; then
5430+ CFLAGS_FOR_TARGET=$CFLAGS
5431+ case " $CFLAGS " in
5432+ *" -O2 "*) ;;
5433+ *) CFLAGS_FOR_TARGET="-O2 $CFLAGS" ;;
5434+ esac
5435+ case " $CFLAGS " in
5436+ *" -g "* | *" -g3 "*) ;;
5437+ *) CFLAGS_FOR_TARGET="-g $CFLAGS" ;;
5438+ esac
5439+fi
5440+
5441+
5442+if test "x$CXXFLAGS_FOR_TARGET" = x; then
5443+ CXXFLAGS_FOR_TARGET=$CXXFLAGS
5444+ case " $CXXFLAGS " in
5445+ *" -O2 "*) ;;
5446+ *) CXXFLAGS_FOR_TARGET="-O2 $CXXFLAGS" ;;
5447+ esac
5448+ case " $CXXFLAGS " in
5449+ *" -g "* | *" -g3 "*) ;;
5450+ *) CXXFLAGS_FOR_TARGET="-g $CXXFLAGS" ;;
5451+ esac
5452+fi
5453+
5454+
5455 # Handle --with-headers=XXX. If the value is not "yes", the contents of
5456 # the named directory are copied to $(tooldir)/sys-include.
5457 if test x"${with_headers}" != x && test x"${with_headers}" != xno ; then
5458@@ -12825,6 +12857,8 @@ s,@gmpinc@,$gmpinc,;t t
5459 s,@stage1_languages@,$stage1_languages,;t t
5460 s,@SYSROOT_CFLAGS_FOR_TARGET@,$SYSROOT_CFLAGS_FOR_TARGET,;t t
5461 s,@DEBUG_PREFIX_CFLAGS_FOR_TARGET@,$DEBUG_PREFIX_CFLAGS_FOR_TARGET,;t t
5462+s,@CFLAGS_FOR_TARGET@,$CFLAGS_FOR_TARGET,;t t
5463+s,@CXXFLAGS_FOR_TARGET@,$CXXFLAGS_FOR_TARGET,;t t
5464 s,@RPATH_ENVVAR@,$RPATH_ENVVAR,;t t
5465 s,@tooldir@,$tooldir,;t t
5466 s,@build_tooldir@,$build_tooldir,;t t
diff --git a/meta/packages/gcc/gcc-cross-sdk_4.3.1.bb b/meta/packages/gcc/gcc-cross-sdk_4.3.1.bb
index 8057608e0d..9562b43fdc 100644
--- a/meta/packages/gcc/gcc-cross-sdk_4.3.1.bb
+++ b/meta/packages/gcc/gcc-cross-sdk_4.3.1.bb
@@ -1,4 +1,4 @@
1PR = "r5" 1PR = "r6"
2 2
3inherit sdk 3inherit sdk
4 4
@@ -7,8 +7,12 @@ require gcc-cross-sdk.inc
7require gcc-configure-sdk.inc 7require gcc-configure-sdk.inc
8require gcc-package-sdk.inc 8require gcc-package-sdk.inc
9 9
10DEPENDS += "gmp-native mpfr-native" 10DEPENDS += "gmp-sdk mpfr-sdk"
11 11
12EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ 12EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
13 --disable-libgomp --disable-libmudflap \ 13 --disable-libgomp --disable-libmudflap \
14 --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}" 14 --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
15
16# to find libmpfr
17export LD_LIBRARY_PATH = "${STAGING_LIBDIR}"
18
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 19:34:07 +0000