diff options
| author | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-04-17 10:04:19 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-04-17 10:04:19 +0000 |
| commit | 66df6d12445faf14fcab925e883375758f7132a2 (patch) | |
| tree | 49092dbe08b3a6b9322b9ccf9e0e51a7a6e2c498 /meta/packages/gcc/gcc-4.2.3/204-uclibc-locale-wchar_fix.patch | |
| parent | abca3ca42f2097d1cef8c2eb87fce46604618af2 (diff) | |
| download | poky-66df6d12445faf14fcab925e883375758f7132a2.tar.gz | |
gcc: upgrade 4.2.2 -> 4.2.3
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4286 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/gcc/gcc-4.2.3/204-uclibc-locale-wchar_fix.patch')
| -rw-r--r-- | meta/packages/gcc/gcc-4.2.3/204-uclibc-locale-wchar_fix.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/meta/packages/gcc/gcc-4.2.3/204-uclibc-locale-wchar_fix.patch b/meta/packages/gcc/gcc-4.2.3/204-uclibc-locale-wchar_fix.patch new file mode 100644 index 0000000000..160ab35bb3 --- /dev/null +++ b/meta/packages/gcc/gcc-4.2.3/204-uclibc-locale-wchar_fix.patch | |||
| @@ -0,0 +1,48 @@ | |||
| 1 | --- gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc.uclibc200_wchar~ 2006-03-10 15:32:37 +0100 | ||
| 2 | +++ gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2006-03-10 15:37:27 +0100 | ||
| 3 | @@ -401,7 +401,7 @@ | ||
| 4 | # ifdef __UCLIBC_HAS_XLOCALE__ | ||
| 5 | _M_data->_M_decimal_point = __cloc->decimal_point_wc; | ||
| 6 | _M_data->_M_thousands_sep = __cloc->thousands_sep_wc; | ||
| 7 | -# else | ||
| 8 | +# elif defined __UCLIBC_HAS_LOCALE__ | ||
| 9 | _M_data->_M_decimal_point = __global_locale->decimal_point_wc; | ||
| 10 | _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc; | ||
| 11 | # endif | ||
| 12 | @@ -556,7 +556,7 @@ | ||
| 13 | # ifdef __UCLIBC_HAS_XLOCALE__ | ||
| 14 | _M_data->_M_decimal_point = __cloc->decimal_point_wc; | ||
| 15 | _M_data->_M_thousands_sep = __cloc->thousands_sep_wc; | ||
| 16 | -# else | ||
| 17 | +# elif defined __UCLIBC_HAS_LOCALE__ | ||
| 18 | _M_data->_M_decimal_point = __global_locale->decimal_point_wc; | ||
| 19 | _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc; | ||
| 20 | # endif | ||
| 21 | --- gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc.uclibc200_wchar~ 2006-03-10 15:32:37 +0100 | ||
| 22 | +++ gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2006-03-10 15:37:27 +0100 | ||
| 23 | @@ -127,12 +127,25 @@ | ||
| 24 | { | ||
| 25 | // Named locale. | ||
| 26 | // NB: In the GNU model wchar_t is always 32 bit wide. | ||
| 27 | +#ifdef __UCLIBC_MJN3_ONLY__ | ||
| 28 | +#warning fix this... should be numeric | ||
| 29 | +#endif | ||
| 30 | +#ifdef __UCLIBC__ | ||
| 31 | +# ifdef __UCLIBC_HAS_XLOCALE__ | ||
| 32 | + _M_data->_M_decimal_point = __cloc->decimal_point_wc; | ||
| 33 | + _M_data->_M_thousands_sep = __cloc->thousands_sep_wc; | ||
| 34 | +# elif defined __UCLIBC_HAS_LOCALE__ | ||
| 35 | + _M_data->_M_decimal_point = __global_locale->decimal_point_wc; | ||
| 36 | + _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc; | ||
| 37 | +# endif | ||
| 38 | +#else | ||
| 39 | union { char *__s; wchar_t __w; } __u; | ||
| 40 | __u.__s = __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc); | ||
| 41 | _M_data->_M_decimal_point = __u.__w; | ||
| 42 | |||
| 43 | __u.__s = __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc); | ||
| 44 | _M_data->_M_thousands_sep = __u.__w; | ||
| 45 | +#endif | ||
| 46 | |||
| 47 | if (_M_data->_M_thousands_sep == L'\0') | ||
| 48 | _M_data->_M_grouping = ""; | ||