|
yann@552
|
1 |
Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_204-uclibc-locale-wchar_fix.patch
|
|
yann@552
|
2 |
diff -durN gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc gcc-4.3.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc
|
|
yann@552
|
3 |
--- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2008-06-10 14:58:47.000000000 +0200
|
|
yann@552
|
4 |
+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2008-06-10 14:58:47.000000000 +0200
|
|
yann@552
|
5 |
@@ -401,7 +401,7 @@
|
|
yann@552
|
6 |
# ifdef __UCLIBC_HAS_XLOCALE__
|
|
yann@552
|
7 |
_M_data->_M_decimal_point = __cloc->decimal_point_wc;
|
|
yann@552
|
8 |
_M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
|
|
yann@552
|
9 |
-# else
|
|
yann@552
|
10 |
+# elif defined __UCLIBC_HAS_LOCALE__
|
|
yann@552
|
11 |
_M_data->_M_decimal_point = __global_locale->decimal_point_wc;
|
|
yann@552
|
12 |
_M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
|
|
yann@552
|
13 |
# endif
|
|
yann@552
|
14 |
@@ -556,7 +556,7 @@
|
|
yann@552
|
15 |
# ifdef __UCLIBC_HAS_XLOCALE__
|
|
yann@552
|
16 |
_M_data->_M_decimal_point = __cloc->decimal_point_wc;
|
|
yann@552
|
17 |
_M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
|
|
yann@552
|
18 |
-# else
|
|
yann@552
|
19 |
+# elif defined __UCLIBC_HAS_LOCALE__
|
|
yann@552
|
20 |
_M_data->_M_decimal_point = __global_locale->decimal_point_wc;
|
|
yann@552
|
21 |
_M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
|
|
yann@552
|
22 |
# endif
|
|
yann@552
|
23 |
diff -durN gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc gcc-4.3.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc
|
|
yann@552
|
24 |
--- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2008-06-10 14:58:47.000000000 +0200
|
|
yann@552
|
25 |
+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2008-06-10 14:58:47.000000000 +0200
|
|
yann@552
|
26 |
@@ -127,12 +127,25 @@
|
|
yann@552
|
27 |
{
|
|
yann@552
|
28 |
// Named locale.
|
|
yann@552
|
29 |
// NB: In the GNU model wchar_t is always 32 bit wide.
|
|
yann@552
|
30 |
+#ifdef __UCLIBC_MJN3_ONLY__
|
|
yann@552
|
31 |
+#warning fix this... should be numeric
|
|
yann@552
|
32 |
+#endif
|
|
yann@552
|
33 |
+#ifdef __UCLIBC__
|
|
yann@552
|
34 |
+# ifdef __UCLIBC_HAS_XLOCALE__
|
|
yann@552
|
35 |
+ _M_data->_M_decimal_point = __cloc->decimal_point_wc;
|
|
yann@552
|
36 |
+ _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
|
|
yann@552
|
37 |
+# elif defined __UCLIBC_HAS_LOCALE__
|
|
yann@552
|
38 |
+ _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
|
|
yann@552
|
39 |
+ _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
|
|
yann@552
|
40 |
+# endif
|
|
yann@552
|
41 |
+#else
|
|
yann@552
|
42 |
union { char *__s; wchar_t __w; } __u;
|
|
yann@552
|
43 |
__u.__s = __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc);
|
|
yann@552
|
44 |
_M_data->_M_decimal_point = __u.__w;
|
|
yann@552
|
45 |
|
|
yann@552
|
46 |
__u.__s = __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc);
|
|
yann@552
|
47 |
_M_data->_M_thousands_sep = __u.__w;
|
|
yann@552
|
48 |
+#endif
|
|
yann@552
|
49 |
|
|
yann@552
|
50 |
if (_M_data->_M_thousands_sep == L'\0')
|
|
yann@552
|
51 |
_M_data->_M_grouping = "";
|