diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2008-06-13 11:49:42 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2008-06-13 11:49:42 +0000 |
| commit | 364405da5f5b3ecb0ff96227f153db7fddf07ee7 (patch) | |
| tree | cd76e42652582cff3cccf901deabcaea95bf1636 /toolchain/gcc/4.2.4/204-uclibc-locale-wchar_fix.patch | |
| parent | 40cee2a9fc1ffef65a39519554e4579a180c4530 (diff) | |
| download | buildroot-novena-364405da5f5b3ecb0ff96227f153db7fddf07ee7.tar.gz buildroot-novena-364405da5f5b3ecb0ff96227f153db7fddf07ee7.zip | |
toolchain: gcc 4.2.4 support
Diffstat (limited to 'toolchain/gcc/4.2.4/204-uclibc-locale-wchar_fix.patch')
| -rw-r--r-- | toolchain/gcc/4.2.4/204-uclibc-locale-wchar_fix.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/toolchain/gcc/4.2.4/204-uclibc-locale-wchar_fix.patch b/toolchain/gcc/4.2.4/204-uclibc-locale-wchar_fix.patch new file mode 100644 index 000000000..160ab35bb --- /dev/null +++ b/toolchain/gcc/4.2.4/204-uclibc-locale-wchar_fix.patch @@ -0,0 +1,48 @@ +--- gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc.uclibc200_wchar~ 2006-03-10 15:32:37 +0100 ++++ gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2006-03-10 15:37:27 +0100 +@@ -401,7 +401,7 @@ + # ifdef __UCLIBC_HAS_XLOCALE__ + _M_data->_M_decimal_point = __cloc->decimal_point_wc; + _M_data->_M_thousands_sep = __cloc->thousands_sep_wc; +-# else ++# elif defined __UCLIBC_HAS_LOCALE__ + _M_data->_M_decimal_point = __global_locale->decimal_point_wc; + _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc; + # endif +@@ -556,7 +556,7 @@ + # ifdef __UCLIBC_HAS_XLOCALE__ + _M_data->_M_decimal_point = __cloc->decimal_point_wc; + _M_data->_M_thousands_sep = __cloc->thousands_sep_wc; +-# else ++# elif defined __UCLIBC_HAS_LOCALE__ + _M_data->_M_decimal_point = __global_locale->decimal_point_wc; + _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc; + # endif +--- gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc.uclibc200_wchar~ 2006-03-10 15:32:37 +0100 ++++ gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2006-03-10 15:37:27 +0100 +@@ -127,12 +127,25 @@ + { + // Named locale. + // NB: In the GNU model wchar_t is always 32 bit wide. ++#ifdef __UCLIBC_MJN3_ONLY__ ++#warning fix this... should be numeric ++#endif ++#ifdef __UCLIBC__ ++# ifdef __UCLIBC_HAS_XLOCALE__ ++ _M_data->_M_decimal_point = __cloc->decimal_point_wc; ++ _M_data->_M_thousands_sep = __cloc->thousands_sep_wc; ++# elif defined __UCLIBC_HAS_LOCALE__ ++ _M_data->_M_decimal_point = __global_locale->decimal_point_wc; ++ _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc; ++# endif ++#else + union { char *__s; wchar_t __w; } __u; + __u.__s = __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc); + _M_data->_M_decimal_point = __u.__w; + + __u.__s = __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc); + _M_data->_M_thousands_sep = __u.__w; ++#endif + + if (_M_data->_M_thousands_sep == L'\0') + _M_data->_M_grouping = ""; |