diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2009-10-10 19:25:48 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2009-10-10 19:25:48 +0000 |
| commit | 215ccb66e6abdaed0a41582d6b8c40ffa340eea7 (patch) | |
| tree | e8ecd7ecc708bda6515831abaffbcb8d9ee65d5f /toolchain/gcc/patches/llvm/204-uclibc-locale-wchar_fix.patch | |
| parent | b49cdabd4ae2c0239dc12eda5e1b7a21b9c2e5dc (diff) | |
| download | upstream-215ccb66e6abdaed0a41582d6b8c40ffa340eea7.tar.gz upstream-215ccb66e6abdaed0a41582d6b8c40ffa340eea7.tar.bz2 upstream-215ccb66e6abdaed0a41582d6b8c40ffa340eea7.zip | |
gcc: add llvm-gcc and llvm from trunk (does not successfully compile a target yet, but gets close)
SVN-Revision: 18019
Diffstat (limited to 'toolchain/gcc/patches/llvm/204-uclibc-locale-wchar_fix.patch')
| -rw-r--r-- | toolchain/gcc/patches/llvm/204-uclibc-locale-wchar_fix.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/toolchain/gcc/patches/llvm/204-uclibc-locale-wchar_fix.patch b/toolchain/gcc/patches/llvm/204-uclibc-locale-wchar_fix.patch new file mode 100644 index 0000000000..d62c3c4334 --- /dev/null +++ b/toolchain/gcc/patches/llvm/204-uclibc-locale-wchar_fix.patch @@ -0,0 +1,48 @@ +--- a/libstdc++-v3/config/locale/uclibc/monetary_members.cc ++++ b/libstdc++-v3/config/locale/uclibc/monetary_members.cc +@@ -401,7 +401,7 @@ namespace std + # 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 @@ namespace std + # 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 +--- a/libstdc++-v3/config/locale/uclibc/numeric_members.cc ++++ b/libstdc++-v3/config/locale/uclibc/numeric_members.cc +@@ -127,12 +127,25 @@ namespace std + { + // 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 = ""; |