diff options
author | Khem Raj <raj.khem@gmail.com> | 2015-05-06 00:04:55 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-09 22:26:44 +0100 |
commit | 9ba0bf8b6af6626bd3b6d1558959a83b5c14d501 (patch) | |
tree | 246997127b81791bed0a639feea1f5acea13c9fe /meta/recipes-devtools/gcc/gcc-5.1/0006-uclibc-locale-wchar_fix.patch | |
parent | a28371be8bbdf29eb2f9c4fc68ff26d9d24631ac (diff) | |
download | openembedded-core-contrib-9ba0bf8b6af6626bd3b6d1558959a83b5c14d501.tar.gz |
gcc: Add 5 recipes
Drop backports obviously
additionally drop local patches around
parallel compilation since it got reworked upstream
To select set
GCCVERSION = "5.1%"
SDKGCCVERSION = "5.1%"
in local.conf
Change-Id: Icdfa61017a617244128f361b022e7c8f1f9e0610
(From OE-Core rev: 4bc4acc67e5d7b3f27afadeda5710f9ba5f627d2)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc-5.1/0006-uclibc-locale-wchar_fix.patch')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-5.1/0006-uclibc-locale-wchar_fix.patch | 68 |
1 files changed, 68 insertions, 0 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-5.1/0006-uclibc-locale-wchar_fix.patch b/meta/recipes-devtools/gcc/gcc-5.1/0006-uclibc-locale-wchar_fix.patch new file mode 100644 index 0000000000..9112a2b1ab --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-5.1/0006-uclibc-locale-wchar_fix.patch @@ -0,0 +1,68 @@ +From cdb9e9c9440beb59bc20476eea5a9cf2538cd194 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 29 Mar 2013 08:45:57 +0400 +Subject: [PATCH 06/35] uclibc-locale-wchar_fix + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Upstream-Status: Pending +--- + libstdc++-v3/config/locale/uclibc/monetary_members.cc | 4 ++-- + libstdc++-v3/config/locale/uclibc/numeric_members.cc | 13 +++++++++++++ + 2 files changed, 15 insertions(+), 2 deletions(-) + +diff --git a/libstdc++-v3/config/locale/uclibc/monetary_members.cc b/libstdc++-v3/config/locale/uclibc/monetary_members.cc +index 2e6f80a..31ebb9f 100644 +--- 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 +diff --git a/libstdc++-v3/config/locale/uclibc/numeric_members.cc b/libstdc++-v3/config/locale/uclibc/numeric_members.cc +index 2c70642..d5c8961 100644 +--- 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 = ""; +-- +2.1.4 + |