summaryrefslogtreecommitdiffstats
path: root/meta/packages/gcc/gcc-4.3.3
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages/gcc/gcc-4.3.3')
-rw-r--r--meta/packages/gcc/gcc-4.3.3/100-uclibc-conf.patch179
-rw-r--r--meta/packages/gcc/gcc-4.3.3/200-uclibc-locale.patch423
-rw-r--r--meta/packages/gcc/gcc-4.3.3/203-uclibc-locale-no__x.patch74
-rw-r--r--meta/packages/gcc/gcc-4.3.3/205-uclibc-locale-update.patch324
-rw-r--r--meta/packages/gcc/gcc-4.3.3/302-c99-snprintf.patch12
-rw-r--r--meta/packages/gcc/gcc-4.3.3/307-locale_facets.patch19
-rw-r--r--meta/packages/gcc/gcc-4.3.3/800-arm-bigendian.patch55
-rw-r--r--meta/packages/gcc/gcc-4.3.3/arm-thumb.patch43
-rw-r--r--meta/packages/gcc/gcc-4.3.3/cache-amnesia.patch28
-rw-r--r--meta/packages/gcc/gcc-4.3.3/gcc-4.0.2-e300c2c3.patch82
-rw-r--r--meta/packages/gcc/gcc-4.3.3/gcc-4.2.3-linux-multilib-fix.patch23
-rw-r--r--meta/packages/gcc/gcc-4.3.3/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch31
-rw-r--r--meta/packages/gcc/gcc-4.3.3/gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch6691
-rw-r--r--meta/packages/gcc/gcc-4.3.3/gcc-flags-for-build.patch279
-rw-r--r--meta/packages/gcc/gcc-4.3.3/headerpath.patch42
-rw-r--r--meta/packages/gcc/gcc-4.3.3/sh_unwind.patch18
-rw-r--r--meta/packages/gcc/gcc-4.3.3/zecke-no-host-includes.patch8
-rw-r--r--meta/packages/gcc/gcc-4.3.3/zecke-xgcc-cpp.patch24
18 files changed, 7745 insertions, 610 deletions
diff --git a/meta/packages/gcc/gcc-4.3.3/100-uclibc-conf.patch b/meta/packages/gcc/gcc-4.3.3/100-uclibc-conf.patch
index 4243ff7b91..0b799607e8 100644
--- a/meta/packages/gcc/gcc-4.3.3/100-uclibc-conf.patch
+++ b/meta/packages/gcc/gcc-4.3.3/100-uclibc-conf.patch
@@ -1,119 +1,7 @@
1--- gcc/libgomp/configure 1Index: gcc-4.3.1/contrib/regression/objs-gcc.sh
2+++ gcc/libgomp/configure 2===================================================================
3@@ -3771,7 +3771,7 @@ 3--- gcc-4.3.1.orig/contrib/regression/objs-gcc.sh 2007-12-24 15:18:57.000000000 -0800
4 ;; 4+++ gcc-4.3.1/contrib/regression/objs-gcc.sh 2008-08-16 01:15:12.000000000 -0700
5
6 # This must be Linux ELF.
7-linux-gnu*)
8+linux*)
9 lt_cv_deplibs_check_method=pass_all
10 ;;
11
12--- gcc/gcc/config/cris/linux.h
13+++ gcc/gcc/config/cris/linux.h
14@@ -74,7 +74,11 @@
15 #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG
16
17 #undef CRIS_SUBTARGET_VERSION
18-#define CRIS_SUBTARGET_VERSION " - cris-axis-linux-gnu"
19+#if UCLIBC_DEFAULT
20+# define CRIS_SUBTARGET_VERSION " - cris-axis-linux-uclibc"
21+#else
22+# define CRIS_SUBTARGET_VERSION " - cris-axis-linux-gnu"
23+#endif
24
25 #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
26
27--- gcc/libstdc++-v3/configure
28+++ gcc/libstdc++-v3/configure
29@@ -4276,7 +4276,7 @@
30 ;;
31
32 # This must be Linux ELF.
33-linux-gnu*)
34+linux*)
35 lt_cv_deplibs_check_method=pass_all
36 ;;
37
38--- gcc/zlib/configure
39+++ gcc/zlib/configure
40@@ -3422,7 +3422,7 @@
41 ;;
42
43 # This must be Linux ELF.
44-linux-gnu*)
45+linux*)
46 lt_cv_deplibs_check_method=pass_all
47 ;;
48
49--- gcc/libobjc/configure
50+++ gcc/libobjc/configure
51@@ -3309,7 +3309,7 @@
52 ;;
53
54 # This must be Linux ELF.
55-linux-gnu*)
56+linux*)
57 lt_cv_deplibs_check_method=pass_all
58 ;;
59
60--- gcc/libgfortran/configure
61+++ gcc/libgfortran/configure
62@@ -3695,7 +3695,7 @@
63 ;;
64
65 # This must be Linux ELF.
66-linux-gnu*)
67+linux*)
68 lt_cv_deplibs_check_method=pass_all
69 ;;
70
71--- gcc/libmudflap/configure
72+++ gcc/libmudflap/configure
73@@ -5378,7 +5378,7 @@
74 ;;
75
76 # This must be Linux ELF.
77-linux-gnu*)
78+linux*)
79 lt_cv_deplibs_check_method=pass_all
80 ;;
81
82--- gcc/boehm-gc/configure
83+++ gcc/boehm-gc/configure
84@@ -4316,7 +4316,7 @@
85 ;;
86
87 # This must be Linux ELF.
88-linux-gnu*)
89+linux*)
90 lt_cv_deplibs_check_method=pass_all
91 ;;
92
93--- gcc/libffi/configure
94+++ gcc/libffi/configure
95@@ -3453,7 +3453,7 @@
96 ;;
97
98 # This must be Linux ELF.
99-linux-gnu*)
100+linux*)
101 lt_cv_deplibs_check_method=pass_all
102 ;;
103
104--- gcc/libssp/configure
105+++ gcc/libssp/configure
106@@ -4409,7 +4409,7 @@
107 ;;
108
109 # This must be Linux ELF.
110-linux-gnu*)
111+linux*)
112 lt_cv_deplibs_check_method=pass_all
113 ;;
114
115--- gcc/contrib/regression/objs-gcc.sh
116+++ gcc/contrib/regression/objs-gcc.sh
117@@ -105,6 +105,10 @@ 5@@ -105,6 +105,10 @@
118 then 6 then
119 make all-gdb all-dejagnu all-ld || exit 1 7 make all-gdb all-dejagnu all-ld || exit 1
@@ -125,61 +13,10 @@
125 elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then 13 elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
126 make bootstrap || exit 1 14 make bootstrap || exit 1
127 make install || exit 1 15 make install || exit 1
128--- gcc/libjava/classpath/ltconfig 16Index: gcc-4.3.1/libjava/classpath/ltconfig
129+++ gcc/libjava/classpath/ltconfig 17===================================================================
130@@ -603,7 +603,7 @@ 18--- gcc-4.3.1.orig/libjava/classpath/ltconfig 2007-06-03 16:18:43.000000000 -0700
131 19+++ gcc-4.3.1/libjava/classpath/ltconfig 2008-08-16 01:15:12.000000000 -0700
132 # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
133 case $host_os in
134-linux-gnu*) ;;
135+linux-gnu*|linux-uclibc*) ;;
136 linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
137 esac
138
139@@ -1251,7 +1251,7 @@
140 ;;
141
142 # This must be Linux ELF.
143-linux-gnu*)
144+linux*)
145 version_type=linux
146 need_lib_prefix=no
147 need_version=no
148--- gcc/libjava/classpath/configure
149+++ gcc/libjava/classpath/configure
150@@ -4665,7 +4665,7 @@
151 ;;
152
153 # This must be Linux ELF.
154-linux-gnu*)
155+linux*)
156 lt_cv_deplibs_check_method=pass_all
157 ;;
158
159--- gcc/libjava/configure
160+++ gcc/libjava/configure
161@@ -5212,7 +5212,7 @@
162 ;;
163
164 # This must be Linux ELF.
165-linux-gnu*)
166+linux*)
167 lt_cv_deplibs_check_method=pass_all
168 ;;
169
170--- gcc/libtool.m4
171+++ gcc/libtool.m4
172@@ -739,7 +739,7 @@
173 ;;
174
175 # This must be Linux ELF.
176-linux-gnu*)
177+linux*)
178 lt_cv_deplibs_check_method=pass_all
179 ;;
180
181--- gcc/ltconfig
182+++ gcc/ltconfig
183@@ -603,7 +603,7 @@ 20@@ -603,7 +603,7 @@
184 21
185 # Transform linux* to *-*-linux-gnu*, to support old configure scripts. 22 # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
diff --git a/meta/packages/gcc/gcc-4.3.3/200-uclibc-locale.patch b/meta/packages/gcc/gcc-4.3.3/200-uclibc-locale.patch
index ea21388b75..70ba98eed7 100644
--- a/meta/packages/gcc/gcc-4.3.3/200-uclibc-locale.patch
+++ b/meta/packages/gcc/gcc-4.3.3/200-uclibc-locale.patch
@@ -1,6 +1,8 @@
1--- gcc/libstdc++-v3/acinclude.m4 1Index: gcc-4.3.2/libstdc++-v3/acinclude.m4
2+++ gcc/libstdc++-v3/acinclude.m4 2===================================================================
3@@ -1369,7 +1369,7 @@ 3--- gcc-4.3.2.orig/libstdc++-v3/acinclude.m4 2008-04-25 09:52:57.000000000 -0700
4+++ gcc-4.3.2/libstdc++-v3/acinclude.m4 2008-08-28 17:55:56.000000000 -0700
5@@ -1349,7 +1349,7 @@
4 AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [ 6 AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [
5 GLIBCXX_ENABLE(clocale,auto,[@<:@=MODEL@:>@], 7 GLIBCXX_ENABLE(clocale,auto,[@<:@=MODEL@:>@],
6 [use MODEL for target locale package], 8 [use MODEL for target locale package],
@@ -9,7 +11,7 @@
9 11
10 # Deal with gettext issues. Default to not using it (=no) until we detect 12 # Deal with gettext issues. Default to not using it (=no) until we detect
11 # support for it later. Let the user turn it off via --e/d, but let that 13 # support for it later. Let the user turn it off via --e/d, but let that
12@@ -1385,6 +1385,9 @@ 14@@ -1370,6 +1370,9 @@
13 # Default to "generic". 15 # Default to "generic".
14 if test $enable_clocale_flag = auto; then 16 if test $enable_clocale_flag = auto; then
15 case ${target_os} in 17 case ${target_os} in
@@ -17,9 +19,9 @@
17+ enable_clocale_flag=uclibc 19+ enable_clocale_flag=uclibc
18+ ;; 20+ ;;
19 linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu) 21 linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu)
20 AC_EGREP_CPP([_GLIBCXX_ok], [ 22 enable_clocale_flag=gnu
21 #include <features.h> 23 ;;
22@@ -1528,6 +1531,40 @@ 24@@ -1541,6 +1544,40 @@
23 CTIME_CC=config/locale/generic/time_members.cc 25 CTIME_CC=config/locale/generic/time_members.cc
24 CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h 26 CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
25 ;; 27 ;;
@@ -60,8 +62,10 @@
60 esac 62 esac
61 63
62 # This is where the testsuite looks for locale catalogs, using the 64 # This is where the testsuite looks for locale catalogs, using the
63--- gcc/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 65Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/c++locale_internal.h
64+++ gcc/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 66===================================================================
67--- /dev/null 1970-01-01 00:00:00.000000000 +0000
68+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 2008-08-28 17:55:56.000000000 -0700
65@@ -0,0 +1,63 @@ 69@@ -0,0 +1,63 @@
66+// Prototypes for GLIBC thread locale __-prefixed functions -*- C++ -*- 70+// Prototypes for GLIBC thread locale __-prefixed functions -*- C++ -*-
67+ 71+
@@ -102,7 +106,7 @@
102+#endif 106+#endif
103+ 107+
104+#ifdef __UCLIBC_HAS_XLOCALE__ 108+#ifdef __UCLIBC_HAS_XLOCALE__
105+ 109+
106+extern "C" __typeof(nl_langinfo_l) __nl_langinfo_l; 110+extern "C" __typeof(nl_langinfo_l) __nl_langinfo_l;
107+extern "C" __typeof(strcoll_l) __strcoll_l; 111+extern "C" __typeof(strcoll_l) __strcoll_l;
108+extern "C" __typeof(strftime_l) __strftime_l; 112+extern "C" __typeof(strftime_l) __strftime_l;
@@ -123,11 +127,13 @@
123+extern "C" __typeof(wcsftime_l) __wcsftime_l; 127+extern "C" __typeof(wcsftime_l) __wcsftime_l;
124+extern "C" __typeof(wcsxfrm_l) __wcsxfrm_l; 128+extern "C" __typeof(wcsxfrm_l) __wcsxfrm_l;
125+extern "C" __typeof(wctype_l) __wctype_l; 129+extern "C" __typeof(wctype_l) __wctype_l;
126+#endif 130+#endif
127+ 131+
128+#endif // GLIBC 2.3 and later 132+#endif // GLIBC 2.3 and later
129--- gcc/libstdc++-v3/config/locale/uclibc/c_locale.cc 133Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/c_locale.cc
130+++ gcc/libstdc++-v3/config/locale/uclibc/c_locale.cc 134===================================================================
135--- /dev/null 1970-01-01 00:00:00.000000000 +0000
136+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/c_locale.cc 2008-08-28 17:55:56.000000000 -0700
131@@ -0,0 +1,160 @@ 137@@ -0,0 +1,160 @@
132+// Wrapper for underlying C-language localization -*- C++ -*- 138+// Wrapper for underlying C-language localization -*- C++ -*-
133+ 139+
@@ -184,11 +190,11 @@
184+#define __duplocale(a) __c_locale() 190+#define __duplocale(a) __c_locale()
185+#endif 191+#endif
186+ 192+
187+namespace std 193+namespace std
188+{ 194+{
189+ template<> 195+ template<>
190+ void 196+ void
191+ __convert_to_v(const char* __s, float& __v, ios_base::iostate& __err, 197+ __convert_to_v(const char* __s, float& __v, ios_base::iostate& __err,
192+ const __c_locale& __cloc) 198+ const __c_locale& __cloc)
193+ { 199+ {
194+ if (!(__err & ios_base::failbit)) 200+ if (!(__err & ios_base::failbit))
@@ -205,7 +211,7 @@
205+ 211+
206+ template<> 212+ template<>
207+ void 213+ void
208+ __convert_to_v(const char* __s, double& __v, ios_base::iostate& __err, 214+ __convert_to_v(const char* __s, double& __v, ios_base::iostate& __err,
209+ const __c_locale& __cloc) 215+ const __c_locale& __cloc)
210+ { 216+ {
211+ if (!(__err & ios_base::failbit)) 217+ if (!(__err & ios_base::failbit))
@@ -238,7 +244,7 @@
238+ } 244+ }
239+ 245+
240+ void 246+ void
241+ locale::facet::_S_create_c_locale(__c_locale& __cloc, const char* __s, 247+ locale::facet::_S_create_c_locale(__c_locale& __cloc, const char* __s,
242+ __c_locale __old) 248+ __c_locale __old)
243+ { 249+ {
244+ __cloc = __newlocale(1 << LC_ALL, __s, __old); 250+ __cloc = __newlocale(1 << LC_ALL, __s, __old);
@@ -251,12 +257,12 @@
251+ } 257+ }
252+#endif 258+#endif
253+ } 259+ }
254+ 260+
255+ void 261+ void
256+ locale::facet::_S_destroy_c_locale(__c_locale& __cloc) 262+ locale::facet::_S_destroy_c_locale(__c_locale& __cloc)
257+ { 263+ {
258+ if (_S_get_c_locale() != __cloc) 264+ if (_S_get_c_locale() != __cloc)
259+ __freelocale(__cloc); 265+ __freelocale(__cloc);
260+ } 266+ }
261+ 267+
262+ __c_locale 268+ __c_locale
@@ -268,19 +274,19 @@
268+{ 274+{
269+ const char* const category_names[6 + _GLIBCXX_NUM_CATEGORIES] = 275+ const char* const category_names[6 + _GLIBCXX_NUM_CATEGORIES] =
270+ { 276+ {
271+ "LC_CTYPE", 277+ "LC_CTYPE",
272+ "LC_NUMERIC", 278+ "LC_NUMERIC",
273+ "LC_TIME", 279+ "LC_TIME",
274+ "LC_COLLATE", 280+ "LC_COLLATE",
275+ "LC_MONETARY", 281+ "LC_MONETARY",
276+ "LC_MESSAGES", 282+ "LC_MESSAGES",
277+#if _GLIBCXX_NUM_CATEGORIES != 0 283+#if _GLIBCXX_NUM_CATEGORIES != 0
278+ "LC_PAPER", 284+ "LC_PAPER",
279+ "LC_NAME", 285+ "LC_NAME",
280+ "LC_ADDRESS", 286+ "LC_ADDRESS",
281+ "LC_TELEPHONE", 287+ "LC_TELEPHONE",
282+ "LC_MEASUREMENT", 288+ "LC_MEASUREMENT",
283+ "LC_IDENTIFICATION" 289+ "LC_IDENTIFICATION"
284+#endif 290+#endif
285+ }; 291+ };
286+} 292+}
@@ -289,8 +295,10 @@
289+{ 295+{
290+ const char* const* const locale::_S_categories = __gnu_cxx::category_names; 296+ const char* const* const locale::_S_categories = __gnu_cxx::category_names;
291+} // namespace std 297+} // namespace std
292--- gcc/libstdc++-v3/config/locale/uclibc/c_locale.h 298Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/c_locale.h
293+++ gcc/libstdc++-v3/config/locale/uclibc/c_locale.h 299===================================================================
300--- /dev/null 1970-01-01 00:00:00.000000000 +0000
301+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/c_locale.h 2008-08-28 17:55:56.000000000 -0700
294@@ -0,0 +1,117 @@ 302@@ -0,0 +1,117 @@
295+// Wrapper for underlying C-language localization -*- C++ -*- 303+// Wrapper for underlying C-language localization -*- C++ -*-
296+ 304+
@@ -356,7 +364,7 @@
356+#endif 364+#endif
357+// #define _GLIBCXX_NUM_CATEGORIES 6 365+// #define _GLIBCXX_NUM_CATEGORIES 6
358+#define _GLIBCXX_NUM_CATEGORIES 0 366+#define _GLIBCXX_NUM_CATEGORIES 0
359+ 367+
360+#ifdef __UCLIBC_HAS_XLOCALE__ 368+#ifdef __UCLIBC_HAS_XLOCALE__
361+namespace __gnu_cxx 369+namespace __gnu_cxx
362+{ 370+{
@@ -378,7 +386,7 @@
378+ // be avoided. 386+ // be avoided.
379+ template<typename _Tv> 387+ template<typename _Tv>
380+ int 388+ int
381+ __convert_from_v(char* __out, 389+ __convert_from_v(char* __out,
382+ const int __size __attribute__ ((__unused__)), 390+ const int __size __attribute__ ((__unused__)),
383+ const char* __fmt, 391+ const char* __fmt,
384+#ifdef __UCLIBC_HAS_XCLOCALE__ 392+#ifdef __UCLIBC_HAS_XCLOCALE__
@@ -409,9 +417,11 @@
409+} 417+}
410+ 418+
411+#endif 419+#endif
412--- gcc/libstdc++-v3/config/locale/uclibc/codecvt_members.cc 420Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/codecvt_members.cc
413+++ gcc/libstdc++-v3/config/locale/uclibc/codecvt_members.cc 421===================================================================
414@@ -0,0 +1,306 @@ 422--- /dev/null 1970-01-01 00:00:00.000000000 +0000
423+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/codecvt_members.cc 2008-08-28 17:55:56.000000000 -0700
424@@ -0,0 +1,308 @@
415+// std::codecvt implementation details, GNU version -*- C++ -*- 425+// std::codecvt implementation details, GNU version -*- C++ -*-
416+ 426+
417+// Copyright (C) 2002, 2003 Free Software Foundation, Inc. 427+// Copyright (C) 2002, 2003 Free Software Foundation, Inc.
@@ -448,6 +458,8 @@
448+// Written by Benjamin Kosnik <bkoz@redhat.com> 458+// Written by Benjamin Kosnik <bkoz@redhat.com>
449+ 459+
450+#include <locale> 460+#include <locale>
461+#include <cstdlib> // For MB_CUR_MAX
462+#include <climits> // For MB_LEN_MAX
451+#include <bits/c++locale_internal.h> 463+#include <bits/c++locale_internal.h>
452+ 464+
453+namespace std 465+namespace std
@@ -456,7 +468,7 @@
456+#ifdef _GLIBCXX_USE_WCHAR_T 468+#ifdef _GLIBCXX_USE_WCHAR_T
457+ codecvt_base::result 469+ codecvt_base::result
458+ codecvt<wchar_t, char, mbstate_t>:: 470+ codecvt<wchar_t, char, mbstate_t>::
459+ do_out(state_type& __state, const intern_type* __from, 471+ do_out(state_type& __state, const intern_type* __from,
460+ const intern_type* __from_end, const intern_type*& __from_next, 472+ const intern_type* __from_end, const intern_type*& __from_next,
461+ extern_type* __to, extern_type* __to_end, 473+ extern_type* __to, extern_type* __to_end,
462+ extern_type*& __to_next) const 474+ extern_type*& __to_next) const
@@ -526,12 +538,12 @@
526+ __uselocale(__old); 538+ __uselocale(__old);
527+#endif 539+#endif
528+ 540+
529+ return __ret; 541+ return __ret;
530+ } 542+ }
531+ 543+
532+ codecvt_base::result 544+ codecvt_base::result
533+ codecvt<wchar_t, char, mbstate_t>:: 545+ codecvt<wchar_t, char, mbstate_t>::
534+ do_in(state_type& __state, const extern_type* __from, 546+ do_in(state_type& __state, const extern_type* __from,
535+ const extern_type* __from_end, const extern_type*& __from_next, 547+ const extern_type* __from_end, const extern_type*& __from_next,
536+ intern_type* __to, intern_type* __to_end, 548+ intern_type* __to, intern_type* __to_end,
537+ intern_type*& __to_next) const 549+ intern_type*& __to_next) const
@@ -575,12 +587,12 @@
575+ break; 587+ break;
576+ } 588+ }
577+ __from_next = __from; 589+ __from_next = __from;
578+ __state = __tmp_state; 590+ __state = __tmp_state;
579+ __ret = error; 591+ __ret = error;
580+ } 592+ }
581+ else if (__from_next && __from_next < __from_chunk_end) 593+ else if (__from_next && __from_next < __from_chunk_end)
582+ { 594+ {
583+ // It is unclear what to return in this case (see DR 382). 595+ // It is unclear what to return in this case (see DR 382).
584+ __to_next += __conv; 596+ __to_next += __conv;
585+ __ret = partial; 597+ __ret = partial;
586+ } 598+ }
@@ -595,7 +607,7 @@
595+ if (__to_next < __to_end) 607+ if (__to_next < __to_end)
596+ { 608+ {
597+ // XXX Probably wrong for stateful encodings 609+ // XXX Probably wrong for stateful encodings
598+ __tmp_state = __state; 610+ __tmp_state = __state;
599+ ++__from_next; 611+ ++__from_next;
600+ *__to_next++ = L'\0'; 612+ *__to_next++ = L'\0';
601+ } 613+ }
@@ -608,10 +620,10 @@
608+ __uselocale(__old); 620+ __uselocale(__old);
609+#endif 621+#endif
610+ 622+
611+ return __ret; 623+ return __ret;
612+ } 624+ }
613+ 625+
614+ int 626+ int
615+ codecvt<wchar_t, char, mbstate_t>:: 627+ codecvt<wchar_t, char, mbstate_t>::
616+ do_encoding() const throw() 628+ do_encoding() const throw()
617+ { 629+ {
@@ -627,9 +639,9 @@
627+ __uselocale(__old); 639+ __uselocale(__old);
628+#endif 640+#endif
629+ return __ret; 641+ return __ret;
630+ } 642+ }
631+ 643+
632+ int 644+ int
633+ codecvt<wchar_t, char, mbstate_t>:: 645+ codecvt<wchar_t, char, mbstate_t>::
634+ do_max_length() const throw() 646+ do_max_length() const throw()
635+ { 647+ {
@@ -643,8 +655,8 @@
643+#endif 655+#endif
644+ return __ret; 656+ return __ret;
645+ } 657+ }
646+ 658+
647+ int 659+ int
648+ codecvt<wchar_t, char, mbstate_t>:: 660+ codecvt<wchar_t, char, mbstate_t>::
649+ do_length(state_type& __state, const extern_type* __from, 661+ do_length(state_type& __state, const extern_type* __from,
650+ const extern_type* __end, size_t __max) const 662+ const extern_type* __end, size_t __max) const
@@ -659,10 +671,10 @@
659+ // mbsnrtowcs is *very* fast but stops if encounters NUL characters: 671+ // mbsnrtowcs is *very* fast but stops if encounters NUL characters:
660+ // in case we advance past it and then continue, in a loop. 672+ // in case we advance past it and then continue, in a loop.
661+ // NB: mbsnrtowcs is a GNU extension 673+ // NB: mbsnrtowcs is a GNU extension
662+ 674+
663+ // A dummy internal buffer is needed in order for mbsnrtocws to consider 675+ // A dummy internal buffer is needed in order for mbsnrtocws to consider
664+ // its fourth parameter (it wouldn't with NULL as first parameter). 676+ // its fourth parameter (it wouldn't with NULL as first parameter).
665+ wchar_t* __to = static_cast<wchar_t*>(__builtin_alloca(sizeof(wchar_t) 677+ wchar_t* __to = static_cast<wchar_t*>(__builtin_alloca(sizeof(wchar_t)
666+ * __max)); 678+ * __max));
667+ while (__from < __end && __max) 679+ while (__from < __end && __max)
668+ { 680+ {
@@ -696,7 +708,7 @@
696+ } 708+ }
697+ if (!__from) 709+ if (!__from)
698+ __from = __from_chunk_end; 710+ __from = __from_chunk_end;
699+ 711+
700+ __ret += __from - __tmp_from; 712+ __ret += __from - __tmp_from;
701+ __max -= __conv; 713+ __max -= __conv;
702+ 714+
@@ -714,12 +726,14 @@
714+ __uselocale(__old); 726+ __uselocale(__old);
715+#endif 727+#endif
716+ 728+
717+ return __ret; 729+ return __ret;
718+ } 730+ }
719+#endif 731+#endif
720+} 732+}
721--- gcc/libstdc++-v3/config/locale/uclibc/collate_members.cc 733Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/collate_members.cc
722+++ gcc/libstdc++-v3/config/locale/uclibc/collate_members.cc 734===================================================================
735--- /dev/null 1970-01-01 00:00:00.000000000 +0000
736+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/collate_members.cc 2008-08-28 17:55:56.000000000 -0700
723@@ -0,0 +1,80 @@ 737@@ -0,0 +1,80 @@
724+// std::collate implementation details, GNU version -*- C++ -*- 738+// std::collate implementation details, GNU version -*- C++ -*-
725+ 739+
@@ -771,29 +785,29 @@
771+ // These are basically extensions to char_traits, and perhaps should 785+ // These are basically extensions to char_traits, and perhaps should
772+ // be put there instead of here. 786+ // be put there instead of here.
773+ template<> 787+ template<>
774+ int 788+ int
775+ collate<char>::_M_compare(const char* __one, const char* __two) const 789+ collate<char>::_M_compare(const char* __one, const char* __two) const
776+ { 790+ {
777+ int __cmp = __strcoll_l(__one, __two, _M_c_locale_collate); 791+ int __cmp = __strcoll_l(__one, __two, _M_c_locale_collate);
778+ return (__cmp >> (8 * sizeof (int) - 2)) | (__cmp != 0); 792+ return (__cmp >> (8 * sizeof (int) - 2)) | (__cmp != 0);
779+ } 793+ }
780+ 794+
781+ template<> 795+ template<>
782+ size_t 796+ size_t
783+ collate<char>::_M_transform(char* __to, const char* __from, 797+ collate<char>::_M_transform(char* __to, const char* __from,
784+ size_t __n) const 798+ size_t __n) const
785+ { return __strxfrm_l(__to, __from, __n, _M_c_locale_collate); } 799+ { return __strxfrm_l(__to, __from, __n, _M_c_locale_collate); }
786+ 800+
787+#ifdef _GLIBCXX_USE_WCHAR_T 801+#ifdef _GLIBCXX_USE_WCHAR_T
788+ template<> 802+ template<>
789+ int 803+ int
790+ collate<wchar_t>::_M_compare(const wchar_t* __one, 804+ collate<wchar_t>::_M_compare(const wchar_t* __one,
791+ const wchar_t* __two) const 805+ const wchar_t* __two) const
792+ { 806+ {
793+ int __cmp = __wcscoll_l(__one, __two, _M_c_locale_collate); 807+ int __cmp = __wcscoll_l(__one, __two, _M_c_locale_collate);
794+ return (__cmp >> (8 * sizeof (int) - 2)) | (__cmp != 0); 808+ return (__cmp >> (8 * sizeof (int) - 2)) | (__cmp != 0);
795+ } 809+ }
796+ 810+
797+ template<> 811+ template<>
798+ size_t 812+ size_t
799+ collate<wchar_t>::_M_transform(wchar_t* __to, const wchar_t* __from, 813+ collate<wchar_t>::_M_transform(wchar_t* __to, const wchar_t* __from,
@@ -801,8 +815,10 @@
801+ { return __wcsxfrm_l(__to, __from, __n, _M_c_locale_collate); } 815+ { return __wcsxfrm_l(__to, __from, __n, _M_c_locale_collate); }
802+#endif 816+#endif
803+} 817+}
804--- gcc/libstdc++-v3/config/locale/uclibc/ctype_members.cc 818Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/ctype_members.cc
805+++ gcc/libstdc++-v3/config/locale/uclibc/ctype_members.cc 819===================================================================
820--- /dev/null 1970-01-01 00:00:00.000000000 +0000
821+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2008-08-28 17:55:56.000000000 -0700
806@@ -0,0 +1,300 @@ 822@@ -0,0 +1,300 @@
807+// std::ctype implementation details, GNU version -*- C++ -*- 823+// std::ctype implementation details, GNU version -*- C++ -*-
808+ 824+
@@ -857,12 +873,12 @@
857+ // various /config/os/* files. 873+ // various /config/os/* files.
858+ template<> 874+ template<>
859+ ctype_byname<char>::ctype_byname(const char* __s, size_t __refs) 875+ ctype_byname<char>::ctype_byname(const char* __s, size_t __refs)
860+ : ctype<char>(0, false, __refs) 876+ : ctype<char>(0, false, __refs)
861+ { 877+ {
862+ if (std::strcmp(__s, "C") != 0 && std::strcmp(__s, "POSIX") != 0) 878+ if (std::strcmp(__s, "C") != 0 && std::strcmp(__s, "POSIX") != 0)
863+ { 879+ {
864+ this->_S_destroy_c_locale(this->_M_c_locale_ctype); 880+ this->_S_destroy_c_locale(this->_M_c_locale_ctype);
865+ this->_S_create_c_locale(this->_M_c_locale_ctype, __s); 881+ this->_S_create_c_locale(this->_M_c_locale_ctype, __s);
866+#ifdef __UCLIBC_HAS_XLOCALE__ 882+#ifdef __UCLIBC_HAS_XLOCALE__
867+ this->_M_toupper = this->_M_c_locale_ctype->__ctype_toupper; 883+ this->_M_toupper = this->_M_c_locale_ctype->__ctype_toupper;
868+ this->_M_tolower = this->_M_c_locale_ctype->__ctype_tolower; 884+ this->_M_tolower = this->_M_c_locale_ctype->__ctype_tolower;
@@ -871,7 +887,7 @@
871+ } 887+ }
872+ } 888+ }
873+ 889+
874+#ifdef _GLIBCXX_USE_WCHAR_T 890+#ifdef _GLIBCXX_USE_WCHAR_T
875+ ctype<wchar_t>::__wmask_type 891+ ctype<wchar_t>::__wmask_type
876+ ctype<wchar_t>::_M_convert_to_wmask(const mask __m) const 892+ ctype<wchar_t>::_M_convert_to_wmask(const mask __m) const
877+ { 893+ {
@@ -916,7 +932,7 @@
916+ } 932+ }
917+ return __ret; 933+ return __ret;
918+ } 934+ }
919+ 935+
920+ wchar_t 936+ wchar_t
921+ ctype<wchar_t>::do_toupper(wchar_t __c) const 937+ ctype<wchar_t>::do_toupper(wchar_t __c) const
922+ { return __towupper_l(__c, _M_c_locale_ctype); } 938+ { return __towupper_l(__c, _M_c_locale_ctype); }
@@ -931,11 +947,11 @@
931+ } 947+ }
932+ return __hi; 948+ return __hi;
933+ } 949+ }
934+ 950+
935+ wchar_t 951+ wchar_t
936+ ctype<wchar_t>::do_tolower(wchar_t __c) const 952+ ctype<wchar_t>::do_tolower(wchar_t __c) const
937+ { return __towlower_l(__c, _M_c_locale_ctype); } 953+ { return __towlower_l(__c, _M_c_locale_ctype); }
938+ 954+
939+ const wchar_t* 955+ const wchar_t*
940+ ctype<wchar_t>::do_tolower(wchar_t* __lo, const wchar_t* __hi) const 956+ ctype<wchar_t>::do_tolower(wchar_t* __lo, const wchar_t* __hi) const
941+ { 957+ {
@@ -950,11 +966,11 @@
950+ bool 966+ bool
951+ ctype<wchar_t>:: 967+ ctype<wchar_t>::
952+ do_is(mask __m, wchar_t __c) const 968+ do_is(mask __m, wchar_t __c) const
953+ { 969+ {
954+ // Highest bitmask in ctype_base == 10, but extra in "C" 970+ // Highest bitmask in ctype_base == 10, but extra in "C"
955+ // library for blank. 971+ // library for blank.
956+ bool __ret = false; 972+ bool __ret = false;
957+ const size_t __bitmasksize = 11; 973+ const size_t __bitmasksize = 11;
958+ for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur) 974+ for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
959+ if (__m & _M_bit[__bitcur] 975+ if (__m & _M_bit[__bitcur]
960+ && __iswctype_l(__c, _M_wmask[__bitcur], _M_c_locale_ctype)) 976+ && __iswctype_l(__c, _M_wmask[__bitcur], _M_c_locale_ctype))
@@ -962,10 +978,10 @@
962+ __ret = true; 978+ __ret = true;
963+ break; 979+ break;
964+ } 980+ }
965+ return __ret; 981+ return __ret;
966+ } 982+ }
967+ 983+
968+ const wchar_t* 984+ const wchar_t*
969+ ctype<wchar_t>:: 985+ ctype<wchar_t>::
970+ do_is(const wchar_t* __lo, const wchar_t* __hi, mask* __vec) const 986+ do_is(const wchar_t* __lo, const wchar_t* __hi, mask* __vec) const
971+ { 987+ {
@@ -973,7 +989,7 @@
973+ { 989+ {
974+ // Highest bitmask in ctype_base == 10, but extra in "C" 990+ // Highest bitmask in ctype_base == 10, but extra in "C"
975+ // library for blank. 991+ // library for blank.
976+ const size_t __bitmasksize = 11; 992+ const size_t __bitmasksize = 11;
977+ mask __m = 0; 993+ mask __m = 0;
978+ for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur) 994+ for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
979+ if (__iswctype_l(*__lo, _M_wmask[__bitcur], _M_c_locale_ctype)) 995+ if (__iswctype_l(*__lo, _M_wmask[__bitcur], _M_c_locale_ctype))
@@ -982,8 +998,8 @@
982+ } 998+ }
983+ return __hi; 999+ return __hi;
984+ } 1000+ }
985+ 1001+
986+ const wchar_t* 1002+ const wchar_t*
987+ ctype<wchar_t>:: 1003+ ctype<wchar_t>::
988+ do_scan_is(mask __m, const wchar_t* __lo, const wchar_t* __hi) const 1004+ do_scan_is(mask __m, const wchar_t* __lo, const wchar_t* __hi) const
989+ { 1005+ {
@@ -1006,7 +1022,7 @@
1006+ do_widen(char __c) const 1022+ do_widen(char __c) const
1007+ { return _M_widen[static_cast<unsigned char>(__c)]; } 1023+ { return _M_widen[static_cast<unsigned char>(__c)]; }
1008+ 1024+
1009+ const char* 1025+ const char*
1010+ ctype<wchar_t>:: 1026+ ctype<wchar_t>::
1011+ do_widen(const char* __lo, const char* __hi, wchar_t* __dest) const 1027+ do_widen(const char* __lo, const char* __hi, wchar_t* __dest) const
1012+ { 1028+ {
@@ -1032,12 +1048,12 @@
1032+#ifdef __UCLIBC_HAS_XLOCALE__ 1048+#ifdef __UCLIBC_HAS_XLOCALE__
1033+ __uselocale(__old); 1049+ __uselocale(__old);
1034+#endif 1050+#endif
1035+ return (__c == EOF ? __dfault : static_cast<char>(__c)); 1051+ return (__c == EOF ? __dfault : static_cast<char>(__c));
1036+ } 1052+ }
1037+ 1053+
1038+ const wchar_t* 1054+ const wchar_t*
1039+ ctype<wchar_t>:: 1055+ ctype<wchar_t>::
1040+ do_narrow(const wchar_t* __lo, const wchar_t* __hi, char __dfault, 1056+ do_narrow(const wchar_t* __lo, const wchar_t* __hi, char __dfault,
1041+ char* __dest) const 1057+ char* __dest) const
1042+ { 1058+ {
1043+#ifdef __UCLIBC_HAS_XLOCALE__ 1059+#ifdef __UCLIBC_HAS_XLOCALE__
@@ -1094,7 +1110,7 @@
1094+ _M_widen[__j] = btowc(__j); 1110+ _M_widen[__j] = btowc(__j);
1095+ 1111+
1096+ for (size_t __k = 0; __k <= 11; ++__k) 1112+ for (size_t __k = 0; __k <= 11; ++__k)
1097+ { 1113+ {
1098+ _M_bit[__k] = static_cast<mask>(_ISbit(__k)); 1114+ _M_bit[__k] = static_cast<mask>(_ISbit(__k));
1099+ _M_wmask[__k] = _M_convert_to_wmask(_M_bit[__k]); 1115+ _M_wmask[__k] = _M_convert_to_wmask(_M_bit[__k]);
1100+ } 1116+ }
@@ -1104,8 +1120,10 @@
1104+ } 1120+ }
1105+#endif // _GLIBCXX_USE_WCHAR_T 1121+#endif // _GLIBCXX_USE_WCHAR_T
1106+} 1122+}
1107--- gcc/libstdc++-v3/config/locale/uclibc/messages_members.cc 1123Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/messages_members.cc
1108+++ gcc/libstdc++-v3/config/locale/uclibc/messages_members.cc 1124===================================================================
1125--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1126+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/messages_members.cc 2008-08-28 17:55:56.000000000 -0700
1109@@ -0,0 +1,100 @@ 1127@@ -0,0 +1,100 @@
1110+// std::messages implementation details, GNU version -*- C++ -*- 1128+// std::messages implementation details, GNU version -*- C++ -*-
1111+ 1129+
@@ -1207,8 +1225,10 @@
1207+ } 1225+ }
1208+#endif 1226+#endif
1209+} 1227+}
1210--- gcc/libstdc++-v3/config/locale/uclibc/messages_members.h 1228Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/messages_members.h
1211+++ gcc/libstdc++-v3/config/locale/uclibc/messages_members.h 1229===================================================================
1230--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1231+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/messages_members.h 2008-08-28 17:55:56.000000000 -0700
1212@@ -0,0 +1,118 @@ 1232@@ -0,0 +1,118 @@
1213+// std::messages implementation details, GNU version -*- C++ -*- 1233+// std::messages implementation details, GNU version -*- C++ -*-
1214+ 1234+
@@ -1262,13 +1282,13 @@
1262+ // Non-virtual member functions. 1282+ // Non-virtual member functions.
1263+ template<typename _CharT> 1283+ template<typename _CharT>
1264+ messages<_CharT>::messages(size_t __refs) 1284+ messages<_CharT>::messages(size_t __refs)
1265+ : facet(__refs), _M_c_locale_messages(_S_get_c_locale()), 1285+ : facet(__refs), _M_c_locale_messages(_S_get_c_locale()),
1266+ _M_name_messages(_S_get_c_name()) 1286+ _M_name_messages(_S_get_c_name())
1267+ { } 1287+ { }
1268+ 1288+
1269+ template<typename _CharT> 1289+ template<typename _CharT>
1270+ messages<_CharT>::messages(__c_locale __cloc, const char* __s, 1290+ messages<_CharT>::messages(__c_locale __cloc, const char* __s,
1271+ size_t __refs) 1291+ size_t __refs)
1272+ : facet(__refs), _M_c_locale_messages(_S_clone_c_locale(__cloc)), 1292+ : facet(__refs), _M_c_locale_messages(_S_clone_c_locale(__cloc)),
1273+ _M_name_messages(__s) 1293+ _M_name_messages(__s)
1274+ { 1294+ {
@@ -1278,28 +1298,28 @@
1278+ } 1298+ }
1279+ 1299+
1280+ template<typename _CharT> 1300+ template<typename _CharT>
1281+ typename messages<_CharT>::catalog 1301+ typename messages<_CharT>::catalog
1282+ messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc, 1302+ messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc,
1283+ const char* __dir) const 1303+ const char* __dir) const
1284+ { 1304+ {
1285+ __bindtextdomain(__s.c_str(), __dir); 1305+ __bindtextdomain(__s.c_str(), __dir);
1286+ return this->do_open(__s, __loc); 1306+ return this->do_open(__s, __loc);
1287+ } 1307+ }
1288+ 1308+
1289+ // Virtual member functions. 1309+ // Virtual member functions.
1290+ template<typename _CharT> 1310+ template<typename _CharT>
1291+ messages<_CharT>::~messages() 1311+ messages<_CharT>::~messages()
1292+ { 1312+ {
1293+ if (_M_name_messages != _S_get_c_name()) 1313+ if (_M_name_messages != _S_get_c_name())
1294+ delete [] _M_name_messages; 1314+ delete [] _M_name_messages;
1295+ _S_destroy_c_locale(_M_c_locale_messages); 1315+ _S_destroy_c_locale(_M_c_locale_messages);
1296+ } 1316+ }
1297+ 1317+
1298+ template<typename _CharT> 1318+ template<typename _CharT>
1299+ typename messages<_CharT>::catalog 1319+ typename messages<_CharT>::catalog
1300+ messages<_CharT>::do_open(const basic_string<char>& __s, 1320+ messages<_CharT>::do_open(const basic_string<char>& __s,
1301+ const locale&) const 1321+ const locale&) const
1302+ { 1322+ {
1303+ // No error checking is done, assume the catalog exists and can 1323+ // No error checking is done, assume the catalog exists and can
1304+ // be used. 1324+ // be used.
1305+ __textdomain(__s.c_str()); 1325+ __textdomain(__s.c_str());
@@ -1307,15 +1327,15 @@
1307+ } 1327+ }
1308+ 1328+
1309+ template<typename _CharT> 1329+ template<typename _CharT>
1310+ void 1330+ void
1311+ messages<_CharT>::do_close(catalog) const 1331+ messages<_CharT>::do_close(catalog) const
1312+ { } 1332+ { }
1313+ 1333+
1314+ // messages_byname 1334+ // messages_byname
1315+ template<typename _CharT> 1335+ template<typename _CharT>
1316+ messages_byname<_CharT>::messages_byname(const char* __s, size_t __refs) 1336+ messages_byname<_CharT>::messages_byname(const char* __s, size_t __refs)
1317+ : messages<_CharT>(__refs) 1337+ : messages<_CharT>(__refs)
1318+ { 1338+ {
1319+ if (this->_M_name_messages != locale::facet::_S_get_c_name()) 1339+ if (this->_M_name_messages != locale::facet::_S_get_c_name())
1320+ delete [] this->_M_name_messages; 1340+ delete [] this->_M_name_messages;
1321+ char* __tmp = new char[std::strlen(__s) + 1]; 1341+ char* __tmp = new char[std::strlen(__s) + 1];
@@ -1325,11 +1345,13 @@
1325+ if (std::strcmp(__s, "C") != 0 && std::strcmp(__s, "POSIX") != 0) 1345+ if (std::strcmp(__s, "C") != 0 && std::strcmp(__s, "POSIX") != 0)
1326+ { 1346+ {
1327+ this->_S_destroy_c_locale(this->_M_c_locale_messages); 1347+ this->_S_destroy_c_locale(this->_M_c_locale_messages);
1328+ this->_S_create_c_locale(this->_M_c_locale_messages, __s); 1348+ this->_S_create_c_locale(this->_M_c_locale_messages, __s);
1329+ } 1349+ }
1330+ } 1350+ }
1331--- gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc 1351Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/monetary_members.cc
1332+++ gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc 1352===================================================================
1353--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1354+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2008-08-28 17:55:56.000000000 -0700
1333@@ -0,0 +1,692 @@ 1355@@ -0,0 +1,692 @@
1334+// std::moneypunct implementation details, GNU version -*- C++ -*- 1356+// std::moneypunct implementation details, GNU version -*- C++ -*-
1335+ 1357+
@@ -1386,7 +1408,7 @@
1386+ // space none symbol sign value 1408+ // space none symbol sign value
1387+ money_base::pattern 1409+ money_base::pattern
1388+ money_base::_S_construct_pattern(char __precedes, char __space, char __posn) 1410+ money_base::_S_construct_pattern(char __precedes, char __space, char __posn)
1389+ { 1411+ {
1390+ pattern __ret; 1412+ pattern __ret;
1391+ 1413+
1392+ // This insanely complicated routine attempts to construct a valid 1414+ // This insanely complicated routine attempts to construct a valid
@@ -1394,7 +1416,7 @@
1394+ 1416+
1395+ // if (__precedes) symbol -> value 1417+ // if (__precedes) symbol -> value
1396+ // else value -> symbol 1418+ // else value -> symbol
1397+ 1419+
1398+ // if (__space) space 1420+ // if (__space) space
1399+ // else none 1421+ // else none
1400+ 1422+
@@ -1479,7 +1501,7 @@
1479+ if (__precedes) 1501+ if (__precedes)
1480+ { 1502+ {
1481+ __ret.field[0] = sign; 1503+ __ret.field[0] = sign;
1482+ __ret.field[1] = symbol; 1504+ __ret.field[1] = symbol;
1483+ if (__space) 1505+ if (__space)
1484+ { 1506+ {
1485+ __ret.field[2] = space; 1507+ __ret.field[2] = space;
@@ -1487,7 +1509,7 @@
1487+ } 1509+ }
1488+ else 1510+ else
1489+ { 1511+ {
1490+ __ret.field[2] = value; 1512+ __ret.field[2] = value;
1491+ __ret.field[3] = none; 1513+ __ret.field[3] = none;
1492+ } 1514+ }
1493+ } 1515+ }
@@ -1548,9 +1570,9 @@
1548+ return __ret; 1570+ return __ret;
1549+ } 1571+ }
1550+ 1572+
1551+ template<> 1573+ template<>
1552+ void 1574+ void
1553+ moneypunct<char, true>::_M_initialize_moneypunct(__c_locale __cloc, 1575+ moneypunct<char, true>::_M_initialize_moneypunct(__c_locale __cloc,
1554+ const char*) 1576+ const char*)
1555+ { 1577+ {
1556+ if (!_M_data) 1578+ if (!_M_data)
@@ -1579,9 +1601,9 @@
1579+ else 1601+ else
1580+ { 1602+ {
1581+ // Named locale. 1603+ // Named locale.
1582+ _M_data->_M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT, 1604+ _M_data->_M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT,
1583+ __cloc)); 1605+ __cloc));
1584+ _M_data->_M_thousands_sep = *(__nl_langinfo_l(__MON_THOUSANDS_SEP, 1606+ _M_data->_M_thousands_sep = *(__nl_langinfo_l(__MON_THOUSANDS_SEP,
1585+ __cloc)); 1607+ __cloc));
1586+ _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc); 1608+ _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
1587+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping); 1609+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
@@ -1592,30 +1614,30 @@
1592+ if (!__nposn) 1614+ if (!__nposn)
1593+ _M_data->_M_negative_sign = "()"; 1615+ _M_data->_M_negative_sign = "()";
1594+ else 1616+ else
1595+ _M_data->_M_negative_sign = __nl_langinfo_l(__NEGATIVE_SIGN, 1617+ _M_data->_M_negative_sign = __nl_langinfo_l(__NEGATIVE_SIGN,
1596+ __cloc); 1618+ __cloc);
1597+ _M_data->_M_negative_sign_size = strlen(_M_data->_M_negative_sign); 1619+ _M_data->_M_negative_sign_size = strlen(_M_data->_M_negative_sign);
1598+ 1620+
1599+ // _Intl == true 1621+ // _Intl == true
1600+ _M_data->_M_curr_symbol = __nl_langinfo_l(__INT_CURR_SYMBOL, __cloc); 1622+ _M_data->_M_curr_symbol = __nl_langinfo_l(__INT_CURR_SYMBOL, __cloc);
1601+ _M_data->_M_curr_symbol_size = strlen(_M_data->_M_curr_symbol); 1623+ _M_data->_M_curr_symbol_size = strlen(_M_data->_M_curr_symbol);
1602+ _M_data->_M_frac_digits = *(__nl_langinfo_l(__INT_FRAC_DIGITS, 1624+ _M_data->_M_frac_digits = *(__nl_langinfo_l(__INT_FRAC_DIGITS,
1603+ __cloc)); 1625+ __cloc));
1604+ char __pprecedes = *(__nl_langinfo_l(__INT_P_CS_PRECEDES, __cloc)); 1626+ char __pprecedes = *(__nl_langinfo_l(__INT_P_CS_PRECEDES, __cloc));
1605+ char __pspace = *(__nl_langinfo_l(__INT_P_SEP_BY_SPACE, __cloc)); 1627+ char __pspace = *(__nl_langinfo_l(__INT_P_SEP_BY_SPACE, __cloc));
1606+ char __pposn = *(__nl_langinfo_l(__INT_P_SIGN_POSN, __cloc)); 1628+ char __pposn = *(__nl_langinfo_l(__INT_P_SIGN_POSN, __cloc));
1607+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace, 1629+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
1608+ __pposn); 1630+ __pposn);
1609+ char __nprecedes = *(__nl_langinfo_l(__INT_N_CS_PRECEDES, __cloc)); 1631+ char __nprecedes = *(__nl_langinfo_l(__INT_N_CS_PRECEDES, __cloc));
1610+ char __nspace = *(__nl_langinfo_l(__INT_N_SEP_BY_SPACE, __cloc)); 1632+ char __nspace = *(__nl_langinfo_l(__INT_N_SEP_BY_SPACE, __cloc));
1611+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace, 1633+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
1612+ __nposn); 1634+ __nposn);
1613+ } 1635+ }
1614+ } 1636+ }
1615+ 1637+
1616+ template<> 1638+ template<>
1617+ void 1639+ void
1618+ moneypunct<char, false>::_M_initialize_moneypunct(__c_locale __cloc, 1640+ moneypunct<char, false>::_M_initialize_moneypunct(__c_locale __cloc,
1619+ const char*) 1641+ const char*)
1620+ { 1642+ {
1621+ if (!_M_data) 1643+ if (!_M_data)
@@ -1644,9 +1666,9 @@
1644+ else 1666+ else
1645+ { 1667+ {
1646+ // Named locale. 1668+ // Named locale.
1647+ _M_data->_M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT, 1669+ _M_data->_M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT,
1648+ __cloc)); 1670+ __cloc));
1649+ _M_data->_M_thousands_sep = *(__nl_langinfo_l(__MON_THOUSANDS_SEP, 1671+ _M_data->_M_thousands_sep = *(__nl_langinfo_l(__MON_THOUSANDS_SEP,
1650+ __cloc)); 1672+ __cloc));
1651+ _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc); 1673+ _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
1652+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping); 1674+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
@@ -1668,27 +1690,27 @@
1668+ char __pprecedes = *(__nl_langinfo_l(__P_CS_PRECEDES, __cloc)); 1690+ char __pprecedes = *(__nl_langinfo_l(__P_CS_PRECEDES, __cloc));
1669+ char __pspace = *(__nl_langinfo_l(__P_SEP_BY_SPACE, __cloc)); 1691+ char __pspace = *(__nl_langinfo_l(__P_SEP_BY_SPACE, __cloc));
1670+ char __pposn = *(__nl_langinfo_l(__P_SIGN_POSN, __cloc)); 1692+ char __pposn = *(__nl_langinfo_l(__P_SIGN_POSN, __cloc));
1671+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace, 1693+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
1672+ __pposn); 1694+ __pposn);
1673+ char __nprecedes = *(__nl_langinfo_l(__N_CS_PRECEDES, __cloc)); 1695+ char __nprecedes = *(__nl_langinfo_l(__N_CS_PRECEDES, __cloc));
1674+ char __nspace = *(__nl_langinfo_l(__N_SEP_BY_SPACE, __cloc)); 1696+ char __nspace = *(__nl_langinfo_l(__N_SEP_BY_SPACE, __cloc));
1675+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace, 1697+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
1676+ __nposn); 1698+ __nposn);
1677+ } 1699+ }
1678+ } 1700+ }
1679+ 1701+
1680+ template<> 1702+ template<>
1681+ moneypunct<char, true>::~moneypunct() 1703+ moneypunct<char, true>::~moneypunct()
1682+ { delete _M_data; } 1704+ { delete _M_data; }
1683+ 1705+
1684+ template<> 1706+ template<>
1685+ moneypunct<char, false>::~moneypunct() 1707+ moneypunct<char, false>::~moneypunct()
1686+ { delete _M_data; } 1708+ { delete _M_data; }
1687+ 1709+
1688+#ifdef _GLIBCXX_USE_WCHAR_T 1710+#ifdef _GLIBCXX_USE_WCHAR_T
1689+ template<> 1711+ template<>
1690+ void 1712+ void
1691+ moneypunct<wchar_t, true>::_M_initialize_moneypunct(__c_locale __cloc, 1713+ moneypunct<wchar_t, true>::_M_initialize_moneypunct(__c_locale __cloc,
1692+#ifdef __UCLIBC_HAS_XLOCALE__ 1714+#ifdef __UCLIBC_HAS_XLOCALE__
1693+ const char*) 1715+ const char*)
1694+#else 1716+#else
@@ -1775,12 +1797,12 @@
1775+ else 1797+ else
1776+ _M_data->_M_positive_sign = L""; 1798+ _M_data->_M_positive_sign = L"";
1777+ _M_data->_M_positive_sign_size = wcslen(_M_data->_M_positive_sign); 1799+ _M_data->_M_positive_sign_size = wcslen(_M_data->_M_positive_sign);
1778+ 1800+
1779+ __len = strlen(__cnegsign); 1801+ __len = strlen(__cnegsign);
1780+ if (!__nposn) 1802+ if (!__nposn)
1781+ _M_data->_M_negative_sign = L"()"; 1803+ _M_data->_M_negative_sign = L"()";
1782+ else if (__len) 1804+ else if (__len)
1783+ { 1805+ {
1784+ ++__len; 1806+ ++__len;
1785+ memset(&__state, 0, sizeof(mbstate_t)); 1807+ memset(&__state, 0, sizeof(mbstate_t));
1786+ __wcs_ns = new wchar_t[__len]; 1808+ __wcs_ns = new wchar_t[__len];
@@ -1790,7 +1812,7 @@
1790+ else 1812+ else
1791+ _M_data->_M_negative_sign = L""; 1813+ _M_data->_M_negative_sign = L"";
1792+ _M_data->_M_negative_sign_size = wcslen(_M_data->_M_negative_sign); 1814+ _M_data->_M_negative_sign_size = wcslen(_M_data->_M_negative_sign);
1793+ 1815+
1794+ // _Intl == true. 1816+ // _Intl == true.
1795+ __len = strlen(__ccurr); 1817+ __len = strlen(__ccurr);
1796+ if (__len) 1818+ if (__len)
@@ -1810,7 +1832,7 @@
1810+ delete _M_data; 1832+ delete _M_data;
1811+ _M_data = 0; 1833+ _M_data = 0;
1812+ delete __wcs_ps; 1834+ delete __wcs_ps;
1813+ delete __wcs_ns; 1835+ delete __wcs_ns;
1814+#ifdef __UCLIBC_HAS_XLOCALE__ 1836+#ifdef __UCLIBC_HAS_XLOCALE__
1815+ __uselocale(__old); 1837+ __uselocale(__old);
1816+#else 1838+#else
@@ -1818,18 +1840,18 @@
1818+ free(__old); 1840+ free(__old);
1819+#endif 1841+#endif
1820+ __throw_exception_again; 1842+ __throw_exception_again;
1821+ } 1843+ }
1822+ 1844+
1823+ _M_data->_M_frac_digits = *(__nl_langinfo_l(__INT_FRAC_DIGITS, 1845+ _M_data->_M_frac_digits = *(__nl_langinfo_l(__INT_FRAC_DIGITS,
1824+ __cloc)); 1846+ __cloc));
1825+ char __pprecedes = *(__nl_langinfo_l(__INT_P_CS_PRECEDES, __cloc)); 1847+ char __pprecedes = *(__nl_langinfo_l(__INT_P_CS_PRECEDES, __cloc));
1826+ char __pspace = *(__nl_langinfo_l(__INT_P_SEP_BY_SPACE, __cloc)); 1848+ char __pspace = *(__nl_langinfo_l(__INT_P_SEP_BY_SPACE, __cloc));
1827+ char __pposn = *(__nl_langinfo_l(__INT_P_SIGN_POSN, __cloc)); 1849+ char __pposn = *(__nl_langinfo_l(__INT_P_SIGN_POSN, __cloc));
1828+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace, 1850+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
1829+ __pposn); 1851+ __pposn);
1830+ char __nprecedes = *(__nl_langinfo_l(__INT_N_CS_PRECEDES, __cloc)); 1852+ char __nprecedes = *(__nl_langinfo_l(__INT_N_CS_PRECEDES, __cloc));
1831+ char __nspace = *(__nl_langinfo_l(__INT_N_SEP_BY_SPACE, __cloc)); 1853+ char __nspace = *(__nl_langinfo_l(__INT_N_SEP_BY_SPACE, __cloc));
1832+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace, 1854+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
1833+ __nposn); 1855+ __nposn);
1834+ 1856+
1835+#ifdef __UCLIBC_HAS_XLOCALE__ 1857+#ifdef __UCLIBC_HAS_XLOCALE__
@@ -1841,7 +1863,7 @@
1841+ } 1863+ }
1842+ } 1864+ }
1843+ 1865+
1844+ template<> 1866+ template<>
1845+ void 1867+ void
1846+ moneypunct<wchar_t, false>::_M_initialize_moneypunct(__c_locale __cloc, 1868+ moneypunct<wchar_t, false>::_M_initialize_moneypunct(__c_locale __cloc,
1847+#ifdef __UCLIBC_HAS_XLOCALE__ 1869+#ifdef __UCLIBC_HAS_XLOCALE__
@@ -1931,12 +1953,12 @@
1931+ else 1953+ else
1932+ _M_data->_M_positive_sign = L""; 1954+ _M_data->_M_positive_sign = L"";
1933+ _M_data->_M_positive_sign_size = wcslen(_M_data->_M_positive_sign); 1955+ _M_data->_M_positive_sign_size = wcslen(_M_data->_M_positive_sign);
1934+ 1956+
1935+ __len = strlen(__cnegsign); 1957+ __len = strlen(__cnegsign);
1936+ if (!__nposn) 1958+ if (!__nposn)
1937+ _M_data->_M_negative_sign = L"()"; 1959+ _M_data->_M_negative_sign = L"()";
1938+ else if (__len) 1960+ else if (__len)
1939+ { 1961+ {
1940+ ++__len; 1962+ ++__len;
1941+ memset(&__state, 0, sizeof(mbstate_t)); 1963+ memset(&__state, 0, sizeof(mbstate_t));
1942+ __wcs_ns = new wchar_t[__len]; 1964+ __wcs_ns = new wchar_t[__len];
@@ -1966,7 +1988,7 @@
1966+ delete _M_data; 1988+ delete _M_data;
1967+ _M_data = 0; 1989+ _M_data = 0;
1968+ delete __wcs_ps; 1990+ delete __wcs_ps;
1969+ delete __wcs_ns; 1991+ delete __wcs_ns;
1970+#ifdef __UCLIBC_HAS_XLOCALE__ 1992+#ifdef __UCLIBC_HAS_XLOCALE__
1971+ __uselocale(__old); 1993+ __uselocale(__old);
1972+#else 1994+#else
@@ -1980,11 +2002,11 @@
1980+ char __pprecedes = *(__nl_langinfo_l(__P_CS_PRECEDES, __cloc)); 2002+ char __pprecedes = *(__nl_langinfo_l(__P_CS_PRECEDES, __cloc));
1981+ char __pspace = *(__nl_langinfo_l(__P_SEP_BY_SPACE, __cloc)); 2003+ char __pspace = *(__nl_langinfo_l(__P_SEP_BY_SPACE, __cloc));
1982+ char __pposn = *(__nl_langinfo_l(__P_SIGN_POSN, __cloc)); 2004+ char __pposn = *(__nl_langinfo_l(__P_SIGN_POSN, __cloc));
1983+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace, 2005+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
1984+ __pposn); 2006+ __pposn);
1985+ char __nprecedes = *(__nl_langinfo_l(__N_CS_PRECEDES, __cloc)); 2007+ char __nprecedes = *(__nl_langinfo_l(__N_CS_PRECEDES, __cloc));
1986+ char __nspace = *(__nl_langinfo_l(__N_SEP_BY_SPACE, __cloc)); 2008+ char __nspace = *(__nl_langinfo_l(__N_SEP_BY_SPACE, __cloc));
1987+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace, 2009+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
1988+ __nposn); 2010+ __nposn);
1989+ 2011+
1990+#ifdef __UCLIBC_HAS_XLOCALE__ 2012+#ifdef __UCLIBC_HAS_XLOCALE__
@@ -1996,7 +2018,7 @@
1996+ } 2018+ }
1997+ } 2019+ }
1998+ 2020+
1999+ template<> 2021+ template<>
2000+ moneypunct<wchar_t, true>::~moneypunct() 2022+ moneypunct<wchar_t, true>::~moneypunct()
2001+ { 2023+ {
2002+ if (_M_data->_M_positive_sign_size) 2024+ if (_M_data->_M_positive_sign_size)
@@ -2009,7 +2031,7 @@
2009+ delete _M_data; 2031+ delete _M_data;
2010+ } 2032+ }
2011+ 2033+
2012+ template<> 2034+ template<>
2013+ moneypunct<wchar_t, false>::~moneypunct() 2035+ moneypunct<wchar_t, false>::~moneypunct()
2014+ { 2036+ {
2015+ if (_M_data->_M_positive_sign_size) 2037+ if (_M_data->_M_positive_sign_size)
@@ -2023,8 +2045,10 @@
2023+ } 2045+ }
2024+#endif 2046+#endif
2025+} 2047+}
2026--- gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2048Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/numeric_members.cc
2027+++ gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2049===================================================================
2050--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2051+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2008-08-28 17:55:56.000000000 -0700
2028@@ -0,0 +1,160 @@ 2052@@ -0,0 +1,160 @@
2029+// std::numpunct implementation details, GNU version -*- C++ -*- 2053+// std::numpunct implementation details, GNU version -*- C++ -*-
2030+ 2054+
@@ -2075,7 +2099,7 @@
2075+ 2099+
2076+namespace std 2100+namespace std
2077+{ 2101+{
2078+ template<> 2102+ template<>
2079+ void 2103+ void
2080+ numpunct<char>::_M_initialize_numpunct(__c_locale __cloc) 2104+ numpunct<char>::_M_initialize_numpunct(__c_locale __cloc)
2081+ { 2105+ {
@@ -2101,9 +2125,9 @@
2101+ else 2125+ else
2102+ { 2126+ {
2103+ // Named locale. 2127+ // Named locale.
2104+ _M_data->_M_decimal_point = *(__nl_langinfo_l(DECIMAL_POINT, 2128+ _M_data->_M_decimal_point = *(__nl_langinfo_l(DECIMAL_POINT,
2105+ __cloc)); 2129+ __cloc));
2106+ _M_data->_M_thousands_sep = *(__nl_langinfo_l(THOUSANDS_SEP, 2130+ _M_data->_M_thousands_sep = *(__nl_langinfo_l(THOUSANDS_SEP,
2107+ __cloc)); 2131+ __cloc));
2108+ 2132+
2109+ // Check for NULL, which implies no grouping. 2133+ // Check for NULL, which implies no grouping.
@@ -2122,13 +2146,13 @@
2122+ _M_data->_M_falsename = "false"; 2146+ _M_data->_M_falsename = "false";
2123+ _M_data->_M_falsename_size = 5; 2147+ _M_data->_M_falsename_size = 5;
2124+ } 2148+ }
2125+ 2149+
2126+ template<> 2150+ template<>
2127+ numpunct<char>::~numpunct() 2151+ numpunct<char>::~numpunct()
2128+ { delete _M_data; } 2152+ { delete _M_data; }
2129+ 2153+
2130+#ifdef _GLIBCXX_USE_WCHAR_T 2154+#ifdef _GLIBCXX_USE_WCHAR_T
2131+ template<> 2155+ template<>
2132+ void 2156+ void
2133+ numpunct<wchar_t>::_M_initialize_numpunct(__c_locale __cloc) 2157+ numpunct<wchar_t>::_M_initialize_numpunct(__c_locale __cloc)
2134+ { 2158+ {
@@ -2181,13 +2205,15 @@
2181+ _M_data->_M_falsename_size = 5; 2205+ _M_data->_M_falsename_size = 5;
2182+ } 2206+ }
2183+ 2207+
2184+ template<> 2208+ template<>
2185+ numpunct<wchar_t>::~numpunct() 2209+ numpunct<wchar_t>::~numpunct()
2186+ { delete _M_data; } 2210+ { delete _M_data; }
2187+ #endif 2211+ #endif
2188+} 2212+}
2189--- gcc/libstdc++-v3/config/locale/uclibc/time_members.cc 2213Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/time_members.cc
2190+++ gcc/libstdc++-v3/config/locale/uclibc/time_members.cc 2214===================================================================
2215--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2216+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/time_members.cc 2008-08-28 17:55:56.000000000 -0700
2191@@ -0,0 +1,406 @@ 2217@@ -0,0 +1,406 @@
2192+// std::time_get, std::time_put implementation, GNU version -*- C++ -*- 2218+// std::time_get, std::time_put implementation, GNU version -*- C++ -*-
2193+ 2219+
@@ -2240,7 +2266,7 @@
2240+ template<> 2266+ template<>
2241+ void 2267+ void
2242+ __timepunct<char>:: 2268+ __timepunct<char>::
2243+ _M_put(char* __s, size_t __maxlen, const char* __format, 2269+ _M_put(char* __s, size_t __maxlen, const char* __format,
2244+ const tm* __tm) const 2270+ const tm* __tm) const
2245+ { 2271+ {
2246+#ifdef __UCLIBC_HAS_XLOCALE__ 2272+#ifdef __UCLIBC_HAS_XLOCALE__
@@ -2258,7 +2284,7 @@
2258+ __s[0] = '\0'; 2284+ __s[0] = '\0';
2259+ } 2285+ }
2260+ 2286+
2261+ template<> 2287+ template<>
2262+ void 2288+ void
2263+ __timepunct<char>::_M_initialize_timepunct(__c_locale __cloc) 2289+ __timepunct<char>::_M_initialize_timepunct(__c_locale __cloc)
2264+ { 2290+ {
@@ -2328,7 +2354,7 @@
2328+ } 2354+ }
2329+ else 2355+ else
2330+ { 2356+ {
2331+ _M_c_locale_timepunct = _S_clone_c_locale(__cloc); 2357+ _M_c_locale_timepunct = _S_clone_c_locale(__cloc);
2332+ 2358+
2333+ _M_data->_M_date_format = __nl_langinfo_l(D_FMT, __cloc); 2359+ _M_data->_M_date_format = __nl_langinfo_l(D_FMT, __cloc);
2334+ _M_data->_M_date_era_format = __nl_langinfo_l(ERA_D_FMT, __cloc); 2360+ _M_data->_M_date_era_format = __nl_langinfo_l(ERA_D_FMT, __cloc);
@@ -2393,7 +2419,7 @@
2393+ template<> 2419+ template<>
2394+ void 2420+ void
2395+ __timepunct<wchar_t>:: 2421+ __timepunct<wchar_t>::
2396+ _M_put(wchar_t* __s, size_t __maxlen, const wchar_t* __format, 2422+ _M_put(wchar_t* __s, size_t __maxlen, const wchar_t* __format,
2397+ const tm* __tm) const 2423+ const tm* __tm) const
2398+ { 2424+ {
2399+#ifdef __UCLIBC_HAS_XLOCALE__ 2425+#ifdef __UCLIBC_HAS_XLOCALE__
@@ -2412,7 +2438,7 @@
2412+ __s[0] = L'\0'; 2438+ __s[0] = L'\0';
2413+ } 2439+ }
2414+ 2440+
2415+ template<> 2441+ template<>
2416+ void 2442+ void
2417+ __timepunct<wchar_t>::_M_initialize_timepunct(__c_locale __cloc) 2443+ __timepunct<wchar_t>::_M_initialize_timepunct(__c_locale __cloc)
2418+ { 2444+ {
@@ -2484,7 +2510,7 @@
2484+#if 0 2510+#if 0
2485+ else 2511+ else
2486+ { 2512+ {
2487+ _M_c_locale_timepunct = _S_clone_c_locale(__cloc); 2513+ _M_c_locale_timepunct = _S_clone_c_locale(__cloc);
2488+ 2514+
2489+ union { char *__s; wchar_t *__w; } __u; 2515+ union { char *__s; wchar_t *__w; } __u;
2490+ 2516+
@@ -2595,8 +2621,10 @@
2595+ } 2621+ }
2596+#endif 2622+#endif
2597+} 2623+}
2598--- gcc/libstdc++-v3/config/locale/uclibc/time_members.h 2624Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/time_members.h
2599+++ gcc/libstdc++-v3/config/locale/uclibc/time_members.h 2625===================================================================
2626--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2627+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/time_members.h 2008-08-28 17:55:56.000000000 -0700
2600@@ -0,0 +1,68 @@ 2628@@ -0,0 +1,68 @@
2601+// std::time_get, std::time_put implementation, GNU version -*- C++ -*- 2629+// std::time_get, std::time_put implementation, GNU version -*- C++ -*-
2602+ 2630+
@@ -2635,40 +2663,42 @@
2635+// Written by Benjamin Kosnik <bkoz@redhat.com> 2663+// Written by Benjamin Kosnik <bkoz@redhat.com>
2636+ 2664+
2637+ template<typename _CharT> 2665+ template<typename _CharT>
2638+ __timepunct<_CharT>::__timepunct(size_t __refs) 2666+ __timepunct<_CharT>::__timepunct(size_t __refs)
2639+ : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL), 2667+ : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL),
2640+ _M_name_timepunct(_S_get_c_name()) 2668+ _M_name_timepunct(_S_get_c_name())
2641+ { _M_initialize_timepunct(); } 2669+ { _M_initialize_timepunct(); }
2642+ 2670+
2643+ template<typename _CharT> 2671+ template<typename _CharT>
2644+ __timepunct<_CharT>::__timepunct(__cache_type* __cache, size_t __refs) 2672+ __timepunct<_CharT>::__timepunct(__cache_type* __cache, size_t __refs)
2645+ : facet(__refs), _M_data(__cache), _M_c_locale_timepunct(NULL), 2673+ : facet(__refs), _M_data(__cache), _M_c_locale_timepunct(NULL),
2646+ _M_name_timepunct(_S_get_c_name()) 2674+ _M_name_timepunct(_S_get_c_name())
2647+ { _M_initialize_timepunct(); } 2675+ { _M_initialize_timepunct(); }
2648+ 2676+
2649+ template<typename _CharT> 2677+ template<typename _CharT>
2650+ __timepunct<_CharT>::__timepunct(__c_locale __cloc, const char* __s, 2678+ __timepunct<_CharT>::__timepunct(__c_locale __cloc, const char* __s,
2651+ size_t __refs) 2679+ size_t __refs)
2652+ : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL), 2680+ : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL),
2653+ _M_name_timepunct(__s) 2681+ _M_name_timepunct(__s)
2654+ { 2682+ {
2655+ char* __tmp = new char[std::strlen(__s) + 1]; 2683+ char* __tmp = new char[std::strlen(__s) + 1];
2656+ std::strcpy(__tmp, __s); 2684+ std::strcpy(__tmp, __s);
2657+ _M_name_timepunct = __tmp; 2685+ _M_name_timepunct = __tmp;
2658+ _M_initialize_timepunct(__cloc); 2686+ _M_initialize_timepunct(__cloc);
2659+ } 2687+ }
2660+ 2688+
2661+ template<typename _CharT> 2689+ template<typename _CharT>
2662+ __timepunct<_CharT>::~__timepunct() 2690+ __timepunct<_CharT>::~__timepunct()
2663+ { 2691+ {
2664+ if (_M_name_timepunct != _S_get_c_name()) 2692+ if (_M_name_timepunct != _S_get_c_name())
2665+ delete [] _M_name_timepunct; 2693+ delete [] _M_name_timepunct;
2666+ delete _M_data; 2694+ delete _M_data;
2667+ _S_destroy_c_locale(_M_c_locale_timepunct); 2695+ _S_destroy_c_locale(_M_c_locale_timepunct);
2668+ } 2696+ }
2669--- gcc/libstdc++-v3/configure 2697Index: gcc-4.3.2/libstdc++-v3/configure
2670+++ gcc/libstdc++-v3/configure 2698===================================================================
2671@@ -5764,7 +5764,7 @@ 2699--- gcc-4.3.2.orig/libstdc++-v3/configure 2008-07-07 12:49:54.000000000 -0700
2700+++ gcc-4.3.2/libstdc++-v3/configure 2008-08-28 18:02:13.000000000 -0700
2701@@ -14003,7 +14003,7 @@
2672 enableval="$enable_clocale" 2702 enableval="$enable_clocale"
2673 2703
2674 case "$enableval" in 2704 case "$enableval" in
@@ -2677,17 +2707,17 @@
2677 *) { { echo "$as_me:$LINENO: error: Unknown argument to enable/disable clocale" >&5 2707 *) { { echo "$as_me:$LINENO: error: Unknown argument to enable/disable clocale" >&5
2678 echo "$as_me: error: Unknown argument to enable/disable clocale" >&2;} 2708 echo "$as_me: error: Unknown argument to enable/disable clocale" >&2;}
2679 { (exit 1); exit 1; }; } ;; 2709 { (exit 1); exit 1; }; } ;;
2680@@ -5789,6 +5789,9 @@ 2710@@ -14036,6 +14036,9 @@
2681 # Default to "generic". 2711 # Default to "generic".
2682 if test $enable_clocale_flag = auto; then 2712 if test $enable_clocale_flag = auto; then
2683 case ${target_os} in 2713 case ${target_os} in
2684+ linux-uclibc*) 2714+ *-uclibc*)
2685+ enable_clocale_flag=uclibc 2715+ enable_clocale_flag=uclibc
2686+ ;; 2716+ ;;
2687 linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu) 2717 linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu)
2688 cat >conftest.$ac_ext <<_ACEOF 2718 enable_clocale_flag=gnu
2689 /* confdefs.h. */ 2719 ;;
2690@@ -6019,6 +6022,76 @@ 2720@@ -14424,6 +14427,76 @@
2691 CTIME_CC=config/locale/generic/time_members.cc 2721 CTIME_CC=config/locale/generic/time_members.cc
2692 CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h 2722 CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
2693 ;; 2723 ;;
@@ -2764,9 +2794,20 @@
2764 esac 2794 esac
2765 2795
2766 # This is where the testsuite looks for locale catalogs, using the 2796 # This is where the testsuite looks for locale catalogs, using the
2767--- gcc/libstdc++-v3/include/c_compatibility/wchar.h 2797@@ -17016,7 +17089,7 @@
2768+++ gcc/libstdc++-v3/include/c_compatibility/wchar.h 2798
2769@@ -101,7 +101,9 @@ 2799 # Fake what AC_TRY_COMPILE does. XXX Look at redoing this new-style.
2800 cat > conftest.$ac_ext << EOF
2801-#line 17019 "configure"
2802+#line 17092 "configure"
2803 int main()
2804 {
2805 // NB: _Atomic_word not necessarily int.
2806Index: gcc-4.3.2/libstdc++-v3/include/c_compatibility/wchar.h
2807===================================================================
2808--- gcc-4.3.2.orig/libstdc++-v3/include/c_compatibility/wchar.h 2007-03-04 14:59:49.000000000 -0800
2809+++ gcc-4.3.2/libstdc++-v3/include/c_compatibility/wchar.h 2008-08-28 17:55:56.000000000 -0700
2810@@ -106,7 +106,9 @@
2770 using std::wmemcpy; 2811 using std::wmemcpy;
2771 using std::wmemmove; 2812 using std::wmemmove;
2772 using std::wmemset; 2813 using std::wmemset;
@@ -2776,8 +2817,10 @@
2776 2817
2777 #if _GLIBCXX_USE_C99 2818 #if _GLIBCXX_USE_C99
2778 using std::wcstold; 2819 using std::wcstold;
2779--- gcc/libstdc++-v3/include/c_std/std_cwchar.h 2820Index: gcc-4.3.2/libstdc++-v3/include/c_std/cwchar
2780+++ gcc/libstdc++-v3/include/c_std/std_cwchar.h 2821===================================================================
2822--- gcc-4.3.2.orig/libstdc++-v3/include/c_std/cwchar 2007-05-27 07:50:21.000000000 -0700
2823+++ gcc-4.3.2/libstdc++-v3/include/c_std/cwchar 2008-08-28 17:55:56.000000000 -0700
2781@@ -182,7 +182,9 @@ 2824@@ -182,7 +182,9 @@
2782 using ::wcscoll; 2825 using ::wcscoll;
2783 using ::wcscpy; 2826 using ::wcscpy;
diff --git a/meta/packages/gcc/gcc-4.3.3/203-uclibc-locale-no__x.patch b/meta/packages/gcc/gcc-4.3.3/203-uclibc-locale-no__x.patch
index 6ba47003b3..f39e65220c 100644
--- a/meta/packages/gcc/gcc-4.3.3/203-uclibc-locale-no__x.patch
+++ b/meta/packages/gcc/gcc-4.3.3/203-uclibc-locale-no__x.patch
@@ -1,8 +1,10 @@
1--- gcc/libstdc++-v3/config/locale/uclibc/c++locale_internal.h.uclibc200no__x~ 2006-03-10 15:06:17 +0100 1Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c++locale_internal.h
2+++ gcc/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 2006-03-10 15:32:37 +0100 2===================================================================
3--- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 2008-08-16 01:29:20.000000000 -0700
4+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 2008-08-16 01:33:23.000000000 -0700
3@@ -60,4 +60,49 @@ 5@@ -60,4 +60,49 @@
4 extern "C" __typeof(wctype_l) __wctype_l; 6 extern "C" __typeof(wctype_l) __wctype_l;
5 #endif 7 #endif
6 8
7+# define __nl_langinfo_l nl_langinfo_l 9+# define __nl_langinfo_l nl_langinfo_l
8+# define __strcoll_l strcoll_l 10+# define __strcoll_l strcoll_l
@@ -44,14 +46,16 @@
44+# define __towlower_l(C, L) towlower((C)) 46+# define __towlower_l(C, L) towlower((C))
45+# define __towupper_l(C, L) towupper((C)) 47+# define __towupper_l(C, L) towupper((C))
46+# define __wcscoll_l(S1, S2, L) wcscoll((S1), (S2)) 48+# define __wcscoll_l(S1, S2, L) wcscoll((S1), (S2))
47+//# define __wcsftime_l(S, M, F, T, L) wcsftime((S), (M), (F), (T)) 49+//# define __wcsftime_l(S, M, F, T, L) wcsftime((S), (M), (F), (T))
48+# define __wcsxfrm_l(S1, S2, N, L) wcsxfrm((S1), (S2), (N)) 50+# define __wcsxfrm_l(S1, S2, N, L) wcsxfrm((S1), (S2), (N))
49+# define __wctype_l(S, L) wctype((S)) 51+# define __wctype_l(S, L) wctype((S))
50+# endif 52+# endif
51+ 53+
52 #endif // GLIBC 2.3 and later 54 #endif // GLIBC 2.3 and later
53--- gcc/libstdc++-v3/config/locale/uclibc/c_locale.cc.uclibc200no__x~ 2006-03-10 15:06:17 +0100 55Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c_locale.cc
54+++ gcc/libstdc++-v3/config/locale/uclibc/c_locale.cc 2006-03-10 15:32:37 +0100 56===================================================================
57--- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc 2008-08-16 01:29:20.000000000 -0700
58+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c_locale.cc 2008-08-16 01:33:00.000000000 -0700
55@@ -39,20 +39,6 @@ 59@@ -39,20 +39,6 @@
56 #include <langinfo.h> 60 #include <langinfo.h>
57 #include <bits/c++locale_internal.h> 61 #include <bits/c++locale_internal.h>
@@ -70,11 +74,13 @@
70-#define __duplocale(a) __c_locale() 74-#define __duplocale(a) __c_locale()
71-#endif 75-#endif
72- 76-
73 namespace std 77 namespace std
74 { 78 {
75 template<> 79 template<>
76--- gcc/libstdc++-v3/config/locale/uclibc/collate_members.cc.uclibc200no__x~ 2006-03-10 15:06:17 +0100 80Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/collate_members.cc
77+++ gcc/libstdc++-v3/config/locale/uclibc/collate_members.cc 2006-03-10 15:32:37 +0100 81===================================================================
82--- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/collate_members.cc 2008-08-16 01:29:20.000000000 -0700
83+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/collate_members.cc 2008-08-16 01:30:31.000000000 -0700
78@@ -36,13 +36,6 @@ 84@@ -36,13 +36,6 @@
79 #include <locale> 85 #include <locale>
80 #include <bits/c++locale_internal.h> 86 #include <bits/c++locale_internal.h>
@@ -89,8 +95,10 @@
89 namespace std 95 namespace std
90 { 96 {
91 // These are basically extensions to char_traits, and perhaps should 97 // These are basically extensions to char_traits, and perhaps should
92--- gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc.uclibc200no__x~ 2006-03-10 15:06:17 +0100 98Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc
93+++ gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2006-03-10 15:32:37 +0100 99===================================================================
100--- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2008-08-16 01:29:20.000000000 -0700
101+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2008-08-16 01:30:31.000000000 -0700
94@@ -43,10 +43,6 @@ 102@@ -43,10 +43,6 @@
95 #warning tailor for stub locale support 103 #warning tailor for stub locale support
96 #endif 104 #endif
@@ -102,8 +110,10 @@
102 namespace std 110 namespace std
103 { 111 {
104 // Construct and return valid pattern consisting of some combination of: 112 // Construct and return valid pattern consisting of some combination of:
105--- gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc.uclibc200no__x~ 2006-03-10 15:06:17 +0100 113Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc
106+++ gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2006-03-10 15:32:37 +0100 114===================================================================
115--- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2008-08-16 01:29:20.000000000 -0700
116+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2008-08-16 01:30:31.000000000 -0700
107@@ -41,9 +41,6 @@ 117@@ -41,9 +41,6 @@
108 #ifdef __UCLIBC_MJN3_ONLY__ 118 #ifdef __UCLIBC_MJN3_ONLY__
109 #warning tailor for stub locale support 119 #warning tailor for stub locale support
@@ -114,8 +124,10 @@
114 124
115 namespace std 125 namespace std
116 { 126 {
117--- gcc/libstdc++-v3/config/locale/uclibc/time_members.cc.uclibc200no__x~ 2006-03-10 15:06:17 +0100 127Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/time_members.cc
118+++ gcc/libstdc++-v3/config/locale/uclibc/time_members.cc 2006-03-10 15:32:37 +0100 128===================================================================
129--- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/time_members.cc 2008-08-16 01:29:20.000000000 -0700
130+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/time_members.cc 2008-08-16 01:30:31.000000000 -0700
119@@ -40,9 +40,6 @@ 131@@ -40,9 +40,6 @@
120 #ifdef __UCLIBC_MJN3_ONLY__ 132 #ifdef __UCLIBC_MJN3_ONLY__
121 #warning tailor for stub locale support 133 #warning tailor for stub locale support
@@ -126,8 +138,10 @@
126 138
127 namespace std 139 namespace std
128 { 140 {
129--- gcc/libstdc++-v3/config/locale/uclibc/ctype_members.cc.uclibc200no__x~ 2006-03-10 15:06:17 +0100 141Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/ctype_members.cc
130+++ gcc/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2006-03-10 15:32:37 +0100 142===================================================================
143--- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2008-08-16 01:29:20.000000000 -0700
144+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2008-08-16 01:30:31.000000000 -0700
131@@ -38,13 +38,6 @@ 145@@ -38,13 +38,6 @@
132 #undef _LIBC 146 #undef _LIBC
133 #include <bits/c++locale_internal.h> 147 #include <bits/c++locale_internal.h>
@@ -142,8 +156,10 @@
142 namespace std 156 namespace std
143 { 157 {
144 // NB: The other ctype<char> specializations are in src/locale.cc and 158 // NB: The other ctype<char> specializations are in src/locale.cc and
145--- gcc/libstdc++-v3/config/locale/uclibc/messages_members.cc.uclibc200no__x~ 2006-03-10 15:06:17 +0100 159Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/messages_members.cc
146+++ gcc/libstdc++-v3/config/locale/uclibc/messages_members.cc 2006-03-10 15:32:37 +0100 160===================================================================
161--- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.cc 2008-08-16 01:27:18.000000000 -0700
162+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/messages_members.cc 2008-08-16 01:30:31.000000000 -0700
147@@ -39,13 +39,10 @@ 163@@ -39,13 +39,10 @@
148 #ifdef __UCLIBC_MJN3_ONLY__ 164 #ifdef __UCLIBC_MJN3_ONLY__
149 #warning fix gettext stuff 165 #warning fix gettext stuff
@@ -160,8 +176,10 @@
160 #define gettext(msgid) (msgid) 176 #define gettext(msgid) (msgid)
161 #endif 177 #endif
162 178
163--- gcc/libstdc++-v3/config/locale/uclibc/messages_members.h.uclibc200no__x~ 2006-03-10 15:06:17 +0100 179Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/messages_members.h
164+++ gcc/libstdc++-v3/config/locale/uclibc/messages_members.h 2006-03-10 15:32:37 +0100 180===================================================================
181--- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.h 2008-08-16 01:29:20.000000000 -0700
182+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/messages_members.h 2008-08-16 01:31:43.000000000 -0700
165@@ -36,15 +36,11 @@ 183@@ -36,15 +36,11 @@
166 #ifdef __UCLIBC_MJN3_ONLY__ 184 #ifdef __UCLIBC_MJN3_ONLY__
167 #warning fix prototypes for *textdomain funcs 185 #warning fix prototypes for *textdomain funcs
@@ -184,16 +202,16 @@
184 202
185 // Non-virtual member functions. 203 // Non-virtual member functions.
186@@ -70,7 +66,7 @@ 204@@ -70,7 +66,7 @@
187 messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc, 205 messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc,
188 const char* __dir) const 206 const char* __dir) const
189 { 207 {
190- __bindtextdomain(__s.c_str(), __dir); 208- __bindtextdomain(__s.c_str(), __dir);
191+ bindtextdomain(__s.c_str(), __dir); 209+ bindtextdomain(__s.c_str(), __dir);
192 return this->do_open(__s, __loc); 210 return this->do_open(__s, __loc);
193 } 211 }
194 212
195@@ -90,7 +86,7 @@ 213@@ -90,7 +86,7 @@
196 { 214 {
197 // No error checking is done, assume the catalog exists and can 215 // No error checking is done, assume the catalog exists and can
198 // be used. 216 // be used.
199- __textdomain(__s.c_str()); 217- __textdomain(__s.c_str());
@@ -201,8 +219,10 @@
201 return 0; 219 return 0;
202 } 220 }
203 221
204--- gcc/libstdc++-v3/config/locale/uclibc/c_locale.h.uclibc200no__x~ 2006-03-10 15:06:17 +0100 222Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c_locale.h
205+++ gcc/libstdc++-v3/config/locale/uclibc/c_locale.h 2006-03-10 15:32:37 +0100 223===================================================================
224--- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.h 2008-08-16 01:29:20.000000000 -0700
225+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c_locale.h 2008-08-16 01:30:31.000000000 -0700
206@@ -68,6 +68,7 @@ 226@@ -68,6 +68,7 @@
207 { 227 {
208 extern "C" __typeof(uselocale) __uselocale; 228 extern "C" __typeof(uselocale) __uselocale;
diff --git a/meta/packages/gcc/gcc-4.3.3/205-uclibc-locale-update.patch b/meta/packages/gcc/gcc-4.3.3/205-uclibc-locale-update.patch
index 86b2844554..48eaa1d442 100644
--- a/meta/packages/gcc/gcc-4.3.3/205-uclibc-locale-update.patch
+++ b/meta/packages/gcc/gcc-4.3.3/205-uclibc-locale-update.patch
@@ -1,7 +1,18 @@
1--- gcc/libstdc++-v3/config/locale/uclibc/c_locale.cc.uclibc200_update~ 2006-03-10 15:32:37 +0100 1Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/c_locale.cc
2+++ gcc/libstdc++-v3/config/locale/uclibc/c_locale.cc 2006-03-10 15:39:14 +0100 2===================================================================
3@@ -46,16 +47,13 @@ 3--- gcc-4.3.2.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc 2008-09-17 22:35:28.000000000 -0700
4 __convert_to_v(const char* __s, float& __v, ios_base::iostate& __err, 4+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/c_locale.cc 2008-09-17 22:35:29.000000000 -0700
5@@ -39,23 +39,20 @@
6 #include <langinfo.h>
7 #include <bits/c++locale_internal.h>
8
9-namespace std
10-{
11+_GLIBCXX_BEGIN_NAMESPACE(std)
12+
13 template<>
14 void
15 __convert_to_v(const char* __s, float& __v, ios_base::iostate& __err,
5 const __c_locale& __cloc) 16 const __c_locale& __cloc)
6 { 17 {
7- if (!(__err & ios_base::failbit)) 18- if (!(__err & ios_base::failbit))
@@ -24,8 +35,8 @@
24 } 35 }
25 36
26 template<> 37 template<>
27@@ -63,16 +61,13 @@ 38@@ -63,16 +60,13 @@
28 __convert_to_v(const char* __s, double& __v, ios_base::iostate& __err, 39 __convert_to_v(const char* __s, double& __v, ios_base::iostate& __err,
29 const __c_locale& __cloc) 40 const __c_locale& __cloc)
30 { 41 {
31- if (!(__err & ios_base::failbit)) 42- if (!(__err & ios_base::failbit))
@@ -48,7 +59,7 @@
48 } 59 }
49 60
50 template<> 61 template<>
51@@ -80,16 +75,13 @@ 62@@ -80,16 +74,13 @@
52 __convert_to_v(const char* __s, long double& __v, ios_base::iostate& __err, 63 __convert_to_v(const char* __s, long double& __v, ios_base::iostate& __err,
53 const __c_locale& __cloc) 64 const __c_locale& __cloc)
54 { 65 {
@@ -72,18 +83,50 @@
72 } 83 }
73 84
74 void 85 void
75@@ -110,7 +102,7 @@ 86@@ -110,17 +101,18 @@
76 void 87 void
77 locale::facet::_S_destroy_c_locale(__c_locale& __cloc) 88 locale::facet::_S_destroy_c_locale(__c_locale& __cloc)
78 { 89 {
79- if (_S_get_c_locale() != __cloc) 90- if (_S_get_c_locale() != __cloc)
80+ if (__cloc && _S_get_c_locale() != __cloc) 91+ if (__cloc && _S_get_c_locale() != __cloc)
81 __freelocale(__cloc); 92 __freelocale(__cloc);
82 } 93 }
83 94
84--- gcc/libstdc++-v3/config/locale/uclibc/ctype_members.cc.uclibc200_update~ 2006-03-10 15:32:37 +0100 95 __c_locale
85+++ gcc/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2006-03-10 15:39:14 +0100 96 locale::facet::_S_clone_c_locale(__c_locale& __cloc)
86@@ -33,9 +33,14 @@ 97 { return __duplocale(__cloc); }
98-} // namespace std
99
100-namespace __gnu_cxx
101-{
102+_GLIBCXX_END_NAMESPACE
103+
104+_GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
105+
106 const char* const category_names[6 + _GLIBCXX_NUM_CATEGORIES] =
107 {
108 "LC_CTYPE",
109@@ -138,9 +130,11 @@
110 "LC_IDENTIFICATION"
111 #endif
112 };
113-}
114
115-namespace std
116-{
117+_GLIBCXX_END_NAMESPACE
118+
119+_GLIBCXX_BEGIN_NAMESPACE(std)
120+
121 const char* const* const locale::_S_categories = __gnu_cxx::category_names;
122-} // namespace std
123+
124+_GLIBCXX_END_NAMESPACE
125Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/ctype_members.cc
126===================================================================
127--- gcc-4.3.2.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2008-09-17 22:35:28.000000000 -0700
128+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2008-09-17 23:09:49.000000000 -0700
129@@ -33,16 +33,20 @@
87 130
88 // Written by Benjamin Kosnik <bkoz@redhat.com> 131 // Written by Benjamin Kosnik <bkoz@redhat.com>
89 132
@@ -97,11 +140,29 @@
97+#endif 140+#endif
98 #include <bits/c++locale_internal.h> 141 #include <bits/c++locale_internal.h>
99 142
100 namespace std 143-namespace std
101@@ -138,20 +143,34 @@ 144-{
145+_GLIBCXX_BEGIN_NAMESPACE(std)
146+
147 // NB: The other ctype<char> specializations are in src/locale.cc and
148 // various /config/os/* files.
149- template<>
150 ctype_byname<char>::ctype_byname(const char* __s, size_t __refs)
151 : ctype<char>(0, false, __refs)
152 {
153@@ -57,6 +61,8 @@
154 #endif
155 }
156 }
157+ ctype_byname<char>::~ctype_byname()
158+ { }
159
160 #ifdef _GLIBCXX_USE_WCHAR_T
161 ctype<wchar_t>::__wmask_type
162@@ -138,17 +144,33 @@
102 ctype<wchar_t>:: 163 ctype<wchar_t>::
103 do_is(mask __m, wchar_t __c) const 164 do_is(mask __m, wchar_t __c) const
104 { 165 {
105- // Highest bitmask in ctype_base == 10, but extra in "C" 166- // Highest bitmask in ctype_base == 10, but extra in "C"
106- // library for blank. 167- // library for blank.
107+ // The case of __m == ctype_base::space is particularly important, 168+ // The case of __m == ctype_base::space is particularly important,
@@ -109,8 +170,9 @@
109+ // it first, exploiting the knowledge that on GNU systems _M_bit[5] 170+ // it first, exploiting the knowledge that on GNU systems _M_bit[5]
110+ // is the mask corresponding to ctype_base::space. NB: an encoding 171+ // is the mask corresponding to ctype_base::space. NB: an encoding
111+ // change would not affect correctness! 172+ // change would not affect correctness!
173+
112 bool __ret = false; 174 bool __ret = false;
113- const size_t __bitmasksize = 11; 175- const size_t __bitmasksize = 11;
114- for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur) 176- for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
115- if (__m & _M_bit[__bitcur] 177- if (__m & _M_bit[__bitcur]
116- && __iswctype_l(__c, _M_wmask[__bitcur], _M_c_locale_ctype)) 178- && __iswctype_l(__c, _M_wmask[__bitcur], _M_c_locale_ctype))
@@ -137,29 +199,29 @@
137+ break; 199+ break;
138+ } 200+ }
139+ } 201+ }
140 return __ret;
141 }
142-
143+ 202+
144 const wchar_t* 203 return __ret;
145 ctype<wchar_t>:: 204 }
146 do_is(const wchar_t* __lo, const wchar_t* __hi, mask* __vec) const
147--- gcc/libstdc++-v3/config/locale/uclibc/messages_members.h.uclibc200_update~ 2006-03-10 15:32:37 +0100
148+++ gcc/libstdc++-v3/config/locale/uclibc/messages_members.h 2006-03-10 15:39:14 +0100
149@@ -47,18 +47,21 @@
150 template<typename _CharT>
151 messages<_CharT>::messages(size_t __refs)
152 : facet(__refs), _M_c_locale_messages(_S_get_c_locale()),
153- _M_name_messages(_S_get_c_name())
154+ _M_name_messages(_S_get_c_name())
155 { }
156 205
206@@ -290,4 +312,5 @@
207 #endif
208 }
209 #endif // _GLIBCXX_USE_WCHAR_T
210-}
211+
212+_GLIBCXX_END_NAMESPACE
213Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/messages_members.h
214===================================================================
215--- gcc-4.3.2.orig/libstdc++-v3/config/locale/uclibc/messages_members.h 2008-09-17 22:35:28.000000000 -0700
216+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/messages_members.h 2008-09-17 23:13:34.000000000 -0700
217@@ -53,12 +53,16 @@
157 template<typename _CharT> 218 template<typename _CharT>
158 messages<_CharT>::messages(__c_locale __cloc, const char* __s, 219 messages<_CharT>::messages(__c_locale __cloc, const char* __s,
159 size_t __refs) 220 size_t __refs)
160- : facet(__refs), _M_c_locale_messages(_S_clone_c_locale(__cloc)), 221- : facet(__refs), _M_c_locale_messages(_S_clone_c_locale(__cloc)),
161- _M_name_messages(__s) 222- _M_name_messages(__s)
162+ : facet(__refs), _M_c_locale_messages(NULL), _M_name_messages(NULL) 223+ : facet(__refs), _M_c_locale_messages(NULL),
224+ _M_name_messages(NULL)
163 { 225 {
164- char* __tmp = new char[std::strlen(__s) + 1]; 226- char* __tmp = new char[std::strlen(__s) + 1];
165- std::strcpy(__tmp, __s); 227- std::strcpy(__tmp, __s);
@@ -173,8 +235,10 @@
173 } 235 }
174 236
175 template<typename _CharT> 237 template<typename _CharT>
176--- gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc.uclibc200_update~ 2006-03-10 15:37:27 +0100 238Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/monetary_members.cc
177+++ gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2006-03-10 15:39:14 +0100 239===================================================================
240--- gcc-4.3.2.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2008-09-17 22:35:28.000000000 -0700
241+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2008-09-17 22:35:29.000000000 -0700
178@@ -33,9 +33,14 @@ 242@@ -33,9 +33,14 @@
179 243
180 // Written by Benjamin Kosnik <bkoz@redhat.com> 244 // Written by Benjamin Kosnik <bkoz@redhat.com>
@@ -199,8 +263,79 @@
199 } 263 }
200 return __ret; 264 return __ret;
201 } 265 }
202--- gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc.uclibc200_update~ 2006-03-10 15:37:27 +0100 266@@ -390,7 +395,9 @@
203+++ gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2006-03-10 15:39:14 +0100 267 __c_locale __old = __uselocale(__cloc);
268 #else
269 // Switch to named locale so that mbsrtowcs will work.
270- char* __old = strdup(setlocale(LC_ALL, NULL));
271+ char* __old = setlocale(LC_ALL, NULL);
272+ const size_t __llen = strlen(__old) + 1;
273+ char* __sav = new char[__llen];
274 setlocale(LC_ALL, __name);
275 #endif
276
277@@ -477,8 +484,8 @@
278 #ifdef __UCLIBC_HAS_XLOCALE__
279 __uselocale(__old);
280 #else
281- setlocale(LC_ALL, __old);
282- free(__old);
283+ setlocale(LC_ALL, __sav);
284+ delete [] __sav;
285 #endif
286 __throw_exception_again;
287 }
288@@ -498,8 +505,8 @@
289 #ifdef __UCLIBC_HAS_XLOCALE__
290 __uselocale(__old);
291 #else
292- setlocale(LC_ALL, __old);
293- free(__old);
294+ setlocale(LC_ALL, __sav);
295+ delete [] __sav;
296 #endif
297 }
298 }
299@@ -545,8 +552,11 @@
300 __c_locale __old = __uselocale(__cloc);
301 #else
302 // Switch to named locale so that mbsrtowcs will work.
303- char* __old = strdup(setlocale(LC_ALL, NULL));
304- setlocale(LC_ALL, __name);
305+ char* __old = setlocale(LC_ALL, NULL);
306+ const size_t __llen = strlen(__old) + 1;
307+ char* __sav = new char[__llen];
308+ memcpy(__sav, __old, __llen);
309+ setlocale(LC_ALL, __name);
310 #endif
311
312 #ifdef __UCLIBC_MJN3_ONLY__
313@@ -633,8 +643,8 @@
314 #ifdef __UCLIBC_HAS_XLOCALE__
315 __uselocale(__old);
316 #else
317- setlocale(LC_ALL, __old);
318- free(__old);
319+ setlocale(LC_ALL, __sav);
320+ delete [] __sav;
321 #endif
322 __throw_exception_again;
323 }
324@@ -653,8 +663,8 @@
325 #ifdef __UCLIBC_HAS_XLOCALE__
326 __uselocale(__old);
327 #else
328- setlocale(LC_ALL, __old);
329- free(__old);
330+ setlocale(LC_ALL, __sav);
331+ delete [] __sav;
332 #endif
333 }
334 }
335Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/numeric_members.cc
336===================================================================
337--- gcc-4.3.2.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2008-09-17 22:35:28.000000000 -0700
338+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2008-09-17 22:35:29.000000000 -0700
204@@ -33,9 +33,14 @@ 339@@ -33,9 +33,14 @@
205 340
206 // Written by Benjamin Kosnik <bkoz@redhat.com> 341 // Written by Benjamin Kosnik <bkoz@redhat.com>
@@ -216,37 +351,24 @@
216 #include <bits/c++locale_internal.h> 351 #include <bits/c++locale_internal.h>
217 352
218 #ifdef __UCLIBC_MJN3_ONLY__ 353 #ifdef __UCLIBC_MJN3_ONLY__
219--- gcc/libstdc++-v3/config/locale/uclibc/time_members.h.uclibc200_update~ 2006-03-10 15:06:17 +0100 354Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/time_members.h
220+++ gcc/libstdc++-v3/config/locale/uclibc/time_members.h 2006-03-10 15:39:14 +0100 355===================================================================
221@@ -37,25 +37,33 @@ 356--- gcc-4.3.2.orig/libstdc++-v3/config/locale/uclibc/time_members.h 2008-09-17 22:35:27.000000000 -0700
222 template<typename _CharT> 357+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/time_members.h 2008-09-17 23:13:34.000000000 -0700
223 __timepunct<_CharT>::__timepunct(size_t __refs) 358@@ -50,12 +50,21 @@
224 : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL),
225- _M_name_timepunct(_S_get_c_name())
226+ _M_name_timepunct(_S_get_c_name())
227 { _M_initialize_timepunct(); }
228
229 template<typename _CharT>
230 __timepunct<_CharT>::__timepunct(__cache_type* __cache, size_t __refs)
231 : facet(__refs), _M_data(__cache), _M_c_locale_timepunct(NULL),
232- _M_name_timepunct(_S_get_c_name())
233+ _M_name_timepunct(_S_get_c_name())
234 { _M_initialize_timepunct(); }
235
236 template<typename _CharT>
237 __timepunct<_CharT>::__timepunct(__c_locale __cloc, const char* __s, 359 __timepunct<_CharT>::__timepunct(__c_locale __cloc, const char* __s,
238 size_t __refs) 360 size_t __refs)
239 : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL), 361 : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL),
240- _M_name_timepunct(__s) 362- _M_name_timepunct(__s)
241+ _M_name_timepunct(NULL) 363+ _M_name_timepunct(NULL)
242 { 364 {
243- char* __tmp = new char[std::strlen(__s) + 1]; 365- char* __tmp = new char[std::strlen(__s) + 1];
244- std::strcpy(__tmp, __s); 366- std::strcpy(__tmp, __s);
245+ const size_t __len = std::strlen(__s) + 1; 367+ const size_t __len = std::strlen(__s) + 1;
246+ char* __tmp = new char[__len]; 368+ char* __tmp = new char[__len];
247+ std::memcpy(__tmp, __s, __len); 369+ std::memcpy(__tmp, __s, __len);
248 _M_name_timepunct = __tmp; 370 _M_name_timepunct = __tmp;
249- _M_initialize_timepunct(__cloc); 371- _M_initialize_timepunct(__cloc);
250+ 372+
251+ try 373+ try
252+ { _M_initialize_timepunct(__cloc); } 374+ { _M_initialize_timepunct(__cloc); }
@@ -255,11 +377,14 @@
255+ delete [] _M_name_timepunct; 377+ delete [] _M_name_timepunct;
256+ __throw_exception_again; 378+ __throw_exception_again;
257+ } 379+ }
380+
258 } 381 }
259 382
260 template<typename _CharT> 383 template<typename _CharT>
261--- gcc-4.2/libstdc++-v3/config/locale/uclibc/c_locale.h.old 2006-09-28 11:39:00.000000000 +0200 384Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/c_locale.h
262+++ gcc-4.2/libstdc++-v3/config/locale/uclibc/c_locale.h 2006-09-28 12:10:41.000000000 +0200 385===================================================================
386--- gcc-4.3.2.orig/libstdc++-v3/config/locale/uclibc/c_locale.h 2008-09-17 22:35:28.000000000 -0700
387+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/c_locale.h 2008-09-17 22:35:29.000000000 -0700
263@@ -39,21 +39,23 @@ 388@@ -39,21 +39,23 @@
264 #pragma GCC system_header 389 #pragma GCC system_header
265 390
@@ -288,19 +413,11 @@
288 #endif 413 #endif
289 #define _GLIBCXX_C_LOCALE_GNU 1 414 #define _GLIBCXX_C_LOCALE_GNU 1
290 415
291@@ -62,7 +64,7 @@ 416@@ -78,23 +80,25 @@
292 #endif 417 #else
293 // #define _GLIBCXX_NUM_CATEGORIES 6
294 #define _GLIBCXX_NUM_CATEGORIES 0
295-
296+
297 #ifdef __UCLIBC_HAS_XLOCALE__
298 namespace __gnu_cxx
299 {
300@@ -79,22 +81,24 @@
301 typedef int* __c_locale; 418 typedef int* __c_locale;
302 #endif 419 #endif
303 420-
304- // Convert numeric value of type _Tv to string and return length of 421- // Convert numeric value of type _Tv to string and return length of
305- // string. If snprintf is available use it, otherwise fall back to 422- // string. If snprintf is available use it, otherwise fall back to
306- // the unsafe sprintf which, in general, can be dangerous and should 423- // the unsafe sprintf which, in general, can be dangerous and should
@@ -310,7 +427,7 @@
310 // be avoided. 427 // be avoided.
311- template<typename _Tv> 428- template<typename _Tv>
312- int 429- int
313- __convert_from_v(char* __out, 430- __convert_from_v(char* __out,
314- const int __size __attribute__ ((__unused__)), 431- const int __size __attribute__ ((__unused__)),
315- const char* __fmt, 432- const char* __fmt,
316-#ifdef __UCLIBC_HAS_XCLOCALE__ 433-#ifdef __UCLIBC_HAS_XCLOCALE__
@@ -318,7 +435,7 @@
318+ inline int 435+ inline int
319+ __convert_from_v(const __c_locale& 436+ __convert_from_v(const __c_locale&
320+#ifndef __UCLIBC_HAS_XCLOCALE__ 437+#ifndef __UCLIBC_HAS_XCLOCALE__
321+ __cloc __attribute__ ((__unused__)) 438+ __cloc __attribute__ ((__unused__))
322+#endif 439+#endif
323+ , 440+ ,
324+ char* __out, 441+ char* __out,
@@ -327,6 +444,7 @@
327 { 444 {
328+ va_list __args; 445+ va_list __args;
329+#ifdef __UCLIBC_HAS_XCLOCALE__ 446+#ifdef __UCLIBC_HAS_XCLOCALE__
447+
330 __c_locale __old = __gnu_cxx::__uselocale(__cloc); 448 __c_locale __old = __gnu_cxx::__uselocale(__cloc);
331 #else 449 #else
332- _Tv __v, const __c_locale&, int __prec) 450- _Tv __v, const __c_locale&, int __prec)
@@ -345,3 +463,57 @@
345 463
346 #ifdef __UCLIBC_HAS_XCLOCALE__ 464 #ifdef __UCLIBC_HAS_XCLOCALE__
347 __gnu_cxx::__uselocale(__old); 465 __gnu_cxx::__uselocale(__old);
466Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/time_members.cc
467===================================================================
468--- gcc-4.3.2.orig/libstdc++-v3/config/locale/uclibc/time_members.cc 2008-09-17 22:35:28.000000000 -0700
469+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/time_members.cc 2008-09-17 22:35:29.000000000 -0700
470@@ -53,11 +53,14 @@
471 const size_t __len = __strftime_l(__s, __maxlen, __format, __tm,
472 _M_c_locale_timepunct);
473 #else
474- char* __old = strdup(setlocale(LC_ALL, NULL));
475+ char* __old = setlocale(LC_ALL, NULL);
476+ const size_t __llen = strlen(__old) + 1;
477+ char* __sav = new char[__llen];
478+ memcpy(__sav, __old, __llen);
479 setlocale(LC_ALL, _M_name_timepunct);
480 const size_t __len = strftime(__s, __maxlen, __format, __tm);
481- setlocale(LC_ALL, __old);
482- free(__old);
483+ setlocale(LC_ALL, __sav);
484+ delete [] __sav;
485 #endif
486 // Make sure __s is null terminated.
487 if (__len == 0)
488@@ -207,11 +210,14 @@
489 const size_t __len = __wcsftime_l(__s, __maxlen, __format, __tm,
490 _M_c_locale_timepunct);
491 #else
492- char* __old = strdup(setlocale(LC_ALL, NULL));
493+ char* __old = setlocale(LC_ALL, NULL);
494+ const size_t __llen = strlen(__old) + 1;
495+ char* __sav = new char[__llen];
496+ memcpy(__sav, __old, __llen);
497 setlocale(LC_ALL, _M_name_timepunct);
498 const size_t __len = wcsftime(__s, __maxlen, __format, __tm);
499- setlocale(LC_ALL, __old);
500- free(__old);
501+ setlocale(LC_ALL, __sav);
502+ delete [] __sav;
503 #endif
504 // Make sure __s is null terminated.
505 if (__len == 0)
506Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/c++locale_internal.h
507===================================================================
508--- gcc-4.3.2.orig/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 2008-09-17 22:35:28.000000000 -0700
509+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 2008-09-17 22:35:29.000000000 -0700
510@@ -31,6 +31,9 @@
511
512 #include <bits/c++config.h>
513 #include <clocale>
514+#include <cstdlib>
515+#include <cstring>
516+#include <cstddef>
517
518 #ifdef __UCLIBC_MJN3_ONLY__
519 #warning clean this up
diff --git a/meta/packages/gcc/gcc-4.3.3/302-c99-snprintf.patch b/meta/packages/gcc/gcc-4.3.3/302-c99-snprintf.patch
index dfb22d681b..02865865e5 100644
--- a/meta/packages/gcc/gcc-4.3.3/302-c99-snprintf.patch
+++ b/meta/packages/gcc/gcc-4.3.3/302-c99-snprintf.patch
@@ -1,8 +1,10 @@
1--- gcc-4.0.0/libstdc++-v3/include/c_std/std_cstdio.h-orig 2005-04-29 00:08:41.000000000 -0500 1Index: gcc-4.3.1/libstdc++-v3/include/c_std/cstdio
2+++ gcc-4.0.0/libstdc++-v3/include/c_std/std_cstdio.h 2005-04-29 00:08:45.000000000 -0500 2===================================================================
3@@ -142,7 +142,7 @@ 3--- gcc-4.3.1.orig/libstdc++-v3/include/c_std/cstdio 2006-12-07 01:35:57.000000000 -0800
4 using ::vsprintf; 4+++ gcc-4.3.1/libstdc++-v3/include/c_std/cstdio 2008-08-16 02:11:37.000000000 -0700
5 } 5@@ -144,7 +144,7 @@
6
7 _GLIBCXX_END_NAMESPACE
6 8
7-#if _GLIBCXX_USE_C99 9-#if _GLIBCXX_USE_C99
8+#if _GLIBCXX_USE_C99 || defined(__UCLIBC__) 10+#if _GLIBCXX_USE_C99 || defined(__UCLIBC__)
diff --git a/meta/packages/gcc/gcc-4.3.3/307-locale_facets.patch b/meta/packages/gcc/gcc-4.3.3/307-locale_facets.patch
index 412f8657dc..774fcfa2ca 100644
--- a/meta/packages/gcc/gcc-4.3.3/307-locale_facets.patch
+++ b/meta/packages/gcc/gcc-4.3.3/307-locale_facets.patch
@@ -4,23 +4,16 @@ std::snprintf function, that, on uClibc, doens't handle sized 0 buffer.
4 4
5Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com> 5Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
6 6
7--- gcc-4.2.1/libstdc++-v3/include/bits/locale_facets.tcc 2006-10-17 18:43:47.000000000 +0200 7Index: gcc-4.3.1/libstdc++-v3/include/bits/locale_facets.tcc
8+++ gcc-4.2.1-st/libstdc++-v3/include/bits/locale_facets.tcc 2007-08-22 18:54:23.000000000 +0200 8===================================================================
9@@ -1143,7 +1143,7 @@ _GLIBCXX_BEGIN_LDBL_NAMESPACE 9--- gcc-4.3.1.orig/libstdc++-v3/include/bits/locale_facets.tcc 2007-11-26 17:59:41.000000000 -0800
10+++ gcc-4.3.1/libstdc++-v3/include/bits/locale_facets.tcc 2008-08-16 02:14:48.000000000 -0700
11@@ -1004,7 +1004,7 @@
10 const int __cs_size = __fixed ? __max_exp + __prec + 4 12 const int __cs_size = __fixed ? __max_exp + __prec + 4
11 : __max_digits * 2 + __prec; 13 : __max_digits * 2 + __prec;
12 char* __cs = static_cast<char*>(__builtin_alloca(__cs_size)); 14 char* __cs = static_cast<char*>(__builtin_alloca(__cs_size));
13- __len = std::__convert_from_v(_S_get_c_locale(), __cs, 0, __fbuf, 15- __len = std::__convert_from_v(_S_get_c_locale(), __cs, 0, __fbuf,
14+ __len = std::__convert_from_v(_S_get_c_locale(), __cs, __cs_size, __fbuf, 16+ __len = std::__convert_from_v(_S_get_c_locale(), __cs, __cs_size, __fbuf,
15 __prec, __v); 17 __prec, __v);
16 #endif 18 #endif
17 19
18@@ -1777,7 +1777,7 @@ _GLIBCXX_BEGIN_LDBL_NAMESPACE
19 // max_exponent10 + 1 for the integer part, + 2 for sign and '\0'.
20 const int __cs_size = numeric_limits<long double>::max_exponent10 + 3;
21 char* __cs = static_cast<char*>(__builtin_alloca(__cs_size));
22- int __len = std::__convert_from_v(_S_get_c_locale(), __cs, 0, "%.*Lf",
23+ int __len = std::__convert_from_v(_S_get_c_locale(), __cs, __cs_size, "%.*Lf",
24 0, __units);
25 #endif
26 string_type __digits(__len, char_type());
diff --git a/meta/packages/gcc/gcc-4.3.3/800-arm-bigendian.patch b/meta/packages/gcc/gcc-4.3.3/800-arm-bigendian.patch
index 07c6093379..f433942783 100644
--- a/meta/packages/gcc/gcc-4.3.3/800-arm-bigendian.patch
+++ b/meta/packages/gcc/gcc-4.3.3/800-arm-bigendian.patch
@@ -3,37 +3,11 @@ Adds support for arm*b-linux* big-endian ARM targets
3 3
4See http://gcc.gnu.org/PR16350 4See http://gcc.gnu.org/PR16350
5 5
6--- gcc-4.2.0/gcc/config/arm/linux-elf.h 6Index: gcc-4.3.2/gcc/config/arm/linux-elf.h
7+++ gcc-4.2.0/gcc/config/arm/linux-elf.h 7===================================================================
8@@ -28,19 +28,33 @@ 8--- gcc-4.3.2.orig/gcc/config/arm/linux-elf.h 2007-11-08 05:44:09.000000000 -0800
9 #undef TARGET_VERSION 9+++ gcc-4.3.2/gcc/config/arm/linux-elf.h 2008-08-28 21:08:30.000000000 -0700
10 #define TARGET_VERSION fputs (" (ARM GNU/Linux with ELF)", stderr); 10@@ -51,7 +51,7 @@
11
12+/*
13+ * 'config.gcc' defines TARGET_BIG_ENDIAN_DEFAULT as 1 for arm*b-*
14+ * (big endian) configurations.
15+ */
16+#if TARGET_BIG_ENDIAN_DEFAULT
17+#define TARGET_ENDIAN_DEFAULT MASK_BIG_END
18+#define TARGET_ENDIAN_OPTION "mbig-endian"
19+#define TARGET_LINKER_EMULATION "armelfb_linux"
20+#else
21+#define TARGET_ENDIAN_DEFAULT 0
22+#define TARGET_ENDIAN_OPTION "mlittle-endian"
23+#define TARGET_LINKER_EMULATION "armelf_linux"
24+#endif
25+
26 #undef TARGET_DEFAULT_FLOAT_ABI
27 #define TARGET_DEFAULT_FLOAT_ABI ARM_FLOAT_ABI_HARD
28
29 #undef TARGET_DEFAULT
30-#define TARGET_DEFAULT (0)
31+#define TARGET_DEFAULT (TARGET_ENDIAN_DEFAULT)
32
33 #define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm6
34
35-#define SUBTARGET_EXTRA_LINK_SPEC " -m armelf_linux -p"
36+#define SUBTARGET_EXTRA_LINK_SPEC " -m " TARGET_LINKER_EMULATION " -p"
37 11
38 #undef MULTILIB_DEFAULTS 12 #undef MULTILIB_DEFAULTS
39 #define MULTILIB_DEFAULTS \ 13 #define MULTILIB_DEFAULTS \
@@ -42,19 +16,12 @@ See http://gcc.gnu.org/PR16350
42 16
43 /* Now we define the strings used to build the spec file. */ 17 /* Now we define the strings used to build the spec file. */
44 #undef LIB_SPEC 18 #undef LIB_SPEC
45@@ -61,7 +75,7 @@ 19Index: gcc-4.3.2/gcc/config.gcc
46 %{rdynamic:-export-dynamic} \ 20===================================================================
47 %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER "} \ 21--- gcc-4.3.2.orig/gcc/config.gcc 2008-08-28 20:57:39.000000000 -0700
48 -X \ 22+++ gcc-4.3.2/gcc/config.gcc 2008-08-28 21:00:11.000000000 -0700
49- %{mbig-endian:-EB}" \ 23@@ -742,6 +742,11 @@
50+ %{mbig-endian:-EB} %{mlittle-endian:-EL}" \ 24 esac
51 SUBTARGET_EXTRA_LINK_SPEC
52
53 #undef LINK_SPEC
54--- gcc-4.2.0/gcc/config.gcc.orig 2006-09-22 14:53:41.000000000 +0200
55+++ gcc-4.2.0/gcc/config.gcc 2006-09-25 10:45:21.000000000 +0200
56@@ -696,6 +696,11 @@
57 tm_file="dbxelf.h elfos.h linux.h arm/elf.h arm/linux-gas.h arm/linux-elf.h"
58 tmake_file="${tmake_file} t-linux arm/t-arm" 25 tmake_file="${tmake_file} t-linux arm/t-arm"
59 case ${target} in 26 case ${target} in
60+ arm*b-*) 27+ arm*b-*)
diff --git a/meta/packages/gcc/gcc-4.3.3/arm-thumb.patch b/meta/packages/gcc/gcc-4.3.3/arm-thumb.patch
index 016a7a550b..7b0b8b2ddc 100644
--- a/meta/packages/gcc/gcc-4.3.3/arm-thumb.patch
+++ b/meta/packages/gcc/gcc-4.3.3/arm-thumb.patch
@@ -3,34 +3,11 @@
3# Patch managed by http://www.holgerschurig.de/patcher.html 3# Patch managed by http://www.holgerschurig.de/patcher.html
4# 4#
5 5
6--- gcc-4.1.1/gcc/config/arm/lib1funcs.asm~gcc 6Index: gcc-4.3.1/gcc/config/arm/lib1funcs.asm
7+++ gcc-4.1.1/gcc/config/arm/lib1funcs.asm 7===================================================================
8@@ -995,10 +995,24 @@ 8--- gcc-4.3.1.orig/gcc/config/arm/lib1funcs.asm 2007-05-30 12:04:09.000000000 -0700
9 .code 32 9+++ gcc-4.3.1/gcc/config/arm/lib1funcs.asm 2008-08-28 21:51:17.000000000 -0700
10 FUNC_START div0 10@@ -1225,11 +1225,12 @@
11
12+#if ! defined __thumb__
13 stmfd sp!, {r1, lr}
14 mov r0, #SIGFPE
15 bl SYM(raise) __PLT__
16 RETLDM r1
17+#else
18+ push {r1, lr}
19+ mov r0, #SIGFPE
20+ bl SYM(raise) __PLT__
21+#if __ARM_ARCH__ > 4
22+ pop {r1, pc}
23+#else
24+ @ on 4T that won't work
25+ pop {r1}
26+ pop {r3}
27+ bx r3
28+#endif
29+#endif
30
31 FUNC_END div0
32
33@@ -1141,11 +1155,12 @@
34 code here switches to the correct mode before executing the function. */ 11 code here switches to the correct mode before executing the function. */
35 12
36 .text 13 .text
@@ -44,7 +21,7 @@
44 21
45 bx \register 22 bx \register
46 nop 23 nop
47@@ -1242,6 +1257,7 @@ 24@@ -1330,6 +1331,7 @@
48 .code 16 25 .code 16
49 26
50 THUMB_FUNC_START _interwork_call_via_\register 27 THUMB_FUNC_START _interwork_call_via_\register
@@ -52,9 +29,11 @@
52 29
53 bx pc 30 bx pc
54 nop 31 nop
55--- gcc-4.1.1/gcc/config/arm/t-linux~gcc 32Index: gcc-4.3.1/gcc/config/arm/t-linux
56+++ gcc-4.1.1/gcc/config/arm/t-linux 33===================================================================
57@@ -7,6 +7,7 @@ 34--- gcc-4.3.1.orig/gcc/config/arm/t-linux 2008-08-28 21:25:24.000000000 -0700
35+++ gcc-4.3.1/gcc/config/arm/t-linux 2008-08-28 21:51:17.000000000 -0700
36@@ -6,6 +6,7 @@
58 LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx \ 37 LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx \
59 _negdf2 _addsubdf3 _muldivdf3 _cmpdf2 _unorddf2 _fixdfsi _fixunsdfsi \ 38 _negdf2 _addsubdf3 _muldivdf3 _cmpdf2 _unorddf2 _fixdfsi _fixunsdfsi \
60 _truncdfsf2 _negsf2 _addsubsf3 _muldivsf3 _cmpsf2 _unordsf2 \ 39 _truncdfsf2 _negsf2 _addsubsf3 _muldivsf3 _cmpsf2 _unordsf2 \
diff --git a/meta/packages/gcc/gcc-4.3.3/cache-amnesia.patch b/meta/packages/gcc/gcc-4.3.3/cache-amnesia.patch
index ef7cd111c5..fb4d1a26d8 100644
--- a/meta/packages/gcc/gcc-4.3.3/cache-amnesia.patch
+++ b/meta/packages/gcc/gcc-4.3.3/cache-amnesia.patch
@@ -1,8 +1,26 @@
1diff --git a/gcc/configure b/gcc/configure 1---
2index 44620ab..6e1830c 100755 2 gcc/configure | 2 +-
3--- a/gcc/configure 3 gcc/configure.ac | 2 +-
4+++ b/gcc/configure 4 2 files changed, 2 insertions(+), 2 deletions(-)
5@@ -12272,7 +12272,7 @@ else 5
6Index: gcc-4.3.1/gcc/configure
7===================================================================
8--- gcc-4.3.1.orig/gcc/configure 2008-08-20 00:27:57.000000000 -0700
9+++ gcc-4.3.1/gcc/configure 2008-08-20 00:45:11.000000000 -0700
10@@ -12813,7 +12813,7 @@ else
11 esac
12 saved_CFLAGS="${CFLAGS}"
13 CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \
14- ${realsrcdir}/configure \
15+ CONFIG_SITE= ${realsrcdir}/configure --cache-file=./other.cache \
16 --enable-languages=${enable_languages-all} \
17 --target=$target_alias --host=$build_alias --build=$build_alias
18 CFLAGS="${saved_CFLAGS}"
19Index: gcc-4.3.1/gcc/configure.ac
20===================================================================
21--- gcc-4.3.1.orig/gcc/configure.ac 2008-08-20 00:27:57.000000000 -0700
22+++ gcc-4.3.1/gcc/configure.ac 2008-08-20 00:44:52.000000000 -0700
23@@ -1480,7 +1480,7 @@ else
6 esac 24 esac
7 saved_CFLAGS="${CFLAGS}" 25 saved_CFLAGS="${CFLAGS}"
8 CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \ 26 CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \
diff --git a/meta/packages/gcc/gcc-4.3.3/gcc-4.0.2-e300c2c3.patch b/meta/packages/gcc/gcc-4.3.3/gcc-4.0.2-e300c2c3.patch
index 736ac4b6b6..d1df8b2716 100644
--- a/meta/packages/gcc/gcc-4.3.3/gcc-4.0.2-e300c2c3.patch
+++ b/meta/packages/gcc/gcc-4.3.3/gcc-4.0.2-e300c2c3.patch
@@ -3,10 +3,18 @@ http://www.bitshrine.org/gpp/tc-fsl-x86lnx-e300c3-nptl-4.0.2-2.src.rpm
3 3
4Leon Woestenberg <leonw@mailcan.com> 4Leon Woestenberg <leonw@mailcan.com>
5 5
6Index: gcc-4.1.2/gcc/config/rs6000/e300c2c3.md 6---
7 gcc/config.gcc | 2
8 gcc/config/rs6000/e300c2c3.md | 189 ++++++++++++++++++++++++++++++++++++++++++
9 gcc/config/rs6000/rs6000.c | 24 +++++
10 gcc/config/rs6000/rs6000.h | 4
11 gcc/config/rs6000/rs6000.md | 3
12 5 files changed, 220 insertions(+), 2 deletions(-)
13
14Index: gcc-4.3.1/gcc/config/rs6000/e300c2c3.md
7=================================================================== 15===================================================================
8--- /dev/null 1970-01-01 00:00:00.000000000 +0000 16--- /dev/null 1970-01-01 00:00:00.000000000 +0000
9+++ gcc-4.1.2/gcc/config/rs6000/e300c2c3.md 2007-10-18 15:32:51.000000000 +0200 17+++ gcc-4.3.1/gcc/config/rs6000/e300c2c3.md 2008-08-23 16:51:33.000000000 -0700
10@@ -0,0 +1,189 @@ 18@@ -0,0 +1,189 @@
11+;; Pipeline description for Motorola PowerPC e300c3 core. 19+;; Pipeline description for Motorola PowerPC e300c3 core.
12+;; Copyright (C) 2003 Free Software Foundation, Inc. 20+;; Copyright (C) 2003 Free Software Foundation, Inc.
@@ -197,12 +205,12 @@ Index: gcc-4.1.2/gcc/config/rs6000/e300c2c3.md
197+ (and (eq_attr "type" "fpstore,fpstore_ux,fpstore_u") 205+ (and (eq_attr "type" "fpstore,fpstore_ux,fpstore_u")
198+ (eq_attr "cpu" "ppce300c3")) 206+ (eq_attr "cpu" "ppce300c3"))
199+ "ppce300c3_decode,ppce300c3_issue+ppce300c3_lsu,ppce300c3_retire") 207+ "ppce300c3_decode,ppce300c3_issue+ppce300c3_lsu,ppce300c3_retire")
200Index: gcc-4.1.2/gcc/config/rs6000/rs6000.c 208Index: gcc-4.3.1/gcc/config/rs6000/rs6000.c
201=================================================================== 209===================================================================
202--- gcc-4.1.2.orig/gcc/config/rs6000/rs6000.c 2006-12-16 20:24:56.000000000 +0100 210--- gcc-4.3.1.orig/gcc/config/rs6000/rs6000.c 2008-08-23 16:49:39.000000000 -0700
203+++ gcc-4.1.2/gcc/config/rs6000/rs6000.c 2007-10-18 15:34:26.000000000 +0200 211+++ gcc-4.3.1/gcc/config/rs6000/rs6000.c 2008-08-23 16:54:25.000000000 -0700
204@@ -557,6 +557,21 @@ 212@@ -669,6 +669,21 @@ struct processor_costs ppc8540_cost = {
205 COSTS_N_INSNS (29), /* ddiv */ 213 1, /* prefetch streams /*/
206 }; 214 };
207 215
208+/* Instruction costs on E300C2 and E300C3 cores. */ 216+/* Instruction costs on E300C2 and E300C3 cores. */
@@ -223,16 +231,16 @@ Index: gcc-4.1.2/gcc/config/rs6000/rs6000.c
223 /* Instruction costs on POWER4 and POWER5 processors. */ 231 /* Instruction costs on POWER4 and POWER5 processors. */
224 static const 232 static const
225 struct processor_costs power4_cost = { 233 struct processor_costs power4_cost = {
226@@ -1140,6 +1155,8 @@ 234@@ -1420,6 +1435,8 @@ rs6000_override_options (const char *def
235 {"8540", PROCESSOR_PPC8540, POWERPC_BASE_MASK | MASK_STRICT_ALIGN},
227 /* 8548 has a dummy entry for now. */ 236 /* 8548 has a dummy entry for now. */
228 {"8548", PROCESSOR_PPC8540, 237 {"8548", PROCESSOR_PPC8540, POWERPC_BASE_MASK | MASK_STRICT_ALIGN},
229 POWERPC_BASE_MASK | MASK_PPC_GFXOPT | MASK_STRICT_ALIGN}, 238+ {"e300c2", PROCESSOR_PPCE300C2, POWERPC_BASE_MASK | MASK_SOFT_FLOAT},
230+ {"e300c2", PROCESSOR_PPCE300C2, POWERPC_BASE_MASK | MASK_SOFT_FLOAT}, 239+ {"e300c3", PROCESSOR_PPCE300C3, POWERPC_BASE_MASK},
231+ {"e300c3", PROCESSOR_PPCE300C3, POWERPC_BASE_MASK},
232 {"860", PROCESSOR_MPCCORE, POWERPC_BASE_MASK | MASK_SOFT_FLOAT}, 240 {"860", PROCESSOR_MPCCORE, POWERPC_BASE_MASK | MASK_SOFT_FLOAT},
233 {"970", PROCESSOR_POWER4, 241 {"970", PROCESSOR_POWER4,
234 POWERPC_7400_MASK | MASK_PPC_GPOPT | MASK_MFCRF | MASK_POWERPC64}, 242 POWERPC_7400_MASK | MASK_PPC_GPOPT | MASK_MFCRF | MASK_POWERPC64},
235@@ -1529,6 +1546,11 @@ 243@@ -1845,6 +1862,11 @@ rs6000_override_options (const char *def
236 rs6000_cost = &ppc8540_cost; 244 rs6000_cost = &ppc8540_cost;
237 break; 245 break;
238 246
@@ -244,68 +252,68 @@ Index: gcc-4.1.2/gcc/config/rs6000/rs6000.c
244 case PROCESSOR_POWER4: 252 case PROCESSOR_POWER4:
245 case PROCESSOR_POWER5: 253 case PROCESSOR_POWER5:
246 rs6000_cost = &power4_cost; 254 rs6000_cost = &power4_cost;
247@@ -16647,6 +16669,8 @@ 255@@ -18606,6 +18628,8 @@ rs6000_issue_rate (void)
248 case CPU_PPC750:
249 case CPU_PPC7400: 256 case CPU_PPC7400:
250 case CPU_PPC8540: 257 case CPU_PPC8540:
258 case CPU_CELL:
251+ case CPU_PPCE300C2: 259+ case CPU_PPCE300C2:
252+ case CPU_PPCE300C3: 260+ case CPU_PPCE300C3:
253 return 2; 261 return 2;
254 case CPU_RIOS2: 262 case CPU_RIOS2:
255 case CPU_PPC604: 263 case CPU_PPC604:
256Index: gcc-4.1.2/gcc/config/rs6000/rs6000.h 264Index: gcc-4.3.1/gcc/config/rs6000/rs6000.h
257=================================================================== 265===================================================================
258--- gcc-4.1.2.orig/gcc/config/rs6000/rs6000.h 2006-11-18 01:25:49.000000000 +0100 266--- gcc-4.3.1.orig/gcc/config/rs6000/rs6000.h 2008-01-26 09:18:35.000000000 -0800
259+++ gcc-4.1.2/gcc/config/rs6000/rs6000.h 2007-10-18 15:32:51.000000000 +0200 267+++ gcc-4.3.1/gcc/config/rs6000/rs6000.h 2008-08-23 16:55:30.000000000 -0700
260@@ -111,6 +111,8 @@ 268@@ -117,6 +117,8 @@
261 %{mcpu=970: -mpower4 -maltivec} \
262 %{mcpu=G5: -mpower4 -maltivec} \ 269 %{mcpu=G5: -mpower4 -maltivec} \
263 %{mcpu=8540: -me500} \ 270 %{mcpu=8540: -me500} \
271 %{mcpu=8548: -me500} \
264+%{mcpu=e300c2: -mppc} \ 272+%{mcpu=e300c2: -mppc} \
265+%{mcpu=e300c3: -mppc -mpmr} \ 273+%{mcpu=e300c3: -mppc -mpmr} \
266 %{maltivec: -maltivec} \ 274 %{maltivec: -maltivec} \
267 -many" 275 -many"
268 276
269@@ -211,6 +213,8 @@ 277@@ -262,6 +264,8 @@ enum processor_type
270 PROCESSOR_PPC7400, 278 PROCESSOR_PPC7400,
271 PROCESSOR_PPC7450, 279 PROCESSOR_PPC7450,
272 PROCESSOR_PPC8540, 280 PROCESSOR_PPC8540,
273+ PROCESSOR_PPCE300C2, 281+ PROCESSOR_PPCE300C2,
274+ PROCESSOR_PPCE300C3, 282+ PROCESSOR_PPCE300C3,
275 PROCESSOR_POWER4, 283 PROCESSOR_POWER4,
276 PROCESSOR_POWER5 284 PROCESSOR_POWER5,
277 }; 285 PROCESSOR_POWER6,
278Index: gcc-4.1.2/gcc/config/rs6000/rs6000.md 286Index: gcc-4.3.1/gcc/config/rs6000/rs6000.md
279=================================================================== 287===================================================================
280--- gcc-4.1.2.orig/gcc/config/rs6000/rs6000.md 2006-12-16 20:24:56.000000000 +0100 288--- gcc-4.3.1.orig/gcc/config/rs6000/rs6000.md 2008-02-13 16:14:45.000000000 -0800
281+++ gcc-4.1.2/gcc/config/rs6000/rs6000.md 2007-10-18 15:32:51.000000000 +0200 289+++ gcc-4.3.1/gcc/config/rs6000/rs6000.md 2008-08-23 16:57:29.000000000 -0700
282@@ -103,7 +103,7 @@ 290@@ -133,7 +133,7 @@
283 ;; Processor type -- this attribute must exactly match the processor_type 291 ;; Processor type -- this attribute must exactly match the processor_type
284 ;; enumeration in rs6000.h. 292 ;; enumeration in rs6000.h.
285 293
286-(define_attr "cpu" "rios1,rios2,rs64a,mpccore,ppc403,ppc405,ppc440,ppc601,ppc603,ppc604,ppc604e,ppc620,ppc630,ppc750,ppc7400,ppc7450,ppc8540,power4,power5" 294-(define_attr "cpu" "rios1,rios2,rs64a,mpccore,ppc403,ppc405,ppc440,ppc601,ppc603,ppc604,ppc604e,ppc620,ppc630,ppc750,ppc7400,ppc7450,ppc8540,power4,power5,power6,cell"
287+(define_attr "cpu" "rios1,rios2,rs64a,mpccore,ppc403,ppc405,ppc440,ppc601,ppc603,ppc604,ppc604e,ppc620,ppc630,ppc750,ppc7400,ppc7450,ppc8540,ppce300c2,ppce300c3,power4,power5" 295+(define_attr "cpu" "rios1,rios2,rs64a,mpccore,ppc403,ppc405,ppc440,ppc601,ppc603,ppc604,ppc604e,ppc620,ppc630,ppc750,ppc7400,ppc7450,ppc8540,power4,power5,power6,cell,ppce300c2,ppce300c3"
288 (const (symbol_ref "rs6000_cpu_attr"))) 296 (const (symbol_ref "rs6000_cpu_attr")))
289 297
290 (automata_option "ndfa") 298
291@@ -119,6 +119,7 @@ 299@@ -166,6 +166,7 @@
292 (include "7xx.md") 300 (include "7xx.md")
293 (include "7450.md") 301 (include "7450.md")
294 (include "8540.md") 302 (include "8540.md")
295+(include "e300c2c3.md") 303+(include "e300c2c3.md")
296 (include "power4.md") 304 (include "power4.md")
297 (include "power5.md") 305 (include "power5.md")
298 306 (include "power6.md")
299Index: gcc-4.1.2/gcc/config.gcc 307Index: gcc-4.3.1/gcc/config.gcc
300=================================================================== 308===================================================================
301--- gcc-4.1.2.orig/gcc/config.gcc 2007-10-18 15:26:23.000000000 +0200 309--- gcc-4.3.1.orig/gcc/config.gcc 2008-08-23 16:49:43.000000000 -0700
302+++ gcc-4.1.2/gcc/config.gcc 2007-10-18 15:32:51.000000000 +0200 310+++ gcc-4.3.1/gcc/config.gcc 2008-08-23 17:03:55.000000000 -0700
303@@ -2710,7 +2710,7 @@ 311@@ -3144,7 +3144,7 @@ case "${target}" in
304 | rios | rios1 | rios2 | rsc | rsc1 | rs64a \ 312 | rios | rios1 | rios2 | rsc | rsc1 | rs64a \
305 | 401 | 403 | 405 | 405fp | 440 | 440fp | 505 \ 313 | 401 | 403 | 405 | 405fp | 440 | 440fp | 505 \
306 | 601 | 602 | 603 | 603e | ec603e | 604 \ 314 | 601 | 602 | 603 | 603e | ec603e | 604 \
307- | 604e | 620 | 630 | 740 | 750 | 7400 | 7450 \ 315- | 604e | 620 | 630 | 740 | 750 | 7400 | 7450 \
308+ | 604e | 620 | 630 | 740 | 750 | 7400 | 7450 | e300c[23] \ 316+ | 604e | 620 | 630 | 740 | 750 | 7400 | 7450 | e300c[23] \
309 | 854[08] | 801 | 821 | 823 | 860 | 970 | G3 | G4 | G5) 317 | 854[08] | 801 | 821 | 823 | 860 | 970 | G3 | G4 | G5 | cell)
310 # OK 318 # OK
311 ;; 319 ;;
diff --git a/meta/packages/gcc/gcc-4.3.3/gcc-4.2.3-linux-multilib-fix.patch b/meta/packages/gcc/gcc-4.3.3/gcc-4.2.3-linux-multilib-fix.patch
new file mode 100644
index 0000000000..81522a8f57
--- /dev/null
+++ b/meta/packages/gcc/gcc-4.3.3/gcc-4.2.3-linux-multilib-fix.patch
@@ -0,0 +1,23 @@
1Change gcc build : Enable m4 and m4-nofpu (needed for kernel) for sh4-gnu-linux
2
3Signed-off-by: Carl Shaw <carl.shaw@st.com>
4
5Index: gcc/gcc/config.gcc
6===================================================================
7--- gcc.orig/gcc/config.gcc 2008-07-18 10:37:54.000000000 +0100
8+++ gcc/gcc/config.gcc 2008-07-18 11:00:42.000000000 +0100
9@@ -2097,11 +2097,12 @@
10 if test x${sh_multilibs} = x ; then
11 case ${target} in
12 sh64-superh-linux* | \
13- sh[1234]*) sh_multilibs=${sh_cpu_target} ;;
14 sh64* | sh5*) sh_multilibs=m5-32media,m5-32media-nofpu,m5-compact,m5-compact-nofpu,m5-64media,m5-64media-nofpu ;;
15- sh-superh-*) sh_multilibs=m4,m4-single,m4-single-only,m4-nofpu ;;
16+ sh-superh-* | \
17+ sh4-*-linux*) sh_multilibs=m4,m4-nofpu ;;
18 sh*-*-linux*) sh_multilibs=m1,m3e,m4 ;;
19 sh*-*-netbsd*) sh_multilibs=m3,m3e,m4 ;;
20+ sh[1234]*) sh_multilibs=${sh_cpu_target} ;;
21 *) sh_multilibs=m1,m2,m2e,m4,m4-single,m4-single-only,m2a,m2a-single ;;
22 esac
23 if test x$with_fp = xno; then
diff --git a/meta/packages/gcc/gcc-4.3.3/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch b/meta/packages/gcc/gcc-4.3.3/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.3/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.3/gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch b/meta/packages/gcc/gcc-4.3.3/gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
new file mode 100644
index 0000000000..1d3936bc39
--- /dev/null
+++ b/meta/packages/gcc/gcc-4.3.3/gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
@@ -0,0 +1,6691 @@
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 | 25
58 Makefile.in | 1845 ++++++++++++++++++++++++++++++-------------------
59 Makefile.tpl | 91 +-
60 config/mh-ppc-darwin | 3
61 configure | 36
62 configure.ac | 32
63 gcc/Makefile.in | 2
64 gcc/configure | 6
65 gcc/configure.ac | 3
66 gcc/doc/install.texi | 56 -
67 libiberty/Makefile.in | 162 ++--
68 libiberty/configure | 46 -
69 libiberty/configure.ac | 43 -
70 13 files changed, 1454 insertions(+), 896 deletions(-)
71
72Index: gcc-4.3.3/configure.ac
73===================================================================
74--- gcc-4.3.3.orig/configure.ac 2008-02-01 20:29:30.000000000 -0700
75+++ gcc-4.3.3/configure.ac 2009-04-29 18:03:50.025603468 -0700
76@@ -1667,6 +1667,38 @@
77 [DEBUG_PREFIX_CFLAGS_FOR_TARGET=])
78 AC_SUBST(DEBUG_PREFIX_CFLAGS_FOR_TARGET)
79
80+# During gcc bootstrap, if we use some random cc for stage1 then CFLAGS
81+# might be empty or "-g". We don't require a C++ compiler, so CXXFLAGS
82+# might also be empty (or "-g", if a non-GCC C++ compiler is in the path).
83+# We want to ensure that TARGET libraries (which we know are built with
84+# gcc) are built with "-O2 -g", so include those options when setting
85+# CFLAGS_FOR_TARGET and CXXFLAGS_FOR_TARGET.
86+if test "x$CFLAGS_FOR_TARGET" = x; then
87+ CFLAGS_FOR_TARGET=$CFLAGS
88+ case " $CFLAGS " in
89+ *" -O2 "*) ;;
90+ *) CFLAGS_FOR_TARGET="-O2 $CFLAGS" ;;
91+ esac
92+ case " $CFLAGS " in
93+ *" -g "* | *" -g3 "*) ;;
94+ *) CFLAGS_FOR_TARGET="-g $CFLAGS" ;;
95+ esac
96+fi
97+AC_SUBST(CFLAGS_FOR_TARGET)
98+
99+if test "x$CXXFLAGS_FOR_TARGET" = x; then
100+ CXXFLAGS_FOR_TARGET=$CXXFLAGS
101+ case " $CXXFLAGS " in
102+ *" -O2 "*) ;;
103+ *) CXXFLAGS_FOR_TARGET="-O2 $CXXFLAGS" ;;
104+ esac
105+ case " $CXXFLAGS " in
106+ *" -g "* | *" -g3 "*) ;;
107+ *) CXXFLAGS_FOR_TARGET="-g $CXXFLAGS" ;;
108+ esac
109+fi
110+AC_SUBST(CXXFLAGS_FOR_TARGET)
111+
112 # Handle --with-headers=XXX. If the value is not "yes", the contents of
113 # the named directory are copied to $(tooldir)/sys-include.
114 if test x"${with_headers}" != x && test x"${with_headers}" != xno ; then
115Index: gcc-4.3.3/Makefile.def
116===================================================================
117--- gcc-4.3.3.orig/Makefile.def 2007-10-23 08:53:18.000000000 -0700
118+++ gcc-4.3.3/Makefile.def 2009-04-29 18:03:50.029603058 -0700
119@@ -214,6 +214,7 @@
120 flags_to_pass = { flag= INSTALL_DATA ; };
121 flags_to_pass = { flag= INSTALL_PROGRAM ; };
122 flags_to_pass = { flag= INSTALL_SCRIPT ; };
123+flags_to_pass = { flag= LDFLAGS_FOR_BUILD ; };
124 flags_to_pass = { flag= LEX ; };
125 flags_to_pass = { flag= M4 ; };
126 flags_to_pass = { flag= MAKE ; };
127@@ -511,43 +512,51 @@
128 // compiler probably has never heard of them.
129 stage_configure_flags='--disable-intermodule $(STAGE1_CHECKING) \
130 --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"' ;
131- stage_cflags='$(STAGE1_CFLAGS)' ; };
132+ stage_cflags='$(STAGE1_CFLAGS)' ;
133+ stage_libcflags='$(STAGE1_LIBCFLAGS)' ; };
134 bootstrap_stage = {
135 id=2 ; prev=1 ;
136 bootstrap_target=bootstrap2 ;
137 stage_configure_flags="@stage2_werror_flag@" ;
138- stage_cflags="$(STAGE2_CFLAGS)" ; };
139+ stage_cflags="$(STAGE2_CFLAGS)" ;
140+ stage_libcflags="$(STAGE2_LIBCFLAGS)" ; };
141 bootstrap_stage = {
142 id=b2g0 ; prev=1 ;
143 bootstrap_target=bootstrap2-debug ;
144 stage_configure_flags="@stage2_werror_flag@" ;
145- stage_cflags="$(STAGE2_CFLAGS) -g0" ; };
146+ stage_cflags="$(STAGE2_CFLAGS) -g0" ;
147+ stage_libcflags="$(STAGE2_LIBCFLAGS) -g0" ; };
148 bootstrap_stage = {
149 id=3 ; prev=2 ; lean=1 ;
150 compare_target=compare ;
151 bootstrap_target=bootstrap ;
152 cleanstrap_target=cleanstrap ;
153 stage_configure_flags="@stage2_werror_flag@" ;
154- stage_cflags="$(STAGE3_CFLAGS)" ; };
155+ stage_cflags="$(STAGE3_CFLAGS)" ;
156+ stage_libcflags="$(STAGE3_LIBCFLAGS)" ; };
157 bootstrap_stage = {
158 id=b3g2 ; prev=b2g0 ; lean=1 ;
159 compare_target=compare-debug ;
160 bootstrap_target=bootstrap-debug ;
161 cleanstrap_target=cleanstrap-debug ;
162 stage_configure_flags="@stage2_werror_flag@" ;
163- stage_cflags="$(STAGE3_CFLAGS) -g2" ; };
164+ stage_cflags="$(STAGE3_CFLAGS) -g2" ;
165+ stage_libcflags="$(STAGE3_LIBCFLAGS) -g2" ; };
166 bootstrap_stage = {
167 id=4 ; prev=3 ; lean=2 ;
168 compare_target=compare3 ;
169 bootstrap_target=bootstrap4 ;
170 stage_configure_flags="@stage2_werror_flag@" ;
171- stage_cflags="$(STAGE4_CFLAGS)" ; };
172+ stage_cflags="$(STAGE4_CFLAGS)" ;
173+ stage_libcflags="$(STAGE4_CFLAGS)" ; };
174 bootstrap_stage = {
175 id=profile ; prev=1 ;
176 stage_configure_flags="@stage2_werror_flag@" ;
177- stage_cflags='$(STAGE2_CFLAGS) -fprofile-generate' ; };
178+ stage_cflags='$(STAGE2_CFLAGS) -fprofile-generate' ;
179+ stage_libcflags='$(STAGE2_LIBCFLAGS) -fprofile-generate' ; };
180 bootstrap_stage = {
181 id=feedback ; prev=profile ;
182 bootstrap_target=profiledbootstrap ;
183 stage_configure_flags="@stage2_werror_flag@" ;
184- stage_cflags='$(STAGE3_CFLAGS) -fprofile-use' ; };
185+ stage_cflags='$(STAGE3_CFLAGS) -fprofile-use' ;
186+ stage_libcflags='$(STAGE3_LIBCFLAGS) -fprofile-use' ; };
187Index: gcc-4.3.3/Makefile.tpl
188===================================================================
189--- gcc-4.3.3.orig/Makefile.tpl 2008-08-16 00:28:01.000000000 -0700
190+++ gcc-4.3.3/Makefile.tpl 2009-04-29 18:04:16.836611837 -0700
191@@ -23,6 +23,14 @@
192 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
193 #
194
195+# First, test for a proper version of make, but only where one is required.
196+
197+@if gcc
198+ifeq (,$(.VARIABLES)) # The variable .VARIABLES, new with 3.80, is never empty.
199+$(error GNU make version 3.80 or newer is required.)
200+endif
201+@endif gcc
202+
203 # -------------------------------
204 # Standard Autoconf-set variables
205 # -------------------------------
206@@ -139,6 +147,13 @@
207 WINDRES="$(WINDRES_FOR_BUILD)"; export WINDRES; \
208 WINDMC="$(WINDMC_FOR_BUILD)"; export WINDMC;
209
210+# These variables must be set on the make command line for directories
211+# built for the build system to override those in BASE_FLAGS_TO_PASSS.
212+EXTRA_BUILD_FLAGS = \
213+ CFLAGS="$(CFLAGS_FOR_BUILD)" \
214+ LDFLAGS="$(LDFLAGS_FOR_BUILD)" \
215+ LIBCFLAGS=""
216+
217 # This is the list of directories to built for the host system.
218 SUBDIRS = @configdirs@
219 # This is set by the configure script to the arguments to use when configuring
220@@ -153,6 +168,7 @@
221 HOST_EXPORTS = \
222 $(BASE_EXPORTS) \
223 CC="$(CC)"; export CC; \
224+ ADA_CFLAGS="$(ADA_CFLAGS)"; export ADA_CFLAGS; \
225 CFLAGS="$(CFLAGS)"; export CFLAGS; \
226 CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
227 CXX="$(CXX)"; export CXX; \
228@@ -207,10 +223,10 @@
229 AR="$(AR_FOR_TARGET)"; export AR; \
230 AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
231 CC="$(CC_FOR_TARGET)"; export CC; \
232- CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
233+ CFLAGS="$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
234 CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
235 CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
236- CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
237+ CXXFLAGS="$(CXXFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS; \
238 GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
239 GFORTRAN="$(GFORTRAN_FOR_TARGET)"; export GFORTRAN; \
240 DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
241@@ -323,7 +339,6 @@
242 LIBCFLAGS = $(CFLAGS)
243 CXXFLAGS = @CXXFLAGS@
244 LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
245-PICFLAG =
246
247 # Only build the C compiler for stage1, because that is the only one that
248 # we can guarantee will build with the native compiler, and also it is the
249@@ -331,14 +346,19 @@
250 # MAKEINFO and MAKEINFOFLAGS are explicitly passed here to make them
251 # overrideable (for a bootstrap build stage1 also builds gcc.info).
252
253-STAGE1_CFLAGS=@stage1_cflags@
254 STAGE1_CHECKING=@stage1_checking@
255 STAGE1_LANGUAGES=@stage1_languages@
256
257+STAGE1_CFLAGS=@stage1_cflags@
258 STAGE2_CFLAGS=$(BOOT_CFLAGS)
259 STAGE3_CFLAGS=$(BOOT_CFLAGS)
260 STAGE4_CFLAGS=$(BOOT_CFLAGS)
261
262+STAGE1_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
263+STAGE2_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
264+STAGE3_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
265+STAGE4_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
266+
267 do-compare = @do_compare@
268 do-compare3 = $(do-compare)
269 do-compare-debug = $(SHELL) $(srcdir)/contrib/compare-debug $$f1 $$f2
270@@ -377,22 +397,14 @@
271 COMPILER_LD_FOR_TARGET=@COMPILER_LD_FOR_TARGET@
272 COMPILER_NM_FOR_TARGET=@COMPILER_NM_FOR_TARGET@
273
274-# During gcc bootstrap, if we use some random cc for stage1 then CFLAGS
275-# might be empty or "-g". We don't require a C++ compiler, so CXXFLAGS
276-# might also be empty (or "-g", if a non-GCC C++ compiler is in the path).
277-# We want to ensure that TARGET libraries (which we know are built with
278-# gcc) are built with "-O2 -g", so prepend those options when setting
279-# CFLAGS_FOR_TARGET and CXXFLAGS_FOR_TARGET.
280-CFLAGS_FOR_TARGET = -O2 -g $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) \
281- $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)
282+CFLAGS_FOR_TARGET = @CFLAGS_FOR_TARGET@
283+CXXFLAGS_FOR_TARGET = @CXXFLAGS_FOR_TARGET@
284 SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
285 DEBUG_PREFIX_CFLAGS_FOR_TARGET = @DEBUG_PREFIX_CFLAGS_FOR_TARGET@
286-CXXFLAGS_FOR_TARGET = -O2 -g $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) \
287- $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)
288+
289 LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
290 LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
291-LDFLAGS_FOR_TARGET =
292-PICFLAG_FOR_TARGET =
293+LDFLAGS_FOR_TARGET = @LDFLAGS@
294
295 # ------------------------------------
296 # Miscellaneous targets and flag lists
297@@ -492,19 +504,20 @@
298 # Flags to pass down to makes which are built with the target environment.
299 # The double $ decreases the length of the command line; those variables
300 # are set in BASE_FLAGS_TO_PASS, and the sub-make will expand them. The
301-# COMPILER_ prefixed variables are not passed down so we expand them here.
302+# *_CFLAGS_FOR_TARGET variables are not passed down and most often empty,
303+# so we expand them here.
304 EXTRA_TARGET_FLAGS = \
305 'AR=$$(AR_FOR_TARGET)' \
306 'AS=$(COMPILER_AS_FOR_TARGET)' \
307 'CC=$$(CC_FOR_TARGET)' \
308- 'CFLAGS=$$(CFLAGS_FOR_TARGET)' \
309+ 'CFLAGS=$$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \
310 'CXX=$$(CXX_FOR_TARGET)' \
311- 'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \
312+ 'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \
313 'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
314 'LD=$(COMPILER_LD_FOR_TARGET)' \
315 'LDFLAGS=$$(LDFLAGS_FOR_TARGET)' \
316- 'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \
317- 'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \
318+ 'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \
319+ 'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \
320 'NM=$(COMPILER_NM_FOR_TARGET)' \
321 'OBJDUMP=$$(OBJDUMP_FOR_TARGET)' \
322 'RANLIB=$$(RANLIB_FOR_TARGET)' \
323@@ -852,9 +865,11 @@
324 fi; \
325 [+ ENDIF check_multilibs +]test ! -f [+subdir+]/[+module+]/Makefile || exit 0; \
326 [+exports+][+ IF prev +] \
327- [+poststage1_exports+][+ ENDIF prev +] \
328+ [+poststage1_exports+][+ ENDIF prev +] [+ IF prefix +] \
329+ CFLAGS="[+stage_libcflags+] $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
330+ CXXFLAGS="[+stage_libcflags+] $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS; [+ ELSE +] \
331 CFLAGS="[+stage_cflags+]"; export CFLAGS; \
332- LIBCFLAGS="[+stage_cflags+]"; export LIBCFLAGS; \
333+ CXXFLAGS="[+stage_cflags+]"; export CXXFLAGS; [+ ENDIF +] \
334 echo Configuring stage [+id+] in [+subdir+]/[+module+] ; \
335 $(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+] ; \
336 cd [+subdir+]/[+module+] || exit 1; \
337@@ -891,7 +906,8 @@
338 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
339 [+exports+] \
340 (cd [+subdir+]/[+module+] && \
341- $(MAKE) [+args+] [+extra_make_flags+] $(TARGET-[+prefix+][+module+]))
342+ $(MAKE) $(BASE_FLAGS_TO_PASS) [+args+] [+extra_make_flags+] \
343+ $(TARGET-[+prefix+][+module+]))
344 @endif [+prefix+][+module+]
345
346 [+ IF bootstrap +]
347@@ -911,8 +927,11 @@
348 [+exports+][+ IF prev +] \
349 [+poststage1_exports+][+ ENDIF prev +] \
350 cd [+subdir+]/[+module+] && \
351- $(MAKE) [+args+] \
352- CFLAGS="[+stage_cflags+]" LIBCFLAGS="[+stage_cflags+]" [+
353+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
354+ CFLAGS="[+stage_cflags+]" CXXFLAGS="[+stage_cflags+]" \
355+ LIBCFLAGS="[+stage_libcflags+]" \
356+ CFLAGS_FOR_TARGET="[+stage_libcflags+]" \
357+ CXXFLAGS_FOR_TARGET="[+stage_libcflags+]" [+args+] [+
358 IF prev +][+poststage1_args+][+ ENDIF prev
359 +] [+extra_make_flags+] \
360 $(TARGET-stage[+id+]-[+prefix+][+module+])
361@@ -945,7 +964,8 @@
362 target_alias=(get "target" "${target_alias}")
363 args="$(BUILD_CONFIGARGS)" no-config-site=true +]
364
365-[+ all prefix="build-" subdir="$(BUILD_SUBDIR)" exports="$(BUILD_EXPORTS)" +]
366+[+ all prefix="build-" subdir="$(BUILD_SUBDIR)" exports="$(BUILD_EXPORTS)"
367+ args="$(EXTRA_BUILD_FLAGS)" +]
368 [+ ENDFOR build_module +]
369
370 # --------------------------------------
371@@ -962,7 +982,7 @@
372 [+ all prefix="" subdir="$(HOST_SUBDIR)"
373 exports="$(HOST_EXPORTS)"
374 poststage1_exports="$(POSTSTAGE1_HOST_EXPORTS)"
375- args="$(FLAGS_TO_PASS)"
376+ args="$(EXTRA_HOST_FLAGS)"
377 poststage1_args="$(POSTSTAGE1_FLAGS_TO_PASS)" +]
378
379 .PHONY: check-[+module+] maybe-check-[+module+]
380@@ -1060,7 +1080,7 @@
381
382 [+ all prefix="target-" subdir="$(TARGET_SUBDIR)"
383 exports="$(RAW_CXX_TARGET_EXPORTS)"
384- args="$(TARGET_FLAGS_TO_PASS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'" +]
385+ args="$(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'" +]
386 [+ ELSE +]
387 [+ configure prefix="target-" subdir="$(TARGET_SUBDIR)"
388 check_multilibs=true
389@@ -1071,7 +1091,7 @@
390
391 [+ all prefix="target-" subdir="$(TARGET_SUBDIR)"
392 exports="$(NORMAL_TARGET_EXPORTS)"
393- args="$(TARGET_FLAGS_TO_PASS)" +]
394+ args="$(EXTRA_TARGET_FLAGS)" +]
395 [+ ENDIF +]
396
397 .PHONY: check-target-[+module+] maybe-check-target-[+module+]
398@@ -1301,7 +1321,7 @@
399
400 # Bubble a bug fix through all the stages up to stage [+id+]. They are
401 # remade, but not reconfigured. The next stage (if any) will not be
402-# reconfigured as well.
403+# reconfigured either.
404 .PHONY: stage[+id+]-bubble
405 stage[+id+]-bubble:: [+ IF prev +]stage[+prev+]-bubble[+ ENDIF +]
406 @r=`${PWD_COMMAND}`; export r; \
407@@ -1440,11 +1460,11 @@
408 @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
409
410 .PHONY: restrap
411-restrap:
412+restrap::
413 @: $(MAKE); $(stage)
414 rm -rf stage1-$(TARGET_SUBDIR) [+ FOR bootstrap-stage +][+ IF prev
415 +]stage[+id+]-* [+ ENDIF prev +][+ ENDFOR bootstrap-stage +]
416- $(MAKE) $(RECURSE_FLAGS_TO_PASS) all
417+restrap:: all
418 @endif gcc-bootstrap
419
420 # --------------------------------------
421@@ -1475,7 +1495,7 @@
422
423 [+ ;; These Scheme functions build the bulk of the dependencies.
424 ;; dep-target builds a string like "maybe-all-MODULE_KIND-gcc",
425- ;; where "maybe-" is only included if HARD is true, and all-gcc
426+ ;; where "maybe-" is only included if HARD is not true, and all-gcc
427 ;; is taken from VAR-NAME.
428 (define dep-target (lambda (module-kind var-name hard)
429 (string-append
430@@ -1633,7 +1653,8 @@
431
432 # Rebuilding configure.
433 AUTOCONF = autoconf
434-$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac $(srcdir)/config/acx.m4
435+$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac $(srcdir)/config/acx.m4 \
436+ $(srcdir)/config/override.m4 $(srcdir)/config/proginstall.m4
437 cd $(srcdir) && $(AUTOCONF)
438
439 # ------------------------------
440Index: gcc-4.3.3/config/mh-ppc-darwin
441===================================================================
442--- gcc-4.3.3.orig/config/mh-ppc-darwin 2007-05-23 07:26:31.000000000 -0700
443+++ gcc-4.3.3/config/mh-ppc-darwin 2009-04-29 18:03:50.057603252 -0700
444@@ -2,5 +2,4 @@
445 # position-independent-code -- the usual default on Darwin. This fix speeds
446 # compiles by 3-5%.
447
448-# Broken because of PR32009.
449-# BOOT_CFLAGS=-g -O2 -mdynamic-no-pic
450+BOOT_CFLAGS=-g -O2 -mdynamic-no-pic
451Index: gcc-4.3.3/gcc/doc/install.texi
452===================================================================
453--- gcc-4.3.3.orig/gcc/doc/install.texi 2009-01-06 17:52:26.000000000 -0700
454+++ gcc-4.3.3/gcc/doc/install.texi 2009-04-29 18:03:50.065603803 -0700
455@@ -1778,33 +1778,35 @@
456 stage2 of the 3-stage bootstrap of the compiler are deleted as
457 soon as they are no longer needed.
458
459-If you want to save additional space during the bootstrap and in
460-the final installation as well, you can build the compiler binaries
461-without debugging information as in the following example. This will save
462-roughly 40% of disk space both for the bootstrap and the final installation.
463-(Libraries will still contain debugging information.)
464-
465-@smallexample
466- make CFLAGS='-O' LIBCFLAGS='-g -O2' \
467- LIBCXXFLAGS='-g -O2 -fno-implicit-templates' bootstrap
468-@end smallexample
469-
470-If you wish to use non-default GCC flags when compiling the stage2 and
471-stage3 compilers, set @code{BOOT_CFLAGS} on the command line when doing
472-@samp{make}. Non-default optimization flags are less well
473-tested here than the default of @samp{-g -O2}, but should still work.
474-In a few cases, you may find that you need to specify special flags such
475-as @option{-msoft-float} here to complete the bootstrap; or, if the
476-native compiler miscompiles the stage1 compiler, you may need to work
477-around this, by choosing @code{BOOT_CFLAGS} to avoid the parts of the
478-stage1 compiler that were miscompiled, or by using @samp{make
479+If you wish to use non-default GCC flags when compiling the stage2
480+and stage3 compilers, set @code{BOOT_CFLAGS} on the command line when
481+doing @samp{make}. For example, if you want to save additional space
482+during the bootstrap and in the final installation as well, you can
483+build the compiler binaries without debugging information as in the
484+following example. This will save roughly 40% of disk space both for
485+the bootstrap and the final installation. (Libraries will still contain
486+debugging information.)
487+
488+@smallexample
489+ make BOOT_CFLAGS='-O' bootstrap
490+@end smallexample
491+
492+You can place non-default optimization flags into @code{BOOT_CFLAGS}; they
493+are less well tested here than the default of @samp{-g -O2}, but should
494+still work. In a few cases, you may find that you need to specify special
495+flags such as @option{-msoft-float} here to complete the bootstrap; or,
496+if the native compiler miscompiles the stage1 compiler, you may need
497+to work around this, by choosing @code{BOOT_CFLAGS} to avoid the parts
498+of the stage1 compiler that were miscompiled, or by using @samp{make
499 bootstrap4} to increase the number of stages of bootstrap.
500
501-Note that using non-standard @code{CFLAGS} can cause bootstrap to fail
502-if these trigger a warning with the new compiler. For example using
503-@samp{-O2 -g -mcpu=i686} on @code{i686-pc-linux-gnu} will cause bootstrap
504-failure as @option{-mcpu=} is deprecated in 3.4.0 and above.
505-
506+@code{BOOT_CFLAGS} does not apply to bootstrapped target libraries.
507+Since these are always compiled with the compiler currently being
508+bootstrapped, you can use @code{CFLAGS_FOR_TARGET} to modify their
509+compilation flags, as for non-bootstrapped target libraries.
510+Again, if the native compiler miscompiles the stage1 compiler, you may
511+need to work around this by avoiding non-working parts of the stage1
512+compiler. Use @code{STAGE1_LIBCFLAGS} to this end.
513
514 If you used the flag @option{--enable-languages=@dots{}} to restrict
515 the compilers to be built, only those you've actually enabled will be
516@@ -2687,8 +2689,8 @@
517 stamp.
518
519 @samp{make compare} may fail on old versions of DEC Unix unless you add
520-@option{-save-temps} to @code{CFLAGS}. On these systems, the name of the
521-assembler input file is stored in the object file, and that makes
522+@option{-save-temps} to @code{BOOT_CFLAGS}. On these systems, the name
523+of the assembler input file is stored in the object file, and that makes
524 comparison fail if it differs between the @code{stage1} and
525 @code{stage2} compilations. The option @option{-save-temps} forces a
526 fixed name to be used for the assembler input file, instead of a
527Index: gcc-4.3.3/Makefile.in
528===================================================================
529--- gcc-4.3.3.orig/Makefile.in 2008-08-16 00:28:01.000000000 -0700
530+++ gcc-4.3.3/Makefile.in 2009-04-29 18:04:32.133111439 -0700
531@@ -20,6 +20,14 @@
532 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
533 #
534
535+# First, test for a proper version of make, but only where one is required.
536+
537+@if gcc
538+ifeq (,$(.VARIABLES)) # The variable .VARIABLES, new with 3.80, is never empty.
539+$(error GNU make version 3.80 or newer is required.)
540+endif
541+@endif gcc
542+
543 # -------------------------------
544 # Standard Autoconf-set variables
545 # -------------------------------
546@@ -136,6 +144,13 @@
547 WINDRES="$(WINDRES_FOR_BUILD)"; export WINDRES; \
548 WINDMC="$(WINDMC_FOR_BUILD)"; export WINDMC;
549
550+# These variables must be set on the make command line for directories
551+# built for the build system to override those in BASE_FLAGS_TO_PASSS.
552+EXTRA_BUILD_FLAGS = \
553+ CFLAGS="$(CFLAGS_FOR_BUILD)" \
554+ LDFLAGS="$(LDFLAGS_FOR_BUILD)" \
555+ LIBCFLAGS=""
556+
557 # This is the list of directories to built for the host system.
558 SUBDIRS = @configdirs@
559 # This is set by the configure script to the arguments to use when configuring
560@@ -150,6 +165,7 @@
561 HOST_EXPORTS = \
562 $(BASE_EXPORTS) \
563 CC="$(CC)"; export CC; \
564+ ADA_CFLAGS="$(ADA_CFLAGS)"; export ADA_CFLAGS; \
565 CFLAGS="$(CFLAGS)"; export CFLAGS; \
566 CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
567 CXX="$(CXX)"; export CXX; \
568@@ -204,10 +220,10 @@
569 AR="$(AR_FOR_TARGET)"; export AR; \
570 AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
571 CC="$(CC_FOR_TARGET)"; export CC; \
572- CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
573+ CFLAGS="$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
574 CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
575 CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
576- CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
577+ CXXFLAGS="$(CXXFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS; \
578 GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
579 GFORTRAN="$(GFORTRAN_FOR_TARGET)"; export GFORTRAN; \
580 DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
581@@ -320,7 +336,6 @@
582 LIBCFLAGS = $(CFLAGS)
583 CXXFLAGS = @CXXFLAGS@
584 LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
585-PICFLAG =
586
587 # Only build the C compiler for stage1, because that is the only one that
588 # we can guarantee will build with the native compiler, and also it is the
589@@ -328,14 +343,19 @@
590 # MAKEINFO and MAKEINFOFLAGS are explicitly passed here to make them
591 # overrideable (for a bootstrap build stage1 also builds gcc.info).
592
593-STAGE1_CFLAGS=@stage1_cflags@
594 STAGE1_CHECKING=@stage1_checking@
595 STAGE1_LANGUAGES=@stage1_languages@
596
597+STAGE1_CFLAGS=@stage1_cflags@
598 STAGE2_CFLAGS=$(BOOT_CFLAGS)
599 STAGE3_CFLAGS=$(BOOT_CFLAGS)
600 STAGE4_CFLAGS=$(BOOT_CFLAGS)
601
602+STAGE1_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
603+STAGE2_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
604+STAGE3_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
605+STAGE4_LIBCFLAGS=$(CFLAGS_FOR_TARGET)
606+
607 do-compare = @do_compare@
608 do-compare3 = $(do-compare)
609 do-compare-debug = $(SHELL) $(srcdir)/contrib/compare-debug $$f1 $$f2
610@@ -374,22 +394,14 @@
611 COMPILER_LD_FOR_TARGET=@COMPILER_LD_FOR_TARGET@
612 COMPILER_NM_FOR_TARGET=@COMPILER_NM_FOR_TARGET@
613
614-# During gcc bootstrap, if we use some random cc for stage1 then CFLAGS
615-# might be empty or "-g". We don't require a C++ compiler, so CXXFLAGS
616-# might also be empty (or "-g", if a non-GCC C++ compiler is in the path).
617-# We want to ensure that TARGET libraries (which we know are built with
618-# gcc) are built with "-O2 -g", so prepend those options when setting
619-# CFLAGS_FOR_TARGET and CXXFLAGS_FOR_TARGET.
620-CFLAGS_FOR_TARGET = -O2 -g $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) \
621- $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)
622+CFLAGS_FOR_TARGET = @CFLAGS_FOR_TARGET@
623+CXXFLAGS_FOR_TARGET = @CXXFLAGS_FOR_TARGET@
624 SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
625 DEBUG_PREFIX_CFLAGS_FOR_TARGET = @DEBUG_PREFIX_CFLAGS_FOR_TARGET@
626-CXXFLAGS_FOR_TARGET = -O2 -g $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) \
627- $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)
628+
629 LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
630 LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
631-LDFLAGS_FOR_TARGET =
632-PICFLAG_FOR_TARGET =
633+LDFLAGS_FOR_TARGET = @LDFLAGS@
634
635 # ------------------------------------
636 # Miscellaneous targets and flag lists
637@@ -496,6 +508,7 @@
638 "INSTALL_DATA=$(INSTALL_DATA)" \
639 "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
640 "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
641+ "LDFLAGS_FOR_BUILD=$(LDFLAGS_FOR_BUILD)" \
642 "LEX=$(LEX)" \
643 "M4=$(M4)" \
644 "MAKE=$(MAKE)" \
645@@ -592,19 +605,20 @@
646 # Flags to pass down to makes which are built with the target environment.
647 # The double $ decreases the length of the command line; those variables
648 # are set in BASE_FLAGS_TO_PASS, and the sub-make will expand them. The
649-# COMPILER_ prefixed variables are not passed down so we expand them here.
650+# *_CFLAGS_FOR_TARGET variables are not passed down and most often empty,
651+# so we expand them here.
652 EXTRA_TARGET_FLAGS = \
653 'AR=$$(AR_FOR_TARGET)' \
654 'AS=$(COMPILER_AS_FOR_TARGET)' \
655 'CC=$$(CC_FOR_TARGET)' \
656- 'CFLAGS=$$(CFLAGS_FOR_TARGET)' \
657+ 'CFLAGS=$$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \
658 'CXX=$$(CXX_FOR_TARGET)' \
659- 'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \
660+ 'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \
661 'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
662 'LD=$(COMPILER_LD_FOR_TARGET)' \
663 'LDFLAGS=$$(LDFLAGS_FOR_TARGET)' \
664- 'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \
665- 'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \
666+ 'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \
667+ 'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)' \
668 'NM=$(COMPILER_NM_FOR_TARGET)' \
669 'OBJDUMP=$$(OBJDUMP_FOR_TARGET)' \
670 'RANLIB=$$(RANLIB_FOR_TARGET)' \
671@@ -2738,7 +2752,8 @@
672 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
673 $(BUILD_EXPORTS) \
674 (cd $(BUILD_SUBDIR)/libiberty && \
675- $(MAKE) $(TARGET-build-libiberty))
676+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS) \
677+ $(TARGET-build-libiberty))
678 @endif build-libiberty
679
680
681@@ -2793,7 +2808,8 @@
682 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
683 $(BUILD_EXPORTS) \
684 (cd $(BUILD_SUBDIR)/bison && \
685- $(MAKE) $(TARGET-build-bison))
686+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS) \
687+ $(TARGET-build-bison))
688 @endif build-bison
689
690
691@@ -2848,7 +2864,8 @@
692 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
693 $(BUILD_EXPORTS) \
694 (cd $(BUILD_SUBDIR)/byacc && \
695- $(MAKE) $(TARGET-build-byacc))
696+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS) \
697+ $(TARGET-build-byacc))
698 @endif build-byacc
699
700
701@@ -2903,7 +2920,8 @@
702 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
703 $(BUILD_EXPORTS) \
704 (cd $(BUILD_SUBDIR)/flex && \
705- $(MAKE) $(TARGET-build-flex))
706+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS) \
707+ $(TARGET-build-flex))
708 @endif build-flex
709
710
711@@ -2958,7 +2976,8 @@
712 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
713 $(BUILD_EXPORTS) \
714 (cd $(BUILD_SUBDIR)/m4 && \
715- $(MAKE) $(TARGET-build-m4))
716+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS) \
717+ $(TARGET-build-m4))
718 @endif build-m4
719
720
721@@ -3013,7 +3032,8 @@
722 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
723 $(BUILD_EXPORTS) \
724 (cd $(BUILD_SUBDIR)/texinfo && \
725- $(MAKE) $(TARGET-build-texinfo))
726+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS) \
727+ $(TARGET-build-texinfo))
728 @endif build-texinfo
729
730
731@@ -3068,7 +3088,8 @@
732 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
733 $(BUILD_EXPORTS) \
734 (cd $(BUILD_SUBDIR)/fixincludes && \
735- $(MAKE) $(TARGET-build-fixincludes))
736+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS) \
737+ $(TARGET-build-fixincludes))
738 @endif build-fixincludes
739
740
741@@ -3127,7 +3148,8 @@
742 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
743 $(HOST_EXPORTS) \
744 (cd $(HOST_SUBDIR)/ash && \
745- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-ash))
746+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
747+ $(TARGET-ash))
748 @endif ash
749
750
751@@ -3551,7 +3573,8 @@
752 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
753 $(HOST_EXPORTS) \
754 (cd $(HOST_SUBDIR)/autoconf && \
755- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-autoconf))
756+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
757+ $(TARGET-autoconf))
758 @endif autoconf
759
760
761@@ -3975,7 +3998,8 @@
762 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
763 $(HOST_EXPORTS) \
764 (cd $(HOST_SUBDIR)/automake && \
765- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-automake))
766+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
767+ $(TARGET-automake))
768 @endif automake
769
770
771@@ -4399,7 +4423,8 @@
772 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
773 $(HOST_EXPORTS) \
774 (cd $(HOST_SUBDIR)/bash && \
775- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-bash))
776+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
777+ $(TARGET-bash))
778 @endif bash
779
780
781@@ -4816,9 +4841,9 @@
782 @r=`${PWD_COMMAND}`; export r; \
783 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
784 test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
785- $(HOST_EXPORTS) \
786+ $(HOST_EXPORTS) \
787 CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
788- LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
789+ CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \
790 echo Configuring stage 1 in $(HOST_SUBDIR)/bfd ; \
791 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
792 cd $(HOST_SUBDIR)/bfd || exit 1; \
793@@ -4847,9 +4872,9 @@
794 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
795 test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
796 $(HOST_EXPORTS) \
797- $(POSTSTAGE1_HOST_EXPORTS) \
798+ $(POSTSTAGE1_HOST_EXPORTS) \
799 CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
800- LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
801+ CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \
802 echo Configuring stage 2 in $(HOST_SUBDIR)/bfd ; \
803 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
804 cd $(HOST_SUBDIR)/bfd || exit 1; \
805@@ -4878,9 +4903,9 @@
806 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
807 test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
808 $(HOST_EXPORTS) \
809- $(POSTSTAGE1_HOST_EXPORTS) \
810+ $(POSTSTAGE1_HOST_EXPORTS) \
811 CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
812- LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
813+ CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS; \
814 echo Configuring stage b2g0 in $(HOST_SUBDIR)/bfd ; \
815 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
816 cd $(HOST_SUBDIR)/bfd || exit 1; \
817@@ -4909,9 +4934,9 @@
818 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
819 test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
820 $(HOST_EXPORTS) \
821- $(POSTSTAGE1_HOST_EXPORTS) \
822+ $(POSTSTAGE1_HOST_EXPORTS) \
823 CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
824- LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
825+ CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \
826 echo Configuring stage 3 in $(HOST_SUBDIR)/bfd ; \
827 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
828 cd $(HOST_SUBDIR)/bfd || exit 1; \
829@@ -4940,9 +4965,9 @@
830 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
831 test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
832 $(HOST_EXPORTS) \
833- $(POSTSTAGE1_HOST_EXPORTS) \
834+ $(POSTSTAGE1_HOST_EXPORTS) \
835 CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
836- LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
837+ CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS; \
838 echo Configuring stage b3g2 in $(HOST_SUBDIR)/bfd ; \
839 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
840 cd $(HOST_SUBDIR)/bfd || exit 1; \
841@@ -4971,9 +4996,9 @@
842 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
843 test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
844 $(HOST_EXPORTS) \
845- $(POSTSTAGE1_HOST_EXPORTS) \
846+ $(POSTSTAGE1_HOST_EXPORTS) \
847 CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
848- LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
849+ CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \
850 echo Configuring stage 4 in $(HOST_SUBDIR)/bfd ; \
851 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
852 cd $(HOST_SUBDIR)/bfd || exit 1; \
853@@ -5002,9 +5027,9 @@
854 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
855 test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
856 $(HOST_EXPORTS) \
857- $(POSTSTAGE1_HOST_EXPORTS) \
858+ $(POSTSTAGE1_HOST_EXPORTS) \
859 CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
860- LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
861+ CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \
862 echo Configuring stage profile in $(HOST_SUBDIR)/bfd ; \
863 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
864 cd $(HOST_SUBDIR)/bfd || exit 1; \
865@@ -5033,9 +5058,9 @@
866 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
867 test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
868 $(HOST_EXPORTS) \
869- $(POSTSTAGE1_HOST_EXPORTS) \
870+ $(POSTSTAGE1_HOST_EXPORTS) \
871 CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
872- LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
873+ CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \
874 echo Configuring stage feedback in $(HOST_SUBDIR)/bfd ; \
875 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
876 cd $(HOST_SUBDIR)/bfd || exit 1; \
877@@ -5070,7 +5095,8 @@
878 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
879 $(HOST_EXPORTS) \
880 (cd $(HOST_SUBDIR)/bfd && \
881- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-bfd))
882+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
883+ $(TARGET-bfd))
884 @endif bfd
885
886
887@@ -5089,8 +5115,11 @@
888 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
889 $(HOST_EXPORTS) \
890 cd $(HOST_SUBDIR)/bfd && \
891- $(MAKE) $(FLAGS_TO_PASS) \
892- CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \
893+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
894+ CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
895+ LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
896+ CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
897+ CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \
898 $(TARGET-stage1-bfd)
899
900 maybe-clean-stage1-bfd: clean-stage1-bfd
901@@ -5103,7 +5132,7 @@
902 $(MAKE) stage1-start; \
903 fi; \
904 cd $(HOST_SUBDIR)/bfd && \
905- $(MAKE) $(FLAGS_TO_PASS) \
906+ $(MAKE) $(EXTRA_HOST_FLAGS) \
907 clean
908 @endif bfd-bootstrap
909
910@@ -5123,8 +5152,11 @@
911 $(HOST_EXPORTS) \
912 $(POSTSTAGE1_HOST_EXPORTS) \
913 cd $(HOST_SUBDIR)/bfd && \
914- $(MAKE) $(FLAGS_TO_PASS) \
915- CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
916+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
917+ CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
918+ LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
919+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
920+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
921 $(TARGET-stage2-bfd)
922
923 maybe-clean-stage2-bfd: clean-stage2-bfd
924@@ -5137,7 +5169,7 @@
925 $(MAKE) stage2-start; \
926 fi; \
927 cd $(HOST_SUBDIR)/bfd && \
928- $(MAKE) $(FLAGS_TO_PASS) \
929+ $(MAKE) $(EXTRA_HOST_FLAGS) \
930 $(POSTSTAGE1_FLAGS_TO_PASS) \
931 clean
932 @endif bfd-bootstrap
933@@ -5158,8 +5190,11 @@
934 $(HOST_EXPORTS) \
935 $(POSTSTAGE1_HOST_EXPORTS) \
936 cd $(HOST_SUBDIR)/bfd && \
937- $(MAKE) $(FLAGS_TO_PASS) \
938- CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS) \
939+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
940+ CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
941+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
942+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
943+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
944 $(TARGET-stageb2g0-bfd)
945
946 maybe-clean-stageb2g0-bfd: clean-stageb2g0-bfd
947@@ -5172,7 +5207,7 @@
948 $(MAKE) stageb2g0-start; \
949 fi; \
950 cd $(HOST_SUBDIR)/bfd && \
951- $(MAKE) $(FLAGS_TO_PASS) \
952+ $(MAKE) $(EXTRA_HOST_FLAGS) \
953 $(POSTSTAGE1_FLAGS_TO_PASS) \
954 clean
955 @endif bfd-bootstrap
956@@ -5193,8 +5228,11 @@
957 $(HOST_EXPORTS) \
958 $(POSTSTAGE1_HOST_EXPORTS) \
959 cd $(HOST_SUBDIR)/bfd && \
960- $(MAKE) $(FLAGS_TO_PASS) \
961- CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
962+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
963+ CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
964+ LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
965+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
966+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
967 $(TARGET-stage3-bfd)
968
969 maybe-clean-stage3-bfd: clean-stage3-bfd
970@@ -5207,7 +5245,7 @@
971 $(MAKE) stage3-start; \
972 fi; \
973 cd $(HOST_SUBDIR)/bfd && \
974- $(MAKE) $(FLAGS_TO_PASS) \
975+ $(MAKE) $(EXTRA_HOST_FLAGS) \
976 $(POSTSTAGE1_FLAGS_TO_PASS) \
977 clean
978 @endif bfd-bootstrap
979@@ -5228,8 +5266,11 @@
980 $(HOST_EXPORTS) \
981 $(POSTSTAGE1_HOST_EXPORTS) \
982 cd $(HOST_SUBDIR)/bfd && \
983- $(MAKE) $(FLAGS_TO_PASS) \
984- CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS) \
985+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
986+ CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
987+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
988+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
989+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
990 $(TARGET-stageb3g2-bfd)
991
992 maybe-clean-stageb3g2-bfd: clean-stageb3g2-bfd
993@@ -5242,7 +5283,7 @@
994 $(MAKE) stageb3g2-start; \
995 fi; \
996 cd $(HOST_SUBDIR)/bfd && \
997- $(MAKE) $(FLAGS_TO_PASS) \
998+ $(MAKE) $(EXTRA_HOST_FLAGS) \
999 $(POSTSTAGE1_FLAGS_TO_PASS) \
1000 clean
1001 @endif bfd-bootstrap
1002@@ -5263,8 +5304,11 @@
1003 $(HOST_EXPORTS) \
1004 $(POSTSTAGE1_HOST_EXPORTS) \
1005 cd $(HOST_SUBDIR)/bfd && \
1006- $(MAKE) $(FLAGS_TO_PASS) \
1007- CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
1008+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1009+ CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
1010+ LIBCFLAGS="$(STAGE4_CFLAGS)" \
1011+ CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
1012+ CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
1013 $(TARGET-stage4-bfd)
1014
1015 maybe-clean-stage4-bfd: clean-stage4-bfd
1016@@ -5277,7 +5321,7 @@
1017 $(MAKE) stage4-start; \
1018 fi; \
1019 cd $(HOST_SUBDIR)/bfd && \
1020- $(MAKE) $(FLAGS_TO_PASS) \
1021+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1022 $(POSTSTAGE1_FLAGS_TO_PASS) \
1023 clean
1024 @endif bfd-bootstrap
1025@@ -5298,8 +5342,11 @@
1026 $(HOST_EXPORTS) \
1027 $(POSTSTAGE1_HOST_EXPORTS) \
1028 cd $(HOST_SUBDIR)/bfd && \
1029- $(MAKE) $(FLAGS_TO_PASS) \
1030- CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS) \
1031+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1032+ CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
1033+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
1034+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
1035+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
1036 $(TARGET-stageprofile-bfd)
1037
1038 maybe-clean-stageprofile-bfd: clean-stageprofile-bfd
1039@@ -5312,7 +5359,7 @@
1040 $(MAKE) stageprofile-start; \
1041 fi; \
1042 cd $(HOST_SUBDIR)/bfd && \
1043- $(MAKE) $(FLAGS_TO_PASS) \
1044+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1045 $(POSTSTAGE1_FLAGS_TO_PASS) \
1046 clean
1047 @endif bfd-bootstrap
1048@@ -5333,8 +5380,11 @@
1049 $(HOST_EXPORTS) \
1050 $(POSTSTAGE1_HOST_EXPORTS) \
1051 cd $(HOST_SUBDIR)/bfd && \
1052- $(MAKE) $(FLAGS_TO_PASS) \
1053- CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS) \
1054+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1055+ CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
1056+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
1057+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
1058+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
1059 $(TARGET-stagefeedback-bfd)
1060
1061 maybe-clean-stagefeedback-bfd: clean-stagefeedback-bfd
1062@@ -5347,7 +5397,7 @@
1063 $(MAKE) stagefeedback-start; \
1064 fi; \
1065 cd $(HOST_SUBDIR)/bfd && \
1066- $(MAKE) $(FLAGS_TO_PASS) \
1067+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1068 $(POSTSTAGE1_FLAGS_TO_PASS) \
1069 clean
1070 @endif bfd-bootstrap
1071@@ -5754,9 +5804,9 @@
1072 @r=`${PWD_COMMAND}`; export r; \
1073 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1074 test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
1075- $(HOST_EXPORTS) \
1076+ $(HOST_EXPORTS) \
1077 CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
1078- LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
1079+ CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \
1080 echo Configuring stage 1 in $(HOST_SUBDIR)/opcodes ; \
1081 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
1082 cd $(HOST_SUBDIR)/opcodes || exit 1; \
1083@@ -5785,9 +5835,9 @@
1084 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1085 test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
1086 $(HOST_EXPORTS) \
1087- $(POSTSTAGE1_HOST_EXPORTS) \
1088+ $(POSTSTAGE1_HOST_EXPORTS) \
1089 CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
1090- LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
1091+ CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \
1092 echo Configuring stage 2 in $(HOST_SUBDIR)/opcodes ; \
1093 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
1094 cd $(HOST_SUBDIR)/opcodes || exit 1; \
1095@@ -5816,9 +5866,9 @@
1096 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1097 test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
1098 $(HOST_EXPORTS) \
1099- $(POSTSTAGE1_HOST_EXPORTS) \
1100+ $(POSTSTAGE1_HOST_EXPORTS) \
1101 CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
1102- LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
1103+ CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS; \
1104 echo Configuring stage b2g0 in $(HOST_SUBDIR)/opcodes ; \
1105 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
1106 cd $(HOST_SUBDIR)/opcodes || exit 1; \
1107@@ -5847,9 +5897,9 @@
1108 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1109 test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
1110 $(HOST_EXPORTS) \
1111- $(POSTSTAGE1_HOST_EXPORTS) \
1112+ $(POSTSTAGE1_HOST_EXPORTS) \
1113 CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
1114- LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
1115+ CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \
1116 echo Configuring stage 3 in $(HOST_SUBDIR)/opcodes ; \
1117 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
1118 cd $(HOST_SUBDIR)/opcodes || exit 1; \
1119@@ -5878,9 +5928,9 @@
1120 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1121 test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
1122 $(HOST_EXPORTS) \
1123- $(POSTSTAGE1_HOST_EXPORTS) \
1124+ $(POSTSTAGE1_HOST_EXPORTS) \
1125 CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
1126- LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
1127+ CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS; \
1128 echo Configuring stage b3g2 in $(HOST_SUBDIR)/opcodes ; \
1129 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
1130 cd $(HOST_SUBDIR)/opcodes || exit 1; \
1131@@ -5909,9 +5959,9 @@
1132 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1133 test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
1134 $(HOST_EXPORTS) \
1135- $(POSTSTAGE1_HOST_EXPORTS) \
1136+ $(POSTSTAGE1_HOST_EXPORTS) \
1137 CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
1138- LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
1139+ CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \
1140 echo Configuring stage 4 in $(HOST_SUBDIR)/opcodes ; \
1141 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
1142 cd $(HOST_SUBDIR)/opcodes || exit 1; \
1143@@ -5940,9 +5990,9 @@
1144 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1145 test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
1146 $(HOST_EXPORTS) \
1147- $(POSTSTAGE1_HOST_EXPORTS) \
1148+ $(POSTSTAGE1_HOST_EXPORTS) \
1149 CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
1150- LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
1151+ CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \
1152 echo Configuring stage profile in $(HOST_SUBDIR)/opcodes ; \
1153 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
1154 cd $(HOST_SUBDIR)/opcodes || exit 1; \
1155@@ -5971,9 +6021,9 @@
1156 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1157 test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
1158 $(HOST_EXPORTS) \
1159- $(POSTSTAGE1_HOST_EXPORTS) \
1160+ $(POSTSTAGE1_HOST_EXPORTS) \
1161 CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
1162- LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
1163+ CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \
1164 echo Configuring stage feedback in $(HOST_SUBDIR)/opcodes ; \
1165 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
1166 cd $(HOST_SUBDIR)/opcodes || exit 1; \
1167@@ -6008,7 +6058,8 @@
1168 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1169 $(HOST_EXPORTS) \
1170 (cd $(HOST_SUBDIR)/opcodes && \
1171- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-opcodes))
1172+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
1173+ $(TARGET-opcodes))
1174 @endif opcodes
1175
1176
1177@@ -6027,8 +6078,11 @@
1178 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1179 $(HOST_EXPORTS) \
1180 cd $(HOST_SUBDIR)/opcodes && \
1181- $(MAKE) $(FLAGS_TO_PASS) \
1182- CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \
1183+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1184+ CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
1185+ LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
1186+ CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
1187+ CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \
1188 $(TARGET-stage1-opcodes)
1189
1190 maybe-clean-stage1-opcodes: clean-stage1-opcodes
1191@@ -6041,7 +6095,7 @@
1192 $(MAKE) stage1-start; \
1193 fi; \
1194 cd $(HOST_SUBDIR)/opcodes && \
1195- $(MAKE) $(FLAGS_TO_PASS) \
1196+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1197 clean
1198 @endif opcodes-bootstrap
1199
1200@@ -6061,8 +6115,11 @@
1201 $(HOST_EXPORTS) \
1202 $(POSTSTAGE1_HOST_EXPORTS) \
1203 cd $(HOST_SUBDIR)/opcodes && \
1204- $(MAKE) $(FLAGS_TO_PASS) \
1205- CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
1206+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1207+ CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
1208+ LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
1209+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
1210+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
1211 $(TARGET-stage2-opcodes)
1212
1213 maybe-clean-stage2-opcodes: clean-stage2-opcodes
1214@@ -6075,7 +6132,7 @@
1215 $(MAKE) stage2-start; \
1216 fi; \
1217 cd $(HOST_SUBDIR)/opcodes && \
1218- $(MAKE) $(FLAGS_TO_PASS) \
1219+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1220 $(POSTSTAGE1_FLAGS_TO_PASS) \
1221 clean
1222 @endif opcodes-bootstrap
1223@@ -6096,8 +6153,11 @@
1224 $(HOST_EXPORTS) \
1225 $(POSTSTAGE1_HOST_EXPORTS) \
1226 cd $(HOST_SUBDIR)/opcodes && \
1227- $(MAKE) $(FLAGS_TO_PASS) \
1228- CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS) \
1229+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1230+ CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
1231+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
1232+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
1233+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
1234 $(TARGET-stageb2g0-opcodes)
1235
1236 maybe-clean-stageb2g0-opcodes: clean-stageb2g0-opcodes
1237@@ -6110,7 +6170,7 @@
1238 $(MAKE) stageb2g0-start; \
1239 fi; \
1240 cd $(HOST_SUBDIR)/opcodes && \
1241- $(MAKE) $(FLAGS_TO_PASS) \
1242+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1243 $(POSTSTAGE1_FLAGS_TO_PASS) \
1244 clean
1245 @endif opcodes-bootstrap
1246@@ -6131,8 +6191,11 @@
1247 $(HOST_EXPORTS) \
1248 $(POSTSTAGE1_HOST_EXPORTS) \
1249 cd $(HOST_SUBDIR)/opcodes && \
1250- $(MAKE) $(FLAGS_TO_PASS) \
1251- CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
1252+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1253+ CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
1254+ LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
1255+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
1256+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
1257 $(TARGET-stage3-opcodes)
1258
1259 maybe-clean-stage3-opcodes: clean-stage3-opcodes
1260@@ -6145,7 +6208,7 @@
1261 $(MAKE) stage3-start; \
1262 fi; \
1263 cd $(HOST_SUBDIR)/opcodes && \
1264- $(MAKE) $(FLAGS_TO_PASS) \
1265+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1266 $(POSTSTAGE1_FLAGS_TO_PASS) \
1267 clean
1268 @endif opcodes-bootstrap
1269@@ -6166,8 +6229,11 @@
1270 $(HOST_EXPORTS) \
1271 $(POSTSTAGE1_HOST_EXPORTS) \
1272 cd $(HOST_SUBDIR)/opcodes && \
1273- $(MAKE) $(FLAGS_TO_PASS) \
1274- CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS) \
1275+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1276+ CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
1277+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
1278+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
1279+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
1280 $(TARGET-stageb3g2-opcodes)
1281
1282 maybe-clean-stageb3g2-opcodes: clean-stageb3g2-opcodes
1283@@ -6180,7 +6246,7 @@
1284 $(MAKE) stageb3g2-start; \
1285 fi; \
1286 cd $(HOST_SUBDIR)/opcodes && \
1287- $(MAKE) $(FLAGS_TO_PASS) \
1288+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1289 $(POSTSTAGE1_FLAGS_TO_PASS) \
1290 clean
1291 @endif opcodes-bootstrap
1292@@ -6201,8 +6267,11 @@
1293 $(HOST_EXPORTS) \
1294 $(POSTSTAGE1_HOST_EXPORTS) \
1295 cd $(HOST_SUBDIR)/opcodes && \
1296- $(MAKE) $(FLAGS_TO_PASS) \
1297- CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
1298+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1299+ CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
1300+ LIBCFLAGS="$(STAGE4_CFLAGS)" \
1301+ CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
1302+ CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
1303 $(TARGET-stage4-opcodes)
1304
1305 maybe-clean-stage4-opcodes: clean-stage4-opcodes
1306@@ -6215,7 +6284,7 @@
1307 $(MAKE) stage4-start; \
1308 fi; \
1309 cd $(HOST_SUBDIR)/opcodes && \
1310- $(MAKE) $(FLAGS_TO_PASS) \
1311+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1312 $(POSTSTAGE1_FLAGS_TO_PASS) \
1313 clean
1314 @endif opcodes-bootstrap
1315@@ -6236,8 +6305,11 @@
1316 $(HOST_EXPORTS) \
1317 $(POSTSTAGE1_HOST_EXPORTS) \
1318 cd $(HOST_SUBDIR)/opcodes && \
1319- $(MAKE) $(FLAGS_TO_PASS) \
1320- CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS) \
1321+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1322+ CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
1323+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
1324+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
1325+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
1326 $(TARGET-stageprofile-opcodes)
1327
1328 maybe-clean-stageprofile-opcodes: clean-stageprofile-opcodes
1329@@ -6250,7 +6322,7 @@
1330 $(MAKE) stageprofile-start; \
1331 fi; \
1332 cd $(HOST_SUBDIR)/opcodes && \
1333- $(MAKE) $(FLAGS_TO_PASS) \
1334+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1335 $(POSTSTAGE1_FLAGS_TO_PASS) \
1336 clean
1337 @endif opcodes-bootstrap
1338@@ -6271,8 +6343,11 @@
1339 $(HOST_EXPORTS) \
1340 $(POSTSTAGE1_HOST_EXPORTS) \
1341 cd $(HOST_SUBDIR)/opcodes && \
1342- $(MAKE) $(FLAGS_TO_PASS) \
1343- CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS) \
1344+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1345+ CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
1346+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
1347+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
1348+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
1349 $(TARGET-stagefeedback-opcodes)
1350
1351 maybe-clean-stagefeedback-opcodes: clean-stagefeedback-opcodes
1352@@ -6285,7 +6360,7 @@
1353 $(MAKE) stagefeedback-start; \
1354 fi; \
1355 cd $(HOST_SUBDIR)/opcodes && \
1356- $(MAKE) $(FLAGS_TO_PASS) \
1357+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1358 $(POSTSTAGE1_FLAGS_TO_PASS) \
1359 clean
1360 @endif opcodes-bootstrap
1361@@ -6692,9 +6767,9 @@
1362 @r=`${PWD_COMMAND}`; export r; \
1363 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1364 test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
1365- $(HOST_EXPORTS) \
1366+ $(HOST_EXPORTS) \
1367 CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
1368- LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
1369+ CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \
1370 echo Configuring stage 1 in $(HOST_SUBDIR)/binutils ; \
1371 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
1372 cd $(HOST_SUBDIR)/binutils || exit 1; \
1373@@ -6723,9 +6798,9 @@
1374 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1375 test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
1376 $(HOST_EXPORTS) \
1377- $(POSTSTAGE1_HOST_EXPORTS) \
1378+ $(POSTSTAGE1_HOST_EXPORTS) \
1379 CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
1380- LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
1381+ CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \
1382 echo Configuring stage 2 in $(HOST_SUBDIR)/binutils ; \
1383 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
1384 cd $(HOST_SUBDIR)/binutils || exit 1; \
1385@@ -6754,9 +6829,9 @@
1386 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1387 test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
1388 $(HOST_EXPORTS) \
1389- $(POSTSTAGE1_HOST_EXPORTS) \
1390+ $(POSTSTAGE1_HOST_EXPORTS) \
1391 CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
1392- LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
1393+ CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS; \
1394 echo Configuring stage b2g0 in $(HOST_SUBDIR)/binutils ; \
1395 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
1396 cd $(HOST_SUBDIR)/binutils || exit 1; \
1397@@ -6785,9 +6860,9 @@
1398 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1399 test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
1400 $(HOST_EXPORTS) \
1401- $(POSTSTAGE1_HOST_EXPORTS) \
1402+ $(POSTSTAGE1_HOST_EXPORTS) \
1403 CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
1404- LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
1405+ CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \
1406 echo Configuring stage 3 in $(HOST_SUBDIR)/binutils ; \
1407 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
1408 cd $(HOST_SUBDIR)/binutils || exit 1; \
1409@@ -6816,9 +6891,9 @@
1410 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1411 test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
1412 $(HOST_EXPORTS) \
1413- $(POSTSTAGE1_HOST_EXPORTS) \
1414+ $(POSTSTAGE1_HOST_EXPORTS) \
1415 CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
1416- LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
1417+ CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS; \
1418 echo Configuring stage b3g2 in $(HOST_SUBDIR)/binutils ; \
1419 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
1420 cd $(HOST_SUBDIR)/binutils || exit 1; \
1421@@ -6847,9 +6922,9 @@
1422 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1423 test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
1424 $(HOST_EXPORTS) \
1425- $(POSTSTAGE1_HOST_EXPORTS) \
1426+ $(POSTSTAGE1_HOST_EXPORTS) \
1427 CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
1428- LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
1429+ CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \
1430 echo Configuring stage 4 in $(HOST_SUBDIR)/binutils ; \
1431 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
1432 cd $(HOST_SUBDIR)/binutils || exit 1; \
1433@@ -6878,9 +6953,9 @@
1434 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1435 test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
1436 $(HOST_EXPORTS) \
1437- $(POSTSTAGE1_HOST_EXPORTS) \
1438+ $(POSTSTAGE1_HOST_EXPORTS) \
1439 CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
1440- LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
1441+ CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \
1442 echo Configuring stage profile in $(HOST_SUBDIR)/binutils ; \
1443 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
1444 cd $(HOST_SUBDIR)/binutils || exit 1; \
1445@@ -6909,9 +6984,9 @@
1446 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1447 test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
1448 $(HOST_EXPORTS) \
1449- $(POSTSTAGE1_HOST_EXPORTS) \
1450+ $(POSTSTAGE1_HOST_EXPORTS) \
1451 CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
1452- LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
1453+ CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \
1454 echo Configuring stage feedback in $(HOST_SUBDIR)/binutils ; \
1455 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
1456 cd $(HOST_SUBDIR)/binutils || exit 1; \
1457@@ -6946,7 +7021,8 @@
1458 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1459 $(HOST_EXPORTS) \
1460 (cd $(HOST_SUBDIR)/binutils && \
1461- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-binutils))
1462+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
1463+ $(TARGET-binutils))
1464 @endif binutils
1465
1466
1467@@ -6965,8 +7041,11 @@
1468 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1469 $(HOST_EXPORTS) \
1470 cd $(HOST_SUBDIR)/binutils && \
1471- $(MAKE) $(FLAGS_TO_PASS) \
1472- CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \
1473+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1474+ CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
1475+ LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
1476+ CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
1477+ CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \
1478 $(TARGET-stage1-binutils)
1479
1480 maybe-clean-stage1-binutils: clean-stage1-binutils
1481@@ -6979,7 +7058,7 @@
1482 $(MAKE) stage1-start; \
1483 fi; \
1484 cd $(HOST_SUBDIR)/binutils && \
1485- $(MAKE) $(FLAGS_TO_PASS) \
1486+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1487 clean
1488 @endif binutils-bootstrap
1489
1490@@ -6999,8 +7078,11 @@
1491 $(HOST_EXPORTS) \
1492 $(POSTSTAGE1_HOST_EXPORTS) \
1493 cd $(HOST_SUBDIR)/binutils && \
1494- $(MAKE) $(FLAGS_TO_PASS) \
1495- CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
1496+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1497+ CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
1498+ LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
1499+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
1500+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
1501 $(TARGET-stage2-binutils)
1502
1503 maybe-clean-stage2-binutils: clean-stage2-binutils
1504@@ -7013,7 +7095,7 @@
1505 $(MAKE) stage2-start; \
1506 fi; \
1507 cd $(HOST_SUBDIR)/binutils && \
1508- $(MAKE) $(FLAGS_TO_PASS) \
1509+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1510 $(POSTSTAGE1_FLAGS_TO_PASS) \
1511 clean
1512 @endif binutils-bootstrap
1513@@ -7034,8 +7116,11 @@
1514 $(HOST_EXPORTS) \
1515 $(POSTSTAGE1_HOST_EXPORTS) \
1516 cd $(HOST_SUBDIR)/binutils && \
1517- $(MAKE) $(FLAGS_TO_PASS) \
1518- CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS) \
1519+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1520+ CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
1521+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
1522+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
1523+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
1524 $(TARGET-stageb2g0-binutils)
1525
1526 maybe-clean-stageb2g0-binutils: clean-stageb2g0-binutils
1527@@ -7048,7 +7133,7 @@
1528 $(MAKE) stageb2g0-start; \
1529 fi; \
1530 cd $(HOST_SUBDIR)/binutils && \
1531- $(MAKE) $(FLAGS_TO_PASS) \
1532+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1533 $(POSTSTAGE1_FLAGS_TO_PASS) \
1534 clean
1535 @endif binutils-bootstrap
1536@@ -7069,8 +7154,11 @@
1537 $(HOST_EXPORTS) \
1538 $(POSTSTAGE1_HOST_EXPORTS) \
1539 cd $(HOST_SUBDIR)/binutils && \
1540- $(MAKE) $(FLAGS_TO_PASS) \
1541- CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
1542+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1543+ CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
1544+ LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
1545+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
1546+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
1547 $(TARGET-stage3-binutils)
1548
1549 maybe-clean-stage3-binutils: clean-stage3-binutils
1550@@ -7083,7 +7171,7 @@
1551 $(MAKE) stage3-start; \
1552 fi; \
1553 cd $(HOST_SUBDIR)/binutils && \
1554- $(MAKE) $(FLAGS_TO_PASS) \
1555+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1556 $(POSTSTAGE1_FLAGS_TO_PASS) \
1557 clean
1558 @endif binutils-bootstrap
1559@@ -7104,8 +7192,11 @@
1560 $(HOST_EXPORTS) \
1561 $(POSTSTAGE1_HOST_EXPORTS) \
1562 cd $(HOST_SUBDIR)/binutils && \
1563- $(MAKE) $(FLAGS_TO_PASS) \
1564- CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS) \
1565+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1566+ CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
1567+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
1568+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
1569+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
1570 $(TARGET-stageb3g2-binutils)
1571
1572 maybe-clean-stageb3g2-binutils: clean-stageb3g2-binutils
1573@@ -7118,7 +7209,7 @@
1574 $(MAKE) stageb3g2-start; \
1575 fi; \
1576 cd $(HOST_SUBDIR)/binutils && \
1577- $(MAKE) $(FLAGS_TO_PASS) \
1578+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1579 $(POSTSTAGE1_FLAGS_TO_PASS) \
1580 clean
1581 @endif binutils-bootstrap
1582@@ -7139,8 +7230,11 @@
1583 $(HOST_EXPORTS) \
1584 $(POSTSTAGE1_HOST_EXPORTS) \
1585 cd $(HOST_SUBDIR)/binutils && \
1586- $(MAKE) $(FLAGS_TO_PASS) \
1587- CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
1588+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1589+ CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
1590+ LIBCFLAGS="$(STAGE4_CFLAGS)" \
1591+ CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
1592+ CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
1593 $(TARGET-stage4-binutils)
1594
1595 maybe-clean-stage4-binutils: clean-stage4-binutils
1596@@ -7153,7 +7247,7 @@
1597 $(MAKE) stage4-start; \
1598 fi; \
1599 cd $(HOST_SUBDIR)/binutils && \
1600- $(MAKE) $(FLAGS_TO_PASS) \
1601+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1602 $(POSTSTAGE1_FLAGS_TO_PASS) \
1603 clean
1604 @endif binutils-bootstrap
1605@@ -7174,8 +7268,11 @@
1606 $(HOST_EXPORTS) \
1607 $(POSTSTAGE1_HOST_EXPORTS) \
1608 cd $(HOST_SUBDIR)/binutils && \
1609- $(MAKE) $(FLAGS_TO_PASS) \
1610- CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS) \
1611+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1612+ CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
1613+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
1614+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
1615+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
1616 $(TARGET-stageprofile-binutils)
1617
1618 maybe-clean-stageprofile-binutils: clean-stageprofile-binutils
1619@@ -7188,7 +7285,7 @@
1620 $(MAKE) stageprofile-start; \
1621 fi; \
1622 cd $(HOST_SUBDIR)/binutils && \
1623- $(MAKE) $(FLAGS_TO_PASS) \
1624+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1625 $(POSTSTAGE1_FLAGS_TO_PASS) \
1626 clean
1627 @endif binutils-bootstrap
1628@@ -7209,8 +7306,11 @@
1629 $(HOST_EXPORTS) \
1630 $(POSTSTAGE1_HOST_EXPORTS) \
1631 cd $(HOST_SUBDIR)/binutils && \
1632- $(MAKE) $(FLAGS_TO_PASS) \
1633- CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS) \
1634+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1635+ CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
1636+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
1637+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
1638+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
1639 $(TARGET-stagefeedback-binutils)
1640
1641 maybe-clean-stagefeedback-binutils: clean-stagefeedback-binutils
1642@@ -7223,7 +7323,7 @@
1643 $(MAKE) stagefeedback-start; \
1644 fi; \
1645 cd $(HOST_SUBDIR)/binutils && \
1646- $(MAKE) $(FLAGS_TO_PASS) \
1647+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1648 $(POSTSTAGE1_FLAGS_TO_PASS) \
1649 clean
1650 @endif binutils-bootstrap
1651@@ -7637,7 +7737,8 @@
1652 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1653 $(HOST_EXPORTS) \
1654 (cd $(HOST_SUBDIR)/bison && \
1655- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-bison))
1656+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
1657+ $(TARGET-bison))
1658 @endif bison
1659
1660
1661@@ -8064,7 +8165,8 @@
1662 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1663 $(HOST_EXPORTS) \
1664 (cd $(HOST_SUBDIR)/byacc && \
1665- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-byacc))
1666+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
1667+ $(TARGET-byacc))
1668 @endif byacc
1669
1670
1671@@ -8491,7 +8593,8 @@
1672 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1673 $(HOST_EXPORTS) \
1674 (cd $(HOST_SUBDIR)/bzip2 && \
1675- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-bzip2))
1676+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
1677+ $(TARGET-bzip2))
1678 @endif bzip2
1679
1680
1681@@ -8915,7 +9018,8 @@
1682 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1683 $(HOST_EXPORTS) \
1684 (cd $(HOST_SUBDIR)/dejagnu && \
1685- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-dejagnu))
1686+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
1687+ $(TARGET-dejagnu))
1688 @endif dejagnu
1689
1690
1691@@ -9339,7 +9443,8 @@
1692 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1693 $(HOST_EXPORTS) \
1694 (cd $(HOST_SUBDIR)/diff && \
1695- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-diff))
1696+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
1697+ $(TARGET-diff))
1698 @endif diff
1699
1700
1701@@ -9763,7 +9868,8 @@
1702 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1703 $(HOST_EXPORTS) \
1704 (cd $(HOST_SUBDIR)/dosutils && \
1705- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-dosutils))
1706+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
1707+ $(TARGET-dosutils))
1708 @endif dosutils
1709
1710
1711@@ -10181,7 +10287,8 @@
1712 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1713 $(HOST_EXPORTS) \
1714 (cd $(HOST_SUBDIR)/etc && \
1715- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-etc))
1716+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
1717+ $(TARGET-etc))
1718 @endif etc
1719
1720
1721@@ -10605,7 +10712,8 @@
1722 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1723 $(HOST_EXPORTS) \
1724 (cd $(HOST_SUBDIR)/fastjar && \
1725- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-fastjar))
1726+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
1727+ $(TARGET-fastjar))
1728 @endif fastjar
1729
1730
1731@@ -11032,7 +11140,8 @@
1732 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1733 $(HOST_EXPORTS) \
1734 (cd $(HOST_SUBDIR)/fileutils && \
1735- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-fileutils))
1736+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
1737+ $(TARGET-fileutils))
1738 @endif fileutils
1739
1740
1741@@ -11456,7 +11565,8 @@
1742 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1743 $(HOST_EXPORTS) \
1744 (cd $(HOST_SUBDIR)/findutils && \
1745- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-findutils))
1746+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
1747+ $(TARGET-findutils))
1748 @endif findutils
1749
1750
1751@@ -11880,7 +11990,8 @@
1752 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1753 $(HOST_EXPORTS) \
1754 (cd $(HOST_SUBDIR)/find && \
1755- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-find))
1756+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
1757+ $(TARGET-find))
1758 @endif find
1759
1760
1761@@ -12304,7 +12415,8 @@
1762 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1763 $(HOST_EXPORTS) \
1764 (cd $(HOST_SUBDIR)/fixincludes && \
1765- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-fixincludes))
1766+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
1767+ $(TARGET-fixincludes))
1768 @endif fixincludes
1769
1770
1771@@ -12712,7 +12824,8 @@
1772 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1773 $(HOST_EXPORTS) \
1774 (cd $(HOST_SUBDIR)/flex && \
1775- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-flex))
1776+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
1777+ $(TARGET-flex))
1778 @endif flex
1779
1780
1781@@ -13132,9 +13245,9 @@
1782 @r=`${PWD_COMMAND}`; export r; \
1783 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1784 test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
1785- $(HOST_EXPORTS) \
1786+ $(HOST_EXPORTS) \
1787 CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
1788- LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
1789+ CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \
1790 echo Configuring stage 1 in $(HOST_SUBDIR)/gas ; \
1791 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
1792 cd $(HOST_SUBDIR)/gas || exit 1; \
1793@@ -13163,9 +13276,9 @@
1794 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1795 test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
1796 $(HOST_EXPORTS) \
1797- $(POSTSTAGE1_HOST_EXPORTS) \
1798+ $(POSTSTAGE1_HOST_EXPORTS) \
1799 CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
1800- LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
1801+ CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \
1802 echo Configuring stage 2 in $(HOST_SUBDIR)/gas ; \
1803 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
1804 cd $(HOST_SUBDIR)/gas || exit 1; \
1805@@ -13194,9 +13307,9 @@
1806 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1807 test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
1808 $(HOST_EXPORTS) \
1809- $(POSTSTAGE1_HOST_EXPORTS) \
1810+ $(POSTSTAGE1_HOST_EXPORTS) \
1811 CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
1812- LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
1813+ CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS; \
1814 echo Configuring stage b2g0 in $(HOST_SUBDIR)/gas ; \
1815 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
1816 cd $(HOST_SUBDIR)/gas || exit 1; \
1817@@ -13225,9 +13338,9 @@
1818 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1819 test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
1820 $(HOST_EXPORTS) \
1821- $(POSTSTAGE1_HOST_EXPORTS) \
1822+ $(POSTSTAGE1_HOST_EXPORTS) \
1823 CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
1824- LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
1825+ CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \
1826 echo Configuring stage 3 in $(HOST_SUBDIR)/gas ; \
1827 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
1828 cd $(HOST_SUBDIR)/gas || exit 1; \
1829@@ -13256,9 +13369,9 @@
1830 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1831 test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
1832 $(HOST_EXPORTS) \
1833- $(POSTSTAGE1_HOST_EXPORTS) \
1834+ $(POSTSTAGE1_HOST_EXPORTS) \
1835 CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
1836- LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
1837+ CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS; \
1838 echo Configuring stage b3g2 in $(HOST_SUBDIR)/gas ; \
1839 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
1840 cd $(HOST_SUBDIR)/gas || exit 1; \
1841@@ -13287,9 +13400,9 @@
1842 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1843 test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
1844 $(HOST_EXPORTS) \
1845- $(POSTSTAGE1_HOST_EXPORTS) \
1846+ $(POSTSTAGE1_HOST_EXPORTS) \
1847 CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
1848- LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
1849+ CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \
1850 echo Configuring stage 4 in $(HOST_SUBDIR)/gas ; \
1851 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
1852 cd $(HOST_SUBDIR)/gas || exit 1; \
1853@@ -13318,9 +13431,9 @@
1854 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1855 test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
1856 $(HOST_EXPORTS) \
1857- $(POSTSTAGE1_HOST_EXPORTS) \
1858+ $(POSTSTAGE1_HOST_EXPORTS) \
1859 CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
1860- LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
1861+ CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \
1862 echo Configuring stage profile in $(HOST_SUBDIR)/gas ; \
1863 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
1864 cd $(HOST_SUBDIR)/gas || exit 1; \
1865@@ -13349,9 +13462,9 @@
1866 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1867 test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
1868 $(HOST_EXPORTS) \
1869- $(POSTSTAGE1_HOST_EXPORTS) \
1870+ $(POSTSTAGE1_HOST_EXPORTS) \
1871 CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
1872- LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
1873+ CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \
1874 echo Configuring stage feedback in $(HOST_SUBDIR)/gas ; \
1875 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
1876 cd $(HOST_SUBDIR)/gas || exit 1; \
1877@@ -13386,7 +13499,8 @@
1878 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1879 $(HOST_EXPORTS) \
1880 (cd $(HOST_SUBDIR)/gas && \
1881- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-gas))
1882+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
1883+ $(TARGET-gas))
1884 @endif gas
1885
1886
1887@@ -13405,8 +13519,11 @@
1888 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1889 $(HOST_EXPORTS) \
1890 cd $(HOST_SUBDIR)/gas && \
1891- $(MAKE) $(FLAGS_TO_PASS) \
1892- CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \
1893+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1894+ CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
1895+ LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
1896+ CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
1897+ CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \
1898 $(TARGET-stage1-gas)
1899
1900 maybe-clean-stage1-gas: clean-stage1-gas
1901@@ -13419,7 +13536,7 @@
1902 $(MAKE) stage1-start; \
1903 fi; \
1904 cd $(HOST_SUBDIR)/gas && \
1905- $(MAKE) $(FLAGS_TO_PASS) \
1906+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1907 clean
1908 @endif gas-bootstrap
1909
1910@@ -13439,8 +13556,11 @@
1911 $(HOST_EXPORTS) \
1912 $(POSTSTAGE1_HOST_EXPORTS) \
1913 cd $(HOST_SUBDIR)/gas && \
1914- $(MAKE) $(FLAGS_TO_PASS) \
1915- CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
1916+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1917+ CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
1918+ LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
1919+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
1920+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
1921 $(TARGET-stage2-gas)
1922
1923 maybe-clean-stage2-gas: clean-stage2-gas
1924@@ -13453,7 +13573,7 @@
1925 $(MAKE) stage2-start; \
1926 fi; \
1927 cd $(HOST_SUBDIR)/gas && \
1928- $(MAKE) $(FLAGS_TO_PASS) \
1929+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1930 $(POSTSTAGE1_FLAGS_TO_PASS) \
1931 clean
1932 @endif gas-bootstrap
1933@@ -13474,8 +13594,11 @@
1934 $(HOST_EXPORTS) \
1935 $(POSTSTAGE1_HOST_EXPORTS) \
1936 cd $(HOST_SUBDIR)/gas && \
1937- $(MAKE) $(FLAGS_TO_PASS) \
1938- CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS) \
1939+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1940+ CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
1941+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
1942+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
1943+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
1944 $(TARGET-stageb2g0-gas)
1945
1946 maybe-clean-stageb2g0-gas: clean-stageb2g0-gas
1947@@ -13488,7 +13611,7 @@
1948 $(MAKE) stageb2g0-start; \
1949 fi; \
1950 cd $(HOST_SUBDIR)/gas && \
1951- $(MAKE) $(FLAGS_TO_PASS) \
1952+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1953 $(POSTSTAGE1_FLAGS_TO_PASS) \
1954 clean
1955 @endif gas-bootstrap
1956@@ -13509,8 +13632,11 @@
1957 $(HOST_EXPORTS) \
1958 $(POSTSTAGE1_HOST_EXPORTS) \
1959 cd $(HOST_SUBDIR)/gas && \
1960- $(MAKE) $(FLAGS_TO_PASS) \
1961- CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
1962+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1963+ CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
1964+ LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
1965+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
1966+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
1967 $(TARGET-stage3-gas)
1968
1969 maybe-clean-stage3-gas: clean-stage3-gas
1970@@ -13523,7 +13649,7 @@
1971 $(MAKE) stage3-start; \
1972 fi; \
1973 cd $(HOST_SUBDIR)/gas && \
1974- $(MAKE) $(FLAGS_TO_PASS) \
1975+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1976 $(POSTSTAGE1_FLAGS_TO_PASS) \
1977 clean
1978 @endif gas-bootstrap
1979@@ -13544,8 +13670,11 @@
1980 $(HOST_EXPORTS) \
1981 $(POSTSTAGE1_HOST_EXPORTS) \
1982 cd $(HOST_SUBDIR)/gas && \
1983- $(MAKE) $(FLAGS_TO_PASS) \
1984- CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS) \
1985+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
1986+ CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
1987+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
1988+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
1989+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
1990 $(TARGET-stageb3g2-gas)
1991
1992 maybe-clean-stageb3g2-gas: clean-stageb3g2-gas
1993@@ -13558,7 +13687,7 @@
1994 $(MAKE) stageb3g2-start; \
1995 fi; \
1996 cd $(HOST_SUBDIR)/gas && \
1997- $(MAKE) $(FLAGS_TO_PASS) \
1998+ $(MAKE) $(EXTRA_HOST_FLAGS) \
1999 $(POSTSTAGE1_FLAGS_TO_PASS) \
2000 clean
2001 @endif gas-bootstrap
2002@@ -13579,8 +13708,11 @@
2003 $(HOST_EXPORTS) \
2004 $(POSTSTAGE1_HOST_EXPORTS) \
2005 cd $(HOST_SUBDIR)/gas && \
2006- $(MAKE) $(FLAGS_TO_PASS) \
2007- CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
2008+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2009+ CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
2010+ LIBCFLAGS="$(STAGE4_CFLAGS)" \
2011+ CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
2012+ CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
2013 $(TARGET-stage4-gas)
2014
2015 maybe-clean-stage4-gas: clean-stage4-gas
2016@@ -13593,7 +13725,7 @@
2017 $(MAKE) stage4-start; \
2018 fi; \
2019 cd $(HOST_SUBDIR)/gas && \
2020- $(MAKE) $(FLAGS_TO_PASS) \
2021+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2022 $(POSTSTAGE1_FLAGS_TO_PASS) \
2023 clean
2024 @endif gas-bootstrap
2025@@ -13614,8 +13746,11 @@
2026 $(HOST_EXPORTS) \
2027 $(POSTSTAGE1_HOST_EXPORTS) \
2028 cd $(HOST_SUBDIR)/gas && \
2029- $(MAKE) $(FLAGS_TO_PASS) \
2030- CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS) \
2031+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2032+ CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
2033+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
2034+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
2035+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
2036 $(TARGET-stageprofile-gas)
2037
2038 maybe-clean-stageprofile-gas: clean-stageprofile-gas
2039@@ -13628,7 +13763,7 @@
2040 $(MAKE) stageprofile-start; \
2041 fi; \
2042 cd $(HOST_SUBDIR)/gas && \
2043- $(MAKE) $(FLAGS_TO_PASS) \
2044+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2045 $(POSTSTAGE1_FLAGS_TO_PASS) \
2046 clean
2047 @endif gas-bootstrap
2048@@ -13649,8 +13784,11 @@
2049 $(HOST_EXPORTS) \
2050 $(POSTSTAGE1_HOST_EXPORTS) \
2051 cd $(HOST_SUBDIR)/gas && \
2052- $(MAKE) $(FLAGS_TO_PASS) \
2053- CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS) \
2054+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2055+ CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
2056+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
2057+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
2058+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
2059 $(TARGET-stagefeedback-gas)
2060
2061 maybe-clean-stagefeedback-gas: clean-stagefeedback-gas
2062@@ -13663,7 +13801,7 @@
2063 $(MAKE) stagefeedback-start; \
2064 fi; \
2065 cd $(HOST_SUBDIR)/gas && \
2066- $(MAKE) $(FLAGS_TO_PASS) \
2067+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2068 $(POSTSTAGE1_FLAGS_TO_PASS) \
2069 clean
2070 @endif gas-bootstrap
2071@@ -14070,9 +14208,9 @@
2072 @r=`${PWD_COMMAND}`; export r; \
2073 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2074 test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
2075- $(HOST_EXPORTS) \
2076+ $(HOST_EXPORTS) \
2077 CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
2078- LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
2079+ CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \
2080 echo Configuring stage 1 in $(HOST_SUBDIR)/gcc ; \
2081 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
2082 cd $(HOST_SUBDIR)/gcc || exit 1; \
2083@@ -14101,9 +14239,9 @@
2084 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2085 test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
2086 $(HOST_EXPORTS) \
2087- $(POSTSTAGE1_HOST_EXPORTS) \
2088+ $(POSTSTAGE1_HOST_EXPORTS) \
2089 CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
2090- LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
2091+ CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \
2092 echo Configuring stage 2 in $(HOST_SUBDIR)/gcc ; \
2093 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
2094 cd $(HOST_SUBDIR)/gcc || exit 1; \
2095@@ -14132,9 +14270,9 @@
2096 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2097 test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
2098 $(HOST_EXPORTS) \
2099- $(POSTSTAGE1_HOST_EXPORTS) \
2100+ $(POSTSTAGE1_HOST_EXPORTS) \
2101 CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
2102- LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
2103+ CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS; \
2104 echo Configuring stage b2g0 in $(HOST_SUBDIR)/gcc ; \
2105 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
2106 cd $(HOST_SUBDIR)/gcc || exit 1; \
2107@@ -14163,9 +14301,9 @@
2108 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2109 test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
2110 $(HOST_EXPORTS) \
2111- $(POSTSTAGE1_HOST_EXPORTS) \
2112+ $(POSTSTAGE1_HOST_EXPORTS) \
2113 CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
2114- LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
2115+ CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \
2116 echo Configuring stage 3 in $(HOST_SUBDIR)/gcc ; \
2117 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
2118 cd $(HOST_SUBDIR)/gcc || exit 1; \
2119@@ -14194,9 +14332,9 @@
2120 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2121 test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
2122 $(HOST_EXPORTS) \
2123- $(POSTSTAGE1_HOST_EXPORTS) \
2124+ $(POSTSTAGE1_HOST_EXPORTS) \
2125 CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
2126- LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
2127+ CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS; \
2128 echo Configuring stage b3g2 in $(HOST_SUBDIR)/gcc ; \
2129 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
2130 cd $(HOST_SUBDIR)/gcc || exit 1; \
2131@@ -14225,9 +14363,9 @@
2132 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2133 test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
2134 $(HOST_EXPORTS) \
2135- $(POSTSTAGE1_HOST_EXPORTS) \
2136+ $(POSTSTAGE1_HOST_EXPORTS) \
2137 CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
2138- LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
2139+ CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \
2140 echo Configuring stage 4 in $(HOST_SUBDIR)/gcc ; \
2141 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
2142 cd $(HOST_SUBDIR)/gcc || exit 1; \
2143@@ -14256,9 +14394,9 @@
2144 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2145 test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
2146 $(HOST_EXPORTS) \
2147- $(POSTSTAGE1_HOST_EXPORTS) \
2148+ $(POSTSTAGE1_HOST_EXPORTS) \
2149 CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
2150- LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
2151+ CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \
2152 echo Configuring stage profile in $(HOST_SUBDIR)/gcc ; \
2153 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
2154 cd $(HOST_SUBDIR)/gcc || exit 1; \
2155@@ -14287,9 +14425,9 @@
2156 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2157 test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
2158 $(HOST_EXPORTS) \
2159- $(POSTSTAGE1_HOST_EXPORTS) \
2160+ $(POSTSTAGE1_HOST_EXPORTS) \
2161 CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
2162- LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
2163+ CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \
2164 echo Configuring stage feedback in $(HOST_SUBDIR)/gcc ; \
2165 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
2166 cd $(HOST_SUBDIR)/gcc || exit 1; \
2167@@ -14324,7 +14462,8 @@
2168 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2169 $(HOST_EXPORTS) \
2170 (cd $(HOST_SUBDIR)/gcc && \
2171- $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) $(TARGET-gcc))
2172+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS) \
2173+ $(TARGET-gcc))
2174 @endif gcc
2175
2176
2177@@ -14343,8 +14482,11 @@
2178 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2179 $(HOST_EXPORTS) \
2180 cd $(HOST_SUBDIR)/gcc && \
2181- $(MAKE) $(FLAGS_TO_PASS) \
2182- CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" $(EXTRA_GCC_FLAGS) \
2183+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2184+ CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
2185+ LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
2186+ CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
2187+ CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS) \
2188 $(TARGET-stage1-gcc)
2189
2190 maybe-clean-stage1-gcc: clean-stage1-gcc
2191@@ -14357,7 +14499,7 @@
2192 $(MAKE) stage1-start; \
2193 fi; \
2194 cd $(HOST_SUBDIR)/gcc && \
2195- $(MAKE) $(FLAGS_TO_PASS) \
2196+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2197 $(EXTRA_GCC_FLAGS) clean
2198 @endif gcc-bootstrap
2199
2200@@ -14377,8 +14519,11 @@
2201 $(HOST_EXPORTS) \
2202 $(POSTSTAGE1_HOST_EXPORTS) \
2203 cd $(HOST_SUBDIR)/gcc && \
2204- $(MAKE) $(FLAGS_TO_PASS) \
2205- CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
2206+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2207+ CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
2208+ LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
2209+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
2210+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
2211 $(TARGET-stage2-gcc)
2212
2213 maybe-clean-stage2-gcc: clean-stage2-gcc
2214@@ -14391,7 +14536,7 @@
2215 $(MAKE) stage2-start; \
2216 fi; \
2217 cd $(HOST_SUBDIR)/gcc && \
2218- $(MAKE) $(FLAGS_TO_PASS) \
2219+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2220 $(POSTSTAGE1_FLAGS_TO_PASS) \
2221 $(EXTRA_GCC_FLAGS) clean
2222 @endif gcc-bootstrap
2223@@ -14412,8 +14557,11 @@
2224 $(HOST_EXPORTS) \
2225 $(POSTSTAGE1_HOST_EXPORTS) \
2226 cd $(HOST_SUBDIR)/gcc && \
2227- $(MAKE) $(FLAGS_TO_PASS) \
2228- CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
2229+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2230+ CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
2231+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
2232+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
2233+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
2234 $(TARGET-stageb2g0-gcc)
2235
2236 maybe-clean-stageb2g0-gcc: clean-stageb2g0-gcc
2237@@ -14426,7 +14574,7 @@
2238 $(MAKE) stageb2g0-start; \
2239 fi; \
2240 cd $(HOST_SUBDIR)/gcc && \
2241- $(MAKE) $(FLAGS_TO_PASS) \
2242+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2243 $(POSTSTAGE1_FLAGS_TO_PASS) \
2244 $(EXTRA_GCC_FLAGS) clean
2245 @endif gcc-bootstrap
2246@@ -14447,8 +14595,11 @@
2247 $(HOST_EXPORTS) \
2248 $(POSTSTAGE1_HOST_EXPORTS) \
2249 cd $(HOST_SUBDIR)/gcc && \
2250- $(MAKE) $(FLAGS_TO_PASS) \
2251- CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
2252+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2253+ CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
2254+ LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
2255+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
2256+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
2257 $(TARGET-stage3-gcc)
2258
2259 maybe-clean-stage3-gcc: clean-stage3-gcc
2260@@ -14461,7 +14612,7 @@
2261 $(MAKE) stage3-start; \
2262 fi; \
2263 cd $(HOST_SUBDIR)/gcc && \
2264- $(MAKE) $(FLAGS_TO_PASS) \
2265+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2266 $(POSTSTAGE1_FLAGS_TO_PASS) \
2267 $(EXTRA_GCC_FLAGS) clean
2268 @endif gcc-bootstrap
2269@@ -14482,8 +14633,11 @@
2270 $(HOST_EXPORTS) \
2271 $(POSTSTAGE1_HOST_EXPORTS) \
2272 cd $(HOST_SUBDIR)/gcc && \
2273- $(MAKE) $(FLAGS_TO_PASS) \
2274- CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
2275+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2276+ CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
2277+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
2278+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
2279+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
2280 $(TARGET-stageb3g2-gcc)
2281
2282 maybe-clean-stageb3g2-gcc: clean-stageb3g2-gcc
2283@@ -14496,7 +14650,7 @@
2284 $(MAKE) stageb3g2-start; \
2285 fi; \
2286 cd $(HOST_SUBDIR)/gcc && \
2287- $(MAKE) $(FLAGS_TO_PASS) \
2288+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2289 $(POSTSTAGE1_FLAGS_TO_PASS) \
2290 $(EXTRA_GCC_FLAGS) clean
2291 @endif gcc-bootstrap
2292@@ -14517,8 +14671,11 @@
2293 $(HOST_EXPORTS) \
2294 $(POSTSTAGE1_HOST_EXPORTS) \
2295 cd $(HOST_SUBDIR)/gcc && \
2296- $(MAKE) $(FLAGS_TO_PASS) \
2297- CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
2298+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2299+ CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
2300+ LIBCFLAGS="$(STAGE4_CFLAGS)" \
2301+ CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
2302+ CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
2303 $(TARGET-stage4-gcc)
2304
2305 maybe-clean-stage4-gcc: clean-stage4-gcc
2306@@ -14531,7 +14688,7 @@
2307 $(MAKE) stage4-start; \
2308 fi; \
2309 cd $(HOST_SUBDIR)/gcc && \
2310- $(MAKE) $(FLAGS_TO_PASS) \
2311+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2312 $(POSTSTAGE1_FLAGS_TO_PASS) \
2313 $(EXTRA_GCC_FLAGS) clean
2314 @endif gcc-bootstrap
2315@@ -14552,8 +14709,11 @@
2316 $(HOST_EXPORTS) \
2317 $(POSTSTAGE1_HOST_EXPORTS) \
2318 cd $(HOST_SUBDIR)/gcc && \
2319- $(MAKE) $(FLAGS_TO_PASS) \
2320- CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
2321+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2322+ CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
2323+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
2324+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
2325+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
2326 $(TARGET-stageprofile-gcc)
2327
2328 maybe-clean-stageprofile-gcc: clean-stageprofile-gcc
2329@@ -14566,7 +14726,7 @@
2330 $(MAKE) stageprofile-start; \
2331 fi; \
2332 cd $(HOST_SUBDIR)/gcc && \
2333- $(MAKE) $(FLAGS_TO_PASS) \
2334+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2335 $(POSTSTAGE1_FLAGS_TO_PASS) \
2336 $(EXTRA_GCC_FLAGS) clean
2337 @endif gcc-bootstrap
2338@@ -14587,8 +14747,11 @@
2339 $(HOST_EXPORTS) \
2340 $(POSTSTAGE1_HOST_EXPORTS) \
2341 cd $(HOST_SUBDIR)/gcc && \
2342- $(MAKE) $(FLAGS_TO_PASS) \
2343- CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
2344+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2345+ CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
2346+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
2347+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
2348+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
2349 $(TARGET-stagefeedback-gcc)
2350
2351 maybe-clean-stagefeedback-gcc: clean-stagefeedback-gcc
2352@@ -14601,7 +14764,7 @@
2353 $(MAKE) stagefeedback-start; \
2354 fi; \
2355 cd $(HOST_SUBDIR)/gcc && \
2356- $(MAKE) $(FLAGS_TO_PASS) \
2357+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2358 $(POSTSTAGE1_FLAGS_TO_PASS) \
2359 $(EXTRA_GCC_FLAGS) clean
2360 @endif gcc-bootstrap
2361@@ -15015,7 +15178,8 @@
2362 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2363 $(HOST_EXPORTS) \
2364 (cd $(HOST_SUBDIR)/gawk && \
2365- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-gawk))
2366+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
2367+ $(TARGET-gawk))
2368 @endif gawk
2369
2370
2371@@ -15439,7 +15603,8 @@
2372 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2373 $(HOST_EXPORTS) \
2374 (cd $(HOST_SUBDIR)/gettext && \
2375- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-gettext))
2376+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
2377+ $(TARGET-gettext))
2378 @endif gettext
2379
2380
2381@@ -15856,9 +16021,9 @@
2382 @r=`${PWD_COMMAND}`; export r; \
2383 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2384 test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
2385- $(HOST_EXPORTS) \
2386+ $(HOST_EXPORTS) \
2387 CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
2388- LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
2389+ CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \
2390 echo Configuring stage 1 in $(HOST_SUBDIR)/gmp ; \
2391 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
2392 cd $(HOST_SUBDIR)/gmp || exit 1; \
2393@@ -15887,9 +16052,9 @@
2394 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2395 test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
2396 $(HOST_EXPORTS) \
2397- $(POSTSTAGE1_HOST_EXPORTS) \
2398+ $(POSTSTAGE1_HOST_EXPORTS) \
2399 CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
2400- LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
2401+ CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \
2402 echo Configuring stage 2 in $(HOST_SUBDIR)/gmp ; \
2403 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
2404 cd $(HOST_SUBDIR)/gmp || exit 1; \
2405@@ -15918,9 +16083,9 @@
2406 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2407 test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
2408 $(HOST_EXPORTS) \
2409- $(POSTSTAGE1_HOST_EXPORTS) \
2410+ $(POSTSTAGE1_HOST_EXPORTS) \
2411 CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
2412- LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
2413+ CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS; \
2414 echo Configuring stage b2g0 in $(HOST_SUBDIR)/gmp ; \
2415 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
2416 cd $(HOST_SUBDIR)/gmp || exit 1; \
2417@@ -15949,9 +16114,9 @@
2418 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2419 test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
2420 $(HOST_EXPORTS) \
2421- $(POSTSTAGE1_HOST_EXPORTS) \
2422+ $(POSTSTAGE1_HOST_EXPORTS) \
2423 CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
2424- LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
2425+ CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \
2426 echo Configuring stage 3 in $(HOST_SUBDIR)/gmp ; \
2427 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
2428 cd $(HOST_SUBDIR)/gmp || exit 1; \
2429@@ -15980,9 +16145,9 @@
2430 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2431 test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
2432 $(HOST_EXPORTS) \
2433- $(POSTSTAGE1_HOST_EXPORTS) \
2434+ $(POSTSTAGE1_HOST_EXPORTS) \
2435 CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
2436- LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
2437+ CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS; \
2438 echo Configuring stage b3g2 in $(HOST_SUBDIR)/gmp ; \
2439 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
2440 cd $(HOST_SUBDIR)/gmp || exit 1; \
2441@@ -16011,9 +16176,9 @@
2442 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2443 test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
2444 $(HOST_EXPORTS) \
2445- $(POSTSTAGE1_HOST_EXPORTS) \
2446+ $(POSTSTAGE1_HOST_EXPORTS) \
2447 CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
2448- LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
2449+ CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \
2450 echo Configuring stage 4 in $(HOST_SUBDIR)/gmp ; \
2451 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
2452 cd $(HOST_SUBDIR)/gmp || exit 1; \
2453@@ -16042,9 +16207,9 @@
2454 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2455 test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
2456 $(HOST_EXPORTS) \
2457- $(POSTSTAGE1_HOST_EXPORTS) \
2458+ $(POSTSTAGE1_HOST_EXPORTS) \
2459 CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
2460- LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
2461+ CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \
2462 echo Configuring stage profile in $(HOST_SUBDIR)/gmp ; \
2463 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
2464 cd $(HOST_SUBDIR)/gmp || exit 1; \
2465@@ -16073,9 +16238,9 @@
2466 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2467 test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
2468 $(HOST_EXPORTS) \
2469- $(POSTSTAGE1_HOST_EXPORTS) \
2470+ $(POSTSTAGE1_HOST_EXPORTS) \
2471 CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
2472- LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
2473+ CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \
2474 echo Configuring stage feedback in $(HOST_SUBDIR)/gmp ; \
2475 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
2476 cd $(HOST_SUBDIR)/gmp || exit 1; \
2477@@ -16110,7 +16275,8 @@
2478 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2479 $(HOST_EXPORTS) \
2480 (cd $(HOST_SUBDIR)/gmp && \
2481- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-gmp))
2482+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
2483+ $(TARGET-gmp))
2484 @endif gmp
2485
2486
2487@@ -16129,8 +16295,11 @@
2488 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2489 $(HOST_EXPORTS) \
2490 cd $(HOST_SUBDIR)/gmp && \
2491- $(MAKE) $(FLAGS_TO_PASS) \
2492- CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \
2493+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2494+ CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
2495+ LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
2496+ CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
2497+ CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \
2498 $(TARGET-stage1-gmp)
2499
2500 maybe-clean-stage1-gmp: clean-stage1-gmp
2501@@ -16143,7 +16312,7 @@
2502 $(MAKE) stage1-start; \
2503 fi; \
2504 cd $(HOST_SUBDIR)/gmp && \
2505- $(MAKE) $(FLAGS_TO_PASS) \
2506+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2507 clean
2508 @endif gmp-bootstrap
2509
2510@@ -16163,8 +16332,11 @@
2511 $(HOST_EXPORTS) \
2512 $(POSTSTAGE1_HOST_EXPORTS) \
2513 cd $(HOST_SUBDIR)/gmp && \
2514- $(MAKE) $(FLAGS_TO_PASS) \
2515- CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
2516+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2517+ CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
2518+ LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
2519+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
2520+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
2521 $(TARGET-stage2-gmp)
2522
2523 maybe-clean-stage2-gmp: clean-stage2-gmp
2524@@ -16177,7 +16349,7 @@
2525 $(MAKE) stage2-start; \
2526 fi; \
2527 cd $(HOST_SUBDIR)/gmp && \
2528- $(MAKE) $(FLAGS_TO_PASS) \
2529+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2530 $(POSTSTAGE1_FLAGS_TO_PASS) \
2531 clean
2532 @endif gmp-bootstrap
2533@@ -16198,8 +16370,11 @@
2534 $(HOST_EXPORTS) \
2535 $(POSTSTAGE1_HOST_EXPORTS) \
2536 cd $(HOST_SUBDIR)/gmp && \
2537- $(MAKE) $(FLAGS_TO_PASS) \
2538- CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS) \
2539+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2540+ CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
2541+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
2542+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
2543+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
2544 $(TARGET-stageb2g0-gmp)
2545
2546 maybe-clean-stageb2g0-gmp: clean-stageb2g0-gmp
2547@@ -16212,7 +16387,7 @@
2548 $(MAKE) stageb2g0-start; \
2549 fi; \
2550 cd $(HOST_SUBDIR)/gmp && \
2551- $(MAKE) $(FLAGS_TO_PASS) \
2552+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2553 $(POSTSTAGE1_FLAGS_TO_PASS) \
2554 clean
2555 @endif gmp-bootstrap
2556@@ -16233,8 +16408,11 @@
2557 $(HOST_EXPORTS) \
2558 $(POSTSTAGE1_HOST_EXPORTS) \
2559 cd $(HOST_SUBDIR)/gmp && \
2560- $(MAKE) $(FLAGS_TO_PASS) \
2561- CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
2562+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2563+ CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
2564+ LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
2565+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
2566+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
2567 $(TARGET-stage3-gmp)
2568
2569 maybe-clean-stage3-gmp: clean-stage3-gmp
2570@@ -16247,7 +16425,7 @@
2571 $(MAKE) stage3-start; \
2572 fi; \
2573 cd $(HOST_SUBDIR)/gmp && \
2574- $(MAKE) $(FLAGS_TO_PASS) \
2575+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2576 $(POSTSTAGE1_FLAGS_TO_PASS) \
2577 clean
2578 @endif gmp-bootstrap
2579@@ -16268,8 +16446,11 @@
2580 $(HOST_EXPORTS) \
2581 $(POSTSTAGE1_HOST_EXPORTS) \
2582 cd $(HOST_SUBDIR)/gmp && \
2583- $(MAKE) $(FLAGS_TO_PASS) \
2584- CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS) \
2585+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2586+ CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
2587+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
2588+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
2589+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
2590 $(TARGET-stageb3g2-gmp)
2591
2592 maybe-clean-stageb3g2-gmp: clean-stageb3g2-gmp
2593@@ -16282,7 +16463,7 @@
2594 $(MAKE) stageb3g2-start; \
2595 fi; \
2596 cd $(HOST_SUBDIR)/gmp && \
2597- $(MAKE) $(FLAGS_TO_PASS) \
2598+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2599 $(POSTSTAGE1_FLAGS_TO_PASS) \
2600 clean
2601 @endif gmp-bootstrap
2602@@ -16303,8 +16484,11 @@
2603 $(HOST_EXPORTS) \
2604 $(POSTSTAGE1_HOST_EXPORTS) \
2605 cd $(HOST_SUBDIR)/gmp && \
2606- $(MAKE) $(FLAGS_TO_PASS) \
2607- CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
2608+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2609+ CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
2610+ LIBCFLAGS="$(STAGE4_CFLAGS)" \
2611+ CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
2612+ CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
2613 $(TARGET-stage4-gmp)
2614
2615 maybe-clean-stage4-gmp: clean-stage4-gmp
2616@@ -16317,7 +16501,7 @@
2617 $(MAKE) stage4-start; \
2618 fi; \
2619 cd $(HOST_SUBDIR)/gmp && \
2620- $(MAKE) $(FLAGS_TO_PASS) \
2621+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2622 $(POSTSTAGE1_FLAGS_TO_PASS) \
2623 clean
2624 @endif gmp-bootstrap
2625@@ -16338,8 +16522,11 @@
2626 $(HOST_EXPORTS) \
2627 $(POSTSTAGE1_HOST_EXPORTS) \
2628 cd $(HOST_SUBDIR)/gmp && \
2629- $(MAKE) $(FLAGS_TO_PASS) \
2630- CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS) \
2631+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2632+ CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
2633+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
2634+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
2635+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
2636 $(TARGET-stageprofile-gmp)
2637
2638 maybe-clean-stageprofile-gmp: clean-stageprofile-gmp
2639@@ -16352,7 +16539,7 @@
2640 $(MAKE) stageprofile-start; \
2641 fi; \
2642 cd $(HOST_SUBDIR)/gmp && \
2643- $(MAKE) $(FLAGS_TO_PASS) \
2644+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2645 $(POSTSTAGE1_FLAGS_TO_PASS) \
2646 clean
2647 @endif gmp-bootstrap
2648@@ -16373,8 +16560,11 @@
2649 $(HOST_EXPORTS) \
2650 $(POSTSTAGE1_HOST_EXPORTS) \
2651 cd $(HOST_SUBDIR)/gmp && \
2652- $(MAKE) $(FLAGS_TO_PASS) \
2653- CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS) \
2654+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2655+ CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
2656+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
2657+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
2658+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
2659 $(TARGET-stagefeedback-gmp)
2660
2661 maybe-clean-stagefeedback-gmp: clean-stagefeedback-gmp
2662@@ -16387,7 +16577,7 @@
2663 $(MAKE) stagefeedback-start; \
2664 fi; \
2665 cd $(HOST_SUBDIR)/gmp && \
2666- $(MAKE) $(FLAGS_TO_PASS) \
2667+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2668 $(POSTSTAGE1_FLAGS_TO_PASS) \
2669 clean
2670 @endif gmp-bootstrap
2671@@ -16788,9 +16978,9 @@
2672 @r=`${PWD_COMMAND}`; export r; \
2673 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2674 test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
2675- $(HOST_EXPORTS) \
2676+ $(HOST_EXPORTS) \
2677 CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
2678- LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
2679+ CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \
2680 echo Configuring stage 1 in $(HOST_SUBDIR)/mpfr ; \
2681 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
2682 cd $(HOST_SUBDIR)/mpfr || exit 1; \
2683@@ -16819,9 +17009,9 @@
2684 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2685 test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
2686 $(HOST_EXPORTS) \
2687- $(POSTSTAGE1_HOST_EXPORTS) \
2688+ $(POSTSTAGE1_HOST_EXPORTS) \
2689 CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
2690- LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
2691+ CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \
2692 echo Configuring stage 2 in $(HOST_SUBDIR)/mpfr ; \
2693 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
2694 cd $(HOST_SUBDIR)/mpfr || exit 1; \
2695@@ -16850,9 +17040,9 @@
2696 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2697 test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
2698 $(HOST_EXPORTS) \
2699- $(POSTSTAGE1_HOST_EXPORTS) \
2700+ $(POSTSTAGE1_HOST_EXPORTS) \
2701 CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
2702- LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
2703+ CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS; \
2704 echo Configuring stage b2g0 in $(HOST_SUBDIR)/mpfr ; \
2705 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
2706 cd $(HOST_SUBDIR)/mpfr || exit 1; \
2707@@ -16881,9 +17071,9 @@
2708 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2709 test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
2710 $(HOST_EXPORTS) \
2711- $(POSTSTAGE1_HOST_EXPORTS) \
2712+ $(POSTSTAGE1_HOST_EXPORTS) \
2713 CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
2714- LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
2715+ CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \
2716 echo Configuring stage 3 in $(HOST_SUBDIR)/mpfr ; \
2717 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
2718 cd $(HOST_SUBDIR)/mpfr || exit 1; \
2719@@ -16912,9 +17102,9 @@
2720 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2721 test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
2722 $(HOST_EXPORTS) \
2723- $(POSTSTAGE1_HOST_EXPORTS) \
2724+ $(POSTSTAGE1_HOST_EXPORTS) \
2725 CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
2726- LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
2727+ CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS; \
2728 echo Configuring stage b3g2 in $(HOST_SUBDIR)/mpfr ; \
2729 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
2730 cd $(HOST_SUBDIR)/mpfr || exit 1; \
2731@@ -16943,9 +17133,9 @@
2732 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2733 test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
2734 $(HOST_EXPORTS) \
2735- $(POSTSTAGE1_HOST_EXPORTS) \
2736+ $(POSTSTAGE1_HOST_EXPORTS) \
2737 CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
2738- LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
2739+ CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \
2740 echo Configuring stage 4 in $(HOST_SUBDIR)/mpfr ; \
2741 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
2742 cd $(HOST_SUBDIR)/mpfr || exit 1; \
2743@@ -16974,9 +17164,9 @@
2744 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2745 test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
2746 $(HOST_EXPORTS) \
2747- $(POSTSTAGE1_HOST_EXPORTS) \
2748+ $(POSTSTAGE1_HOST_EXPORTS) \
2749 CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
2750- LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
2751+ CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \
2752 echo Configuring stage profile in $(HOST_SUBDIR)/mpfr ; \
2753 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
2754 cd $(HOST_SUBDIR)/mpfr || exit 1; \
2755@@ -17005,9 +17195,9 @@
2756 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2757 test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
2758 $(HOST_EXPORTS) \
2759- $(POSTSTAGE1_HOST_EXPORTS) \
2760+ $(POSTSTAGE1_HOST_EXPORTS) \
2761 CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
2762- LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
2763+ CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \
2764 echo Configuring stage feedback in $(HOST_SUBDIR)/mpfr ; \
2765 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
2766 cd $(HOST_SUBDIR)/mpfr || exit 1; \
2767@@ -17042,7 +17232,8 @@
2768 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2769 $(HOST_EXPORTS) \
2770 (cd $(HOST_SUBDIR)/mpfr && \
2771- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-mpfr))
2772+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
2773+ $(TARGET-mpfr))
2774 @endif mpfr
2775
2776
2777@@ -17061,8 +17252,11 @@
2778 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2779 $(HOST_EXPORTS) \
2780 cd $(HOST_SUBDIR)/mpfr && \
2781- $(MAKE) $(FLAGS_TO_PASS) \
2782- CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \
2783+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2784+ CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
2785+ LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
2786+ CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
2787+ CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \
2788 $(TARGET-stage1-mpfr)
2789
2790 maybe-clean-stage1-mpfr: clean-stage1-mpfr
2791@@ -17075,7 +17269,7 @@
2792 $(MAKE) stage1-start; \
2793 fi; \
2794 cd $(HOST_SUBDIR)/mpfr && \
2795- $(MAKE) $(FLAGS_TO_PASS) \
2796+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2797 clean
2798 @endif mpfr-bootstrap
2799
2800@@ -17095,8 +17289,11 @@
2801 $(HOST_EXPORTS) \
2802 $(POSTSTAGE1_HOST_EXPORTS) \
2803 cd $(HOST_SUBDIR)/mpfr && \
2804- $(MAKE) $(FLAGS_TO_PASS) \
2805- CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
2806+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2807+ CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
2808+ LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
2809+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
2810+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
2811 $(TARGET-stage2-mpfr)
2812
2813 maybe-clean-stage2-mpfr: clean-stage2-mpfr
2814@@ -17109,7 +17306,7 @@
2815 $(MAKE) stage2-start; \
2816 fi; \
2817 cd $(HOST_SUBDIR)/mpfr && \
2818- $(MAKE) $(FLAGS_TO_PASS) \
2819+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2820 $(POSTSTAGE1_FLAGS_TO_PASS) \
2821 clean
2822 @endif mpfr-bootstrap
2823@@ -17130,8 +17327,11 @@
2824 $(HOST_EXPORTS) \
2825 $(POSTSTAGE1_HOST_EXPORTS) \
2826 cd $(HOST_SUBDIR)/mpfr && \
2827- $(MAKE) $(FLAGS_TO_PASS) \
2828- CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS) \
2829+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2830+ CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
2831+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
2832+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
2833+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
2834 $(TARGET-stageb2g0-mpfr)
2835
2836 maybe-clean-stageb2g0-mpfr: clean-stageb2g0-mpfr
2837@@ -17144,7 +17344,7 @@
2838 $(MAKE) stageb2g0-start; \
2839 fi; \
2840 cd $(HOST_SUBDIR)/mpfr && \
2841- $(MAKE) $(FLAGS_TO_PASS) \
2842+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2843 $(POSTSTAGE1_FLAGS_TO_PASS) \
2844 clean
2845 @endif mpfr-bootstrap
2846@@ -17165,8 +17365,11 @@
2847 $(HOST_EXPORTS) \
2848 $(POSTSTAGE1_HOST_EXPORTS) \
2849 cd $(HOST_SUBDIR)/mpfr && \
2850- $(MAKE) $(FLAGS_TO_PASS) \
2851- CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
2852+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2853+ CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
2854+ LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
2855+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
2856+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
2857 $(TARGET-stage3-mpfr)
2858
2859 maybe-clean-stage3-mpfr: clean-stage3-mpfr
2860@@ -17179,7 +17382,7 @@
2861 $(MAKE) stage3-start; \
2862 fi; \
2863 cd $(HOST_SUBDIR)/mpfr && \
2864- $(MAKE) $(FLAGS_TO_PASS) \
2865+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2866 $(POSTSTAGE1_FLAGS_TO_PASS) \
2867 clean
2868 @endif mpfr-bootstrap
2869@@ -17200,8 +17403,11 @@
2870 $(HOST_EXPORTS) \
2871 $(POSTSTAGE1_HOST_EXPORTS) \
2872 cd $(HOST_SUBDIR)/mpfr && \
2873- $(MAKE) $(FLAGS_TO_PASS) \
2874- CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS) \
2875+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2876+ CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
2877+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
2878+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
2879+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
2880 $(TARGET-stageb3g2-mpfr)
2881
2882 maybe-clean-stageb3g2-mpfr: clean-stageb3g2-mpfr
2883@@ -17214,7 +17420,7 @@
2884 $(MAKE) stageb3g2-start; \
2885 fi; \
2886 cd $(HOST_SUBDIR)/mpfr && \
2887- $(MAKE) $(FLAGS_TO_PASS) \
2888+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2889 $(POSTSTAGE1_FLAGS_TO_PASS) \
2890 clean
2891 @endif mpfr-bootstrap
2892@@ -17235,8 +17441,11 @@
2893 $(HOST_EXPORTS) \
2894 $(POSTSTAGE1_HOST_EXPORTS) \
2895 cd $(HOST_SUBDIR)/mpfr && \
2896- $(MAKE) $(FLAGS_TO_PASS) \
2897- CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
2898+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2899+ CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
2900+ LIBCFLAGS="$(STAGE4_CFLAGS)" \
2901+ CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
2902+ CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
2903 $(TARGET-stage4-mpfr)
2904
2905 maybe-clean-stage4-mpfr: clean-stage4-mpfr
2906@@ -17249,7 +17458,7 @@
2907 $(MAKE) stage4-start; \
2908 fi; \
2909 cd $(HOST_SUBDIR)/mpfr && \
2910- $(MAKE) $(FLAGS_TO_PASS) \
2911+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2912 $(POSTSTAGE1_FLAGS_TO_PASS) \
2913 clean
2914 @endif mpfr-bootstrap
2915@@ -17270,8 +17479,11 @@
2916 $(HOST_EXPORTS) \
2917 $(POSTSTAGE1_HOST_EXPORTS) \
2918 cd $(HOST_SUBDIR)/mpfr && \
2919- $(MAKE) $(FLAGS_TO_PASS) \
2920- CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS) \
2921+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2922+ CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
2923+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
2924+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
2925+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
2926 $(TARGET-stageprofile-mpfr)
2927
2928 maybe-clean-stageprofile-mpfr: clean-stageprofile-mpfr
2929@@ -17284,7 +17496,7 @@
2930 $(MAKE) stageprofile-start; \
2931 fi; \
2932 cd $(HOST_SUBDIR)/mpfr && \
2933- $(MAKE) $(FLAGS_TO_PASS) \
2934+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2935 $(POSTSTAGE1_FLAGS_TO_PASS) \
2936 clean
2937 @endif mpfr-bootstrap
2938@@ -17305,8 +17517,11 @@
2939 $(HOST_EXPORTS) \
2940 $(POSTSTAGE1_HOST_EXPORTS) \
2941 cd $(HOST_SUBDIR)/mpfr && \
2942- $(MAKE) $(FLAGS_TO_PASS) \
2943- CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS) \
2944+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
2945+ CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
2946+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
2947+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
2948+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
2949 $(TARGET-stagefeedback-mpfr)
2950
2951 maybe-clean-stagefeedback-mpfr: clean-stagefeedback-mpfr
2952@@ -17319,7 +17534,7 @@
2953 $(MAKE) stagefeedback-start; \
2954 fi; \
2955 cd $(HOST_SUBDIR)/mpfr && \
2956- $(MAKE) $(FLAGS_TO_PASS) \
2957+ $(MAKE) $(EXTRA_HOST_FLAGS) \
2958 $(POSTSTAGE1_FLAGS_TO_PASS) \
2959 clean
2960 @endif mpfr-bootstrap
2961@@ -17727,7 +17942,8 @@
2962 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2963 $(HOST_EXPORTS) \
2964 (cd $(HOST_SUBDIR)/gnuserv && \
2965- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-gnuserv))
2966+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
2967+ $(TARGET-gnuserv))
2968 @endif gnuserv
2969
2970
2971@@ -18151,7 +18367,8 @@
2972 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2973 $(HOST_EXPORTS) \
2974 (cd $(HOST_SUBDIR)/gprof && \
2975- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-gprof))
2976+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
2977+ $(TARGET-gprof))
2978 @endif gprof
2979
2980
2981@@ -18575,7 +18792,8 @@
2982 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2983 $(HOST_EXPORTS) \
2984 (cd $(HOST_SUBDIR)/gzip && \
2985- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-gzip))
2986+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
2987+ $(TARGET-gzip))
2988 @endif gzip
2989
2990
2991@@ -18999,7 +19217,8 @@
2992 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
2993 $(HOST_EXPORTS) \
2994 (cd $(HOST_SUBDIR)/hello && \
2995- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-hello))
2996+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
2997+ $(TARGET-hello))
2998 @endif hello
2999
3000
3001@@ -19423,7 +19642,8 @@
3002 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3003 $(HOST_EXPORTS) \
3004 (cd $(HOST_SUBDIR)/indent && \
3005- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-indent))
3006+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
3007+ $(TARGET-indent))
3008 @endif indent
3009
3010
3011@@ -19840,9 +20060,9 @@
3012 @r=`${PWD_COMMAND}`; export r; \
3013 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3014 test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
3015- $(HOST_EXPORTS) \
3016+ $(HOST_EXPORTS) \
3017 CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
3018- LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
3019+ CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \
3020 echo Configuring stage 1 in $(HOST_SUBDIR)/intl ; \
3021 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
3022 cd $(HOST_SUBDIR)/intl || exit 1; \
3023@@ -19871,9 +20091,9 @@
3024 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3025 test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
3026 $(HOST_EXPORTS) \
3027- $(POSTSTAGE1_HOST_EXPORTS) \
3028+ $(POSTSTAGE1_HOST_EXPORTS) \
3029 CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
3030- LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
3031+ CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \
3032 echo Configuring stage 2 in $(HOST_SUBDIR)/intl ; \
3033 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
3034 cd $(HOST_SUBDIR)/intl || exit 1; \
3035@@ -19902,9 +20122,9 @@
3036 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3037 test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
3038 $(HOST_EXPORTS) \
3039- $(POSTSTAGE1_HOST_EXPORTS) \
3040+ $(POSTSTAGE1_HOST_EXPORTS) \
3041 CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
3042- LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
3043+ CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS; \
3044 echo Configuring stage b2g0 in $(HOST_SUBDIR)/intl ; \
3045 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
3046 cd $(HOST_SUBDIR)/intl || exit 1; \
3047@@ -19933,9 +20153,9 @@
3048 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3049 test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
3050 $(HOST_EXPORTS) \
3051- $(POSTSTAGE1_HOST_EXPORTS) \
3052+ $(POSTSTAGE1_HOST_EXPORTS) \
3053 CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
3054- LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
3055+ CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \
3056 echo Configuring stage 3 in $(HOST_SUBDIR)/intl ; \
3057 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
3058 cd $(HOST_SUBDIR)/intl || exit 1; \
3059@@ -19964,9 +20184,9 @@
3060 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3061 test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
3062 $(HOST_EXPORTS) \
3063- $(POSTSTAGE1_HOST_EXPORTS) \
3064+ $(POSTSTAGE1_HOST_EXPORTS) \
3065 CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
3066- LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
3067+ CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS; \
3068 echo Configuring stage b3g2 in $(HOST_SUBDIR)/intl ; \
3069 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
3070 cd $(HOST_SUBDIR)/intl || exit 1; \
3071@@ -19995,9 +20215,9 @@
3072 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3073 test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
3074 $(HOST_EXPORTS) \
3075- $(POSTSTAGE1_HOST_EXPORTS) \
3076+ $(POSTSTAGE1_HOST_EXPORTS) \
3077 CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
3078- LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
3079+ CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \
3080 echo Configuring stage 4 in $(HOST_SUBDIR)/intl ; \
3081 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
3082 cd $(HOST_SUBDIR)/intl || exit 1; \
3083@@ -20026,9 +20246,9 @@
3084 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3085 test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
3086 $(HOST_EXPORTS) \
3087- $(POSTSTAGE1_HOST_EXPORTS) \
3088+ $(POSTSTAGE1_HOST_EXPORTS) \
3089 CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
3090- LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
3091+ CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \
3092 echo Configuring stage profile in $(HOST_SUBDIR)/intl ; \
3093 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
3094 cd $(HOST_SUBDIR)/intl || exit 1; \
3095@@ -20057,9 +20277,9 @@
3096 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3097 test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
3098 $(HOST_EXPORTS) \
3099- $(POSTSTAGE1_HOST_EXPORTS) \
3100+ $(POSTSTAGE1_HOST_EXPORTS) \
3101 CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
3102- LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
3103+ CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \
3104 echo Configuring stage feedback in $(HOST_SUBDIR)/intl ; \
3105 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
3106 cd $(HOST_SUBDIR)/intl || exit 1; \
3107@@ -20094,7 +20314,8 @@
3108 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3109 $(HOST_EXPORTS) \
3110 (cd $(HOST_SUBDIR)/intl && \
3111- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-intl))
3112+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
3113+ $(TARGET-intl))
3114 @endif intl
3115
3116
3117@@ -20113,8 +20334,11 @@
3118 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3119 $(HOST_EXPORTS) \
3120 cd $(HOST_SUBDIR)/intl && \
3121- $(MAKE) $(FLAGS_TO_PASS) \
3122- CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \
3123+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3124+ CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
3125+ LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
3126+ CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
3127+ CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \
3128 $(TARGET-stage1-intl)
3129
3130 maybe-clean-stage1-intl: clean-stage1-intl
3131@@ -20127,7 +20351,7 @@
3132 $(MAKE) stage1-start; \
3133 fi; \
3134 cd $(HOST_SUBDIR)/intl && \
3135- $(MAKE) $(FLAGS_TO_PASS) \
3136+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3137 clean
3138 @endif intl-bootstrap
3139
3140@@ -20147,8 +20371,11 @@
3141 $(HOST_EXPORTS) \
3142 $(POSTSTAGE1_HOST_EXPORTS) \
3143 cd $(HOST_SUBDIR)/intl && \
3144- $(MAKE) $(FLAGS_TO_PASS) \
3145- CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
3146+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3147+ CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
3148+ LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
3149+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
3150+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3151 $(TARGET-stage2-intl)
3152
3153 maybe-clean-stage2-intl: clean-stage2-intl
3154@@ -20161,7 +20388,7 @@
3155 $(MAKE) stage2-start; \
3156 fi; \
3157 cd $(HOST_SUBDIR)/intl && \
3158- $(MAKE) $(FLAGS_TO_PASS) \
3159+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3160 $(POSTSTAGE1_FLAGS_TO_PASS) \
3161 clean
3162 @endif intl-bootstrap
3163@@ -20182,8 +20409,11 @@
3164 $(HOST_EXPORTS) \
3165 $(POSTSTAGE1_HOST_EXPORTS) \
3166 cd $(HOST_SUBDIR)/intl && \
3167- $(MAKE) $(FLAGS_TO_PASS) \
3168- CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS) \
3169+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3170+ CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
3171+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
3172+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
3173+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3174 $(TARGET-stageb2g0-intl)
3175
3176 maybe-clean-stageb2g0-intl: clean-stageb2g0-intl
3177@@ -20196,7 +20426,7 @@
3178 $(MAKE) stageb2g0-start; \
3179 fi; \
3180 cd $(HOST_SUBDIR)/intl && \
3181- $(MAKE) $(FLAGS_TO_PASS) \
3182+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3183 $(POSTSTAGE1_FLAGS_TO_PASS) \
3184 clean
3185 @endif intl-bootstrap
3186@@ -20217,8 +20447,11 @@
3187 $(HOST_EXPORTS) \
3188 $(POSTSTAGE1_HOST_EXPORTS) \
3189 cd $(HOST_SUBDIR)/intl && \
3190- $(MAKE) $(FLAGS_TO_PASS) \
3191- CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
3192+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3193+ CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
3194+ LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
3195+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
3196+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3197 $(TARGET-stage3-intl)
3198
3199 maybe-clean-stage3-intl: clean-stage3-intl
3200@@ -20231,7 +20464,7 @@
3201 $(MAKE) stage3-start; \
3202 fi; \
3203 cd $(HOST_SUBDIR)/intl && \
3204- $(MAKE) $(FLAGS_TO_PASS) \
3205+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3206 $(POSTSTAGE1_FLAGS_TO_PASS) \
3207 clean
3208 @endif intl-bootstrap
3209@@ -20252,8 +20485,11 @@
3210 $(HOST_EXPORTS) \
3211 $(POSTSTAGE1_HOST_EXPORTS) \
3212 cd $(HOST_SUBDIR)/intl && \
3213- $(MAKE) $(FLAGS_TO_PASS) \
3214- CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS) \
3215+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3216+ CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
3217+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
3218+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
3219+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3220 $(TARGET-stageb3g2-intl)
3221
3222 maybe-clean-stageb3g2-intl: clean-stageb3g2-intl
3223@@ -20266,7 +20502,7 @@
3224 $(MAKE) stageb3g2-start; \
3225 fi; \
3226 cd $(HOST_SUBDIR)/intl && \
3227- $(MAKE) $(FLAGS_TO_PASS) \
3228+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3229 $(POSTSTAGE1_FLAGS_TO_PASS) \
3230 clean
3231 @endif intl-bootstrap
3232@@ -20287,8 +20523,11 @@
3233 $(HOST_EXPORTS) \
3234 $(POSTSTAGE1_HOST_EXPORTS) \
3235 cd $(HOST_SUBDIR)/intl && \
3236- $(MAKE) $(FLAGS_TO_PASS) \
3237- CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
3238+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3239+ CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
3240+ LIBCFLAGS="$(STAGE4_CFLAGS)" \
3241+ CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
3242+ CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3243 $(TARGET-stage4-intl)
3244
3245 maybe-clean-stage4-intl: clean-stage4-intl
3246@@ -20301,7 +20540,7 @@
3247 $(MAKE) stage4-start; \
3248 fi; \
3249 cd $(HOST_SUBDIR)/intl && \
3250- $(MAKE) $(FLAGS_TO_PASS) \
3251+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3252 $(POSTSTAGE1_FLAGS_TO_PASS) \
3253 clean
3254 @endif intl-bootstrap
3255@@ -20322,8 +20561,11 @@
3256 $(HOST_EXPORTS) \
3257 $(POSTSTAGE1_HOST_EXPORTS) \
3258 cd $(HOST_SUBDIR)/intl && \
3259- $(MAKE) $(FLAGS_TO_PASS) \
3260- CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS) \
3261+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3262+ CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
3263+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
3264+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
3265+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3266 $(TARGET-stageprofile-intl)
3267
3268 maybe-clean-stageprofile-intl: clean-stageprofile-intl
3269@@ -20336,7 +20578,7 @@
3270 $(MAKE) stageprofile-start; \
3271 fi; \
3272 cd $(HOST_SUBDIR)/intl && \
3273- $(MAKE) $(FLAGS_TO_PASS) \
3274+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3275 $(POSTSTAGE1_FLAGS_TO_PASS) \
3276 clean
3277 @endif intl-bootstrap
3278@@ -20357,8 +20599,11 @@
3279 $(HOST_EXPORTS) \
3280 $(POSTSTAGE1_HOST_EXPORTS) \
3281 cd $(HOST_SUBDIR)/intl && \
3282- $(MAKE) $(FLAGS_TO_PASS) \
3283- CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS) \
3284+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3285+ CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
3286+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
3287+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
3288+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3289 $(TARGET-stagefeedback-intl)
3290
3291 maybe-clean-stagefeedback-intl: clean-stagefeedback-intl
3292@@ -20371,7 +20616,7 @@
3293 $(MAKE) stagefeedback-start; \
3294 fi; \
3295 cd $(HOST_SUBDIR)/intl && \
3296- $(MAKE) $(FLAGS_TO_PASS) \
3297+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3298 $(POSTSTAGE1_FLAGS_TO_PASS) \
3299 clean
3300 @endif intl-bootstrap
3301@@ -20785,7 +21030,8 @@
3302 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3303 $(HOST_EXPORTS) \
3304 (cd $(HOST_SUBDIR)/tcl && \
3305- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-tcl))
3306+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
3307+ $(TARGET-tcl))
3308 @endif tcl
3309
3310
3311@@ -21194,7 +21440,8 @@
3312 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3313 $(HOST_EXPORTS) \
3314 (cd $(HOST_SUBDIR)/itcl && \
3315- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-itcl))
3316+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
3317+ $(TARGET-itcl))
3318 @endif itcl
3319
3320
3321@@ -21611,9 +21858,9 @@
3322 @r=`${PWD_COMMAND}`; export r; \
3323 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3324 test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
3325- $(HOST_EXPORTS) \
3326+ $(HOST_EXPORTS) \
3327 CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
3328- LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
3329+ CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \
3330 echo Configuring stage 1 in $(HOST_SUBDIR)/ld ; \
3331 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
3332 cd $(HOST_SUBDIR)/ld || exit 1; \
3333@@ -21642,9 +21889,9 @@
3334 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3335 test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
3336 $(HOST_EXPORTS) \
3337- $(POSTSTAGE1_HOST_EXPORTS) \
3338+ $(POSTSTAGE1_HOST_EXPORTS) \
3339 CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
3340- LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
3341+ CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \
3342 echo Configuring stage 2 in $(HOST_SUBDIR)/ld ; \
3343 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
3344 cd $(HOST_SUBDIR)/ld || exit 1; \
3345@@ -21673,9 +21920,9 @@
3346 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3347 test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
3348 $(HOST_EXPORTS) \
3349- $(POSTSTAGE1_HOST_EXPORTS) \
3350+ $(POSTSTAGE1_HOST_EXPORTS) \
3351 CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
3352- LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
3353+ CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS; \
3354 echo Configuring stage b2g0 in $(HOST_SUBDIR)/ld ; \
3355 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
3356 cd $(HOST_SUBDIR)/ld || exit 1; \
3357@@ -21704,9 +21951,9 @@
3358 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3359 test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
3360 $(HOST_EXPORTS) \
3361- $(POSTSTAGE1_HOST_EXPORTS) \
3362+ $(POSTSTAGE1_HOST_EXPORTS) \
3363 CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
3364- LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
3365+ CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \
3366 echo Configuring stage 3 in $(HOST_SUBDIR)/ld ; \
3367 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
3368 cd $(HOST_SUBDIR)/ld || exit 1; \
3369@@ -21735,9 +21982,9 @@
3370 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3371 test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
3372 $(HOST_EXPORTS) \
3373- $(POSTSTAGE1_HOST_EXPORTS) \
3374+ $(POSTSTAGE1_HOST_EXPORTS) \
3375 CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
3376- LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
3377+ CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS; \
3378 echo Configuring stage b3g2 in $(HOST_SUBDIR)/ld ; \
3379 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
3380 cd $(HOST_SUBDIR)/ld || exit 1; \
3381@@ -21766,9 +22013,9 @@
3382 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3383 test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
3384 $(HOST_EXPORTS) \
3385- $(POSTSTAGE1_HOST_EXPORTS) \
3386+ $(POSTSTAGE1_HOST_EXPORTS) \
3387 CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
3388- LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
3389+ CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \
3390 echo Configuring stage 4 in $(HOST_SUBDIR)/ld ; \
3391 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
3392 cd $(HOST_SUBDIR)/ld || exit 1; \
3393@@ -21797,9 +22044,9 @@
3394 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3395 test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
3396 $(HOST_EXPORTS) \
3397- $(POSTSTAGE1_HOST_EXPORTS) \
3398+ $(POSTSTAGE1_HOST_EXPORTS) \
3399 CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
3400- LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
3401+ CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \
3402 echo Configuring stage profile in $(HOST_SUBDIR)/ld ; \
3403 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
3404 cd $(HOST_SUBDIR)/ld || exit 1; \
3405@@ -21828,9 +22075,9 @@
3406 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3407 test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
3408 $(HOST_EXPORTS) \
3409- $(POSTSTAGE1_HOST_EXPORTS) \
3410+ $(POSTSTAGE1_HOST_EXPORTS) \
3411 CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
3412- LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
3413+ CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \
3414 echo Configuring stage feedback in $(HOST_SUBDIR)/ld ; \
3415 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
3416 cd $(HOST_SUBDIR)/ld || exit 1; \
3417@@ -21865,7 +22112,8 @@
3418 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3419 $(HOST_EXPORTS) \
3420 (cd $(HOST_SUBDIR)/ld && \
3421- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-ld))
3422+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
3423+ $(TARGET-ld))
3424 @endif ld
3425
3426
3427@@ -21884,8 +22132,11 @@
3428 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3429 $(HOST_EXPORTS) \
3430 cd $(HOST_SUBDIR)/ld && \
3431- $(MAKE) $(FLAGS_TO_PASS) \
3432- CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \
3433+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3434+ CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
3435+ LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
3436+ CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
3437+ CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \
3438 $(TARGET-stage1-ld)
3439
3440 maybe-clean-stage1-ld: clean-stage1-ld
3441@@ -21898,7 +22149,7 @@
3442 $(MAKE) stage1-start; \
3443 fi; \
3444 cd $(HOST_SUBDIR)/ld && \
3445- $(MAKE) $(FLAGS_TO_PASS) \
3446+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3447 clean
3448 @endif ld-bootstrap
3449
3450@@ -21918,8 +22169,11 @@
3451 $(HOST_EXPORTS) \
3452 $(POSTSTAGE1_HOST_EXPORTS) \
3453 cd $(HOST_SUBDIR)/ld && \
3454- $(MAKE) $(FLAGS_TO_PASS) \
3455- CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
3456+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3457+ CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
3458+ LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
3459+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
3460+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3461 $(TARGET-stage2-ld)
3462
3463 maybe-clean-stage2-ld: clean-stage2-ld
3464@@ -21932,7 +22186,7 @@
3465 $(MAKE) stage2-start; \
3466 fi; \
3467 cd $(HOST_SUBDIR)/ld && \
3468- $(MAKE) $(FLAGS_TO_PASS) \
3469+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3470 $(POSTSTAGE1_FLAGS_TO_PASS) \
3471 clean
3472 @endif ld-bootstrap
3473@@ -21953,8 +22207,11 @@
3474 $(HOST_EXPORTS) \
3475 $(POSTSTAGE1_HOST_EXPORTS) \
3476 cd $(HOST_SUBDIR)/ld && \
3477- $(MAKE) $(FLAGS_TO_PASS) \
3478- CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS) \
3479+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3480+ CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
3481+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
3482+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
3483+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3484 $(TARGET-stageb2g0-ld)
3485
3486 maybe-clean-stageb2g0-ld: clean-stageb2g0-ld
3487@@ -21967,7 +22224,7 @@
3488 $(MAKE) stageb2g0-start; \
3489 fi; \
3490 cd $(HOST_SUBDIR)/ld && \
3491- $(MAKE) $(FLAGS_TO_PASS) \
3492+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3493 $(POSTSTAGE1_FLAGS_TO_PASS) \
3494 clean
3495 @endif ld-bootstrap
3496@@ -21988,8 +22245,11 @@
3497 $(HOST_EXPORTS) \
3498 $(POSTSTAGE1_HOST_EXPORTS) \
3499 cd $(HOST_SUBDIR)/ld && \
3500- $(MAKE) $(FLAGS_TO_PASS) \
3501- CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
3502+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3503+ CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
3504+ LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
3505+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
3506+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3507 $(TARGET-stage3-ld)
3508
3509 maybe-clean-stage3-ld: clean-stage3-ld
3510@@ -22002,7 +22262,7 @@
3511 $(MAKE) stage3-start; \
3512 fi; \
3513 cd $(HOST_SUBDIR)/ld && \
3514- $(MAKE) $(FLAGS_TO_PASS) \
3515+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3516 $(POSTSTAGE1_FLAGS_TO_PASS) \
3517 clean
3518 @endif ld-bootstrap
3519@@ -22023,8 +22283,11 @@
3520 $(HOST_EXPORTS) \
3521 $(POSTSTAGE1_HOST_EXPORTS) \
3522 cd $(HOST_SUBDIR)/ld && \
3523- $(MAKE) $(FLAGS_TO_PASS) \
3524- CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS) \
3525+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3526+ CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
3527+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
3528+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
3529+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3530 $(TARGET-stageb3g2-ld)
3531
3532 maybe-clean-stageb3g2-ld: clean-stageb3g2-ld
3533@@ -22037,7 +22300,7 @@
3534 $(MAKE) stageb3g2-start; \
3535 fi; \
3536 cd $(HOST_SUBDIR)/ld && \
3537- $(MAKE) $(FLAGS_TO_PASS) \
3538+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3539 $(POSTSTAGE1_FLAGS_TO_PASS) \
3540 clean
3541 @endif ld-bootstrap
3542@@ -22058,8 +22321,11 @@
3543 $(HOST_EXPORTS) \
3544 $(POSTSTAGE1_HOST_EXPORTS) \
3545 cd $(HOST_SUBDIR)/ld && \
3546- $(MAKE) $(FLAGS_TO_PASS) \
3547- CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
3548+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3549+ CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
3550+ LIBCFLAGS="$(STAGE4_CFLAGS)" \
3551+ CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
3552+ CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3553 $(TARGET-stage4-ld)
3554
3555 maybe-clean-stage4-ld: clean-stage4-ld
3556@@ -22072,7 +22338,7 @@
3557 $(MAKE) stage4-start; \
3558 fi; \
3559 cd $(HOST_SUBDIR)/ld && \
3560- $(MAKE) $(FLAGS_TO_PASS) \
3561+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3562 $(POSTSTAGE1_FLAGS_TO_PASS) \
3563 clean
3564 @endif ld-bootstrap
3565@@ -22093,8 +22359,11 @@
3566 $(HOST_EXPORTS) \
3567 $(POSTSTAGE1_HOST_EXPORTS) \
3568 cd $(HOST_SUBDIR)/ld && \
3569- $(MAKE) $(FLAGS_TO_PASS) \
3570- CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS) \
3571+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3572+ CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
3573+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
3574+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
3575+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3576 $(TARGET-stageprofile-ld)
3577
3578 maybe-clean-stageprofile-ld: clean-stageprofile-ld
3579@@ -22107,7 +22376,7 @@
3580 $(MAKE) stageprofile-start; \
3581 fi; \
3582 cd $(HOST_SUBDIR)/ld && \
3583- $(MAKE) $(FLAGS_TO_PASS) \
3584+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3585 $(POSTSTAGE1_FLAGS_TO_PASS) \
3586 clean
3587 @endif ld-bootstrap
3588@@ -22128,8 +22397,11 @@
3589 $(HOST_EXPORTS) \
3590 $(POSTSTAGE1_HOST_EXPORTS) \
3591 cd $(HOST_SUBDIR)/ld && \
3592- $(MAKE) $(FLAGS_TO_PASS) \
3593- CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS) \
3594+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3595+ CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
3596+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
3597+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
3598+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3599 $(TARGET-stagefeedback-ld)
3600
3601 maybe-clean-stagefeedback-ld: clean-stagefeedback-ld
3602@@ -22142,7 +22414,7 @@
3603 $(MAKE) stagefeedback-start; \
3604 fi; \
3605 cd $(HOST_SUBDIR)/ld && \
3606- $(MAKE) $(FLAGS_TO_PASS) \
3607+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3608 $(POSTSTAGE1_FLAGS_TO_PASS) \
3609 clean
3610 @endif ld-bootstrap
3611@@ -22549,9 +22821,9 @@
3612 @r=`${PWD_COMMAND}`; export r; \
3613 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3614 test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
3615- $(HOST_EXPORTS) \
3616+ $(HOST_EXPORTS) \
3617 CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
3618- LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
3619+ CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \
3620 echo Configuring stage 1 in $(HOST_SUBDIR)/libcpp ; \
3621 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
3622 cd $(HOST_SUBDIR)/libcpp || exit 1; \
3623@@ -22580,9 +22852,9 @@
3624 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3625 test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
3626 $(HOST_EXPORTS) \
3627- $(POSTSTAGE1_HOST_EXPORTS) \
3628+ $(POSTSTAGE1_HOST_EXPORTS) \
3629 CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
3630- LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
3631+ CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \
3632 echo Configuring stage 2 in $(HOST_SUBDIR)/libcpp ; \
3633 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
3634 cd $(HOST_SUBDIR)/libcpp || exit 1; \
3635@@ -22611,9 +22883,9 @@
3636 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3637 test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
3638 $(HOST_EXPORTS) \
3639- $(POSTSTAGE1_HOST_EXPORTS) \
3640+ $(POSTSTAGE1_HOST_EXPORTS) \
3641 CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
3642- LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
3643+ CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS; \
3644 echo Configuring stage b2g0 in $(HOST_SUBDIR)/libcpp ; \
3645 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
3646 cd $(HOST_SUBDIR)/libcpp || exit 1; \
3647@@ -22642,9 +22914,9 @@
3648 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3649 test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
3650 $(HOST_EXPORTS) \
3651- $(POSTSTAGE1_HOST_EXPORTS) \
3652+ $(POSTSTAGE1_HOST_EXPORTS) \
3653 CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
3654- LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
3655+ CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \
3656 echo Configuring stage 3 in $(HOST_SUBDIR)/libcpp ; \
3657 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
3658 cd $(HOST_SUBDIR)/libcpp || exit 1; \
3659@@ -22673,9 +22945,9 @@
3660 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3661 test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
3662 $(HOST_EXPORTS) \
3663- $(POSTSTAGE1_HOST_EXPORTS) \
3664+ $(POSTSTAGE1_HOST_EXPORTS) \
3665 CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
3666- LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
3667+ CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS; \
3668 echo Configuring stage b3g2 in $(HOST_SUBDIR)/libcpp ; \
3669 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
3670 cd $(HOST_SUBDIR)/libcpp || exit 1; \
3671@@ -22704,9 +22976,9 @@
3672 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3673 test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
3674 $(HOST_EXPORTS) \
3675- $(POSTSTAGE1_HOST_EXPORTS) \
3676+ $(POSTSTAGE1_HOST_EXPORTS) \
3677 CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
3678- LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
3679+ CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \
3680 echo Configuring stage 4 in $(HOST_SUBDIR)/libcpp ; \
3681 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
3682 cd $(HOST_SUBDIR)/libcpp || exit 1; \
3683@@ -22735,9 +23007,9 @@
3684 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3685 test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
3686 $(HOST_EXPORTS) \
3687- $(POSTSTAGE1_HOST_EXPORTS) \
3688+ $(POSTSTAGE1_HOST_EXPORTS) \
3689 CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
3690- LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
3691+ CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \
3692 echo Configuring stage profile in $(HOST_SUBDIR)/libcpp ; \
3693 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
3694 cd $(HOST_SUBDIR)/libcpp || exit 1; \
3695@@ -22766,9 +23038,9 @@
3696 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3697 test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
3698 $(HOST_EXPORTS) \
3699- $(POSTSTAGE1_HOST_EXPORTS) \
3700+ $(POSTSTAGE1_HOST_EXPORTS) \
3701 CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
3702- LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
3703+ CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \
3704 echo Configuring stage feedback in $(HOST_SUBDIR)/libcpp ; \
3705 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
3706 cd $(HOST_SUBDIR)/libcpp || exit 1; \
3707@@ -22803,7 +23075,8 @@
3708 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3709 $(HOST_EXPORTS) \
3710 (cd $(HOST_SUBDIR)/libcpp && \
3711- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-libcpp))
3712+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
3713+ $(TARGET-libcpp))
3714 @endif libcpp
3715
3716
3717@@ -22822,8 +23095,11 @@
3718 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3719 $(HOST_EXPORTS) \
3720 cd $(HOST_SUBDIR)/libcpp && \
3721- $(MAKE) $(FLAGS_TO_PASS) \
3722- CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \
3723+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3724+ CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
3725+ LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
3726+ CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
3727+ CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \
3728 $(TARGET-stage1-libcpp)
3729
3730 maybe-clean-stage1-libcpp: clean-stage1-libcpp
3731@@ -22836,7 +23112,7 @@
3732 $(MAKE) stage1-start; \
3733 fi; \
3734 cd $(HOST_SUBDIR)/libcpp && \
3735- $(MAKE) $(FLAGS_TO_PASS) \
3736+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3737 clean
3738 @endif libcpp-bootstrap
3739
3740@@ -22856,8 +23132,11 @@
3741 $(HOST_EXPORTS) \
3742 $(POSTSTAGE1_HOST_EXPORTS) \
3743 cd $(HOST_SUBDIR)/libcpp && \
3744- $(MAKE) $(FLAGS_TO_PASS) \
3745- CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
3746+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3747+ CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
3748+ LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
3749+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
3750+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3751 $(TARGET-stage2-libcpp)
3752
3753 maybe-clean-stage2-libcpp: clean-stage2-libcpp
3754@@ -22870,7 +23149,7 @@
3755 $(MAKE) stage2-start; \
3756 fi; \
3757 cd $(HOST_SUBDIR)/libcpp && \
3758- $(MAKE) $(FLAGS_TO_PASS) \
3759+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3760 $(POSTSTAGE1_FLAGS_TO_PASS) \
3761 clean
3762 @endif libcpp-bootstrap
3763@@ -22891,8 +23170,11 @@
3764 $(HOST_EXPORTS) \
3765 $(POSTSTAGE1_HOST_EXPORTS) \
3766 cd $(HOST_SUBDIR)/libcpp && \
3767- $(MAKE) $(FLAGS_TO_PASS) \
3768- CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS) \
3769+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3770+ CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
3771+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
3772+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
3773+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3774 $(TARGET-stageb2g0-libcpp)
3775
3776 maybe-clean-stageb2g0-libcpp: clean-stageb2g0-libcpp
3777@@ -22905,7 +23187,7 @@
3778 $(MAKE) stageb2g0-start; \
3779 fi; \
3780 cd $(HOST_SUBDIR)/libcpp && \
3781- $(MAKE) $(FLAGS_TO_PASS) \
3782+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3783 $(POSTSTAGE1_FLAGS_TO_PASS) \
3784 clean
3785 @endif libcpp-bootstrap
3786@@ -22926,8 +23208,11 @@
3787 $(HOST_EXPORTS) \
3788 $(POSTSTAGE1_HOST_EXPORTS) \
3789 cd $(HOST_SUBDIR)/libcpp && \
3790- $(MAKE) $(FLAGS_TO_PASS) \
3791- CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
3792+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3793+ CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
3794+ LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
3795+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
3796+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3797 $(TARGET-stage3-libcpp)
3798
3799 maybe-clean-stage3-libcpp: clean-stage3-libcpp
3800@@ -22940,7 +23225,7 @@
3801 $(MAKE) stage3-start; \
3802 fi; \
3803 cd $(HOST_SUBDIR)/libcpp && \
3804- $(MAKE) $(FLAGS_TO_PASS) \
3805+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3806 $(POSTSTAGE1_FLAGS_TO_PASS) \
3807 clean
3808 @endif libcpp-bootstrap
3809@@ -22961,8 +23246,11 @@
3810 $(HOST_EXPORTS) \
3811 $(POSTSTAGE1_HOST_EXPORTS) \
3812 cd $(HOST_SUBDIR)/libcpp && \
3813- $(MAKE) $(FLAGS_TO_PASS) \
3814- CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS) \
3815+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3816+ CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
3817+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
3818+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
3819+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3820 $(TARGET-stageb3g2-libcpp)
3821
3822 maybe-clean-stageb3g2-libcpp: clean-stageb3g2-libcpp
3823@@ -22975,7 +23263,7 @@
3824 $(MAKE) stageb3g2-start; \
3825 fi; \
3826 cd $(HOST_SUBDIR)/libcpp && \
3827- $(MAKE) $(FLAGS_TO_PASS) \
3828+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3829 $(POSTSTAGE1_FLAGS_TO_PASS) \
3830 clean
3831 @endif libcpp-bootstrap
3832@@ -22996,8 +23284,11 @@
3833 $(HOST_EXPORTS) \
3834 $(POSTSTAGE1_HOST_EXPORTS) \
3835 cd $(HOST_SUBDIR)/libcpp && \
3836- $(MAKE) $(FLAGS_TO_PASS) \
3837- CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
3838+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3839+ CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
3840+ LIBCFLAGS="$(STAGE4_CFLAGS)" \
3841+ CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
3842+ CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3843 $(TARGET-stage4-libcpp)
3844
3845 maybe-clean-stage4-libcpp: clean-stage4-libcpp
3846@@ -23010,7 +23301,7 @@
3847 $(MAKE) stage4-start; \
3848 fi; \
3849 cd $(HOST_SUBDIR)/libcpp && \
3850- $(MAKE) $(FLAGS_TO_PASS) \
3851+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3852 $(POSTSTAGE1_FLAGS_TO_PASS) \
3853 clean
3854 @endif libcpp-bootstrap
3855@@ -23031,8 +23322,11 @@
3856 $(HOST_EXPORTS) \
3857 $(POSTSTAGE1_HOST_EXPORTS) \
3858 cd $(HOST_SUBDIR)/libcpp && \
3859- $(MAKE) $(FLAGS_TO_PASS) \
3860- CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS) \
3861+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3862+ CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
3863+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
3864+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
3865+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3866 $(TARGET-stageprofile-libcpp)
3867
3868 maybe-clean-stageprofile-libcpp: clean-stageprofile-libcpp
3869@@ -23045,7 +23339,7 @@
3870 $(MAKE) stageprofile-start; \
3871 fi; \
3872 cd $(HOST_SUBDIR)/libcpp && \
3873- $(MAKE) $(FLAGS_TO_PASS) \
3874+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3875 $(POSTSTAGE1_FLAGS_TO_PASS) \
3876 clean
3877 @endif libcpp-bootstrap
3878@@ -23066,8 +23360,11 @@
3879 $(HOST_EXPORTS) \
3880 $(POSTSTAGE1_HOST_EXPORTS) \
3881 cd $(HOST_SUBDIR)/libcpp && \
3882- $(MAKE) $(FLAGS_TO_PASS) \
3883- CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS) \
3884+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
3885+ CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
3886+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
3887+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
3888+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
3889 $(TARGET-stagefeedback-libcpp)
3890
3891 maybe-clean-stagefeedback-libcpp: clean-stagefeedback-libcpp
3892@@ -23080,7 +23377,7 @@
3893 $(MAKE) stagefeedback-start; \
3894 fi; \
3895 cd $(HOST_SUBDIR)/libcpp && \
3896- $(MAKE) $(FLAGS_TO_PASS) \
3897+ $(MAKE) $(EXTRA_HOST_FLAGS) \
3898 $(POSTSTAGE1_FLAGS_TO_PASS) \
3899 clean
3900 @endif libcpp-bootstrap
3901@@ -23487,9 +23784,9 @@
3902 @r=`${PWD_COMMAND}`; export r; \
3903 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3904 test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
3905- $(HOST_EXPORTS) \
3906+ $(HOST_EXPORTS) \
3907 CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
3908- LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
3909+ CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \
3910 echo Configuring stage 1 in $(HOST_SUBDIR)/libdecnumber ; \
3911 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
3912 cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
3913@@ -23518,9 +23815,9 @@
3914 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3915 test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
3916 $(HOST_EXPORTS) \
3917- $(POSTSTAGE1_HOST_EXPORTS) \
3918+ $(POSTSTAGE1_HOST_EXPORTS) \
3919 CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
3920- LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
3921+ CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \
3922 echo Configuring stage 2 in $(HOST_SUBDIR)/libdecnumber ; \
3923 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
3924 cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
3925@@ -23549,9 +23846,9 @@
3926 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3927 test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
3928 $(HOST_EXPORTS) \
3929- $(POSTSTAGE1_HOST_EXPORTS) \
3930+ $(POSTSTAGE1_HOST_EXPORTS) \
3931 CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
3932- LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
3933+ CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS; \
3934 echo Configuring stage b2g0 in $(HOST_SUBDIR)/libdecnumber ; \
3935 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
3936 cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
3937@@ -23580,9 +23877,9 @@
3938 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3939 test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
3940 $(HOST_EXPORTS) \
3941- $(POSTSTAGE1_HOST_EXPORTS) \
3942+ $(POSTSTAGE1_HOST_EXPORTS) \
3943 CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
3944- LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
3945+ CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \
3946 echo Configuring stage 3 in $(HOST_SUBDIR)/libdecnumber ; \
3947 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
3948 cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
3949@@ -23611,9 +23908,9 @@
3950 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3951 test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
3952 $(HOST_EXPORTS) \
3953- $(POSTSTAGE1_HOST_EXPORTS) \
3954+ $(POSTSTAGE1_HOST_EXPORTS) \
3955 CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
3956- LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
3957+ CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS; \
3958 echo Configuring stage b3g2 in $(HOST_SUBDIR)/libdecnumber ; \
3959 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
3960 cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
3961@@ -23642,9 +23939,9 @@
3962 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3963 test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
3964 $(HOST_EXPORTS) \
3965- $(POSTSTAGE1_HOST_EXPORTS) \
3966+ $(POSTSTAGE1_HOST_EXPORTS) \
3967 CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
3968- LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
3969+ CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \
3970 echo Configuring stage 4 in $(HOST_SUBDIR)/libdecnumber ; \
3971 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
3972 cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
3973@@ -23673,9 +23970,9 @@
3974 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3975 test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
3976 $(HOST_EXPORTS) \
3977- $(POSTSTAGE1_HOST_EXPORTS) \
3978+ $(POSTSTAGE1_HOST_EXPORTS) \
3979 CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
3980- LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
3981+ CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \
3982 echo Configuring stage profile in $(HOST_SUBDIR)/libdecnumber ; \
3983 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
3984 cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
3985@@ -23704,9 +24001,9 @@
3986 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3987 test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
3988 $(HOST_EXPORTS) \
3989- $(POSTSTAGE1_HOST_EXPORTS) \
3990+ $(POSTSTAGE1_HOST_EXPORTS) \
3991 CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
3992- LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
3993+ CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \
3994 echo Configuring stage feedback in $(HOST_SUBDIR)/libdecnumber ; \
3995 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
3996 cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
3997@@ -23741,7 +24038,8 @@
3998 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
3999 $(HOST_EXPORTS) \
4000 (cd $(HOST_SUBDIR)/libdecnumber && \
4001- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-libdecnumber))
4002+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4003+ $(TARGET-libdecnumber))
4004 @endif libdecnumber
4005
4006
4007@@ -23760,8 +24058,11 @@
4008 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4009 $(HOST_EXPORTS) \
4010 cd $(HOST_SUBDIR)/libdecnumber && \
4011- $(MAKE) $(FLAGS_TO_PASS) \
4012- CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \
4013+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
4014+ CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
4015+ LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
4016+ CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
4017+ CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \
4018 $(TARGET-stage1-libdecnumber)
4019
4020 maybe-clean-stage1-libdecnumber: clean-stage1-libdecnumber
4021@@ -23774,7 +24075,7 @@
4022 $(MAKE) stage1-start; \
4023 fi; \
4024 cd $(HOST_SUBDIR)/libdecnumber && \
4025- $(MAKE) $(FLAGS_TO_PASS) \
4026+ $(MAKE) $(EXTRA_HOST_FLAGS) \
4027 clean
4028 @endif libdecnumber-bootstrap
4029
4030@@ -23794,8 +24095,11 @@
4031 $(HOST_EXPORTS) \
4032 $(POSTSTAGE1_HOST_EXPORTS) \
4033 cd $(HOST_SUBDIR)/libdecnumber && \
4034- $(MAKE) $(FLAGS_TO_PASS) \
4035- CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
4036+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
4037+ CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
4038+ LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
4039+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
4040+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
4041 $(TARGET-stage2-libdecnumber)
4042
4043 maybe-clean-stage2-libdecnumber: clean-stage2-libdecnumber
4044@@ -23808,7 +24112,7 @@
4045 $(MAKE) stage2-start; \
4046 fi; \
4047 cd $(HOST_SUBDIR)/libdecnumber && \
4048- $(MAKE) $(FLAGS_TO_PASS) \
4049+ $(MAKE) $(EXTRA_HOST_FLAGS) \
4050 $(POSTSTAGE1_FLAGS_TO_PASS) \
4051 clean
4052 @endif libdecnumber-bootstrap
4053@@ -23829,8 +24133,11 @@
4054 $(HOST_EXPORTS) \
4055 $(POSTSTAGE1_HOST_EXPORTS) \
4056 cd $(HOST_SUBDIR)/libdecnumber && \
4057- $(MAKE) $(FLAGS_TO_PASS) \
4058- CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS) \
4059+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
4060+ CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
4061+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
4062+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
4063+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
4064 $(TARGET-stageb2g0-libdecnumber)
4065
4066 maybe-clean-stageb2g0-libdecnumber: clean-stageb2g0-libdecnumber
4067@@ -23843,7 +24150,7 @@
4068 $(MAKE) stageb2g0-start; \
4069 fi; \
4070 cd $(HOST_SUBDIR)/libdecnumber && \
4071- $(MAKE) $(FLAGS_TO_PASS) \
4072+ $(MAKE) $(EXTRA_HOST_FLAGS) \
4073 $(POSTSTAGE1_FLAGS_TO_PASS) \
4074 clean
4075 @endif libdecnumber-bootstrap
4076@@ -23864,8 +24171,11 @@
4077 $(HOST_EXPORTS) \
4078 $(POSTSTAGE1_HOST_EXPORTS) \
4079 cd $(HOST_SUBDIR)/libdecnumber && \
4080- $(MAKE) $(FLAGS_TO_PASS) \
4081- CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
4082+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
4083+ CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
4084+ LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
4085+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
4086+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
4087 $(TARGET-stage3-libdecnumber)
4088
4089 maybe-clean-stage3-libdecnumber: clean-stage3-libdecnumber
4090@@ -23878,7 +24188,7 @@
4091 $(MAKE) stage3-start; \
4092 fi; \
4093 cd $(HOST_SUBDIR)/libdecnumber && \
4094- $(MAKE) $(FLAGS_TO_PASS) \
4095+ $(MAKE) $(EXTRA_HOST_FLAGS) \
4096 $(POSTSTAGE1_FLAGS_TO_PASS) \
4097 clean
4098 @endif libdecnumber-bootstrap
4099@@ -23899,8 +24209,11 @@
4100 $(HOST_EXPORTS) \
4101 $(POSTSTAGE1_HOST_EXPORTS) \
4102 cd $(HOST_SUBDIR)/libdecnumber && \
4103- $(MAKE) $(FLAGS_TO_PASS) \
4104- CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS) \
4105+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
4106+ CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
4107+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
4108+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
4109+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
4110 $(TARGET-stageb3g2-libdecnumber)
4111
4112 maybe-clean-stageb3g2-libdecnumber: clean-stageb3g2-libdecnumber
4113@@ -23913,7 +24226,7 @@
4114 $(MAKE) stageb3g2-start; \
4115 fi; \
4116 cd $(HOST_SUBDIR)/libdecnumber && \
4117- $(MAKE) $(FLAGS_TO_PASS) \
4118+ $(MAKE) $(EXTRA_HOST_FLAGS) \
4119 $(POSTSTAGE1_FLAGS_TO_PASS) \
4120 clean
4121 @endif libdecnumber-bootstrap
4122@@ -23934,8 +24247,11 @@
4123 $(HOST_EXPORTS) \
4124 $(POSTSTAGE1_HOST_EXPORTS) \
4125 cd $(HOST_SUBDIR)/libdecnumber && \
4126- $(MAKE) $(FLAGS_TO_PASS) \
4127- CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
4128+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
4129+ CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
4130+ LIBCFLAGS="$(STAGE4_CFLAGS)" \
4131+ CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
4132+ CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
4133 $(TARGET-stage4-libdecnumber)
4134
4135 maybe-clean-stage4-libdecnumber: clean-stage4-libdecnumber
4136@@ -23948,7 +24264,7 @@
4137 $(MAKE) stage4-start; \
4138 fi; \
4139 cd $(HOST_SUBDIR)/libdecnumber && \
4140- $(MAKE) $(FLAGS_TO_PASS) \
4141+ $(MAKE) $(EXTRA_HOST_FLAGS) \
4142 $(POSTSTAGE1_FLAGS_TO_PASS) \
4143 clean
4144 @endif libdecnumber-bootstrap
4145@@ -23969,8 +24285,11 @@
4146 $(HOST_EXPORTS) \
4147 $(POSTSTAGE1_HOST_EXPORTS) \
4148 cd $(HOST_SUBDIR)/libdecnumber && \
4149- $(MAKE) $(FLAGS_TO_PASS) \
4150- CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS) \
4151+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
4152+ CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
4153+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
4154+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
4155+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
4156 $(TARGET-stageprofile-libdecnumber)
4157
4158 maybe-clean-stageprofile-libdecnumber: clean-stageprofile-libdecnumber
4159@@ -23983,7 +24302,7 @@
4160 $(MAKE) stageprofile-start; \
4161 fi; \
4162 cd $(HOST_SUBDIR)/libdecnumber && \
4163- $(MAKE) $(FLAGS_TO_PASS) \
4164+ $(MAKE) $(EXTRA_HOST_FLAGS) \
4165 $(POSTSTAGE1_FLAGS_TO_PASS) \
4166 clean
4167 @endif libdecnumber-bootstrap
4168@@ -24004,8 +24323,11 @@
4169 $(HOST_EXPORTS) \
4170 $(POSTSTAGE1_HOST_EXPORTS) \
4171 cd $(HOST_SUBDIR)/libdecnumber && \
4172- $(MAKE) $(FLAGS_TO_PASS) \
4173- CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS) \
4174+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
4175+ CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
4176+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
4177+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
4178+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
4179 $(TARGET-stagefeedback-libdecnumber)
4180
4181 maybe-clean-stagefeedback-libdecnumber: clean-stagefeedback-libdecnumber
4182@@ -24018,7 +24340,7 @@
4183 $(MAKE) stagefeedback-start; \
4184 fi; \
4185 cd $(HOST_SUBDIR)/libdecnumber && \
4186- $(MAKE) $(FLAGS_TO_PASS) \
4187+ $(MAKE) $(EXTRA_HOST_FLAGS) \
4188 $(POSTSTAGE1_FLAGS_TO_PASS) \
4189 clean
4190 @endif libdecnumber-bootstrap
4191@@ -24432,7 +24754,8 @@
4192 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4193 $(HOST_EXPORTS) \
4194 (cd $(HOST_SUBDIR)/libgui && \
4195- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-libgui))
4196+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4197+ $(TARGET-libgui))
4198 @endif libgui
4199
4200
4201@@ -24849,9 +25172,9 @@
4202 @r=`${PWD_COMMAND}`; export r; \
4203 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4204 test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
4205- $(HOST_EXPORTS) \
4206+ $(HOST_EXPORTS) \
4207 CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
4208- LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
4209+ CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \
4210 echo Configuring stage 1 in $(HOST_SUBDIR)/libiberty ; \
4211 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
4212 cd $(HOST_SUBDIR)/libiberty || exit 1; \
4213@@ -24880,9 +25203,9 @@
4214 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4215 test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
4216 $(HOST_EXPORTS) \
4217- $(POSTSTAGE1_HOST_EXPORTS) \
4218+ $(POSTSTAGE1_HOST_EXPORTS) \
4219 CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
4220- LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
4221+ CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \
4222 echo Configuring stage 2 in $(HOST_SUBDIR)/libiberty ; \
4223 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
4224 cd $(HOST_SUBDIR)/libiberty || exit 1; \
4225@@ -24911,9 +25234,9 @@
4226 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4227 test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
4228 $(HOST_EXPORTS) \
4229- $(POSTSTAGE1_HOST_EXPORTS) \
4230+ $(POSTSTAGE1_HOST_EXPORTS) \
4231 CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
4232- LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
4233+ CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS; \
4234 echo Configuring stage b2g0 in $(HOST_SUBDIR)/libiberty ; \
4235 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
4236 cd $(HOST_SUBDIR)/libiberty || exit 1; \
4237@@ -24942,9 +25265,9 @@
4238 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4239 test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
4240 $(HOST_EXPORTS) \
4241- $(POSTSTAGE1_HOST_EXPORTS) \
4242+ $(POSTSTAGE1_HOST_EXPORTS) \
4243 CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
4244- LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
4245+ CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \
4246 echo Configuring stage 3 in $(HOST_SUBDIR)/libiberty ; \
4247 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
4248 cd $(HOST_SUBDIR)/libiberty || exit 1; \
4249@@ -24973,9 +25296,9 @@
4250 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4251 test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
4252 $(HOST_EXPORTS) \
4253- $(POSTSTAGE1_HOST_EXPORTS) \
4254+ $(POSTSTAGE1_HOST_EXPORTS) \
4255 CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
4256- LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
4257+ CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS; \
4258 echo Configuring stage b3g2 in $(HOST_SUBDIR)/libiberty ; \
4259 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
4260 cd $(HOST_SUBDIR)/libiberty || exit 1; \
4261@@ -25004,9 +25327,9 @@
4262 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4263 test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
4264 $(HOST_EXPORTS) \
4265- $(POSTSTAGE1_HOST_EXPORTS) \
4266+ $(POSTSTAGE1_HOST_EXPORTS) \
4267 CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
4268- LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
4269+ CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \
4270 echo Configuring stage 4 in $(HOST_SUBDIR)/libiberty ; \
4271 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
4272 cd $(HOST_SUBDIR)/libiberty || exit 1; \
4273@@ -25035,9 +25358,9 @@
4274 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4275 test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
4276 $(HOST_EXPORTS) \
4277- $(POSTSTAGE1_HOST_EXPORTS) \
4278+ $(POSTSTAGE1_HOST_EXPORTS) \
4279 CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
4280- LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
4281+ CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \
4282 echo Configuring stage profile in $(HOST_SUBDIR)/libiberty ; \
4283 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
4284 cd $(HOST_SUBDIR)/libiberty || exit 1; \
4285@@ -25066,9 +25389,9 @@
4286 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4287 test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
4288 $(HOST_EXPORTS) \
4289- $(POSTSTAGE1_HOST_EXPORTS) \
4290+ $(POSTSTAGE1_HOST_EXPORTS) \
4291 CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
4292- LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
4293+ CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \
4294 echo Configuring stage feedback in $(HOST_SUBDIR)/libiberty ; \
4295 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
4296 cd $(HOST_SUBDIR)/libiberty || exit 1; \
4297@@ -25103,7 +25426,8 @@
4298 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4299 $(HOST_EXPORTS) \
4300 (cd $(HOST_SUBDIR)/libiberty && \
4301- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-libiberty))
4302+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4303+ $(TARGET-libiberty))
4304 @endif libiberty
4305
4306
4307@@ -25122,8 +25446,11 @@
4308 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4309 $(HOST_EXPORTS) \
4310 cd $(HOST_SUBDIR)/libiberty && \
4311- $(MAKE) $(FLAGS_TO_PASS) \
4312- CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \
4313+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
4314+ CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
4315+ LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
4316+ CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
4317+ CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \
4318 $(TARGET-stage1-libiberty)
4319
4320 maybe-clean-stage1-libiberty: clean-stage1-libiberty
4321@@ -25136,7 +25463,7 @@
4322 $(MAKE) stage1-start; \
4323 fi; \
4324 cd $(HOST_SUBDIR)/libiberty && \
4325- $(MAKE) $(FLAGS_TO_PASS) \
4326+ $(MAKE) $(EXTRA_HOST_FLAGS) \
4327 clean
4328 @endif libiberty-bootstrap
4329
4330@@ -25156,8 +25483,11 @@
4331 $(HOST_EXPORTS) \
4332 $(POSTSTAGE1_HOST_EXPORTS) \
4333 cd $(HOST_SUBDIR)/libiberty && \
4334- $(MAKE) $(FLAGS_TO_PASS) \
4335- CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
4336+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
4337+ CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
4338+ LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
4339+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
4340+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
4341 $(TARGET-stage2-libiberty)
4342
4343 maybe-clean-stage2-libiberty: clean-stage2-libiberty
4344@@ -25170,7 +25500,7 @@
4345 $(MAKE) stage2-start; \
4346 fi; \
4347 cd $(HOST_SUBDIR)/libiberty && \
4348- $(MAKE) $(FLAGS_TO_PASS) \
4349+ $(MAKE) $(EXTRA_HOST_FLAGS) \
4350 $(POSTSTAGE1_FLAGS_TO_PASS) \
4351 clean
4352 @endif libiberty-bootstrap
4353@@ -25191,8 +25521,11 @@
4354 $(HOST_EXPORTS) \
4355 $(POSTSTAGE1_HOST_EXPORTS) \
4356 cd $(HOST_SUBDIR)/libiberty && \
4357- $(MAKE) $(FLAGS_TO_PASS) \
4358- CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS) \
4359+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
4360+ CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
4361+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
4362+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
4363+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
4364 $(TARGET-stageb2g0-libiberty)
4365
4366 maybe-clean-stageb2g0-libiberty: clean-stageb2g0-libiberty
4367@@ -25205,7 +25538,7 @@
4368 $(MAKE) stageb2g0-start; \
4369 fi; \
4370 cd $(HOST_SUBDIR)/libiberty && \
4371- $(MAKE) $(FLAGS_TO_PASS) \
4372+ $(MAKE) $(EXTRA_HOST_FLAGS) \
4373 $(POSTSTAGE1_FLAGS_TO_PASS) \
4374 clean
4375 @endif libiberty-bootstrap
4376@@ -25226,8 +25559,11 @@
4377 $(HOST_EXPORTS) \
4378 $(POSTSTAGE1_HOST_EXPORTS) \
4379 cd $(HOST_SUBDIR)/libiberty && \
4380- $(MAKE) $(FLAGS_TO_PASS) \
4381- CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
4382+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
4383+ CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
4384+ LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
4385+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
4386+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
4387 $(TARGET-stage3-libiberty)
4388
4389 maybe-clean-stage3-libiberty: clean-stage3-libiberty
4390@@ -25240,7 +25576,7 @@
4391 $(MAKE) stage3-start; \
4392 fi; \
4393 cd $(HOST_SUBDIR)/libiberty && \
4394- $(MAKE) $(FLAGS_TO_PASS) \
4395+ $(MAKE) $(EXTRA_HOST_FLAGS) \
4396 $(POSTSTAGE1_FLAGS_TO_PASS) \
4397 clean
4398 @endif libiberty-bootstrap
4399@@ -25261,8 +25597,11 @@
4400 $(HOST_EXPORTS) \
4401 $(POSTSTAGE1_HOST_EXPORTS) \
4402 cd $(HOST_SUBDIR)/libiberty && \
4403- $(MAKE) $(FLAGS_TO_PASS) \
4404- CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS) \
4405+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
4406+ CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
4407+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
4408+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
4409+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
4410 $(TARGET-stageb3g2-libiberty)
4411
4412 maybe-clean-stageb3g2-libiberty: clean-stageb3g2-libiberty
4413@@ -25275,7 +25614,7 @@
4414 $(MAKE) stageb3g2-start; \
4415 fi; \
4416 cd $(HOST_SUBDIR)/libiberty && \
4417- $(MAKE) $(FLAGS_TO_PASS) \
4418+ $(MAKE) $(EXTRA_HOST_FLAGS) \
4419 $(POSTSTAGE1_FLAGS_TO_PASS) \
4420 clean
4421 @endif libiberty-bootstrap
4422@@ -25296,8 +25635,11 @@
4423 $(HOST_EXPORTS) \
4424 $(POSTSTAGE1_HOST_EXPORTS) \
4425 cd $(HOST_SUBDIR)/libiberty && \
4426- $(MAKE) $(FLAGS_TO_PASS) \
4427- CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
4428+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
4429+ CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
4430+ LIBCFLAGS="$(STAGE4_CFLAGS)" \
4431+ CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
4432+ CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
4433 $(TARGET-stage4-libiberty)
4434
4435 maybe-clean-stage4-libiberty: clean-stage4-libiberty
4436@@ -25310,7 +25652,7 @@
4437 $(MAKE) stage4-start; \
4438 fi; \
4439 cd $(HOST_SUBDIR)/libiberty && \
4440- $(MAKE) $(FLAGS_TO_PASS) \
4441+ $(MAKE) $(EXTRA_HOST_FLAGS) \
4442 $(POSTSTAGE1_FLAGS_TO_PASS) \
4443 clean
4444 @endif libiberty-bootstrap
4445@@ -25331,8 +25673,11 @@
4446 $(HOST_EXPORTS) \
4447 $(POSTSTAGE1_HOST_EXPORTS) \
4448 cd $(HOST_SUBDIR)/libiberty && \
4449- $(MAKE) $(FLAGS_TO_PASS) \
4450- CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS) \
4451+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
4452+ CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
4453+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
4454+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
4455+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
4456 $(TARGET-stageprofile-libiberty)
4457
4458 maybe-clean-stageprofile-libiberty: clean-stageprofile-libiberty
4459@@ -25345,7 +25690,7 @@
4460 $(MAKE) stageprofile-start; \
4461 fi; \
4462 cd $(HOST_SUBDIR)/libiberty && \
4463- $(MAKE) $(FLAGS_TO_PASS) \
4464+ $(MAKE) $(EXTRA_HOST_FLAGS) \
4465 $(POSTSTAGE1_FLAGS_TO_PASS) \
4466 clean
4467 @endif libiberty-bootstrap
4468@@ -25366,8 +25711,11 @@
4469 $(HOST_EXPORTS) \
4470 $(POSTSTAGE1_HOST_EXPORTS) \
4471 cd $(HOST_SUBDIR)/libiberty && \
4472- $(MAKE) $(FLAGS_TO_PASS) \
4473- CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS) \
4474+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
4475+ CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
4476+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
4477+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
4478+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
4479 $(TARGET-stagefeedback-libiberty)
4480
4481 maybe-clean-stagefeedback-libiberty: clean-stagefeedback-libiberty
4482@@ -25380,7 +25728,7 @@
4483 $(MAKE) stagefeedback-start; \
4484 fi; \
4485 cd $(HOST_SUBDIR)/libiberty && \
4486- $(MAKE) $(FLAGS_TO_PASS) \
4487+ $(MAKE) $(EXTRA_HOST_FLAGS) \
4488 $(POSTSTAGE1_FLAGS_TO_PASS) \
4489 clean
4490 @endif libiberty-bootstrap
4491@@ -25794,7 +26142,8 @@
4492 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4493 $(HOST_EXPORTS) \
4494 (cd $(HOST_SUBDIR)/libtool && \
4495- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-libtool))
4496+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4497+ $(TARGET-libtool))
4498 @endif libtool
4499
4500
4501@@ -26218,7 +26567,8 @@
4502 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4503 $(HOST_EXPORTS) \
4504 (cd $(HOST_SUBDIR)/m4 && \
4505- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-m4))
4506+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4507+ $(TARGET-m4))
4508 @endif m4
4509
4510
4511@@ -26642,7 +26992,8 @@
4512 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4513 $(HOST_EXPORTS) \
4514 (cd $(HOST_SUBDIR)/make && \
4515- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-make))
4516+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4517+ $(TARGET-make))
4518 @endif make
4519
4520
4521@@ -27066,7 +27417,8 @@
4522 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4523 $(HOST_EXPORTS) \
4524 (cd $(HOST_SUBDIR)/mmalloc && \
4525- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-mmalloc))
4526+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4527+ $(TARGET-mmalloc))
4528 @endif mmalloc
4529
4530
4531@@ -27484,7 +27836,8 @@
4532 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4533 $(HOST_EXPORTS) \
4534 (cd $(HOST_SUBDIR)/patch && \
4535- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-patch))
4536+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4537+ $(TARGET-patch))
4538 @endif patch
4539
4540
4541@@ -27908,7 +28261,8 @@
4542 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4543 $(HOST_EXPORTS) \
4544 (cd $(HOST_SUBDIR)/perl && \
4545- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-perl))
4546+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4547+ $(TARGET-perl))
4548 @endif perl
4549
4550
4551@@ -28332,7 +28686,8 @@
4552 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4553 $(HOST_EXPORTS) \
4554 (cd $(HOST_SUBDIR)/prms && \
4555- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-prms))
4556+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4557+ $(TARGET-prms))
4558 @endif prms
4559
4560
4561@@ -28756,7 +29111,8 @@
4562 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4563 $(HOST_EXPORTS) \
4564 (cd $(HOST_SUBDIR)/rcs && \
4565- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-rcs))
4566+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4567+ $(TARGET-rcs))
4568 @endif rcs
4569
4570
4571@@ -29180,7 +29536,8 @@
4572 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4573 $(HOST_EXPORTS) \
4574 (cd $(HOST_SUBDIR)/readline && \
4575- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-readline))
4576+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4577+ $(TARGET-readline))
4578 @endif readline
4579
4580
4581@@ -29604,7 +29961,8 @@
4582 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4583 $(HOST_EXPORTS) \
4584 (cd $(HOST_SUBDIR)/release && \
4585- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-release))
4586+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4587+ $(TARGET-release))
4588 @endif release
4589
4590
4591@@ -30016,7 +30374,8 @@
4592 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4593 $(HOST_EXPORTS) \
4594 (cd $(HOST_SUBDIR)/recode && \
4595- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-recode))
4596+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4597+ $(TARGET-recode))
4598 @endif recode
4599
4600
4601@@ -30440,7 +30799,8 @@
4602 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4603 $(HOST_EXPORTS) \
4604 (cd $(HOST_SUBDIR)/sed && \
4605- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-sed))
4606+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4607+ $(TARGET-sed))
4608 @endif sed
4609
4610
4611@@ -30864,7 +31224,8 @@
4612 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4613 $(HOST_EXPORTS) \
4614 (cd $(HOST_SUBDIR)/send-pr && \
4615- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-send-pr))
4616+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4617+ $(TARGET-send-pr))
4618 @endif send-pr
4619
4620
4621@@ -31288,7 +31649,8 @@
4622 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4623 $(HOST_EXPORTS) \
4624 (cd $(HOST_SUBDIR)/shellutils && \
4625- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-shellutils))
4626+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4627+ $(TARGET-shellutils))
4628 @endif shellutils
4629
4630
4631@@ -31712,7 +32074,8 @@
4632 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4633 $(HOST_EXPORTS) \
4634 (cd $(HOST_SUBDIR)/sid && \
4635- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-sid))
4636+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4637+ $(TARGET-sid))
4638 @endif sid
4639
4640
4641@@ -32136,7 +32499,8 @@
4642 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4643 $(HOST_EXPORTS) \
4644 (cd $(HOST_SUBDIR)/sim && \
4645- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-sim))
4646+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4647+ $(TARGET-sim))
4648 @endif sim
4649
4650
4651@@ -32560,7 +32924,8 @@
4652 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4653 $(HOST_EXPORTS) \
4654 (cd $(HOST_SUBDIR)/tar && \
4655- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-tar))
4656+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4657+ $(TARGET-tar))
4658 @endif tar
4659
4660
4661@@ -32984,7 +33349,8 @@
4662 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4663 $(HOST_EXPORTS) \
4664 (cd $(HOST_SUBDIR)/texinfo && \
4665- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-texinfo))
4666+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4667+ $(TARGET-texinfo))
4668 @endif texinfo
4669
4670
4671@@ -33402,7 +33768,8 @@
4672 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4673 $(HOST_EXPORTS) \
4674 (cd $(HOST_SUBDIR)/textutils && \
4675- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-textutils))
4676+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4677+ $(TARGET-textutils))
4678 @endif textutils
4679
4680
4681@@ -33826,7 +34193,8 @@
4682 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4683 $(HOST_EXPORTS) \
4684 (cd $(HOST_SUBDIR)/time && \
4685- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-time))
4686+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4687+ $(TARGET-time))
4688 @endif time
4689
4690
4691@@ -34250,7 +34618,8 @@
4692 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4693 $(HOST_EXPORTS) \
4694 (cd $(HOST_SUBDIR)/uudecode && \
4695- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-uudecode))
4696+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4697+ $(TARGET-uudecode))
4698 @endif uudecode
4699
4700
4701@@ -34674,7 +35043,8 @@
4702 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4703 $(HOST_EXPORTS) \
4704 (cd $(HOST_SUBDIR)/wdiff && \
4705- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-wdiff))
4706+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4707+ $(TARGET-wdiff))
4708 @endif wdiff
4709
4710
4711@@ -35098,7 +35468,8 @@
4712 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4713 $(HOST_EXPORTS) \
4714 (cd $(HOST_SUBDIR)/zip && \
4715- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-zip))
4716+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4717+ $(TARGET-zip))
4718 @endif zip
4719
4720
4721@@ -35518,9 +35889,9 @@
4722 @r=`${PWD_COMMAND}`; export r; \
4723 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4724 test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
4725- $(HOST_EXPORTS) \
4726+ $(HOST_EXPORTS) \
4727 CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
4728- LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
4729+ CXXFLAGS="$(STAGE1_CFLAGS)"; export CXXFLAGS; \
4730 echo Configuring stage 1 in $(HOST_SUBDIR)/zlib ; \
4731 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
4732 cd $(HOST_SUBDIR)/zlib || exit 1; \
4733@@ -35549,9 +35920,9 @@
4734 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4735 test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
4736 $(HOST_EXPORTS) \
4737- $(POSTSTAGE1_HOST_EXPORTS) \
4738+ $(POSTSTAGE1_HOST_EXPORTS) \
4739 CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
4740- LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
4741+ CXXFLAGS="$(STAGE2_CFLAGS)"; export CXXFLAGS; \
4742 echo Configuring stage 2 in $(HOST_SUBDIR)/zlib ; \
4743 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
4744 cd $(HOST_SUBDIR)/zlib || exit 1; \
4745@@ -35580,9 +35951,9 @@
4746 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4747 test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
4748 $(HOST_EXPORTS) \
4749- $(POSTSTAGE1_HOST_EXPORTS) \
4750+ $(POSTSTAGE1_HOST_EXPORTS) \
4751 CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
4752- LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
4753+ CXXFLAGS="$(STAGE2_CFLAGS) -g0"; export CXXFLAGS; \
4754 echo Configuring stage b2g0 in $(HOST_SUBDIR)/zlib ; \
4755 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
4756 cd $(HOST_SUBDIR)/zlib || exit 1; \
4757@@ -35611,9 +35982,9 @@
4758 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4759 test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
4760 $(HOST_EXPORTS) \
4761- $(POSTSTAGE1_HOST_EXPORTS) \
4762+ $(POSTSTAGE1_HOST_EXPORTS) \
4763 CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
4764- LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
4765+ CXXFLAGS="$(STAGE3_CFLAGS)"; export CXXFLAGS; \
4766 echo Configuring stage 3 in $(HOST_SUBDIR)/zlib ; \
4767 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
4768 cd $(HOST_SUBDIR)/zlib || exit 1; \
4769@@ -35642,9 +36013,9 @@
4770 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4771 test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
4772 $(HOST_EXPORTS) \
4773- $(POSTSTAGE1_HOST_EXPORTS) \
4774+ $(POSTSTAGE1_HOST_EXPORTS) \
4775 CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
4776- LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
4777+ CXXFLAGS="$(STAGE3_CFLAGS) -g2"; export CXXFLAGS; \
4778 echo Configuring stage b3g2 in $(HOST_SUBDIR)/zlib ; \
4779 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
4780 cd $(HOST_SUBDIR)/zlib || exit 1; \
4781@@ -35673,9 +36044,9 @@
4782 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4783 test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
4784 $(HOST_EXPORTS) \
4785- $(POSTSTAGE1_HOST_EXPORTS) \
4786+ $(POSTSTAGE1_HOST_EXPORTS) \
4787 CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
4788- LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
4789+ CXXFLAGS="$(STAGE4_CFLAGS)"; export CXXFLAGS; \
4790 echo Configuring stage 4 in $(HOST_SUBDIR)/zlib ; \
4791 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
4792 cd $(HOST_SUBDIR)/zlib || exit 1; \
4793@@ -35704,9 +36075,9 @@
4794 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4795 test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
4796 $(HOST_EXPORTS) \
4797- $(POSTSTAGE1_HOST_EXPORTS) \
4798+ $(POSTSTAGE1_HOST_EXPORTS) \
4799 CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
4800- LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
4801+ CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CXXFLAGS; \
4802 echo Configuring stage profile in $(HOST_SUBDIR)/zlib ; \
4803 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
4804 cd $(HOST_SUBDIR)/zlib || exit 1; \
4805@@ -35735,9 +36106,9 @@
4806 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4807 test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
4808 $(HOST_EXPORTS) \
4809- $(POSTSTAGE1_HOST_EXPORTS) \
4810+ $(POSTSTAGE1_HOST_EXPORTS) \
4811 CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
4812- LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
4813+ CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CXXFLAGS; \
4814 echo Configuring stage feedback in $(HOST_SUBDIR)/zlib ; \
4815 $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
4816 cd $(HOST_SUBDIR)/zlib || exit 1; \
4817@@ -35772,7 +36143,8 @@
4818 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4819 $(HOST_EXPORTS) \
4820 (cd $(HOST_SUBDIR)/zlib && \
4821- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-zlib))
4822+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
4823+ $(TARGET-zlib))
4824 @endif zlib
4825
4826
4827@@ -35791,8 +36163,11 @@
4828 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
4829 $(HOST_EXPORTS) \
4830 cd $(HOST_SUBDIR)/zlib && \
4831- $(MAKE) $(FLAGS_TO_PASS) \
4832- CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \
4833+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
4834+ CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
4835+ LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
4836+ CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
4837+ CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) \
4838 $(TARGET-stage1-zlib)
4839
4840 maybe-clean-stage1-zlib: clean-stage1-zlib
4841@@ -35805,7 +36180,7 @@
4842 $(MAKE) stage1-start; \
4843 fi; \
4844 cd $(HOST_SUBDIR)/zlib && \
4845- $(MAKE) $(FLAGS_TO_PASS) \
4846+ $(MAKE) $(EXTRA_HOST_FLAGS) \
4847 clean
4848 @endif zlib-bootstrap
4849
4850@@ -35825,8 +36200,11 @@
4851 $(HOST_EXPORTS) \
4852 $(POSTSTAGE1_HOST_EXPORTS) \
4853 cd $(HOST_SUBDIR)/zlib && \
4854- $(MAKE) $(FLAGS_TO_PASS) \
4855- CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
4856+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
4857+ CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
4858+ LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
4859+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
4860+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
4861 $(TARGET-stage2-zlib)
4862
4863 maybe-clean-stage2-zlib: clean-stage2-zlib
4864@@ -35839,7 +36217,7 @@
4865 $(MAKE) stage2-start; \
4866 fi; \
4867 cd $(HOST_SUBDIR)/zlib && \
4868- $(MAKE) $(FLAGS_TO_PASS) \
4869+ $(MAKE) $(EXTRA_HOST_FLAGS) \
4870 $(POSTSTAGE1_FLAGS_TO_PASS) \
4871 clean
4872 @endif zlib-bootstrap
4873@@ -35860,8 +36238,11 @@
4874 $(HOST_EXPORTS) \
4875 $(POSTSTAGE1_HOST_EXPORTS) \
4876 cd $(HOST_SUBDIR)/zlib && \
4877- $(MAKE) $(FLAGS_TO_PASS) \
4878- CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" $(POSTSTAGE1_FLAGS_TO_PASS) \
4879+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
4880+ CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
4881+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
4882+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
4883+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
4884 $(TARGET-stageb2g0-zlib)
4885
4886 maybe-clean-stageb2g0-zlib: clean-stageb2g0-zlib
4887@@ -35874,7 +36255,7 @@
4888 $(MAKE) stageb2g0-start; \
4889 fi; \
4890 cd $(HOST_SUBDIR)/zlib && \
4891- $(MAKE) $(FLAGS_TO_PASS) \
4892+ $(MAKE) $(EXTRA_HOST_FLAGS) \
4893 $(POSTSTAGE1_FLAGS_TO_PASS) \
4894 clean
4895 @endif zlib-bootstrap
4896@@ -35895,8 +36276,11 @@
4897 $(HOST_EXPORTS) \
4898 $(POSTSTAGE1_HOST_EXPORTS) \
4899 cd $(HOST_SUBDIR)/zlib && \
4900- $(MAKE) $(FLAGS_TO_PASS) \
4901- CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
4902+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
4903+ CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
4904+ LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
4905+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
4906+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
4907 $(TARGET-stage3-zlib)
4908
4909 maybe-clean-stage3-zlib: clean-stage3-zlib
4910@@ -35909,7 +36293,7 @@
4911 $(MAKE) stage3-start; \
4912 fi; \
4913 cd $(HOST_SUBDIR)/zlib && \
4914- $(MAKE) $(FLAGS_TO_PASS) \
4915+ $(MAKE) $(EXTRA_HOST_FLAGS) \
4916 $(POSTSTAGE1_FLAGS_TO_PASS) \
4917 clean
4918 @endif zlib-bootstrap
4919@@ -35930,8 +36314,11 @@
4920 $(HOST_EXPORTS) \
4921 $(POSTSTAGE1_HOST_EXPORTS) \
4922 cd $(HOST_SUBDIR)/zlib && \
4923- $(MAKE) $(FLAGS_TO_PASS) \
4924- CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" $(POSTSTAGE1_FLAGS_TO_PASS) \
4925+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
4926+ CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
4927+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
4928+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
4929+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
4930 $(TARGET-stageb3g2-zlib)
4931
4932 maybe-clean-stageb3g2-zlib: clean-stageb3g2-zlib
4933@@ -35944,7 +36331,7 @@
4934 $(MAKE) stageb3g2-start; \
4935 fi; \
4936 cd $(HOST_SUBDIR)/zlib && \
4937- $(MAKE) $(FLAGS_TO_PASS) \
4938+ $(MAKE) $(EXTRA_HOST_FLAGS) \
4939 $(POSTSTAGE1_FLAGS_TO_PASS) \
4940 clean
4941 @endif zlib-bootstrap
4942@@ -35965,8 +36352,11 @@
4943 $(HOST_EXPORTS) \
4944 $(POSTSTAGE1_HOST_EXPORTS) \
4945 cd $(HOST_SUBDIR)/zlib && \
4946- $(MAKE) $(FLAGS_TO_PASS) \
4947- CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" $(POSTSTAGE1_FLAGS_TO_PASS) \
4948+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
4949+ CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
4950+ LIBCFLAGS="$(STAGE4_CFLAGS)" \
4951+ CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
4952+ CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
4953 $(TARGET-stage4-zlib)
4954
4955 maybe-clean-stage4-zlib: clean-stage4-zlib
4956@@ -35979,7 +36369,7 @@
4957 $(MAKE) stage4-start; \
4958 fi; \
4959 cd $(HOST_SUBDIR)/zlib && \
4960- $(MAKE) $(FLAGS_TO_PASS) \
4961+ $(MAKE) $(EXTRA_HOST_FLAGS) \
4962 $(POSTSTAGE1_FLAGS_TO_PASS) \
4963 clean
4964 @endif zlib-bootstrap
4965@@ -36000,8 +36390,11 @@
4966 $(HOST_EXPORTS) \
4967 $(POSTSTAGE1_HOST_EXPORTS) \
4968 cd $(HOST_SUBDIR)/zlib && \
4969- $(MAKE) $(FLAGS_TO_PASS) \
4970- CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" $(POSTSTAGE1_FLAGS_TO_PASS) \
4971+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
4972+ CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
4973+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
4974+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
4975+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
4976 $(TARGET-stageprofile-zlib)
4977
4978 maybe-clean-stageprofile-zlib: clean-stageprofile-zlib
4979@@ -36014,7 +36407,7 @@
4980 $(MAKE) stageprofile-start; \
4981 fi; \
4982 cd $(HOST_SUBDIR)/zlib && \
4983- $(MAKE) $(FLAGS_TO_PASS) \
4984+ $(MAKE) $(EXTRA_HOST_FLAGS) \
4985 $(POSTSTAGE1_FLAGS_TO_PASS) \
4986 clean
4987 @endif zlib-bootstrap
4988@@ -36035,8 +36428,11 @@
4989 $(HOST_EXPORTS) \
4990 $(POSTSTAGE1_HOST_EXPORTS) \
4991 cd $(HOST_SUBDIR)/zlib && \
4992- $(MAKE) $(FLAGS_TO_PASS) \
4993- CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" $(POSTSTAGE1_FLAGS_TO_PASS) \
4994+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
4995+ CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
4996+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
4997+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
4998+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \
4999 $(TARGET-stagefeedback-zlib)
5000
5001 maybe-clean-stagefeedback-zlib: clean-stagefeedback-zlib
5002@@ -36049,7 +36445,7 @@
5003 $(MAKE) stagefeedback-start; \
5004 fi; \
5005 cd $(HOST_SUBDIR)/zlib && \
5006- $(MAKE) $(FLAGS_TO_PASS) \
5007+ $(MAKE) $(EXTRA_HOST_FLAGS) \
5008 $(POSTSTAGE1_FLAGS_TO_PASS) \
5009 clean
5010 @endif zlib-bootstrap
5011@@ -36451,7 +36847,8 @@
5012 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5013 $(HOST_EXPORTS) \
5014 (cd $(HOST_SUBDIR)/gdb && \
5015- $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) $(TARGET-gdb))
5016+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS) \
5017+ $(TARGET-gdb))
5018 @endif gdb
5019
5020
5021@@ -36875,7 +37272,8 @@
5022 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5023 $(HOST_EXPORTS) \
5024 (cd $(HOST_SUBDIR)/expect && \
5025- $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) $(TARGET-expect))
5026+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS) \
5027+ $(TARGET-expect))
5028 @endif expect
5029
5030
5031@@ -37299,7 +37697,8 @@
5032 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5033 $(HOST_EXPORTS) \
5034 (cd $(HOST_SUBDIR)/guile && \
5035- $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) $(TARGET-guile))
5036+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS) \
5037+ $(TARGET-guile))
5038 @endif guile
5039
5040
5041@@ -37723,7 +38122,8 @@
5042 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5043 $(HOST_EXPORTS) \
5044 (cd $(HOST_SUBDIR)/tk && \
5045- $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) $(TARGET-tk))
5046+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS) \
5047+ $(TARGET-tk))
5048 @endif tk
5049
5050
5051@@ -38147,7 +38547,8 @@
5052 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5053 $(HOST_EXPORTS) \
5054 (cd $(HOST_SUBDIR)/libtermcap && \
5055- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-libtermcap))
5056+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
5057+ $(TARGET-libtermcap))
5058 @endif libtermcap
5059
5060
5061@@ -38505,7 +38906,8 @@
5062 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5063 $(HOST_EXPORTS) \
5064 (cd $(HOST_SUBDIR)/utils && \
5065- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-utils))
5066+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
5067+ $(TARGET-utils))
5068 @endif utils
5069
5070
5071@@ -38923,7 +39325,8 @@
5072 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5073 $(HOST_EXPORTS) \
5074 (cd $(HOST_SUBDIR)/gnattools && \
5075- $(MAKE) $(FLAGS_TO_PASS) $(TARGET-gnattools))
5076+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
5077+ $(TARGET-gnattools))
5078 @endif gnattools
5079
5080
5081@@ -39368,7 +39771,8 @@
5082 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5083 $(RAW_CXX_TARGET_EXPORTS) \
5084 (cd $(TARGET_SUBDIR)/libstdc++-v3 && \
5085- $(MAKE) $(TARGET_FLAGS_TO_PASS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' $(TARGET-target-libstdc++-v3))
5086+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \
5087+ $(TARGET-target-libstdc++-v3))
5088 @endif target-libstdc++-v3
5089
5090
5091@@ -39809,7 +40213,8 @@
5092 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5093 $(NORMAL_TARGET_EXPORTS) \
5094 (cd $(TARGET_SUBDIR)/libmudflap && \
5095- $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libmudflap))
5096+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \
5097+ $(TARGET-target-libmudflap))
5098 @endif target-libmudflap
5099
5100
5101@@ -40250,7 +40655,8 @@
5102 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5103 $(NORMAL_TARGET_EXPORTS) \
5104 (cd $(TARGET_SUBDIR)/libssp && \
5105- $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libssp))
5106+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \
5107+ $(TARGET-target-libssp))
5108 @endif target-libssp
5109
5110
5111@@ -40691,7 +41097,8 @@
5112 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5113 $(NORMAL_TARGET_EXPORTS) \
5114 (cd $(TARGET_SUBDIR)/newlib && \
5115- $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-newlib))
5116+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \
5117+ $(TARGET-target-newlib))
5118 @endif target-newlib
5119
5120
5121@@ -41137,9 +41544,9 @@
5122 mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
5123 fi; \
5124 test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
5125- $(NORMAL_TARGET_EXPORTS) \
5126- CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \
5127- LIBCFLAGS="$(STAGE1_CFLAGS)"; export LIBCFLAGS; \
5128+ $(NORMAL_TARGET_EXPORTS) \
5129+ CFLAGS="$(STAGE1_LIBCFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
5130+ CXXFLAGS="$(STAGE1_LIBCFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS; \
5131 echo Configuring stage 1 in $(TARGET_SUBDIR)/libgcc ; \
5132 $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
5133 cd $(TARGET_SUBDIR)/libgcc || exit 1; \
5134@@ -41180,9 +41587,9 @@
5135 fi; \
5136 test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
5137 $(NORMAL_TARGET_EXPORTS) \
5138- \
5139- CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \
5140- LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \
5141+ \
5142+ CFLAGS="$(STAGE2_LIBCFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
5143+ CXXFLAGS="$(STAGE2_LIBCFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS; \
5144 echo Configuring stage 2 in $(TARGET_SUBDIR)/libgcc ; \
5145 $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
5146 cd $(TARGET_SUBDIR)/libgcc || exit 1; \
5147@@ -41223,9 +41630,9 @@
5148 fi; \
5149 test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
5150 $(NORMAL_TARGET_EXPORTS) \
5151- \
5152- CFLAGS="$(STAGE2_CFLAGS) -g0"; export CFLAGS; \
5153- LIBCFLAGS="$(STAGE2_CFLAGS) -g0"; export LIBCFLAGS; \
5154+ \
5155+ CFLAGS="$(STAGE2_LIBCFLAGS) -g0 $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
5156+ CXXFLAGS="$(STAGE2_LIBCFLAGS) -g0 $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS; \
5157 echo Configuring stage b2g0 in $(TARGET_SUBDIR)/libgcc ; \
5158 $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
5159 cd $(TARGET_SUBDIR)/libgcc || exit 1; \
5160@@ -41266,9 +41673,9 @@
5161 fi; \
5162 test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
5163 $(NORMAL_TARGET_EXPORTS) \
5164- \
5165- CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \
5166- LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \
5167+ \
5168+ CFLAGS="$(STAGE3_LIBCFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
5169+ CXXFLAGS="$(STAGE3_LIBCFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS; \
5170 echo Configuring stage 3 in $(TARGET_SUBDIR)/libgcc ; \
5171 $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
5172 cd $(TARGET_SUBDIR)/libgcc || exit 1; \
5173@@ -41309,9 +41716,9 @@
5174 fi; \
5175 test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
5176 $(NORMAL_TARGET_EXPORTS) \
5177- \
5178- CFLAGS="$(STAGE3_CFLAGS) -g2"; export CFLAGS; \
5179- LIBCFLAGS="$(STAGE3_CFLAGS) -g2"; export LIBCFLAGS; \
5180+ \
5181+ CFLAGS="$(STAGE3_LIBCFLAGS) -g2 $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
5182+ CXXFLAGS="$(STAGE3_LIBCFLAGS) -g2 $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS; \
5183 echo Configuring stage b3g2 in $(TARGET_SUBDIR)/libgcc ; \
5184 $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
5185 cd $(TARGET_SUBDIR)/libgcc || exit 1; \
5186@@ -41352,9 +41759,9 @@
5187 fi; \
5188 test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
5189 $(NORMAL_TARGET_EXPORTS) \
5190- \
5191- CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \
5192- LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \
5193+ \
5194+ CFLAGS="$(STAGE4_CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
5195+ CXXFLAGS="$(STAGE4_CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS; \
5196 echo Configuring stage 4 in $(TARGET_SUBDIR)/libgcc ; \
5197 $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
5198 cd $(TARGET_SUBDIR)/libgcc || exit 1; \
5199@@ -41395,9 +41802,9 @@
5200 fi; \
5201 test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
5202 $(NORMAL_TARGET_EXPORTS) \
5203- \
5204- CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export CFLAGS; \
5205- LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate"; export LIBCFLAGS; \
5206+ \
5207+ CFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
5208+ CXXFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS; \
5209 echo Configuring stage profile in $(TARGET_SUBDIR)/libgcc ; \
5210 $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
5211 cd $(TARGET_SUBDIR)/libgcc || exit 1; \
5212@@ -41438,9 +41845,9 @@
5213 fi; \
5214 test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
5215 $(NORMAL_TARGET_EXPORTS) \
5216- \
5217- CFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export CFLAGS; \
5218- LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use"; export LIBCFLAGS; \
5219+ \
5220+ CFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
5221+ CXXFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CXXFLAGS; \
5222 echo Configuring stage feedback in $(TARGET_SUBDIR)/libgcc ; \
5223 $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
5224 cd $(TARGET_SUBDIR)/libgcc || exit 1; \
5225@@ -41475,7 +41882,8 @@
5226 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5227 $(NORMAL_TARGET_EXPORTS) \
5228 (cd $(TARGET_SUBDIR)/libgcc && \
5229- $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libgcc))
5230+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \
5231+ $(TARGET-target-libgcc))
5232 @endif target-libgcc
5233
5234
5235@@ -41494,8 +41902,11 @@
5236 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5237 $(NORMAL_TARGET_EXPORTS) \
5238 cd $(TARGET_SUBDIR)/libgcc && \
5239- $(MAKE) $(TARGET_FLAGS_TO_PASS) \
5240- CFLAGS="$(STAGE1_CFLAGS)" LIBCFLAGS="$(STAGE1_CFLAGS)" \
5241+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
5242+ CFLAGS="$(STAGE1_CFLAGS)" CXXFLAGS="$(STAGE1_CFLAGS)" \
5243+ LIBCFLAGS="$(STAGE1_LIBCFLAGS)" \
5244+ CFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" \
5245+ CXXFLAGS_FOR_TARGET="$(STAGE1_LIBCFLAGS)" $(EXTRA_TARGET_FLAGS) \
5246 $(TARGET-stage1-target-libgcc)
5247
5248 maybe-clean-stage1-target-libgcc: clean-stage1-target-libgcc
5249@@ -41508,7 +41919,7 @@
5250 $(MAKE) stage1-start; \
5251 fi; \
5252 cd $(TARGET_SUBDIR)/libgcc && \
5253- $(MAKE) $(TARGET_FLAGS_TO_PASS) \
5254+ $(MAKE) $(EXTRA_TARGET_FLAGS) \
5255 clean
5256 @endif target-libgcc-bootstrap
5257
5258@@ -41528,8 +41939,11 @@
5259 $(NORMAL_TARGET_EXPORTS) \
5260 \
5261 cd $(TARGET_SUBDIR)/libgcc && \
5262- $(MAKE) $(TARGET_FLAGS_TO_PASS) \
5263- CFLAGS="$(STAGE2_CFLAGS)" LIBCFLAGS="$(STAGE2_CFLAGS)" \
5264+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
5265+ CFLAGS="$(STAGE2_CFLAGS)" CXXFLAGS="$(STAGE2_CFLAGS)" \
5266+ LIBCFLAGS="$(STAGE2_LIBCFLAGS)" \
5267+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" \
5268+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS)" $(EXTRA_TARGET_FLAGS) \
5269 $(TARGET-stage2-target-libgcc)
5270
5271 maybe-clean-stage2-target-libgcc: clean-stage2-target-libgcc
5272@@ -41542,7 +41956,7 @@
5273 $(MAKE) stage2-start; \
5274 fi; \
5275 cd $(TARGET_SUBDIR)/libgcc && \
5276- $(MAKE) $(TARGET_FLAGS_TO_PASS) \
5277+ $(MAKE) $(EXTRA_TARGET_FLAGS) \
5278 \
5279 clean
5280 @endif target-libgcc-bootstrap
5281@@ -41563,8 +41977,11 @@
5282 $(NORMAL_TARGET_EXPORTS) \
5283 \
5284 cd $(TARGET_SUBDIR)/libgcc && \
5285- $(MAKE) $(TARGET_FLAGS_TO_PASS) \
5286- CFLAGS="$(STAGE2_CFLAGS) -g0" LIBCFLAGS="$(STAGE2_CFLAGS) -g0" \
5287+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
5288+ CFLAGS="$(STAGE2_CFLAGS) -g0" CXXFLAGS="$(STAGE2_CFLAGS) -g0" \
5289+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -g0" \
5290+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" \
5291+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -g0" $(EXTRA_TARGET_FLAGS) \
5292 $(TARGET-stageb2g0-target-libgcc)
5293
5294 maybe-clean-stageb2g0-target-libgcc: clean-stageb2g0-target-libgcc
5295@@ -41577,7 +41994,7 @@
5296 $(MAKE) stageb2g0-start; \
5297 fi; \
5298 cd $(TARGET_SUBDIR)/libgcc && \
5299- $(MAKE) $(TARGET_FLAGS_TO_PASS) \
5300+ $(MAKE) $(EXTRA_TARGET_FLAGS) \
5301 \
5302 clean
5303 @endif target-libgcc-bootstrap
5304@@ -41598,8 +42015,11 @@
5305 $(NORMAL_TARGET_EXPORTS) \
5306 \
5307 cd $(TARGET_SUBDIR)/libgcc && \
5308- $(MAKE) $(TARGET_FLAGS_TO_PASS) \
5309- CFLAGS="$(STAGE3_CFLAGS)" LIBCFLAGS="$(STAGE3_CFLAGS)" \
5310+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
5311+ CFLAGS="$(STAGE3_CFLAGS)" CXXFLAGS="$(STAGE3_CFLAGS)" \
5312+ LIBCFLAGS="$(STAGE3_LIBCFLAGS)" \
5313+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" \
5314+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS)" $(EXTRA_TARGET_FLAGS) \
5315 $(TARGET-stage3-target-libgcc)
5316
5317 maybe-clean-stage3-target-libgcc: clean-stage3-target-libgcc
5318@@ -41612,7 +42032,7 @@
5319 $(MAKE) stage3-start; \
5320 fi; \
5321 cd $(TARGET_SUBDIR)/libgcc && \
5322- $(MAKE) $(TARGET_FLAGS_TO_PASS) \
5323+ $(MAKE) $(EXTRA_TARGET_FLAGS) \
5324 \
5325 clean
5326 @endif target-libgcc-bootstrap
5327@@ -41633,8 +42053,11 @@
5328 $(NORMAL_TARGET_EXPORTS) \
5329 \
5330 cd $(TARGET_SUBDIR)/libgcc && \
5331- $(MAKE) $(TARGET_FLAGS_TO_PASS) \
5332- CFLAGS="$(STAGE3_CFLAGS) -g2" LIBCFLAGS="$(STAGE3_CFLAGS) -g2" \
5333+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
5334+ CFLAGS="$(STAGE3_CFLAGS) -g2" CXXFLAGS="$(STAGE3_CFLAGS) -g2" \
5335+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -g2" \
5336+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" \
5337+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -g2" $(EXTRA_TARGET_FLAGS) \
5338 $(TARGET-stageb3g2-target-libgcc)
5339
5340 maybe-clean-stageb3g2-target-libgcc: clean-stageb3g2-target-libgcc
5341@@ -41647,7 +42070,7 @@
5342 $(MAKE) stageb3g2-start; \
5343 fi; \
5344 cd $(TARGET_SUBDIR)/libgcc && \
5345- $(MAKE) $(TARGET_FLAGS_TO_PASS) \
5346+ $(MAKE) $(EXTRA_TARGET_FLAGS) \
5347 \
5348 clean
5349 @endif target-libgcc-bootstrap
5350@@ -41668,8 +42091,11 @@
5351 $(NORMAL_TARGET_EXPORTS) \
5352 \
5353 cd $(TARGET_SUBDIR)/libgcc && \
5354- $(MAKE) $(TARGET_FLAGS_TO_PASS) \
5355- CFLAGS="$(STAGE4_CFLAGS)" LIBCFLAGS="$(STAGE4_CFLAGS)" \
5356+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
5357+ CFLAGS="$(STAGE4_CFLAGS)" CXXFLAGS="$(STAGE4_CFLAGS)" \
5358+ LIBCFLAGS="$(STAGE4_CFLAGS)" \
5359+ CFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" \
5360+ CXXFLAGS_FOR_TARGET="$(STAGE4_CFLAGS)" $(EXTRA_TARGET_FLAGS) \
5361 $(TARGET-stage4-target-libgcc)
5362
5363 maybe-clean-stage4-target-libgcc: clean-stage4-target-libgcc
5364@@ -41682,7 +42108,7 @@
5365 $(MAKE) stage4-start; \
5366 fi; \
5367 cd $(TARGET_SUBDIR)/libgcc && \
5368- $(MAKE) $(TARGET_FLAGS_TO_PASS) \
5369+ $(MAKE) $(EXTRA_TARGET_FLAGS) \
5370 \
5371 clean
5372 @endif target-libgcc-bootstrap
5373@@ -41703,8 +42129,11 @@
5374 $(NORMAL_TARGET_EXPORTS) \
5375 \
5376 cd $(TARGET_SUBDIR)/libgcc && \
5377- $(MAKE) $(TARGET_FLAGS_TO_PASS) \
5378- CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" LIBCFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
5379+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
5380+ CFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" CXXFLAGS="$(STAGE2_CFLAGS) -fprofile-generate" \
5381+ LIBCFLAGS="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
5382+ CFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" \
5383+ CXXFLAGS_FOR_TARGET="$(STAGE2_LIBCFLAGS) -fprofile-generate" $(EXTRA_TARGET_FLAGS) \
5384 $(TARGET-stageprofile-target-libgcc)
5385
5386 maybe-clean-stageprofile-target-libgcc: clean-stageprofile-target-libgcc
5387@@ -41717,7 +42146,7 @@
5388 $(MAKE) stageprofile-start; \
5389 fi; \
5390 cd $(TARGET_SUBDIR)/libgcc && \
5391- $(MAKE) $(TARGET_FLAGS_TO_PASS) \
5392+ $(MAKE) $(EXTRA_TARGET_FLAGS) \
5393 \
5394 clean
5395 @endif target-libgcc-bootstrap
5396@@ -41738,8 +42167,11 @@
5397 $(NORMAL_TARGET_EXPORTS) \
5398 \
5399 cd $(TARGET_SUBDIR)/libgcc && \
5400- $(MAKE) $(TARGET_FLAGS_TO_PASS) \
5401- CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" LIBCFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
5402+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
5403+ CFLAGS="$(STAGE3_CFLAGS) -fprofile-use" CXXFLAGS="$(STAGE3_CFLAGS) -fprofile-use" \
5404+ LIBCFLAGS="$(STAGE3_LIBCFLAGS) -fprofile-use" \
5405+ CFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" \
5406+ CXXFLAGS_FOR_TARGET="$(STAGE3_LIBCFLAGS) -fprofile-use" $(EXTRA_TARGET_FLAGS) \
5407 $(TARGET-stagefeedback-target-libgcc)
5408
5409 maybe-clean-stagefeedback-target-libgcc: clean-stagefeedback-target-libgcc
5410@@ -41752,7 +42184,7 @@
5411 $(MAKE) stagefeedback-start; \
5412 fi; \
5413 cd $(TARGET_SUBDIR)/libgcc && \
5414- $(MAKE) $(TARGET_FLAGS_TO_PASS) \
5415+ $(MAKE) $(EXTRA_TARGET_FLAGS) \
5416 \
5417 clean
5418 @endif target-libgcc-bootstrap
5419@@ -42191,7 +42623,8 @@
5420 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5421 $(NORMAL_TARGET_EXPORTS) \
5422 (cd $(TARGET_SUBDIR)/libgfortran && \
5423- $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libgfortran))
5424+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \
5425+ $(TARGET-target-libgfortran))
5426 @endif target-libgfortran
5427
5428
5429@@ -42632,7 +43065,8 @@
5430 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5431 $(NORMAL_TARGET_EXPORTS) \
5432 (cd $(TARGET_SUBDIR)/libobjc && \
5433- $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libobjc))
5434+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \
5435+ $(TARGET-target-libobjc))
5436 @endif target-libobjc
5437
5438
5439@@ -43073,7 +43507,8 @@
5440 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5441 $(NORMAL_TARGET_EXPORTS) \
5442 (cd $(TARGET_SUBDIR)/libtermcap && \
5443- $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libtermcap))
5444+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \
5445+ $(TARGET-target-libtermcap))
5446 @endif target-libtermcap
5447
5448
5449@@ -43449,7 +43884,8 @@
5450 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5451 $(NORMAL_TARGET_EXPORTS) \
5452 (cd $(TARGET_SUBDIR)/winsup && \
5453- $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-winsup))
5454+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \
5455+ $(TARGET-target-winsup))
5456 @endif target-winsup
5457
5458
5459@@ -43890,7 +44326,8 @@
5460 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5461 $(NORMAL_TARGET_EXPORTS) \
5462 (cd $(TARGET_SUBDIR)/libgloss && \
5463- $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libgloss))
5464+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \
5465+ $(TARGET-target-libgloss))
5466 @endif target-libgloss
5467
5468
5469@@ -44326,7 +44763,8 @@
5470 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5471 $(NORMAL_TARGET_EXPORTS) \
5472 (cd $(TARGET_SUBDIR)/libiberty && \
5473- $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libiberty))
5474+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \
5475+ $(TARGET-target-libiberty))
5476 @endif target-libiberty
5477
5478
5479@@ -44767,7 +45205,8 @@
5480 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5481 $(NORMAL_TARGET_EXPORTS) \
5482 (cd $(TARGET_SUBDIR)/gperf && \
5483- $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-gperf))
5484+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \
5485+ $(TARGET-target-gperf))
5486 @endif target-gperf
5487
5488
5489@@ -45208,7 +45647,8 @@
5490 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5491 $(NORMAL_TARGET_EXPORTS) \
5492 (cd $(TARGET_SUBDIR)/examples && \
5493- $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-examples))
5494+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \
5495+ $(TARGET-target-examples))
5496 @endif target-examples
5497
5498
5499@@ -45639,7 +46079,8 @@
5500 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5501 $(NORMAL_TARGET_EXPORTS) \
5502 (cd $(TARGET_SUBDIR)/libffi && \
5503- $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libffi))
5504+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \
5505+ $(TARGET-target-libffi))
5506 @endif target-libffi
5507
5508
5509@@ -46080,7 +46521,8 @@
5510 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5511 $(RAW_CXX_TARGET_EXPORTS) \
5512 (cd $(TARGET_SUBDIR)/libjava && \
5513- $(MAKE) $(TARGET_FLAGS_TO_PASS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' $(TARGET-target-libjava))
5514+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \
5515+ $(TARGET-target-libjava))
5516 @endif target-libjava
5517
5518
5519@@ -46521,7 +46963,8 @@
5520 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5521 $(NORMAL_TARGET_EXPORTS) \
5522 (cd $(TARGET_SUBDIR)/zlib && \
5523- $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-zlib))
5524+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \
5525+ $(TARGET-target-zlib))
5526 @endif target-zlib
5527
5528
5529@@ -46962,7 +47405,8 @@
5530 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5531 $(NORMAL_TARGET_EXPORTS) \
5532 (cd $(TARGET_SUBDIR)/boehm-gc && \
5533- $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-boehm-gc))
5534+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \
5535+ $(TARGET-target-boehm-gc))
5536 @endif target-boehm-gc
5537
5538
5539@@ -47403,7 +47847,8 @@
5540 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5541 $(NORMAL_TARGET_EXPORTS) \
5542 (cd $(TARGET_SUBDIR)/qthreads && \
5543- $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-qthreads))
5544+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \
5545+ $(TARGET-target-qthreads))
5546 @endif target-qthreads
5547
5548
5549@@ -47844,7 +48289,8 @@
5550 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5551 $(NORMAL_TARGET_EXPORTS) \
5552 (cd $(TARGET_SUBDIR)/rda && \
5553- $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-rda))
5554+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \
5555+ $(TARGET-target-rda))
5556 @endif target-rda
5557
5558
5559@@ -48285,7 +48731,8 @@
5560 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5561 $(NORMAL_TARGET_EXPORTS) \
5562 (cd $(TARGET_SUBDIR)/libada && \
5563- $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libada))
5564+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \
5565+ $(TARGET-target-libada))
5566 @endif target-libada
5567
5568
5569@@ -48726,7 +49173,8 @@
5570 s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
5571 $(NORMAL_TARGET_EXPORTS) \
5572 (cd $(TARGET_SUBDIR)/libgomp && \
5573- $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libgomp))
5574+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \
5575+ $(TARGET-target-libgomp))
5576 @endif target-libgomp
5577
5578
5579@@ -49359,7 +49807,7 @@
5580
5581 # Bubble a bug fix through all the stages up to stage 1. They are
5582 # remade, but not reconfigured. The next stage (if any) will not be
5583-# reconfigured as well.
5584+# reconfigured either.
5585 .PHONY: stage1-bubble
5586 stage1-bubble::
5587 @r=`${PWD_COMMAND}`; export r; \
5588@@ -49570,7 +50018,7 @@
5589
5590 # Bubble a bug fix through all the stages up to stage 2. They are
5591 # remade, but not reconfigured. The next stage (if any) will not be
5592-# reconfigured as well.
5593+# reconfigured either.
5594 .PHONY: stage2-bubble
5595 stage2-bubble:: stage1-bubble
5596 @r=`${PWD_COMMAND}`; export r; \
5597@@ -49802,7 +50250,7 @@
5598
5599 # Bubble a bug fix through all the stages up to stage b2g0. They are
5600 # remade, but not reconfigured. The next stage (if any) will not be
5601-# reconfigured as well.
5602+# reconfigured either.
5603 .PHONY: stageb2g0-bubble
5604 stageb2g0-bubble:: stage1-bubble
5605 @r=`${PWD_COMMAND}`; export r; \
5606@@ -50034,7 +50482,7 @@
5607
5608 # Bubble a bug fix through all the stages up to stage 3. They are
5609 # remade, but not reconfigured. The next stage (if any) will not be
5610-# reconfigured as well.
5611+# reconfigured either.
5612 .PHONY: stage3-bubble
5613 stage3-bubble:: stage2-bubble
5614 @r=`${PWD_COMMAND}`; export r; \
5615@@ -50320,7 +50768,7 @@
5616
5617 # Bubble a bug fix through all the stages up to stage b3g2. They are
5618 # remade, but not reconfigured. The next stage (if any) will not be
5619-# reconfigured as well.
5620+# reconfigured either.
5621 .PHONY: stageb3g2-bubble
5622 stageb3g2-bubble:: stageb2g0-bubble
5623 @r=`${PWD_COMMAND}`; export r; \
5624@@ -50606,7 +51054,7 @@
5625
5626 # Bubble a bug fix through all the stages up to stage 4. They are
5627 # remade, but not reconfigured. The next stage (if any) will not be
5628-# reconfigured as well.
5629+# reconfigured either.
5630 .PHONY: stage4-bubble
5631 stage4-bubble:: stage3-bubble
5632 @r=`${PWD_COMMAND}`; export r; \
5633@@ -50881,7 +51329,7 @@
5634
5635 # Bubble a bug fix through all the stages up to stage profile. They are
5636 # remade, but not reconfigured. The next stage (if any) will not be
5637-# reconfigured as well.
5638+# reconfigured either.
5639 .PHONY: stageprofile-bubble
5640 stageprofile-bubble:: stage1-bubble
5641 @r=`${PWD_COMMAND}`; export r; \
5642@@ -51092,7 +51540,7 @@
5643
5644 # Bubble a bug fix through all the stages up to stage feedback. They are
5645 # remade, but not reconfigured. The next stage (if any) will not be
5646-# reconfigured as well.
5647+# reconfigured either.
5648 .PHONY: stagefeedback-bubble
5649 stagefeedback-bubble:: stageprofile-bubble
5650 @r=`${PWD_COMMAND}`; export r; \
5651@@ -51175,10 +51623,10 @@
5652 @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
5653
5654 .PHONY: restrap
5655-restrap:
5656+restrap::
5657 @: $(MAKE); $(stage)
5658 rm -rf stage1-$(TARGET_SUBDIR) stage2-* stageb2g0-* stage3-* stageb3g2-* stage4-* stageprofile-* stagefeedback-*
5659- $(MAKE) $(RECURSE_FLAGS_TO_PASS) all
5660+restrap:: all
5661 @endif gcc-bootstrap
5662
5663 # --------------------------------------
5664@@ -52004,7 +52452,8 @@
5665
5666 # Rebuilding configure.
5667 AUTOCONF = autoconf
5668-$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac $(srcdir)/config/acx.m4
5669+$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac $(srcdir)/config/acx.m4 \
5670+ $(srcdir)/config/override.m4 $(srcdir)/config/proginstall.m4
5671 cd $(srcdir) && $(AUTOCONF)
5672
5673 # ------------------------------
5674Index: gcc-4.3.3/configure
5675===================================================================
5676--- gcc-4.3.3.orig/configure 2008-02-01 20:29:30.000000000 -0700
5677+++ gcc-4.3.3/configure 2009-04-29 18:03:50.204611816 -0700
5678@@ -272,7 +272,7 @@
5679 PACKAGE_BUGREPORT=
5680
5681 ac_unique_file="move-if-change"
5682-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'
5683+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'
5684 ac_subst_files='serialization_dependencies host_makefile_frag target_makefile_frag alphaieee_frag ospace_frag'
5685
5686 # Initialize some variables set by options.
5687@@ -5147,6 +5147,38 @@
5688 fi;
5689
5690
5691+# During gcc bootstrap, if we use some random cc for stage1 then CFLAGS
5692+# might be empty or "-g". We don't require a C++ compiler, so CXXFLAGS
5693+# might also be empty (or "-g", if a non-GCC C++ compiler is in the path).
5694+# We want to ensure that TARGET libraries (which we know are built with
5695+# gcc) are built with "-O2 -g", so include those options when setting
5696+# CFLAGS_FOR_TARGET and CXXFLAGS_FOR_TARGET.
5697+if test "x$CFLAGS_FOR_TARGET" = x; then
5698+ CFLAGS_FOR_TARGET=$CFLAGS
5699+ case " $CFLAGS " in
5700+ *" -O2 "*) ;;
5701+ *) CFLAGS_FOR_TARGET="-O2 $CFLAGS" ;;
5702+ esac
5703+ case " $CFLAGS " in
5704+ *" -g "* | *" -g3 "*) ;;
5705+ *) CFLAGS_FOR_TARGET="-g $CFLAGS" ;;
5706+ esac
5707+fi
5708+
5709+
5710+if test "x$CXXFLAGS_FOR_TARGET" = x; then
5711+ CXXFLAGS_FOR_TARGET=$CXXFLAGS
5712+ case " $CXXFLAGS " in
5713+ *" -O2 "*) ;;
5714+ *) CXXFLAGS_FOR_TARGET="-O2 $CXXFLAGS" ;;
5715+ esac
5716+ case " $CXXFLAGS " in
5717+ *" -g "* | *" -g3 "*) ;;
5718+ *) CXXFLAGS_FOR_TARGET="-g $CXXFLAGS" ;;
5719+ esac
5720+fi
5721+
5722+
5723 # Handle --with-headers=XXX. If the value is not "yes", the contents of
5724 # the named directory are copied to $(tooldir)/sys-include.
5725 if test x"${with_headers}" != x && test x"${with_headers}" != xno ; then
5726@@ -12825,6 +12857,8 @@
5727 s,@stage1_languages@,$stage1_languages,;t t
5728 s,@SYSROOT_CFLAGS_FOR_TARGET@,$SYSROOT_CFLAGS_FOR_TARGET,;t t
5729 s,@DEBUG_PREFIX_CFLAGS_FOR_TARGET@,$DEBUG_PREFIX_CFLAGS_FOR_TARGET,;t t
5730+s,@CFLAGS_FOR_TARGET@,$CFLAGS_FOR_TARGET,;t t
5731+s,@CXXFLAGS_FOR_TARGET@,$CXXFLAGS_FOR_TARGET,;t t
5732 s,@RPATH_ENVVAR@,$RPATH_ENVVAR,;t t
5733 s,@tooldir@,$tooldir,;t t
5734 s,@build_tooldir@,$build_tooldir,;t t
5735Index: gcc-4.3.3/libiberty/Makefile.in
5736===================================================================
5737--- gcc-4.3.3.orig/libiberty/Makefile.in 2007-07-24 23:26:45.000000000 -0700
5738+++ gcc-4.3.3/libiberty/Makefile.in 2009-04-29 18:03:50.212612133 -0700
5739@@ -60,7 +60,7 @@
5740 MAKEINFO = @MAKEINFO@
5741 PERL = @PERL@
5742
5743-PICFLAG =
5744+PICFLAG = @PICFLAG@
5745
5746 MAKEOVERRIDES =
5747
5748@@ -143,10 +143,11 @@
5749 pex-unix.c pex-win32.c \
5750 physmem.c putenv.c \
5751 random.c regex.c rename.c rindex.c \
5752- safe-ctype.c setenv.c sigsetmask.c snprintf.c sort.c spaces.c \
5753- splay-tree.c stpcpy.c stpncpy.c strcasecmp.c strchr.c strdup.c \
5754- strerror.c strncasecmp.c strncmp.c strrchr.c strsignal.c \
5755- strstr.c strtod.c strtol.c strtoul.c strndup.c strverscmp.c \
5756+ safe-ctype.c setenv.c sigsetmask.c snprintf.c sort.c \
5757+ spaces.c splay-tree.c stpcpy.c stpncpy.c strcasecmp.c \
5758+ strchr.c strdup.c strerror.c strncasecmp.c strncmp.c \
5759+ strrchr.c strsignal.c strstr.c strtod.c strtol.c strtoul.c \
5760+ strndup.c strverscmp.c \
5761 tmpnam.c \
5762 unlink-if-ordinary.c \
5763 vasprintf.c vfork.c vfprintf.c vprintf.c vsnprintf.c vsprintf.c \
5764@@ -156,7 +157,8 @@
5765
5766 # These are always included in the library. The first four are listed
5767 # first and by compile time to optimize parallel builds.
5768-REQUIRED_OFILES = ./regex.o ./cplus-dem.o ./cp-demangle.o ./md5.o \
5769+REQUIRED_OFILES = \
5770+ ./regex.o ./cplus-dem.o ./cp-demangle.o ./md5.o \
5771 ./alloca.o ./argv.o \
5772 ./choose-temp.o ./concat.o ./cp-demint.o \
5773 ./dyn-string.o \
5774@@ -473,13 +475,13 @@
5775 config.status: $(srcdir)/configure
5776 $(SHELL) ./config.status --recheck
5777
5778-# Depending on stamp-h makes sure that config.status has been re-run
5779+# Depending on config.h makes sure that config.status has been re-run
5780 # if needed. This prevents problems with parallel builds, in case
5781 # subdirectories need to run config.status also.
5782 all-subdir check-subdir installcheck-subdir info-subdir \
5783 install-info-subdir clean-info-subdir dvi-subdir pdf-subdir install-subdir \
5784 etags-subdir mostlyclean-subdir clean-subdir distclean-subdir \
5785-maintainer-clean-subdir: stamp-h
5786+maintainer-clean-subdir: config.h
5787 @subdirs='$(SUBDIRS)'; \
5788 target=`echo $@ | sed -e 's/-subdir//'`; \
5789 for dir in $$subdirs ; do \
5790@@ -496,40 +498,41 @@
5791 # The dependencies in the remainder of this file are automatically
5792 # generated by "make maint-deps". Manual edits will be lost.
5793
5794-./_doprnt.o: $(srcdir)/_doprnt.c stamp-h $(INCDIR)/ansidecl.h \
5795+./_doprnt.o: $(srcdir)/_doprnt.c config.h $(INCDIR)/ansidecl.h \
5796 $(INCDIR)/safe-ctype.h
5797 if [ x"$(PICFLAG)" != x ]; then \
5798 $(COMPILE.c) $(PICFLAG) $(srcdir)/_doprnt.c -o pic/$@; \
5799 else true; fi
5800 $(COMPILE.c) $(srcdir)/_doprnt.c $(OUTPUT_OPTION)
5801
5802-./alloca.o: $(srcdir)/alloca.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
5803+./alloca.o: $(srcdir)/alloca.c config.h $(INCDIR)/ansidecl.h \
5804+ $(INCDIR)/libiberty.h
5805 if [ x"$(PICFLAG)" != x ]; then \
5806 $(COMPILE.c) $(PICFLAG) $(srcdir)/alloca.c -o pic/$@; \
5807 else true; fi
5808 $(COMPILE.c) $(srcdir)/alloca.c $(OUTPUT_OPTION)
5809
5810-./argv.o: $(srcdir)/argv.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
5811+./argv.o: $(srcdir)/argv.c config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
5812 $(INCDIR)/safe-ctype.h
5813 if [ x"$(PICFLAG)" != x ]; then \
5814 $(COMPILE.c) $(PICFLAG) $(srcdir)/argv.c -o pic/$@; \
5815 else true; fi
5816 $(COMPILE.c) $(srcdir)/argv.c $(OUTPUT_OPTION)
5817
5818-./asprintf.o: $(srcdir)/asprintf.c stamp-h $(INCDIR)/ansidecl.h \
5819+./asprintf.o: $(srcdir)/asprintf.c config.h $(INCDIR)/ansidecl.h \
5820 $(INCDIR)/libiberty.h
5821 if [ x"$(PICFLAG)" != x ]; then \
5822 $(COMPILE.c) $(PICFLAG) $(srcdir)/asprintf.c -o pic/$@; \
5823 else true; fi
5824 $(COMPILE.c) $(srcdir)/asprintf.c $(OUTPUT_OPTION)
5825
5826-./atexit.o: $(srcdir)/atexit.c stamp-h
5827+./atexit.o: $(srcdir)/atexit.c config.h
5828 if [ x"$(PICFLAG)" != x ]; then \
5829 $(COMPILE.c) $(PICFLAG) $(srcdir)/atexit.c -o pic/$@; \
5830 else true; fi
5831 $(COMPILE.c) $(srcdir)/atexit.c $(OUTPUT_OPTION)
5832
5833-./basename.o: $(srcdir)/basename.c stamp-h $(INCDIR)/ansidecl.h \
5834+./basename.o: $(srcdir)/basename.c config.h $(INCDIR)/ansidecl.h \
5835 $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h
5836 if [ x"$(PICFLAG)" != x ]; then \
5837 $(COMPILE.c) $(PICFLAG) $(srcdir)/basename.c -o pic/$@; \
5838@@ -548,7 +551,7 @@
5839 else true; fi
5840 $(COMPILE.c) $(srcdir)/bcopy.c $(OUTPUT_OPTION)
5841
5842-./bsearch.o: $(srcdir)/bsearch.c stamp-h $(INCDIR)/ansidecl.h
5843+./bsearch.o: $(srcdir)/bsearch.c config.h $(INCDIR)/ansidecl.h
5844 if [ x"$(PICFLAG)" != x ]; then \
5845 $(COMPILE.c) $(PICFLAG) $(srcdir)/bsearch.c -o pic/$@; \
5846 else true; fi
5847@@ -566,20 +569,21 @@
5848 else true; fi
5849 $(COMPILE.c) $(srcdir)/calloc.c $(OUTPUT_OPTION)
5850
5851-./choose-temp.o: $(srcdir)/choose-temp.c stamp-h $(INCDIR)/ansidecl.h \
5852+./choose-temp.o: $(srcdir)/choose-temp.c config.h $(INCDIR)/ansidecl.h \
5853 $(INCDIR)/libiberty.h
5854 if [ x"$(PICFLAG)" != x ]; then \
5855 $(COMPILE.c) $(PICFLAG) $(srcdir)/choose-temp.c -o pic/$@; \
5856 else true; fi
5857 $(COMPILE.c) $(srcdir)/choose-temp.c $(OUTPUT_OPTION)
5858
5859-./clock.o: $(srcdir)/clock.c stamp-h
5860+./clock.o: $(srcdir)/clock.c config.h
5861 if [ x"$(PICFLAG)" != x ]; then \
5862 $(COMPILE.c) $(PICFLAG) $(srcdir)/clock.c -o pic/$@; \
5863 else true; fi
5864 $(COMPILE.c) $(srcdir)/clock.c $(OUTPUT_OPTION)
5865
5866-./concat.o: $(srcdir)/concat.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
5867+./concat.o: $(srcdir)/concat.c config.h $(INCDIR)/ansidecl.h \
5868+ $(INCDIR)/libiberty.h
5869 if [ x"$(PICFLAG)" != x ]; then \
5870 $(COMPILE.c) $(PICFLAG) $(srcdir)/concat.c -o pic/$@; \
5871 else true; fi
5872@@ -591,7 +595,7 @@
5873 else true; fi
5874 $(COMPILE.c) $(srcdir)/copysign.c $(OUTPUT_OPTION)
5875
5876-./cp-demangle.o: $(srcdir)/cp-demangle.c stamp-h $(INCDIR)/ansidecl.h \
5877+./cp-demangle.o: $(srcdir)/cp-demangle.c config.h $(INCDIR)/ansidecl.h \
5878 $(srcdir)/cp-demangle.h $(INCDIR)/demangle.h \
5879 $(INCDIR)/dyn-string.h $(INCDIR)/getopt.h $(INCDIR)/libiberty.h
5880 if [ x"$(PICFLAG)" != x ]; then \
5881@@ -599,7 +603,7 @@
5882 else true; fi
5883 $(COMPILE.c) $(srcdir)/cp-demangle.c $(OUTPUT_OPTION)
5884
5885-./cp-demint.o: $(srcdir)/cp-demint.c stamp-h $(INCDIR)/ansidecl.h \
5886+./cp-demint.o: $(srcdir)/cp-demint.c config.h $(INCDIR)/ansidecl.h \
5887 $(srcdir)/cp-demangle.h $(INCDIR)/demangle.h \
5888 $(INCDIR)/libiberty.h
5889 if [ x"$(PICFLAG)" != x ]; then \
5890@@ -607,7 +611,7 @@
5891 else true; fi
5892 $(COMPILE.c) $(srcdir)/cp-demint.c $(OUTPUT_OPTION)
5893
5894-./cplus-dem.o: $(srcdir)/cplus-dem.c stamp-h $(INCDIR)/ansidecl.h \
5895+./cplus-dem.o: $(srcdir)/cplus-dem.c config.h $(INCDIR)/ansidecl.h \
5896 $(INCDIR)/demangle.h $(INCDIR)/libiberty.h \
5897 $(INCDIR)/safe-ctype.h
5898 if [ x"$(PICFLAG)" != x ]; then \
5899@@ -615,14 +619,14 @@
5900 else true; fi
5901 $(COMPILE.c) $(srcdir)/cplus-dem.c $(OUTPUT_OPTION)
5902
5903-./dyn-string.o: $(srcdir)/dyn-string.c stamp-h $(INCDIR)/ansidecl.h \
5904+./dyn-string.o: $(srcdir)/dyn-string.c config.h $(INCDIR)/ansidecl.h \
5905 $(INCDIR)/dyn-string.h $(INCDIR)/libiberty.h
5906 if [ x"$(PICFLAG)" != x ]; then \
5907 $(COMPILE.c) $(PICFLAG) $(srcdir)/dyn-string.c -o pic/$@; \
5908 else true; fi
5909 $(COMPILE.c) $(srcdir)/dyn-string.c $(OUTPUT_OPTION)
5910
5911-./fdmatch.o: $(srcdir)/fdmatch.c stamp-h $(INCDIR)/ansidecl.h \
5912+./fdmatch.o: $(srcdir)/fdmatch.c config.h $(INCDIR)/ansidecl.h \
5913 $(INCDIR)/libiberty.h
5914 if [ x"$(PICFLAG)" != x ]; then \
5915 $(COMPILE.c) $(PICFLAG) $(srcdir)/fdmatch.c -o pic/$@; \
5916@@ -635,93 +639,94 @@
5917 else true; fi
5918 $(COMPILE.c) $(srcdir)/ffs.c $(OUTPUT_OPTION)
5919
5920-./fibheap.o: $(srcdir)/fibheap.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/fibheap.h \
5921- $(INCDIR)/libiberty.h
5922+./fibheap.o: $(srcdir)/fibheap.c config.h $(INCDIR)/ansidecl.h \
5923+ $(INCDIR)/fibheap.h $(INCDIR)/libiberty.h
5924 if [ x"$(PICFLAG)" != x ]; then \
5925 $(COMPILE.c) $(PICFLAG) $(srcdir)/fibheap.c -o pic/$@; \
5926 else true; fi
5927 $(COMPILE.c) $(srcdir)/fibheap.c $(OUTPUT_OPTION)
5928
5929-./filename_cmp.o: $(srcdir)/filename_cmp.c stamp-h $(INCDIR)/filenames.h \
5930+./filename_cmp.o: $(srcdir)/filename_cmp.c config.h $(INCDIR)/filenames.h \
5931 $(INCDIR)/safe-ctype.h
5932 if [ x"$(PICFLAG)" != x ]; then \
5933 $(COMPILE.c) $(PICFLAG) $(srcdir)/filename_cmp.c -o pic/$@; \
5934 else true; fi
5935 $(COMPILE.c) $(srcdir)/filename_cmp.c $(OUTPUT_OPTION)
5936
5937-./floatformat.o: $(srcdir)/floatformat.c stamp-h $(INCDIR)/ansidecl.h \
5938+./floatformat.o: $(srcdir)/floatformat.c config.h $(INCDIR)/ansidecl.h \
5939 $(INCDIR)/floatformat.h $(INCDIR)/libiberty.h
5940 if [ x"$(PICFLAG)" != x ]; then \
5941 $(COMPILE.c) $(PICFLAG) $(srcdir)/floatformat.c -o pic/$@; \
5942 else true; fi
5943 $(COMPILE.c) $(srcdir)/floatformat.c $(OUTPUT_OPTION)
5944
5945-./fnmatch.o: $(srcdir)/fnmatch.c stamp-h $(INCDIR)/fnmatch.h \
5946+./fnmatch.o: $(srcdir)/fnmatch.c config.h $(INCDIR)/fnmatch.h \
5947 $(INCDIR)/safe-ctype.h
5948 if [ x"$(PICFLAG)" != x ]; then \
5949 $(COMPILE.c) $(PICFLAG) $(srcdir)/fnmatch.c -o pic/$@; \
5950 else true; fi
5951 $(COMPILE.c) $(srcdir)/fnmatch.c $(OUTPUT_OPTION)
5952
5953-./fopen_unlocked.o: $(srcdir)/fopen_unlocked.c stamp-h $(INCDIR)/ansidecl.h \
5954+./fopen_unlocked.o: $(srcdir)/fopen_unlocked.c config.h $(INCDIR)/ansidecl.h \
5955 $(INCDIR)/libiberty.h
5956 if [ x"$(PICFLAG)" != x ]; then \
5957 $(COMPILE.c) $(PICFLAG) $(srcdir)/fopen_unlocked.c -o pic/$@; \
5958 else true; fi
5959 $(COMPILE.c) $(srcdir)/fopen_unlocked.c $(OUTPUT_OPTION)
5960
5961-./getcwd.o: $(srcdir)/getcwd.c stamp-h
5962+./getcwd.o: $(srcdir)/getcwd.c config.h
5963 if [ x"$(PICFLAG)" != x ]; then \
5964 $(COMPILE.c) $(PICFLAG) $(srcdir)/getcwd.c -o pic/$@; \
5965 else true; fi
5966 $(COMPILE.c) $(srcdir)/getcwd.c $(OUTPUT_OPTION)
5967
5968-./getopt.o: $(srcdir)/getopt.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/getopt.h
5969+./getopt.o: $(srcdir)/getopt.c config.h $(INCDIR)/ansidecl.h $(INCDIR)/getopt.h
5970 if [ x"$(PICFLAG)" != x ]; then \
5971 $(COMPILE.c) $(PICFLAG) $(srcdir)/getopt.c -o pic/$@; \
5972 else true; fi
5973 $(COMPILE.c) $(srcdir)/getopt.c $(OUTPUT_OPTION)
5974
5975-./getopt1.o: $(srcdir)/getopt1.c stamp-h $(INCDIR)/getopt.h
5976+./getopt1.o: $(srcdir)/getopt1.c config.h $(INCDIR)/getopt.h
5977 if [ x"$(PICFLAG)" != x ]; then \
5978 $(COMPILE.c) $(PICFLAG) $(srcdir)/getopt1.c -o pic/$@; \
5979 else true; fi
5980 $(COMPILE.c) $(srcdir)/getopt1.c $(OUTPUT_OPTION)
5981
5982-./getpagesize.o: $(srcdir)/getpagesize.c stamp-h
5983+./getpagesize.o: $(srcdir)/getpagesize.c config.h
5984 if [ x"$(PICFLAG)" != x ]; then \
5985 $(COMPILE.c) $(PICFLAG) $(srcdir)/getpagesize.c -o pic/$@; \
5986 else true; fi
5987 $(COMPILE.c) $(srcdir)/getpagesize.c $(OUTPUT_OPTION)
5988
5989-./getpwd.o: $(srcdir)/getpwd.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
5990+./getpwd.o: $(srcdir)/getpwd.c config.h $(INCDIR)/ansidecl.h \
5991+ $(INCDIR)/libiberty.h
5992 if [ x"$(PICFLAG)" != x ]; then \
5993 $(COMPILE.c) $(PICFLAG) $(srcdir)/getpwd.c -o pic/$@; \
5994 else true; fi
5995 $(COMPILE.c) $(srcdir)/getpwd.c $(OUTPUT_OPTION)
5996
5997-./getruntime.o: $(srcdir)/getruntime.c stamp-h $(INCDIR)/ansidecl.h \
5998+./getruntime.o: $(srcdir)/getruntime.c config.h $(INCDIR)/ansidecl.h \
5999 $(INCDIR)/libiberty.h
6000 if [ x"$(PICFLAG)" != x ]; then \
6001 $(COMPILE.c) $(PICFLAG) $(srcdir)/getruntime.c -o pic/$@; \
6002 else true; fi
6003 $(COMPILE.c) $(srcdir)/getruntime.c $(OUTPUT_OPTION)
6004
6005-./gettimeofday.o: $(srcdir)/gettimeofday.c stamp-h $(INCDIR)/ansidecl.h \
6006+./gettimeofday.o: $(srcdir)/gettimeofday.c config.h $(INCDIR)/ansidecl.h \
6007 $(INCDIR)/libiberty.h
6008 if [ x"$(PICFLAG)" != x ]; then \
6009 $(COMPILE.c) $(PICFLAG) $(srcdir)/gettimeofday.c -o pic/$@; \
6010 else true; fi
6011 $(COMPILE.c) $(srcdir)/gettimeofday.c $(OUTPUT_OPTION)
6012
6013-./hashtab.o: $(srcdir)/hashtab.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/hashtab.h \
6014- $(INCDIR)/libiberty.h
6015+./hashtab.o: $(srcdir)/hashtab.c config.h $(INCDIR)/ansidecl.h \
6016+ $(INCDIR)/hashtab.h $(INCDIR)/libiberty.h
6017 if [ x"$(PICFLAG)" != x ]; then \
6018 $(COMPILE.c) $(PICFLAG) $(srcdir)/hashtab.c -o pic/$@; \
6019 else true; fi
6020 $(COMPILE.c) $(srcdir)/hashtab.c $(OUTPUT_OPTION)
6021
6022-./hex.o: $(srcdir)/hex.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
6023+./hex.o: $(srcdir)/hex.c config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
6024 $(INCDIR)/safe-ctype.h
6025 if [ x"$(PICFLAG)" != x ]; then \
6026 $(COMPILE.c) $(PICFLAG) $(srcdir)/hex.c -o pic/$@; \
6027@@ -740,7 +745,7 @@
6028 else true; fi
6029 $(COMPILE.c) $(srcdir)/insque.c $(OUTPUT_OPTION)
6030
6031-./lbasename.o: $(srcdir)/lbasename.c stamp-h $(INCDIR)/ansidecl.h \
6032+./lbasename.o: $(srcdir)/lbasename.c config.h $(INCDIR)/ansidecl.h \
6033 $(INCDIR)/filenames.h $(INCDIR)/libiberty.h \
6034 $(INCDIR)/safe-ctype.h
6035 if [ x"$(PICFLAG)" != x ]; then \
6036@@ -748,28 +753,28 @@
6037 else true; fi
6038 $(COMPILE.c) $(srcdir)/lbasename.c $(OUTPUT_OPTION)
6039
6040-./lrealpath.o: $(srcdir)/lrealpath.c stamp-h $(INCDIR)/ansidecl.h \
6041+./lrealpath.o: $(srcdir)/lrealpath.c config.h $(INCDIR)/ansidecl.h \
6042 $(INCDIR)/libiberty.h
6043 if [ x"$(PICFLAG)" != x ]; then \
6044 $(COMPILE.c) $(PICFLAG) $(srcdir)/lrealpath.c -o pic/$@; \
6045 else true; fi
6046 $(COMPILE.c) $(srcdir)/lrealpath.c $(OUTPUT_OPTION)
6047
6048-./make-relative-prefix.o: $(srcdir)/make-relative-prefix.c stamp-h \
6049+./make-relative-prefix.o: $(srcdir)/make-relative-prefix.c config.h \
6050 $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
6051 if [ x"$(PICFLAG)" != x ]; then \
6052 $(COMPILE.c) $(PICFLAG) $(srcdir)/make-relative-prefix.c -o pic/$@; \
6053 else true; fi
6054 $(COMPILE.c) $(srcdir)/make-relative-prefix.c $(OUTPUT_OPTION)
6055
6056-./make-temp-file.o: $(srcdir)/make-temp-file.c stamp-h $(INCDIR)/ansidecl.h \
6057+./make-temp-file.o: $(srcdir)/make-temp-file.c config.h $(INCDIR)/ansidecl.h \
6058 $(INCDIR)/libiberty.h
6059 if [ x"$(PICFLAG)" != x ]; then \
6060 $(COMPILE.c) $(PICFLAG) $(srcdir)/make-temp-file.c -o pic/$@; \
6061 else true; fi
6062 $(COMPILE.c) $(srcdir)/make-temp-file.c $(OUTPUT_OPTION)
6063
6064-./md5.o: $(srcdir)/md5.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/md5.h
6065+./md5.o: $(srcdir)/md5.c config.h $(INCDIR)/ansidecl.h $(INCDIR)/md5.h
6066 if [ x"$(PICFLAG)" != x ]; then \
6067 $(COMPILE.c) $(PICFLAG) $(srcdir)/md5.c -o pic/$@; \
6068 else true; fi
6069@@ -811,7 +816,7 @@
6070 else true; fi
6071 $(COMPILE.c) $(srcdir)/memset.c $(OUTPUT_OPTION)
6072
6073-./mkstemps.o: $(srcdir)/mkstemps.c stamp-h $(INCDIR)/ansidecl.h
6074+./mkstemps.o: $(srcdir)/mkstemps.c config.h $(INCDIR)/ansidecl.h
6075 if [ x"$(PICFLAG)" != x ]; then \
6076 $(COMPILE.c) $(PICFLAG) $(srcdir)/mkstemps.c -o pic/$@; \
6077 else true; fi
6078@@ -823,41 +828,41 @@
6079 else true; fi
6080 $(COMPILE.c) $(srcdir)/msdos.c $(OUTPUT_OPTION)
6081
6082-./objalloc.o: $(srcdir)/objalloc.c stamp-h $(INCDIR)/ansidecl.h \
6083+./objalloc.o: $(srcdir)/objalloc.c config.h $(INCDIR)/ansidecl.h \
6084 $(INCDIR)/objalloc.h
6085 if [ x"$(PICFLAG)" != x ]; then \
6086 $(COMPILE.c) $(PICFLAG) $(srcdir)/objalloc.c -o pic/$@; \
6087 else true; fi
6088 $(COMPILE.c) $(srcdir)/objalloc.c $(OUTPUT_OPTION)
6089
6090-./obstack.o: $(srcdir)/obstack.c stamp-h $(INCDIR)/obstack.h
6091+./obstack.o: $(srcdir)/obstack.c config.h $(INCDIR)/obstack.h
6092 if [ x"$(PICFLAG)" != x ]; then \
6093 $(COMPILE.c) $(PICFLAG) $(srcdir)/obstack.c -o pic/$@; \
6094 else true; fi
6095 $(COMPILE.c) $(srcdir)/obstack.c $(OUTPUT_OPTION)
6096
6097-./partition.o: $(srcdir)/partition.c stamp-h $(INCDIR)/ansidecl.h \
6098+./partition.o: $(srcdir)/partition.c config.h $(INCDIR)/ansidecl.h \
6099 $(INCDIR)/libiberty.h $(INCDIR)/partition.h
6100 if [ x"$(PICFLAG)" != x ]; then \
6101 $(COMPILE.c) $(PICFLAG) $(srcdir)/partition.c -o pic/$@; \
6102 else true; fi
6103 $(COMPILE.c) $(srcdir)/partition.c $(OUTPUT_OPTION)
6104
6105-./pex-common.o: $(srcdir)/pex-common.c stamp-h $(INCDIR)/ansidecl.h \
6106+./pex-common.o: $(srcdir)/pex-common.c config.h $(INCDIR)/ansidecl.h \
6107 $(INCDIR)/libiberty.h $(srcdir)/pex-common.h
6108 if [ x"$(PICFLAG)" != x ]; then \
6109 $(COMPILE.c) $(PICFLAG) $(srcdir)/pex-common.c -o pic/$@; \
6110 else true; fi
6111 $(COMPILE.c) $(srcdir)/pex-common.c $(OUTPUT_OPTION)
6112
6113-./pex-djgpp.o: $(srcdir)/pex-djgpp.c stamp-h $(INCDIR)/ansidecl.h \
6114+./pex-djgpp.o: $(srcdir)/pex-djgpp.c config.h $(INCDIR)/ansidecl.h \
6115 $(INCDIR)/libiberty.h $(srcdir)/pex-common.h
6116 if [ x"$(PICFLAG)" != x ]; then \
6117 $(COMPILE.c) $(PICFLAG) $(srcdir)/pex-djgpp.c -o pic/$@; \
6118 else true; fi
6119 $(COMPILE.c) $(srcdir)/pex-djgpp.c $(OUTPUT_OPTION)
6120
6121-./pex-msdos.o: $(srcdir)/pex-msdos.c stamp-h $(INCDIR)/ansidecl.h \
6122+./pex-msdos.o: $(srcdir)/pex-msdos.c config.h $(INCDIR)/ansidecl.h \
6123 $(INCDIR)/libiberty.h $(srcdir)/pex-common.h \
6124 $(INCDIR)/safe-ctype.h
6125 if [ x"$(PICFLAG)" != x ]; then \
6126@@ -865,42 +870,42 @@
6127 else true; fi
6128 $(COMPILE.c) $(srcdir)/pex-msdos.c $(OUTPUT_OPTION)
6129
6130-./pex-one.o: $(srcdir)/pex-one.c stamp-h $(INCDIR)/ansidecl.h \
6131+./pex-one.o: $(srcdir)/pex-one.c config.h $(INCDIR)/ansidecl.h \
6132 $(INCDIR)/libiberty.h
6133 if [ x"$(PICFLAG)" != x ]; then \
6134 $(COMPILE.c) $(PICFLAG) $(srcdir)/pex-one.c -o pic/$@; \
6135 else true; fi
6136 $(COMPILE.c) $(srcdir)/pex-one.c $(OUTPUT_OPTION)
6137
6138-./pex-unix.o: $(srcdir)/pex-unix.c stamp-h $(INCDIR)/ansidecl.h \
6139+./pex-unix.o: $(srcdir)/pex-unix.c config.h $(INCDIR)/ansidecl.h \
6140 $(INCDIR)/libiberty.h $(srcdir)/pex-common.h
6141 if [ x"$(PICFLAG)" != x ]; then \
6142 $(COMPILE.c) $(PICFLAG) $(srcdir)/pex-unix.c -o pic/$@; \
6143 else true; fi
6144 $(COMPILE.c) $(srcdir)/pex-unix.c $(OUTPUT_OPTION)
6145
6146-./pex-win32.o: $(srcdir)/pex-win32.c stamp-h $(INCDIR)/ansidecl.h \
6147+./pex-win32.o: $(srcdir)/pex-win32.c config.h $(INCDIR)/ansidecl.h \
6148 $(INCDIR)/libiberty.h $(srcdir)/pex-common.h
6149 if [ x"$(PICFLAG)" != x ]; then \
6150 $(COMPILE.c) $(PICFLAG) $(srcdir)/pex-win32.c -o pic/$@; \
6151 else true; fi
6152 $(COMPILE.c) $(srcdir)/pex-win32.c $(OUTPUT_OPTION)
6153
6154-./pexecute.o: $(srcdir)/pexecute.c stamp-h $(INCDIR)/ansidecl.h \
6155+./pexecute.o: $(srcdir)/pexecute.c config.h $(INCDIR)/ansidecl.h \
6156 $(INCDIR)/libiberty.h
6157 if [ x"$(PICFLAG)" != x ]; then \
6158 $(COMPILE.c) $(PICFLAG) $(srcdir)/pexecute.c -o pic/$@; \
6159 else true; fi
6160 $(COMPILE.c) $(srcdir)/pexecute.c $(OUTPUT_OPTION)
6161
6162-./physmem.o: $(srcdir)/physmem.c stamp-h $(INCDIR)/ansidecl.h \
6163+./physmem.o: $(srcdir)/physmem.c config.h $(INCDIR)/ansidecl.h \
6164 $(INCDIR)/libiberty.h
6165 if [ x"$(PICFLAG)" != x ]; then \
6166 $(COMPILE.c) $(PICFLAG) $(srcdir)/physmem.c -o pic/$@; \
6167 else true; fi
6168 $(COMPILE.c) $(srcdir)/physmem.c $(OUTPUT_OPTION)
6169
6170-./putenv.o: $(srcdir)/putenv.c stamp-h $(INCDIR)/ansidecl.h
6171+./putenv.o: $(srcdir)/putenv.c config.h $(INCDIR)/ansidecl.h
6172 if [ x"$(PICFLAG)" != x ]; then \
6173 $(COMPILE.c) $(PICFLAG) $(srcdir)/putenv.c -o pic/$@; \
6174 else true; fi
6175@@ -912,14 +917,14 @@
6176 else true; fi
6177 $(COMPILE.c) $(srcdir)/random.c $(OUTPUT_OPTION)
6178
6179-./regex.o: $(srcdir)/regex.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/xregex.h \
6180+./regex.o: $(srcdir)/regex.c config.h $(INCDIR)/ansidecl.h $(INCDIR)/xregex.h \
6181 $(INCDIR)/xregex2.h
6182 if [ x"$(PICFLAG)" != x ]; then \
6183 $(COMPILE.c) $(PICFLAG) $(srcdir)/regex.c -o pic/$@; \
6184 else true; fi
6185 $(COMPILE.c) $(srcdir)/regex.c $(OUTPUT_OPTION)
6186
6187-./rename.o: $(srcdir)/rename.c stamp-h $(INCDIR)/ansidecl.h
6188+./rename.o: $(srcdir)/rename.c config.h $(INCDIR)/ansidecl.h
6189 if [ x"$(PICFLAG)" != x ]; then \
6190 $(COMPILE.c) $(PICFLAG) $(srcdir)/rename.c -o pic/$@; \
6191 else true; fi
6192@@ -938,7 +943,7 @@
6193 else true; fi
6194 $(COMPILE.c) $(srcdir)/safe-ctype.c $(OUTPUT_OPTION)
6195
6196-./setenv.o: $(srcdir)/setenv.c stamp-h $(INCDIR)/ansidecl.h
6197+./setenv.o: $(srcdir)/setenv.c config.h $(INCDIR)/ansidecl.h
6198 if [ x"$(PICFLAG)" != x ]; then \
6199 $(COMPILE.c) $(PICFLAG) $(srcdir)/setenv.c -o pic/$@; \
6200 else true; fi
6201@@ -956,20 +961,21 @@
6202 else true; fi
6203 $(COMPILE.c) $(srcdir)/snprintf.c $(OUTPUT_OPTION)
6204
6205-./sort.o: $(srcdir)/sort.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
6206+./sort.o: $(srcdir)/sort.c config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
6207 $(INCDIR)/sort.h
6208 if [ x"$(PICFLAG)" != x ]; then \
6209 $(COMPILE.c) $(PICFLAG) $(srcdir)/sort.c -o pic/$@; \
6210 else true; fi
6211 $(COMPILE.c) $(srcdir)/sort.c $(OUTPUT_OPTION)
6212
6213-./spaces.o: $(srcdir)/spaces.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
6214+./spaces.o: $(srcdir)/spaces.c config.h $(INCDIR)/ansidecl.h \
6215+ $(INCDIR)/libiberty.h
6216 if [ x"$(PICFLAG)" != x ]; then \
6217 $(COMPILE.c) $(PICFLAG) $(srcdir)/spaces.c -o pic/$@; \
6218 else true; fi
6219 $(COMPILE.c) $(srcdir)/spaces.c $(OUTPUT_OPTION)
6220
6221-./splay-tree.o: $(srcdir)/splay-tree.c stamp-h $(INCDIR)/ansidecl.h \
6222+./splay-tree.o: $(srcdir)/splay-tree.c config.h $(INCDIR)/ansidecl.h \
6223 $(INCDIR)/libiberty.h $(INCDIR)/splay-tree.h
6224 if [ x"$(PICFLAG)" != x ]; then \
6225 $(COMPILE.c) $(PICFLAG) $(srcdir)/splay-tree.c -o pic/$@; \
6226@@ -1006,7 +1012,7 @@
6227 else true; fi
6228 $(COMPILE.c) $(srcdir)/strdup.c $(OUTPUT_OPTION)
6229
6230-./strerror.o: $(srcdir)/strerror.c stamp-h $(INCDIR)/ansidecl.h \
6231+./strerror.o: $(srcdir)/strerror.c config.h $(INCDIR)/ansidecl.h \
6232 $(INCDIR)/libiberty.h
6233 if [ x"$(PICFLAG)" != x ]; then \
6234 $(COMPILE.c) $(PICFLAG) $(srcdir)/strerror.c -o pic/$@; \
6235@@ -1037,7 +1043,7 @@
6236 else true; fi
6237 $(COMPILE.c) $(srcdir)/strrchr.c $(OUTPUT_OPTION)
6238
6239-./strsignal.o: $(srcdir)/strsignal.c stamp-h $(INCDIR)/ansidecl.h \
6240+./strsignal.o: $(srcdir)/strsignal.c config.h $(INCDIR)/ansidecl.h \
6241 $(INCDIR)/libiberty.h
6242 if [ x"$(PICFLAG)" != x ]; then \
6243 $(COMPILE.c) $(PICFLAG) $(srcdir)/strsignal.c -o pic/$@; \
6244@@ -1056,13 +1062,13 @@
6245 else true; fi
6246 $(COMPILE.c) $(srcdir)/strtod.c $(OUTPUT_OPTION)
6247
6248-./strtol.o: $(srcdir)/strtol.c stamp-h $(INCDIR)/safe-ctype.h
6249+./strtol.o: $(srcdir)/strtol.c config.h $(INCDIR)/safe-ctype.h
6250 if [ x"$(PICFLAG)" != x ]; then \
6251 $(COMPILE.c) $(PICFLAG) $(srcdir)/strtol.c -o pic/$@; \
6252 else true; fi
6253 $(COMPILE.c) $(srcdir)/strtol.c $(OUTPUT_OPTION)
6254
6255-./strtoul.o: $(srcdir)/strtoul.c stamp-h $(INCDIR)/ansidecl.h \
6256+./strtoul.o: $(srcdir)/strtoul.c config.h $(INCDIR)/ansidecl.h \
6257 $(INCDIR)/safe-ctype.h
6258 if [ x"$(PICFLAG)" != x ]; then \
6259 $(COMPILE.c) $(PICFLAG) $(srcdir)/strtoul.c -o pic/$@; \
6260@@ -1082,14 +1088,14 @@
6261 else true; fi
6262 $(COMPILE.c) $(srcdir)/tmpnam.c $(OUTPUT_OPTION)
6263
6264-./unlink-if-ordinary.o: $(srcdir)/unlink-if-ordinary.c stamp-h \
6265+./unlink-if-ordinary.o: $(srcdir)/unlink-if-ordinary.c config.h \
6266 $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
6267 if [ x"$(PICFLAG)" != x ]; then \
6268 $(COMPILE.c) $(PICFLAG) $(srcdir)/unlink-if-ordinary.c -o pic/$@; \
6269 else true; fi
6270 $(COMPILE.c) $(srcdir)/unlink-if-ordinary.c $(OUTPUT_OPTION)
6271
6272-./vasprintf.o: $(srcdir)/vasprintf.c stamp-h $(INCDIR)/ansidecl.h \
6273+./vasprintf.o: $(srcdir)/vasprintf.c config.h $(INCDIR)/ansidecl.h \
6274 $(INCDIR)/libiberty.h
6275 if [ x"$(PICFLAG)" != x ]; then \
6276 $(COMPILE.c) $(PICFLAG) $(srcdir)/vasprintf.c -o pic/$@; \
6277@@ -1114,7 +1120,7 @@
6278 else true; fi
6279 $(COMPILE.c) $(srcdir)/vprintf.c $(OUTPUT_OPTION)
6280
6281-./vsnprintf.o: $(srcdir)/vsnprintf.c stamp-h $(INCDIR)/ansidecl.h \
6282+./vsnprintf.o: $(srcdir)/vsnprintf.c config.h $(INCDIR)/ansidecl.h \
6283 $(INCDIR)/libiberty.h
6284 if [ x"$(PICFLAG)" != x ]; then \
6285 $(COMPILE.c) $(PICFLAG) $(srcdir)/vsnprintf.c -o pic/$@; \
6286@@ -1127,54 +1133,54 @@
6287 else true; fi
6288 $(COMPILE.c) $(srcdir)/vsprintf.c $(OUTPUT_OPTION)
6289
6290-./waitpid.o: $(srcdir)/waitpid.c stamp-h $(INCDIR)/ansidecl.h
6291+./waitpid.o: $(srcdir)/waitpid.c config.h $(INCDIR)/ansidecl.h
6292 if [ x"$(PICFLAG)" != x ]; then \
6293 $(COMPILE.c) $(PICFLAG) $(srcdir)/waitpid.c -o pic/$@; \
6294 else true; fi
6295 $(COMPILE.c) $(srcdir)/waitpid.c $(OUTPUT_OPTION)
6296
6297-./xatexit.o: $(srcdir)/xatexit.c stamp-h $(INCDIR)/ansidecl.h \
6298+./xatexit.o: $(srcdir)/xatexit.c config.h $(INCDIR)/ansidecl.h \
6299 $(INCDIR)/libiberty.h
6300 if [ x"$(PICFLAG)" != x ]; then \
6301 $(COMPILE.c) $(PICFLAG) $(srcdir)/xatexit.c -o pic/$@; \
6302 else true; fi
6303 $(COMPILE.c) $(srcdir)/xatexit.c $(OUTPUT_OPTION)
6304
6305-./xexit.o: $(srcdir)/xexit.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
6306+./xexit.o: $(srcdir)/xexit.c config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
6307 if [ x"$(PICFLAG)" != x ]; then \
6308 $(COMPILE.c) $(PICFLAG) $(srcdir)/xexit.c -o pic/$@; \
6309 else true; fi
6310 $(COMPILE.c) $(srcdir)/xexit.c $(OUTPUT_OPTION)
6311
6312-./xmalloc.o: $(srcdir)/xmalloc.c stamp-h $(INCDIR)/ansidecl.h \
6313+./xmalloc.o: $(srcdir)/xmalloc.c config.h $(INCDIR)/ansidecl.h \
6314 $(INCDIR)/libiberty.h
6315 if [ x"$(PICFLAG)" != x ]; then \
6316 $(COMPILE.c) $(PICFLAG) $(srcdir)/xmalloc.c -o pic/$@; \
6317 else true; fi
6318 $(COMPILE.c) $(srcdir)/xmalloc.c $(OUTPUT_OPTION)
6319
6320-./xmemdup.o: $(srcdir)/xmemdup.c stamp-h $(INCDIR)/ansidecl.h \
6321+./xmemdup.o: $(srcdir)/xmemdup.c config.h $(INCDIR)/ansidecl.h \
6322 $(INCDIR)/libiberty.h
6323 if [ x"$(PICFLAG)" != x ]; then \
6324 $(COMPILE.c) $(PICFLAG) $(srcdir)/xmemdup.c -o pic/$@; \
6325 else true; fi
6326 $(COMPILE.c) $(srcdir)/xmemdup.c $(OUTPUT_OPTION)
6327
6328-./xstrdup.o: $(srcdir)/xstrdup.c stamp-h $(INCDIR)/ansidecl.h \
6329+./xstrdup.o: $(srcdir)/xstrdup.c config.h $(INCDIR)/ansidecl.h \
6330 $(INCDIR)/libiberty.h
6331 if [ x"$(PICFLAG)" != x ]; then \
6332 $(COMPILE.c) $(PICFLAG) $(srcdir)/xstrdup.c -o pic/$@; \
6333 else true; fi
6334 $(COMPILE.c) $(srcdir)/xstrdup.c $(OUTPUT_OPTION)
6335
6336-./xstrerror.o: $(srcdir)/xstrerror.c stamp-h $(INCDIR)/ansidecl.h \
6337+./xstrerror.o: $(srcdir)/xstrerror.c config.h $(INCDIR)/ansidecl.h \
6338 $(INCDIR)/libiberty.h
6339 if [ x"$(PICFLAG)" != x ]; then \
6340 $(COMPILE.c) $(PICFLAG) $(srcdir)/xstrerror.c -o pic/$@; \
6341 else true; fi
6342 $(COMPILE.c) $(srcdir)/xstrerror.c $(OUTPUT_OPTION)
6343
6344-./xstrndup.o: $(srcdir)/xstrndup.c stamp-h $(INCDIR)/ansidecl.h \
6345+./xstrndup.o: $(srcdir)/xstrndup.c config.h $(INCDIR)/ansidecl.h \
6346 $(INCDIR)/libiberty.h
6347 if [ x"$(PICFLAG)" != x ]; then \
6348 $(COMPILE.c) $(PICFLAG) $(srcdir)/xstrndup.c -o pic/$@; \
6349Index: gcc-4.3.3/libiberty/configure
6350===================================================================
6351--- gcc-4.3.3.orig/libiberty/configure 2007-07-17 10:52:28.000000000 -0700
6352+++ gcc-4.3.3/libiberty/configure 2009-04-29 18:03:50.224612238 -0700
6353@@ -309,7 +309,7 @@
6354 # include <unistd.h>
6355 #endif"
6356
6357-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 libiberty_topdir MAINT NOTMAINT MAKEINFO BUILD_INFO PERL HAVE_PERL build build_cpu build_vendor build_os host host_cpu host_vendor host_os AR ac_ct_AR RANLIB ac_ct_RANLIB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP ac_libiberty_warn_cflags NO_MINUS_C_MINUS_O OUTPUT_OPTION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA EGREP LIBOBJS CHECK target_header_dir pexecute INSTALL_DEST datarootdir docdir htmldir LTLIBOBJS'
6358+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 libiberty_topdir MAINT NOTMAINT MAKEINFO BUILD_INFO PERL HAVE_PERL build build_cpu build_vendor build_os host host_cpu host_vendor host_os AR ac_ct_AR RANLIB ac_ct_RANLIB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP ac_libiberty_warn_cflags NO_MINUS_C_MINUS_O OUTPUT_OPTION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PICFLAG EGREP LIBOBJS CHECK target_header_dir pexecute INSTALL_DEST datarootdir docdir htmldir LTLIBOBJS'
6359 ac_subst_files='host_makefile_frag'
6360
6361 # Initialize some variables set by options.
6362@@ -3699,9 +3699,7 @@
6363 esac
6364
6365 if [ -n "${frag}" ]; then
6366- frags=${libiberty_topdir}/libiberty/config/$frag
6367-else
6368- frags=
6369+ frag=${libiberty_topdir}/libiberty/config/$frag
6370 fi
6371
6372 # If they didn't specify --enable-shared, don't generate shared libs.
6373@@ -3712,34 +3710,35 @@
6374 *) shared=yes ;;
6375 esac
6376 if [ "${shared}" = "yes" ]; then
6377- frag=
6378 case "${host}" in
6379 *-*-cygwin*) ;;
6380- alpha*-*-linux*) frag=mh-elfalphapic ;;
6381- arm*-*-*) frag=mh-armpic ;;
6382- hppa*-*-*) frag=mh-papic ;;
6383+ alpha*-*-linux*) PICFLAG=-fPIC ;;
6384+ arm*-*-*) PICFLAG=-fPIC ;;
6385+ hppa*-*-*) PICFLAG=-fPIC ;;
6386+ i370-*-*) PICFLAG=-fPIC ;;
6387+ ia64-*-*) PICFLAG=-fpic ;;
6388 i[34567]86-*-* | x86_64-*-*)
6389- frag=mh-x86pic ;;
6390+ PICFLAG=-fpic ;;
6391+ m68k-*-*) PICFLAG=-fpic ;;
6392+ mips*-*-linux) PICFLAG=-fPIC ;;
6393 powerpc*-*-aix*) ;;
6394- powerpc*-*-*) frag=mh-ppcpic ;;
6395- sparc*-*-*) frag=mh-sparcpic ;;
6396- s390*-*-*) frag=mh-s390pic ;;
6397- *) frag=mh-${host_cpu}pic ;;
6398+ powerpc*-*-*) PICFLAG=-fPIC ;;
6399+ sparc*-*-*) case "${CFLAGS}" in
6400+ *-fpic* ) PICFLAG=-fpic ;;
6401+ * ) PICFLAG=-fPIC ;;
6402+ esac ;;
6403+ s390*-*-*) PICFLAG=-fpic ;;
6404 esac
6405- if [ -n "${frag}" ]; then
6406- frags="${frags} ${libiberty_topdir}/config/${frag}"
6407- fi
6408 fi
6409
6410+
6411 echo "# Warning: this fragment is automatically generated" > temp-frag
6412
6413-for frag in ${frags}; do
6414- if [ -f ${frag} ]; then
6415- echo "Appending ${frag} to xhost-mkfrag"
6416- echo "# Following fragment copied from ${frag}" >> temp-frag
6417- cat ${frag} >> temp-frag
6418- fi
6419-done
6420+if [ -n "${frag}" ] && [ -f "${frag}" ]; then
6421+ echo "Appending ${frag} to xhost-mkfrag"
6422+ echo "# Following fragment copied from ${frag}" >> temp-frag
6423+ cat ${frag} >> temp-frag
6424+fi
6425
6426 # record if we want to build shared libs.
6427 if [ "${shared}" = "yes" ]; then
6428@@ -9671,6 +9670,7 @@
6429 s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
6430 s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
6431 s,@INSTALL_DATA@,$INSTALL_DATA,;t t
6432+s,@PICFLAG@,$PICFLAG,;t t
6433 s,@EGREP@,$EGREP,;t t
6434 s,@LIBOBJS@,$LIBOBJS,;t t
6435 s,@CHECK@,$CHECK,;t t
6436Index: gcc-4.3.3/libiberty/configure.ac
6437===================================================================
6438--- gcc-4.3.3.orig/libiberty/configure.ac 2007-07-17 10:52:28.000000000 -0700
6439+++ gcc-4.3.3/libiberty/configure.ac 2009-04-29 18:03:50.224612238 -0700
6440@@ -187,9 +187,7 @@
6441 esac
6442
6443 if [[ -n "${frag}" ]]; then
6444- frags=${libiberty_topdir}/libiberty/config/$frag
6445-else
6446- frags=
6447+ frag=${libiberty_topdir}/libiberty/config/$frag
6448 fi
6449
6450 # If they didn't specify --enable-shared, don't generate shared libs.
6451@@ -200,34 +198,35 @@
6452 *) shared=yes ;;
6453 esac
6454 if [[ "${shared}" = "yes" ]]; then
6455- frag=
6456 case "${host}" in
6457 *-*-cygwin*) ;;
6458- alpha*-*-linux*) frag=mh-elfalphapic ;;
6459- arm*-*-*) frag=mh-armpic ;;
6460- hppa*-*-*) frag=mh-papic ;;
6461+ alpha*-*-linux*) PICFLAG=-fPIC ;;
6462+ arm*-*-*) PICFLAG=-fPIC ;;
6463+ hppa*-*-*) PICFLAG=-fPIC ;;
6464+ i370-*-*) PICFLAG=-fPIC ;;
6465+ ia64-*-*) PICFLAG=-fpic ;;
6466 i[[34567]]86-*-* | x86_64-*-*)
6467- frag=mh-x86pic ;;
6468+ PICFLAG=-fpic ;;
6469+ m68k-*-*) PICFLAG=-fpic ;;
6470+ mips*-*-linux) PICFLAG=-fPIC ;;
6471 powerpc*-*-aix*) ;;
6472- powerpc*-*-*) frag=mh-ppcpic ;;
6473- sparc*-*-*) frag=mh-sparcpic ;;
6474- s390*-*-*) frag=mh-s390pic ;;
6475- *) frag=mh-${host_cpu}pic ;;
6476+ powerpc*-*-*) PICFLAG=-fPIC ;;
6477+ sparc*-*-*) case "${CFLAGS}" in
6478+ *-fpic* ) PICFLAG=-fpic ;;
6479+ * ) PICFLAG=-fPIC ;;
6480+ esac ;;
6481+ s390*-*-*) PICFLAG=-fpic ;;
6482 esac
6483- if [[ -n "${frag}" ]]; then
6484- frags="${frags} ${libiberty_topdir}/config/${frag}"
6485- fi
6486 fi
6487+AC_SUBST(PICFLAG)
6488
6489 echo "# Warning: this fragment is automatically generated" > temp-frag
6490
6491-for frag in ${frags}; do
6492- if [[ -f ${frag} ]]; then
6493- echo "Appending ${frag} to xhost-mkfrag"
6494- echo "# Following fragment copied from ${frag}" >> temp-frag
6495- cat ${frag} >> temp-frag
6496- fi
6497-done
6498+if [[ -n "${frag}" ]] && [[ -f "${frag}" ]]; then
6499+ echo "Appending ${frag} to xhost-mkfrag"
6500+ echo "# Following fragment copied from ${frag}" >> temp-frag
6501+ cat ${frag} >> temp-frag
6502+fi
6503
6504 # record if we want to build shared libs.
6505 if [[ "${shared}" = "yes" ]]; then
6506Index: gcc-4.3.3/gcc/Makefile.in
6507===================================================================
6508--- gcc-4.3.3.orig/gcc/Makefile.in 2009-04-29 17:55:20.000000000 -0700
6509+++ gcc-4.3.3/gcc/Makefile.in 2009-04-29 18:03:50.236612117 -0700
6510@@ -689,7 +689,7 @@
6511 BUILD_CFLAGS= @BUILD_CFLAGS@ -DGENERATOR_FILE
6512
6513 # Native linker and preprocessor flags. For x-fragment overrides.
6514-BUILD_LDFLAGS=$(LDFLAGS)
6515+BUILD_LDFLAGS=@BUILD_LDFLAGS@
6516 BUILD_CPPFLAGS=$(ALL_CPPFLAGS)
6517
6518 # Actual name to use when installing a native compiler.
6519Index: gcc-4.3.3/gcc/configure
6520===================================================================
6521--- gcc-4.3.3.orig/gcc/configure 2009-04-29 17:55:27.000000000 -0700
6522+++ gcc-4.3.3/gcc/configure 2009-04-29 18:03:50.256611768 -0700
6523@@ -458,7 +458,7 @@
6524 # include <unistd.h>
6525 #endif"
6526
6527-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 host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical build_libsubdir build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP loose_warn cxx_compat_warn strict_warn warn_cflags nocommon_flag TREEBROWSER valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_decimal_float enable_fixed_point enable_shared TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI datarootdir docdir htmldir SET_MAKE AWK LN_S LN RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON NM AR COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file extra_opt_files USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT host_cc_for_libada CROSS ALL SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS STMP_FIXINC STMP_FIXPROTO collect2 LIBTOOL SED FGREP GREP LD DUMPBIN ac_ct_DUMPBIN ac_ct_AR STRIP ac_ct_STRIP lt_ECHO objdir enable_fast_install gcc_cv_as ORIGINAL_AS_FOR_TARGET gcc_cv_ld ORIGINAL_LD_FOR_TARGET gcc_cv_nm ORIGINAL_NM_FOR_TARGET gcc_cv_objdump libgcc_visibility GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir subdirs srcdir all_compilers all_gtfiles all_lang_makefrags all_lang_makefiles all_languages all_selected_languages build_exeext build_install_headers_dir build_xm_file_list build_xm_include_list build_xm_defines build_file_translate check_languages cpp_install_dir xmake_file tmake_file extra_gcc_objs extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir host_exeext host_xm_file_list host_xm_include_list host_xm_defines out_host_hook_obj install lang_opt_files lang_specs_files lang_tree_files local_prefix md_file objc_boehm_gc out_file out_object_file thread_file tm_file_list tm_include_list tm_defines tm_p_file_list tm_p_include_list xm_file_list xm_include_list xm_defines c_target_objs cxx_target_objs target_cpu_default GMPLIBS GMPINC LIBOBJS LTLIBOBJS'
6528+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 host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical build_libsubdir build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP loose_warn cxx_compat_warn strict_warn warn_cflags nocommon_flag TREEBROWSER valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_decimal_float enable_fixed_point enable_shared TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI datarootdir docdir htmldir SET_MAKE AWK LN_S LN RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON NM AR COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file extra_opt_files USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT host_cc_for_libada CROSS ALL SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS BUILD_LDFLAGS STMP_FIXINC STMP_FIXPROTO collect2 LIBTOOL SED FGREP GREP LD DUMPBIN ac_ct_DUMPBIN ac_ct_AR STRIP ac_ct_STRIP lt_ECHO objdir enable_fast_install gcc_cv_as ORIGINAL_AS_FOR_TARGET gcc_cv_ld ORIGINAL_LD_FOR_TARGET gcc_cv_nm ORIGINAL_NM_FOR_TARGET gcc_cv_objdump libgcc_visibility GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir subdirs srcdir all_compilers all_gtfiles all_lang_makefrags all_lang_makefiles all_languages all_selected_languages build_exeext build_install_headers_dir build_xm_file_list build_xm_include_list build_xm_defines build_file_translate check_languages cpp_install_dir xmake_file tmake_file extra_gcc_objs extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir host_exeext host_xm_file_list host_xm_include_list host_xm_defines out_host_hook_obj install lang_opt_files lang_specs_files lang_tree_files local_prefix md_file objc_boehm_gc out_file out_object_file thread_file tm_file_list tm_include_list tm_defines tm_p_file_list tm_p_include_list xm_file_list xm_include_list xm_defines c_target_objs cxx_target_objs target_cpu_default GMPLIBS GMPINC LIBOBJS LTLIBOBJS'
6529 ac_subst_files='language_hooks'
6530
6531 # Initialize some variables set by options.
6532@@ -12972,6 +12972,7 @@
6533 esac
6534 saved_CFLAGS="${CFLAGS}"
6535 CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \
6536+ LDFLAGS="${LDFLAGS_FOR_BUILD}" \
6537 CONFIG_SITE= ${realsrcdir}/configure --cache-file=./other.cache \
6538 --enable-languages=${enable_languages-all} \
6539 --target=$target_alias --host=$build_alias --build=$build_alias
6540@@ -13469,6 +13470,7 @@
6541 # These are the normal (build=host) settings:
6542 CC_FOR_BUILD='$(CC)'
6543 BUILD_CFLAGS='$(ALL_CFLAGS)'
6544+BUILD_LDFLAGS='$(LDFLAGS)'
6545 STMP_FIXINC=stmp-fixinc
6546
6547 # Possibly disable fixproto, on a per-target basis.
6548@@ -13486,6 +13488,7 @@
6549 if test x$build != x$host || test "x$coverage_flags" != x
6550 then
6551 BUILD_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)'
6552+ BUILD_LDFLAGS='$(LDFLAGS_FOR_BUILD)'
6553
6554 if test "x$TARGET_SYSTEM_ROOT" = x; then
6555 if test "x$STMP_FIXPROTO" != x; then
6556@@ -14064,13 +14067,13 @@
6557 else
6558 lt_cv_nm_interface="BSD nm"
6559 echo "int some_variable = 0;" > conftest.$ac_ext
6560- (eval echo "\"\$as_me:14067: $ac_compile\"" >&5)
6561+ (eval echo "\"\$as_me:14070: $ac_compile\"" >&5)
6562 (eval "$ac_compile" 2>conftest.err)
6563 cat conftest.err >&5
6564- (eval echo "\"\$as_me:14070: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
6565+ (eval echo "\"\$as_me:14073: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
6566 (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
6567 cat conftest.err >&5
6568- (eval echo "\"\$as_me:14073: output\"" >&5)
6569+ (eval echo "\"\$as_me:14076: output\"" >&5)
6570 cat conftest.out >&5
6571 if $GREP 'External.*some_variable' conftest.out > /dev/null; then
6572 lt_cv_nm_interface="MS dumpbin"
6573@@ -15125,7 +15128,7 @@
6574 ;;
6575 *-*-irix6*)
6576 # Find out which ABI we are using.
6577- echo '#line 15128 "configure"' > conftest.$ac_ext
6578+ echo '#line 15131 "configure"' > conftest.$ac_ext
6579 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6580 (eval $ac_compile) 2>&5
6581 ac_status=$?
6582@@ -15745,11 +15748,11 @@
6583 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
6584 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
6585 -e 's:$: $lt_compiler_flag:'`
6586- (eval echo "\"\$as_me:15748: $lt_compile\"" >&5)
6587+ (eval echo "\"\$as_me:15751: $lt_compile\"" >&5)
6588 (eval "$lt_compile" 2>conftest.err)
6589 ac_status=$?
6590 cat conftest.err >&5
6591- echo "$as_me:15752: \$? = $ac_status" >&5
6592+ echo "$as_me:15755: \$? = $ac_status" >&5
6593 if (exit $ac_status) && test -s "$ac_outfile"; then
6594 # The compiler can only warn and ignore the option if not recognized
6595 # So say no if there are warnings other than the usual output.
6596@@ -16067,11 +16070,11 @@
6597 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
6598 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
6599 -e 's:$: $lt_compiler_flag:'`
6600- (eval echo "\"\$as_me:16070: $lt_compile\"" >&5)
6601+ (eval echo "\"\$as_me:16073: $lt_compile\"" >&5)
6602 (eval "$lt_compile" 2>conftest.err)
6603 ac_status=$?
6604 cat conftest.err >&5
6605- echo "$as_me:16074: \$? = $ac_status" >&5
6606+ echo "$as_me:16077: \$? = $ac_status" >&5
6607 if (exit $ac_status) && test -s "$ac_outfile"; then
6608 # The compiler can only warn and ignore the option if not recognized
6609 # So say no if there are warnings other than the usual output.
6610@@ -16172,11 +16175,11 @@
6611 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
6612 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
6613 -e 's:$: $lt_compiler_flag:'`
6614- (eval echo "\"\$as_me:16175: $lt_compile\"" >&5)
6615+ (eval echo "\"\$as_me:16178: $lt_compile\"" >&5)
6616 (eval "$lt_compile" 2>out/conftest.err)
6617 ac_status=$?
6618 cat out/conftest.err >&5
6619- echo "$as_me:16179: \$? = $ac_status" >&5
6620+ echo "$as_me:16182: \$? = $ac_status" >&5
6621 if (exit $ac_status) && test -s out/conftest2.$ac_objext
6622 then
6623 # The compiler can only warn and ignore the option if not recognized
6624@@ -16227,11 +16230,11 @@
6625 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
6626 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
6627 -e 's:$: $lt_compiler_flag:'`
6628- (eval echo "\"\$as_me:16230: $lt_compile\"" >&5)
6629+ (eval echo "\"\$as_me:16233: $lt_compile\"" >&5)
6630 (eval "$lt_compile" 2>out/conftest.err)
6631 ac_status=$?
6632 cat out/conftest.err >&5
6633- echo "$as_me:16234: \$? = $ac_status" >&5
6634+ echo "$as_me:16237: \$? = $ac_status" >&5
6635 if (exit $ac_status) && test -s out/conftest2.$ac_objext
6636 then
6637 # The compiler can only warn and ignore the option if not recognized
6638@@ -19024,7 +19027,7 @@
6639 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
6640 lt_status=$lt_dlunknown
6641 cat > conftest.$ac_ext <<_LT_EOF
6642-#line 19027 "configure"
6643+#line 19030 "configure"
6644 #include "confdefs.h"
6645
6646 #if HAVE_DLFCN_H
6647@@ -19124,7 +19127,7 @@
6648 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
6649 lt_status=$lt_dlunknown
6650 cat > conftest.$ac_ext <<_LT_EOF
6651-#line 19127 "configure"
6652+#line 19130 "configure"
6653 #include "confdefs.h"
6654
6655 #if HAVE_DLFCN_H
6656@@ -23934,6 +23937,7 @@
6657 s,@inhibit_libc@,$inhibit_libc,;t t
6658 s,@CC_FOR_BUILD@,$CC_FOR_BUILD,;t t
6659 s,@BUILD_CFLAGS@,$BUILD_CFLAGS,;t t
6660+s,@BUILD_LDFLAGS@,$BUILD_LDFLAGS,;t t
6661 s,@STMP_FIXINC@,$STMP_FIXINC,;t t
6662 s,@STMP_FIXPROTO@,$STMP_FIXPROTO,;t t
6663 s,@collect2@,$collect2,;t t
6664Index: gcc-4.3.3/gcc/configure.ac
6665===================================================================
6666--- gcc-4.3.3.orig/gcc/configure.ac 2009-04-29 17:55:27.000000000 -0700
6667+++ gcc-4.3.3/gcc/configure.ac 2009-04-29 18:03:50.264611238 -0700
6668@@ -1480,6 +1480,7 @@
6669 esac
6670 saved_CFLAGS="${CFLAGS}"
6671 CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \
6672+ LDFLAGS="${LDFLAGS_FOR_BUILD}" \
6673 CONFIG_SITE= ${realsrcdir}/configure --cache-file=./other.cache \
6674 --enable-languages=${enable_languages-all} \
6675 --target=$target_alias --host=$build_alias --build=$build_alias
6676@@ -1776,6 +1777,7 @@
6677 # These are the normal (build=host) settings:
6678 CC_FOR_BUILD='$(CC)' AC_SUBST(CC_FOR_BUILD)
6679 BUILD_CFLAGS='$(ALL_CFLAGS)' AC_SUBST(BUILD_CFLAGS)
6680+BUILD_LDFLAGS='$(LDFLAGS)' AC_SUBST(BUILD_LDFLAGS)
6681 STMP_FIXINC=stmp-fixinc AC_SUBST(STMP_FIXINC)
6682
6683 # Possibly disable fixproto, on a per-target basis.
6684@@ -1793,6 +1795,7 @@
6685 if test x$build != x$host || test "x$coverage_flags" != x
6686 then
6687 BUILD_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)'
6688+ BUILD_LDFLAGS='$(LDFLAGS_FOR_BUILD)'
6689
6690 if test "x$TARGET_SYSTEM_ROOT" = x; then
6691 if test "x$STMP_FIXPROTO" != x; then
diff --git a/meta/packages/gcc/gcc-4.3.3/gcc-flags-for-build.patch b/meta/packages/gcc/gcc-4.3.3/gcc-flags-for-build.patch
new file mode 100644
index 0000000000..43a9d73dcf
--- /dev/null
+++ b/meta/packages/gcc/gcc-4.3.3/gcc-flags-for-build.patch
@@ -0,0 +1,279 @@
1Index: gcc-4.3.2/Makefile.def
2===================================================================
3--- gcc-4.3.2.orig/Makefile.def 2008-08-28 18:21:19.000000000 -0700
4+++ gcc-4.3.2/Makefile.def 2008-08-28 18:21:41.000000000 -0700
5@@ -207,6 +207,7 @@
6 flags_to_pass = { flag= BISON ; };
7 flags_to_pass = { flag= CC_FOR_BUILD ; };
8 flags_to_pass = { flag= CFLAGS_FOR_BUILD ; };
9+flags_to_pass = { flag= CPPFLAGS_FOR_BUILD ; };
10 flags_to_pass = { flag= CXX_FOR_BUILD ; };
11 flags_to_pass = { flag= EXPECT ; };
12 flags_to_pass = { flag= FLEX ; };
13Index: gcc-4.3.2/gcc/Makefile.in
14===================================================================
15--- gcc-4.3.2.orig/gcc/Makefile.in 2008-08-28 18:21:20.000000000 -0700
16+++ gcc-4.3.2/gcc/Makefile.in 2008-08-28 18:21:41.000000000 -0700
17@@ -673,7 +673,7 @@
18
19 # Native linker and preprocessor flags. For x-fragment overrides.
20 BUILD_LDFLAGS=@BUILD_LDFLAGS@
21-BUILD_CPPFLAGS=$(ALL_CPPFLAGS)
22+BUILD_CPPFLAGS=$(INCLUDES) @BUILD_CPPFLAGS@ $(X_CPPFLAGS)
23
24 # Actual name to use when installing a native compiler.
25 GCC_INSTALL_NAME := $(shell echo gcc|sed '$(program_transform_name)')
26Index: gcc-4.3.2/gcc/configure.ac
27===================================================================
28--- gcc-4.3.2.orig/gcc/configure.ac 2008-08-28 18:21:20.000000000 -0700
29+++ gcc-4.3.2/gcc/configure.ac 2008-08-28 18:21:41.000000000 -0700
30@@ -1775,10 +1775,11 @@
31 # Also, we cannot run fixincludes or fix-header.
32
33 # These are the normal (build=host) settings:
34-CC_FOR_BUILD='$(CC)' AC_SUBST(CC_FOR_BUILD)
35-BUILD_CFLAGS='$(ALL_CFLAGS)' AC_SUBST(BUILD_CFLAGS)
36-BUILD_LDFLAGS='$(LDFLAGS)' AC_SUBST(BUILD_LDFLAGS)
37-STMP_FIXINC=stmp-fixinc AC_SUBST(STMP_FIXINC)
38+CC_FOR_BUILD='$(CC)' AC_SUBST(CC_FOR_BUILD)
39+BUILD_CFLAGS='$(ALL_CFLAGS)' AC_SUBST(BUILD_CFLAGS)
40+BUILD_LDFLAGS='$(LDFLAGS)' AC_SUBST(BUILD_LDFLAGS)
41+BUILD_CPPFLAGS='$(ALL_CPPFLAGS)' AC_SUBST(BUILD_CPPFLAGS)
42+STMP_FIXINC=stmp-fixinc AC_SUBST(STMP_FIXINC)
43
44 # Possibly disable fixproto, on a per-target basis.
45 case ${use_fixproto} in
46@@ -1796,6 +1797,7 @@
47 then
48 BUILD_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)'
49 BUILD_LDFLAGS='$(LDFLAGS_FOR_BUILD)'
50+ BUILD_CPPFLAGS='$(CPPFLAGS_FOR_BUILD)'
51
52 if test "x$TARGET_SYSTEM_ROOT" = x; then
53 if test "x$STMP_FIXPROTO" != x; then
54Index: gcc-4.3.2/Makefile.in
55===================================================================
56--- gcc-4.3.2.orig/Makefile.in 2008-08-28 18:21:20.000000000 -0700
57+++ gcc-4.3.2/Makefile.in 2008-08-28 18:21:41.000000000 -0700
58@@ -272,6 +272,7 @@
59 AS_FOR_BUILD = @AS_FOR_BUILD@
60 CC_FOR_BUILD = @CC_FOR_BUILD@
61 CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
62+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
63 CXXFLAGS_FOR_BUILD = @CXXFLAGS_FOR_BUILD@
64 CXX_FOR_BUILD = @CXX_FOR_BUILD@
65 DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@
66@@ -502,6 +503,7 @@
67 "BISON=$(BISON)" \
68 "CC_FOR_BUILD=$(CC_FOR_BUILD)" \
69 "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
70+ "CPPFLAGS_FOR_BUILD=$(CPPFLAGS_FOR_BUILD)" \
71 "CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \
72 "EXPECT=$(EXPECT)" \
73 "FLEX=$(FLEX)" \
74Index: gcc-4.3.2/gcc/configure
75===================================================================
76--- gcc-4.3.2.orig/gcc/configure 2008-08-28 18:21:20.000000000 -0700
77+++ gcc-4.3.2/gcc/configure 2008-08-28 18:21:50.000000000 -0700
78@@ -458,7 +458,7 @@
79 # include <unistd.h>
80 #endif"
81
82-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 host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical build_libsubdir build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP loose_warn cxx_compat_warn strict_warn warn_cflags nocommon_flag TREEBROWSER valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_decimal_float enable_fixed_point enable_shared TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI datarootdir docdir htmldir SET_MAKE AWK LN_S LN RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON NM AR COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file extra_opt_files USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT host_cc_for_libada CROSS ALL SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS BUILD_LDFLAGS STMP_FIXINC STMP_FIXPROTO collect2 LIBTOOL SED FGREP GREP LD DUMPBIN ac_ct_DUMPBIN ac_ct_AR STRIP ac_ct_STRIP lt_ECHO objdir enable_fast_install gcc_cv_as ORIGINAL_AS_FOR_TARGET gcc_cv_ld ORIGINAL_LD_FOR_TARGET gcc_cv_nm ORIGINAL_NM_FOR_TARGET gcc_cv_objdump libgcc_visibility GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir subdirs srcdir all_compilers all_gtfiles all_lang_makefrags all_lang_makefiles all_languages all_selected_languages build_exeext build_install_headers_dir build_xm_file_list build_xm_include_list build_xm_defines build_file_translate check_languages cpp_install_dir xmake_file tmake_file extra_gcc_objs extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir host_exeext host_xm_file_list host_xm_include_list host_xm_defines out_host_hook_obj install lang_opt_files lang_specs_files lang_tree_files local_prefix md_file objc_boehm_gc out_file out_object_file thread_file tm_file_list tm_include_list tm_defines tm_p_file_list tm_p_include_list xm_file_list xm_include_list xm_defines c_target_objs cxx_target_objs target_cpu_default GMPLIBS GMPINC LIBOBJS LTLIBOBJS'
83+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 host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical build_libsubdir build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP loose_warn cxx_compat_warn strict_warn warn_cflags nocommon_flag TREEBROWSER valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_decimal_float enable_fixed_point enable_shared TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI datarootdir docdir htmldir SET_MAKE AWK LN_S LN RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON NM AR COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file extra_opt_files USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT host_cc_for_libada CROSS ALL SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS BUILD_LDFLAGS BUILD_CPPFLAGS STMP_FIXINC STMP_FIXPROTO collect2 LIBTOOL SED FGREP GREP LD DUMPBIN ac_ct_DUMPBIN ac_ct_AR STRIP ac_ct_STRIP lt_ECHO objdir enable_fast_install gcc_cv_as ORIGINAL_AS_FOR_TARGET gcc_cv_ld ORIGINAL_LD_FOR_TARGET gcc_cv_nm ORIGINAL_NM_FOR_TARGET gcc_cv_objdump libgcc_visibility GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir subdirs srcdir all_compilers all_gtfiles all_lang_makefrags all_lang_makefiles all_languages all_selected_languages build_exeext build_install_headers_dir build_xm_file_list build_xm_include_list build_xm_defines build_file_translate check_languages cpp_install_dir xmake_file tmake_file extra_gcc_objs extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir host_exeext host_xm_file_list host_xm_include_list host_xm_defines out_host_hook_obj install lang_opt_files lang_specs_files lang_tree_files local_prefix md_file objc_boehm_gc out_file out_object_file thread_file tm_file_list tm_include_list tm_defines tm_p_file_list tm_p_include_list xm_file_list xm_include_list xm_defines c_target_objs cxx_target_objs target_cpu_default GMPLIBS GMPINC LIBOBJS LTLIBOBJS'
84 ac_subst_files='language_hooks'
85
86 # Initialize some variables set by options.
87@@ -13471,6 +13471,7 @@
88 CC_FOR_BUILD='$(CC)'
89 BUILD_CFLAGS='$(ALL_CFLAGS)'
90 BUILD_LDFLAGS='$(LDFLAGS)'
91+BUILD_CPPFLAGS='$(ALL_CPPFLAGS)'
92 STMP_FIXINC=stmp-fixinc
93
94 # Possibly disable fixproto, on a per-target basis.
95@@ -13489,6 +13490,7 @@
96 then
97 BUILD_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)'
98 BUILD_LDFLAGS='$(LDFLAGS_FOR_BUILD)'
99+ BUILD_CPPFLAGS='$(CPPFLAGS_FOR_BUILD)'
100
101 if test "x$TARGET_SYSTEM_ROOT" = x; then
102 if test "x$STMP_FIXPROTO" != x; then
103@@ -14067,13 +14069,13 @@
104 else
105 lt_cv_nm_interface="BSD nm"
106 echo "int some_variable = 0;" > conftest.$ac_ext
107- (eval echo "\"\$as_me:14070: $ac_compile\"" >&5)
108+ (eval echo "\"\$as_me:14072: $ac_compile\"" >&5)
109 (eval "$ac_compile" 2>conftest.err)
110 cat conftest.err >&5
111- (eval echo "\"\$as_me:14073: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
112+ (eval echo "\"\$as_me:14075: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
113 (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
114 cat conftest.err >&5
115- (eval echo "\"\$as_me:14076: output\"" >&5)
116+ (eval echo "\"\$as_me:14078: output\"" >&5)
117 cat conftest.out >&5
118 if $GREP 'External.*some_variable' conftest.out > /dev/null; then
119 lt_cv_nm_interface="MS dumpbin"
120@@ -15128,7 +15130,7 @@
121 ;;
122 *-*-irix6*)
123 # Find out which ABI we are using.
124- echo '#line 15131 "configure"' > conftest.$ac_ext
125+ echo '#line 15133 "configure"' > conftest.$ac_ext
126 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
127 (eval $ac_compile) 2>&5
128 ac_status=$?
129@@ -15748,11 +15750,11 @@
130 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
131 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
132 -e 's:$: $lt_compiler_flag:'`
133- (eval echo "\"\$as_me:15751: $lt_compile\"" >&5)
134+ (eval echo "\"\$as_me:15753: $lt_compile\"" >&5)
135 (eval "$lt_compile" 2>conftest.err)
136 ac_status=$?
137 cat conftest.err >&5
138- echo "$as_me:15755: \$? = $ac_status" >&5
139+ echo "$as_me:15757: \$? = $ac_status" >&5
140 if (exit $ac_status) && test -s "$ac_outfile"; then
141 # The compiler can only warn and ignore the option if not recognized
142 # So say no if there are warnings other than the usual output.
143@@ -16070,11 +16072,11 @@
144 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
145 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
146 -e 's:$: $lt_compiler_flag:'`
147- (eval echo "\"\$as_me:16073: $lt_compile\"" >&5)
148+ (eval echo "\"\$as_me:16075: $lt_compile\"" >&5)
149 (eval "$lt_compile" 2>conftest.err)
150 ac_status=$?
151 cat conftest.err >&5
152- echo "$as_me:16077: \$? = $ac_status" >&5
153+ echo "$as_me:16079: \$? = $ac_status" >&5
154 if (exit $ac_status) && test -s "$ac_outfile"; then
155 # The compiler can only warn and ignore the option if not recognized
156 # So say no if there are warnings other than the usual output.
157@@ -16175,11 +16177,11 @@
158 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
159 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
160 -e 's:$: $lt_compiler_flag:'`
161- (eval echo "\"\$as_me:16178: $lt_compile\"" >&5)
162+ (eval echo "\"\$as_me:16180: $lt_compile\"" >&5)
163 (eval "$lt_compile" 2>out/conftest.err)
164 ac_status=$?
165 cat out/conftest.err >&5
166- echo "$as_me:16182: \$? = $ac_status" >&5
167+ echo "$as_me:16184: \$? = $ac_status" >&5
168 if (exit $ac_status) && test -s out/conftest2.$ac_objext
169 then
170 # The compiler can only warn and ignore the option if not recognized
171@@ -16230,11 +16232,11 @@
172 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
173 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
174 -e 's:$: $lt_compiler_flag:'`
175- (eval echo "\"\$as_me:16233: $lt_compile\"" >&5)
176+ (eval echo "\"\$as_me:16235: $lt_compile\"" >&5)
177 (eval "$lt_compile" 2>out/conftest.err)
178 ac_status=$?
179 cat out/conftest.err >&5
180- echo "$as_me:16237: \$? = $ac_status" >&5
181+ echo "$as_me:16239: \$? = $ac_status" >&5
182 if (exit $ac_status) && test -s out/conftest2.$ac_objext
183 then
184 # The compiler can only warn and ignore the option if not recognized
185@@ -19027,7 +19029,7 @@
186 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
187 lt_status=$lt_dlunknown
188 cat > conftest.$ac_ext <<_LT_EOF
189-#line 19030 "configure"
190+#line 19032 "configure"
191 #include "confdefs.h"
192
193 #if HAVE_DLFCN_H
194@@ -19127,7 +19129,7 @@
195 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
196 lt_status=$lt_dlunknown
197 cat > conftest.$ac_ext <<_LT_EOF
198-#line 19130 "configure"
199+#line 19132 "configure"
200 #include "confdefs.h"
201
202 #if HAVE_DLFCN_H
203@@ -23938,6 +23940,7 @@
204 s,@CC_FOR_BUILD@,$CC_FOR_BUILD,;t t
205 s,@BUILD_CFLAGS@,$BUILD_CFLAGS,;t t
206 s,@BUILD_LDFLAGS@,$BUILD_LDFLAGS,;t t
207+s,@BUILD_CPPFLAGS@,$BUILD_CPPFLAGS,;t t
208 s,@STMP_FIXINC@,$STMP_FIXINC,;t t
209 s,@STMP_FIXPROTO@,$STMP_FIXPROTO,;t t
210 s,@collect2@,$collect2,;t t
211Index: gcc-4.3.2/Makefile.tpl
212===================================================================
213--- gcc-4.3.2.orig/Makefile.tpl 2008-08-28 18:21:20.000000000 -0700
214+++ gcc-4.3.2/Makefile.tpl 2008-08-28 18:21:41.000000000 -0700
215@@ -275,6 +275,7 @@
216 AS_FOR_BUILD = @AS_FOR_BUILD@
217 CC_FOR_BUILD = @CC_FOR_BUILD@
218 CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
219+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
220 CXXFLAGS_FOR_BUILD = @CXXFLAGS_FOR_BUILD@
221 CXX_FOR_BUILD = @CXX_FOR_BUILD@
222 DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@
223Index: gcc-4.3.2/configure
224===================================================================
225--- gcc-4.3.2.orig/configure 2008-08-28 18:21:20.000000000 -0700
226+++ gcc-4.3.2/configure 2008-08-28 18:21:41.000000000 -0700
227@@ -272,7 +272,7 @@
228 PACKAGE_BUGREPORT=
229
230 ac_unique_file="move-if-change"
231-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'
232+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 CPPFLAGS_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'
233 ac_subst_files='serialization_dependencies host_makefile_frag target_makefile_frag alphaieee_frag ospace_frag'
234
235 # Initialize some variables set by options.
236@@ -5914,6 +5914,7 @@
237 # our build compiler if desired.
238 if test x"${build}" = x"${host}" ; then
239 CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-${CFLAGS}}
240+ CPPFLAGS_FOR_BUILD=${CPPFLAGS_FOR_BUILD-${CPPFLAGS}}
241 CXXFLAGS_FOR_BUILD=${CXXFLAGS_FOR_BUILD-${CXXFLAGS}}
242 LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-${LDFLAGS}}
243 fi
244@@ -5991,6 +5992,7 @@
245
246
247
248+
249 # Generate default definitions for YACC, M4, LEX and other programs that run
250 # on the build machine. These are used if the Makefile can't locate these
251 # programs in objdir.
252@@ -12874,6 +12876,7 @@
253 s,@AS_FOR_BUILD@,$AS_FOR_BUILD,;t t
254 s,@CC_FOR_BUILD@,$CC_FOR_BUILD,;t t
255 s,@CFLAGS_FOR_BUILD@,$CFLAGS_FOR_BUILD,;t t
256+s,@CPPFLAGS_FOR_BUILD@,$CPPFLAGS_FOR_BUILD,;t t
257 s,@CXXFLAGS_FOR_BUILD@,$CXXFLAGS_FOR_BUILD,;t t
258 s,@CXX_FOR_BUILD@,$CXX_FOR_BUILD,;t t
259 s,@DLLTOOL_FOR_BUILD@,$DLLTOOL_FOR_BUILD,;t t
260Index: gcc-4.3.2/configure.ac
261===================================================================
262--- gcc-4.3.2.orig/configure.ac 2008-08-28 18:21:20.000000000 -0700
263+++ gcc-4.3.2/configure.ac 2008-08-28 18:21:41.000000000 -0700
264@@ -2425,6 +2425,7 @@
265 # our build compiler if desired.
266 if test x"${build}" = x"${host}" ; then
267 CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-${CFLAGS}}
268+ CPPFLAGS_FOR_BUILD=${CPPFLAGS_FOR_BUILD-${CPPFLAGS}}
269 CXXFLAGS_FOR_BUILD=${CXXFLAGS_FOR_BUILD-${CXXFLAGS}}
270 LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-${LDFLAGS}}
271 fi
272@@ -2489,6 +2490,7 @@
273 AC_SUBST(AS_FOR_BUILD)
274 AC_SUBST(CC_FOR_BUILD)
275 AC_SUBST(CFLAGS_FOR_BUILD)
276+AC_SUBST(CPPFLAGS_FOR_BUILD)
277 AC_SUBST(CXXFLAGS_FOR_BUILD)
278 AC_SUBST(CXX_FOR_BUILD)
279 AC_SUBST(DLLTOOL_FOR_BUILD)
diff --git a/meta/packages/gcc/gcc-4.3.3/headerpath.patch b/meta/packages/gcc/gcc-4.3.3/headerpath.patch
new file mode 100644
index 0000000000..a3a6aff270
--- /dev/null
+++ b/meta/packages/gcc/gcc-4.3.3/headerpath.patch
@@ -0,0 +1,42 @@
1Index: gcc-4.3.3/gcc/Makefile.in
2===================================================================
3--- gcc-4.3.3.orig/gcc/Makefile.in 2009-09-11 17:51:50.000000000 +0100
4+++ gcc-4.3.3/gcc/Makefile.in 2009-09-11 17:56:48.000000000 +0100
5@@ -378,7 +378,7 @@
6 MD5_H = $(srcdir)/../include/md5.h
7
8 # Default native SYSTEM_HEADER_DIR, to be overridden by targets.
9-NATIVE_SYSTEM_HEADER_DIR = /usr/include
10+NATIVE_SYSTEM_HEADER_DIR = @NATIVE_SYSTEM_HEADER_DIR@
11 # Default cross SYSTEM_HEADER_DIR, to be overridden by targets.
12 CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@
13
14Index: gcc-4.3.3/gcc/configure
15===================================================================
16--- gcc-4.3.3.orig/gcc/configure 2009-09-11 17:49:58.000000000 +0100
17+++ gcc-4.3.3/gcc/configure 2009-09-11 18:00:16.000000000 +0100
18@@ -7315,7 +7315,7 @@
19 enable_shared=yes
20 fi;
21
22-
23+NATIVE_SYSTEM_HEADER_DIR=$NATIVE_SYSTEM_HEADER_DIR
24
25 # Check whether --with-build-sysroot or --without-build-sysroot was given.
26 if test "${with_build_sysroot+set}" = set; then
27@@ -7323,7 +7323,6 @@
28
29 fi;
30
31-
32 # Check whether --with-sysroot or --without-sysroot was given.
33 if test "${with_sysroot+set}" = set; then
34 withval="$with_sysroot"
35@@ -23882,6 +23881,7 @@
36 s,@TARGET_SYSTEM_ROOT@,$TARGET_SYSTEM_ROOT,;t t
37 s,@TARGET_SYSTEM_ROOT_DEFINE@,$TARGET_SYSTEM_ROOT_DEFINE,;t t
38 s,@CROSS_SYSTEM_HEADER_DIR@,$CROSS_SYSTEM_HEADER_DIR,;t t
39+s,@NATIVE_SYSTEM_HEADER_DIR@,$NATIVE_SYSTEM_HEADER_DIR,;t t
40 s,@onestep@,$onestep,;t t
41 s,@PKGVERSION@,$PKGVERSION,;t t
42 s,@REPORT_BUGS_TO@,$REPORT_BUGS_TO,;t t
diff --git a/meta/packages/gcc/gcc-4.3.3/sh_unwind.patch b/meta/packages/gcc/gcc-4.3.3/sh_unwind.patch
new file mode 100644
index 0000000000..94921636bc
--- /dev/null
+++ b/meta/packages/gcc/gcc-4.3.3/sh_unwind.patch
@@ -0,0 +1,18 @@
1Index: gcc-4.2.4/gcc/config/sh/linux-unwind.h
2===================================================================
3--- gcc-4.2.4.orig/gcc/config/sh/linux-unwind.h 2008-10-04 00:05:29.434889757 +0200
4+++ gcc-4.2.4/gcc/config/sh/linux-unwind.h 2008-10-04 00:06:02.594883544 +0200
5@@ -26,6 +26,7 @@
6 the Free Software Foundation, 51 Franklin Street, Fifth Floor,
7 Boston, MA 02110-1301, USA. */
8
9+#ifndef inhibit_libc
10 /* Do code reading to identify a signal frame, and set the frame
11 state data appropriately. See unwind-dw2.c for the structs. */
12
13@@ -251,3 +252,5 @@
14 return _URC_NO_REASON;
15 }
16 #endif /* defined (__SH5__) */
17+
18+#endif /* defined inhibit_libc */
diff --git a/meta/packages/gcc/gcc-4.3.3/zecke-no-host-includes.patch b/meta/packages/gcc/gcc-4.3.3/zecke-no-host-includes.patch
index 8b05cb73a9..1f3b062feb 100644
--- a/meta/packages/gcc/gcc-4.3.3/zecke-no-host-includes.patch
+++ b/meta/packages/gcc/gcc-4.3.3/zecke-no-host-includes.patch
@@ -6,7 +6,7 @@ Index: gcc-4.0.2/gcc/c-incpath.c
6 p->construct = 0; 6 p->construct = 0;
7 p->user_supplied_p = user_supplied_p; 7 p->user_supplied_p = user_supplied_p;
8 8
9+#ifdef CROSS_COMPILE 9+#ifdef CROSS_DIRECTORY_STRUCTURE
10+ /* A common error when cross compiling is including 10+ /* A common error when cross compiling is including
11+ host headers. This code below will try to fail fast 11+ host headers. This code below will try to fail fast
12+ for cross compiling. Currently we consider /usr/include, 12+ for cross compiling. Currently we consider /usr/include,
@@ -14,13 +14,13 @@ Index: gcc-4.0.2/gcc/c-incpath.c
14+ { 14+ {
15+ /* printf("Adding Path: %s\n", p->name ); */ 15+ /* printf("Adding Path: %s\n", p->name ); */
16+ if( strstr(p->name, "/usr/include" ) == p->name ) { 16+ if( strstr(p->name, "/usr/include" ) == p->name ) {
17+ fprintf(stderr, _("BUILD ISOLATION FAILURE: /usr/include in INCLUDEPATH: %s\n Please fix the flags passed to the compiler to use the correct prefix.\n"), p->name); 17+ fprintf(stderr, _("CROSS COMPILE Badness: /usr/include in INCLUDEPATH: %s\n"), p->name);
18+ abort(); 18+ abort();
19+ } else if( strstr(p->name, "/sw/include") == p->name ) { 19+ } else if( strstr(p->name, "/sw/include") == p->name ) {
20+ fprintf(stderr, _("BUILD ISOLATION FAILURE: /sw/include in INCLUDEPATH: %s\n Please fix the flags passed to the compiler to use the correct prefix.\n"), p->name); 20+ fprintf(stderr, _("CROSS COMPILE Badness: /sw/include in INCLUDEPATH: %s\n"), p->name);
21+ abort(); 21+ abort();
22+ } else if( strstr(p->name, "/opt/include") == p->name ) { 22+ } else if( strstr(p->name, "/opt/include") == p->name ) {
23+ fprintf(stderr, _("BUILD ISOLATION FAILURE: /opt/include in INCLUDEPATH: %s\n Please fix the flags passed to the compiler to use the correct prefix.\n"), p->name); 23+ fprintf(stderr, _("CROSS COMPILE Badness: /opt/include in INCLUDEPATH: %s\n"), p->name);
24+ abort(); 24+ abort();
25+ } 25+ }
26+ } 26+ }
diff --git a/meta/packages/gcc/gcc-4.3.3/zecke-xgcc-cpp.patch b/meta/packages/gcc/gcc-4.3.3/zecke-xgcc-cpp.patch
index 3ccd124764..a7722cbfc4 100644
--- a/meta/packages/gcc/gcc-4.3.3/zecke-xgcc-cpp.patch
+++ b/meta/packages/gcc/gcc-4.3.3/zecke-xgcc-cpp.patch
@@ -2,15 +2,27 @@ upstream: n/a
2comment: Use the preprocessor we have just compiled instead the one of 2comment: Use the preprocessor we have just compiled instead the one of
3the system. There might be incompabilities between us and them. 3the system. There might be incompabilities between us and them.
4 4
5Index: gcc-4.1.1/Makefile.in 5Index: gcc-4.3.1/Makefile.in
6=================================================================== 6===================================================================
7--- gcc-4.1.1.orig/Makefile.in 2006-08-06 13:32:44.000000000 +0200 7--- gcc-4.3.1.orig/Makefile.in 2008-08-19 01:09:56.000000000 -0700
8+++ gcc-4.1.1/Makefile.in 2006-08-06 13:32:46.000000000 +0200 8+++ gcc-4.3.1/Makefile.in 2008-08-19 01:13:27.000000000 -0700
9@@ -194,6 +194,7 @@ 9@@ -204,6 +204,7 @@
10 AR="$(AR_FOR_TARGET)"; export AR; \
10 AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \ 11 AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
11 CC="$(CC_FOR_TARGET)"; export CC; \ 12 CC="$(CC_FOR_TARGET)"; export CC; \
12 CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
13+ CPP="$(CC_FOR_TARGET) -E"; export CPP; \ 13+ CPP="$(CC_FOR_TARGET) -E"; export CPP; \
14 CFLAGS="$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
15 CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
16 CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
17Index: gcc-4.3.1/Makefile.tpl
18===================================================================
19--- gcc-4.3.1.orig/Makefile.tpl 2008-08-21 00:07:58.000000000 -0700
20+++ gcc-4.3.1/Makefile.tpl 2008-08-21 00:09:52.000000000 -0700
21@@ -223,6 +223,7 @@
22 AR="$(AR_FOR_TARGET)"; export AR; \
23 AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
24 CC="$(CC_FOR_TARGET)"; export CC; \
25+ CPP="$(CC_FOR_TARGET) -E"; export CPP; \
26 CFLAGS="$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
14 CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ 27 CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
15 CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \ 28 CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
16 CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 03:41:39 +0000