diff options
author | Khem Raj <raj.khem@gmail.com> | 2014-03-19 15:20:56 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-06 17:59:15 +0100 |
commit | 3d094751c8712f6805f9303c75471ccd26be304e (patch) | |
tree | ad71efcdabe984882e814e5d775ba743adadb1c7 /meta/recipes-devtools/gcc/gcc-4.9/0006-uclibc-locale-wchar_fix.patch | |
parent | 7b78c364b7de901f97cd8dbe56d5e02f545bf3d3 (diff) | |
download | poky-3d094751c8712f6805f9303c75471ccd26be304e.tar.gz |
gcc: Add 4.9 recipes
(From OE-Core rev: f051216ea373f166016b15bbd2a2a6f136430372)
(From OE-Core rev: d4573cb750bfde488682244d30266dfe675bac06)
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.9/0006-uclibc-locale-wchar_fix.patch')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-4.9/0006-uclibc-locale-wchar_fix.patch | 68 |
1 files changed, 68 insertions, 0 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.9/0006-uclibc-locale-wchar_fix.patch b/meta/recipes-devtools/gcc/gcc-4.9/0006-uclibc-locale-wchar_fix.patch new file mode 100644 index 0000000000..3406859e11 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.9/0006-uclibc-locale-wchar_fix.patch | |||
@@ -0,0 +1,68 @@ | |||
1 | From 225511a3aeb193a916b3999f0b640a392caa67cd Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 29 Mar 2013 08:45:57 +0400 | ||
4 | Subject: [PATCH 06/35] uclibc-locale-wchar_fix | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | --- | ||
10 | libstdc++-v3/config/locale/uclibc/monetary_members.cc | 4 ++-- | ||
11 | libstdc++-v3/config/locale/uclibc/numeric_members.cc | 13 +++++++++++++ | ||
12 | 2 files changed, 15 insertions(+), 2 deletions(-) | ||
13 | |||
14 | diff --git a/libstdc++-v3/config/locale/uclibc/monetary_members.cc b/libstdc++-v3/config/locale/uclibc/monetary_members.cc | ||
15 | index 2e6f80a..31ebb9f 100644 | ||
16 | --- a/libstdc++-v3/config/locale/uclibc/monetary_members.cc | ||
17 | +++ b/libstdc++-v3/config/locale/uclibc/monetary_members.cc | ||
18 | @@ -401,7 +401,7 @@ namespace std | ||
19 | # ifdef __UCLIBC_HAS_XLOCALE__ | ||
20 | _M_data->_M_decimal_point = __cloc->decimal_point_wc; | ||
21 | _M_data->_M_thousands_sep = __cloc->thousands_sep_wc; | ||
22 | -# else | ||
23 | +# elif defined __UCLIBC_HAS_LOCALE__ | ||
24 | _M_data->_M_decimal_point = __global_locale->decimal_point_wc; | ||
25 | _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc; | ||
26 | # endif | ||
27 | @@ -556,7 +556,7 @@ namespace std | ||
28 | # ifdef __UCLIBC_HAS_XLOCALE__ | ||
29 | _M_data->_M_decimal_point = __cloc->decimal_point_wc; | ||
30 | _M_data->_M_thousands_sep = __cloc->thousands_sep_wc; | ||
31 | -# else | ||
32 | +# elif defined __UCLIBC_HAS_LOCALE__ | ||
33 | _M_data->_M_decimal_point = __global_locale->decimal_point_wc; | ||
34 | _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc; | ||
35 | # endif | ||
36 | diff --git a/libstdc++-v3/config/locale/uclibc/numeric_members.cc b/libstdc++-v3/config/locale/uclibc/numeric_members.cc | ||
37 | index 2c70642..d5c8961 100644 | ||
38 | --- a/libstdc++-v3/config/locale/uclibc/numeric_members.cc | ||
39 | +++ b/libstdc++-v3/config/locale/uclibc/numeric_members.cc | ||
40 | @@ -127,12 +127,25 @@ namespace std | ||
41 | { | ||
42 | // Named locale. | ||
43 | // NB: In the GNU model wchar_t is always 32 bit wide. | ||
44 | +#ifdef __UCLIBC_MJN3_ONLY__ | ||
45 | +#warning fix this... should be numeric | ||
46 | +#endif | ||
47 | +#ifdef __UCLIBC__ | ||
48 | +# ifdef __UCLIBC_HAS_XLOCALE__ | ||
49 | + _M_data->_M_decimal_point = __cloc->decimal_point_wc; | ||
50 | + _M_data->_M_thousands_sep = __cloc->thousands_sep_wc; | ||
51 | +# elif defined __UCLIBC_HAS_LOCALE__ | ||
52 | + _M_data->_M_decimal_point = __global_locale->decimal_point_wc; | ||
53 | + _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc; | ||
54 | +# endif | ||
55 | +#else | ||
56 | union { char *__s; wchar_t __w; } __u; | ||
57 | __u.__s = __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc); | ||
58 | _M_data->_M_decimal_point = __u.__w; | ||
59 | |||
60 | __u.__s = __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc); | ||
61 | _M_data->_M_thousands_sep = __u.__w; | ||
62 | +#endif | ||
63 | |||
64 | if (_M_data->_M_thousands_sep == L'\0') | ||
65 | _M_data->_M_grouping = ""; | ||
66 | -- | ||
67 | 1.7.10.4 | ||
68 | |||