diff options
author | Khem Raj <raj.khem@gmail.com> | 2012-02-23 19:14:58 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-30 11:37:24 +0100 |
commit | aafa59064b9409e3ce06bf334ca250fc2c483acb (patch) | |
tree | 1bd0f82a6812d154785f849c511771852ab1bf3a /meta/recipes-devtools/gcc/gcc-4.7/204-uclibc-locale-wchar_fix.patch | |
parent | 173f424808b935f5db99905bf5af307990d87107 (diff) | |
download | poky-aafa59064b9409e3ce06bf334ca250fc2c483acb.tar.gz |
gcc-4.7: Add recipes
Add new recipes for gcc-4_7-branch right now gcc 4.7.0
is latest release from this branch
(From OE-Core rev: 3f8fee75e598ad0994acc5da0a612e6eca4f35f6)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc-4.7/204-uclibc-locale-wchar_fix.patch')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-4.7/204-uclibc-locale-wchar_fix.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.7/204-uclibc-locale-wchar_fix.patch b/meta/recipes-devtools/gcc/gcc-4.7/204-uclibc-locale-wchar_fix.patch new file mode 100644 index 0000000000..896d2a57c7 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.7/204-uclibc-locale-wchar_fix.patch | |||
@@ -0,0 +1,54 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Index: gcc-4.6.0/libstdc++-v3/config/locale/uclibc/monetary_members.cc | ||
4 | =================================================================== | ||
5 | --- gcc-4.6.0.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc | ||
6 | +++ gcc-4.6.0/libstdc++-v3/config/locale/uclibc/monetary_members.cc | ||
7 | @@ -401,7 +401,7 @@ namespace std | ||
8 | # ifdef __UCLIBC_HAS_XLOCALE__ | ||
9 | _M_data->_M_decimal_point = __cloc->decimal_point_wc; | ||
10 | _M_data->_M_thousands_sep = __cloc->thousands_sep_wc; | ||
11 | -# else | ||
12 | +# elif defined __UCLIBC_HAS_LOCALE__ | ||
13 | _M_data->_M_decimal_point = __global_locale->decimal_point_wc; | ||
14 | _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc; | ||
15 | # endif | ||
16 | @@ -556,7 +556,7 @@ namespace std | ||
17 | # ifdef __UCLIBC_HAS_XLOCALE__ | ||
18 | _M_data->_M_decimal_point = __cloc->decimal_point_wc; | ||
19 | _M_data->_M_thousands_sep = __cloc->thousands_sep_wc; | ||
20 | -# else | ||
21 | +# elif defined __UCLIBC_HAS_LOCALE__ | ||
22 | _M_data->_M_decimal_point = __global_locale->decimal_point_wc; | ||
23 | _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc; | ||
24 | # endif | ||
25 | Index: gcc-4.6.0/libstdc++-v3/config/locale/uclibc/numeric_members.cc | ||
26 | =================================================================== | ||
27 | --- gcc-4.6.0.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc | ||
28 | +++ gcc-4.6.0/libstdc++-v3/config/locale/uclibc/numeric_members.cc | ||
29 | @@ -127,12 +127,25 @@ namespace std | ||
30 | { | ||
31 | // Named locale. | ||
32 | // NB: In the GNU model wchar_t is always 32 bit wide. | ||
33 | +#ifdef __UCLIBC_MJN3_ONLY__ | ||
34 | +#warning fix this... should be numeric | ||
35 | +#endif | ||
36 | +#ifdef __UCLIBC__ | ||
37 | +# ifdef __UCLIBC_HAS_XLOCALE__ | ||
38 | + _M_data->_M_decimal_point = __cloc->decimal_point_wc; | ||
39 | + _M_data->_M_thousands_sep = __cloc->thousands_sep_wc; | ||
40 | +# elif defined __UCLIBC_HAS_LOCALE__ | ||
41 | + _M_data->_M_decimal_point = __global_locale->decimal_point_wc; | ||
42 | + _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc; | ||
43 | +# endif | ||
44 | +#else | ||
45 | union { char *__s; wchar_t __w; } __u; | ||
46 | __u.__s = __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc); | ||
47 | _M_data->_M_decimal_point = __u.__w; | ||
48 | |||
49 | __u.__s = __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc); | ||
50 | _M_data->_M_thousands_sep = __u.__w; | ||
51 | +#endif | ||
52 | |||
53 | if (_M_data->_M_thousands_sep == L'\0') | ||
54 | _M_data->_M_grouping = ""; | ||