diff options
| author | Khem Raj <raj.khem@gmail.com> | 2011-06-17 17:11:43 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-23 11:49:04 +0100 |
| commit | 68b545f4ff719f2b6e57d68b002dc9845c7a14ae (patch) | |
| tree | f21182fa4d1394686b9afafbaac6d90bc3aa69a8 /meta/recipes-devtools/gcc/gcc-4.6/204-uclibc-locale-wchar_fix.patch | |
| parent | b32666e29999c7c698b1a1378f96844fbc48358d (diff) | |
| download | openembedded-core-68b545f4ff719f2b6e57d68b002dc9845c7a14ae.tar.gz openembedded-core-68b545f4ff719f2b6e57d68b002dc9845c7a14ae.tar.bz2 openembedded-core-68b545f4ff719f2b6e57d68b002dc9845c7a14ae.tar.xz openembedded-core-68b545f4ff719f2b6e57d68b002dc9845c7a14ae.zip | |
gcc-4.6: Switch to using svn SRC_URI for recipe
We call the recipes 4.6
Remove the backport patches
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc-4.6/204-uclibc-locale-wchar_fix.patch')
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-4.6/204-uclibc-locale-wchar_fix.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/204-uclibc-locale-wchar_fix.patch b/meta/recipes-devtools/gcc/gcc-4.6/204-uclibc-locale-wchar_fix.patch new file mode 100644 index 000000000..896d2a57c --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.6/204-uclibc-locale-wchar_fix.patch @@ -0,0 +1,54 @@ +Upstream-Status: Pending + +Index: gcc-4.6.0/libstdc++-v3/config/locale/uclibc/monetary_members.cc +=================================================================== +--- gcc-4.6.0.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc ++++ gcc-4.6.0/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 +Index: gcc-4.6.0/libstdc++-v3/config/locale/uclibc/numeric_members.cc +=================================================================== +--- gcc-4.6.0.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc ++++ gcc-4.6.0/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 = ""; |