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.2/204-uclibc-locale-wchar_fix.patch | |
parent | abca3ca42f2097d1cef8c2eb87fce46604618af2 (diff) | |
download | openembedded-core-66df6d12445faf14fcab925e883375758f7132a2.tar.gz openembedded-core-66df6d12445faf14fcab925e883375758f7132a2.tar.bz2 openembedded-core-66df6d12445faf14fcab925e883375758f7132a2.tar.xz openembedded-core-66df6d12445faf14fcab925e883375758f7132a2.zip |
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.2/204-uclibc-locale-wchar_fix.patch')
-rw-r--r-- | meta/packages/gcc/gcc-4.2.2/204-uclibc-locale-wchar_fix.patch | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/meta/packages/gcc/gcc-4.2.2/204-uclibc-locale-wchar_fix.patch b/meta/packages/gcc/gcc-4.2.2/204-uclibc-locale-wchar_fix.patch deleted file mode 100644 index 160ab35bb..000000000 --- a/meta/packages/gcc/gcc-4.2.2/204-uclibc-locale-wchar_fix.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- 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 = ""; |