aboutsummaryrefslogtreecommitdiffstats
path: root/toolchain/gcc/patches/4.2.4/204-uclibc-locale-wchar_fix.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2008-05-31 18:45:07 +0000
committerImre Kaloz <kaloz@openwrt.org>2008-05-31 18:45:07 +0000
commit389c1186cf53918fbf5be9db470c118394ff352c (patch)
tree08aae266715b32c53cae6a55038859212af880be /toolchain/gcc/patches/4.2.4/204-uclibc-locale-wchar_fix.patch
parent80219efc2d2fd0eefaebac28e50fddf723100a65 (diff)
downloadupstream-389c1186cf53918fbf5be9db470c118394ff352c.tar.gz
upstream-389c1186cf53918fbf5be9db470c118394ff352c.tar.bz2
upstream-389c1186cf53918fbf5be9db470c118394ff352c.zip
gcc 4.2.4 support
SVN-Revision: 11310
Diffstat (limited to 'toolchain/gcc/patches/4.2.4/204-uclibc-locale-wchar_fix.patch')
-rw-r--r--toolchain/gcc/patches/4.2.4/204-uclibc-locale-wchar_fix.patch52
1 files changed, 52 insertions, 0 deletions
diff --git a/toolchain/gcc/patches/4.2.4/204-uclibc-locale-wchar_fix.patch b/toolchain/gcc/patches/4.2.4/204-uclibc-locale-wchar_fix.patch
new file mode 100644
index 0000000000..cba8d9a7b4
--- /dev/null
+++ b/toolchain/gcc/patches/4.2.4/204-uclibc-locale-wchar_fix.patch
@@ -0,0 +1,52 @@
+Index: gcc-4.2.3/libstdc++-v3/config/locale/uclibc/monetary_members.cc
+===================================================================
+--- gcc-4.2.3.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2008-05-21 13:45:45.257288137 +0200
++++ gcc-4.2.3/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2008-05-21 13:45:46.105290284 +0200
+@@ -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
+Index: gcc-4.2.3/libstdc++-v3/config/locale/uclibc/numeric_members.cc
+===================================================================
+--- gcc-4.2.3.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2008-05-21 13:45:45.257288137 +0200
++++ gcc-4.2.3/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2008-05-21 13:45:46.105290284 +0200
+@@ -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 = "";