crosstool-ng/patches/gcc/4.3.0/700-204-uclibc-locale-wchar_fix.patch
Yann E. MORIN" bfb7f715f2 Vampirise patches for gcc-4.3.{0,1} from gentoo. Absolutely untested...
/trunk/patches/gcc/4.3.0/275-gcc-x86-emit-cld.patch             |  156   156     0     0 +
 /trunk/patches/gcc/4.3.0/450-gcc4-noteGNUstack.patch            |  198   198     0     0 +
 /trunk/patches/gcc/4.3.0/550-gcc43-pr25343.patch                |   21    21     0     0 +
 /trunk/patches/gcc/4.3.0/375-gcc43-pr35440.patch                |   59    59     0     0 +
 /trunk/patches/gcc/4.3.0/125-gcc-trampolinewarn.patch           |   35    35     0     0 +
 /trunk/patches/gcc/4.3.0/475-gcc43-pr35705.patch                |   21    21     0     0 +
 /trunk/patches/gcc/4.3.0/700-204-uclibc-locale-wchar_fix.patch  |   51    51     0     0 +
 /trunk/patches/gcc/4.3.0/775-303-c99-complex-ugly-hack.patch    |   14    14     0     0 +
 /trunk/patches/gcc/4.3.0/575-sh-pr24836.patch                   |   28    28     0     0 +
 /trunk/patches/gcc/4.3.0/675-203-uclibc-locale-no__x.patch      |  224   224     0     0 +
 /trunk/patches/gcc/4.3.0/400-gcc43-pr24170.patch                |   61    61     0     0 +
 /trunk/patches/gcc/4.3.0/100-gcc-4.1-alpha-mieee-default.patch  |   34    34     0     0 +
 /trunk/patches/gcc/4.3.0/825-305-libmudflap-susv3-legacy.patch  |   49    49     0     0 +
 /trunk/patches/gcc/4.3.0/175-gcc-4.1-cross-compile.patch        |   44    44     0     0 +
 /trunk/patches/gcc/4.3.0/850-306-libstdc++-namespace.patch      |   38    38     0     0 +
 /trunk/patches/gcc/4.3.0/200-gcc-netbsd-symbolic.patch          |   14    14     0     0 +
 /trunk/patches/gcc/4.3.0/750-301-missing-execinfo_h.patch       |   13    13     0     0 +
 /trunk/patches/gcc/4.3.0/225-gcc-sparc64-bsd.patch              |   30    30     0     0 +
 /trunk/patches/gcc/4.3.0/350-300-libstdc++-pic.patch            |   56    56     0     0 +
 /trunk/patches/gcc/4.3.0/500-gcc43-pr34571.patch                |   35    35     0     0 +
 /trunk/patches/gcc/4.3.0/300-gcc-3.4-libiberty-pic.patch        |   12    12     0     0 +
 /trunk/patches/gcc/4.3.0/625-103-uclibc-conf-noupstream.patch   |   13    13     0     0 +
 /trunk/patches/gcc/4.3.0/425-gcc4-ia64-noteGNUstack.patch       |   96    96     0     0 +
 /trunk/patches/gcc/4.3.0/325-gcc4-superh-default-multilib.patch |   25    25     0     0 +
 /trunk/patches/gcc/4.3.0/725-205-uclibc-locale-update.patch     |  355   355     0     0 ++
 /trunk/patches/gcc/4.3.0/800-304-index_macro.patch              |   27    27     0     0 +
 /trunk/patches/gcc/4.3.0/600-gcc-ca-translation-typo.patch      |   19    19     0     0 +
 /trunk/patches/gcc/4.3.0/650-200-uclibc-locale.patch            | 2794  2794     0     0 +++++++++++++++
 /trunk/patches/gcc/4.3.0/525-gcc43-pr35982.patch                |   23    23     0     0 +
 /trunk/patches/gcc/4.3.0/150-gcc43-java-nomulti.patch           |   47    47     0     0 +
 /trunk/patches/gcc/4.3.0/250-904-flatten-switch-stmt-00.patch   |   76    76     0     0 +
 /trunk/patches/gcc/4.3.1/100-gcc-4.1-alpha-mieee-default.patch  |   34    34     0     0 +
 /trunk/patches/gcc/4.3.1/500-103-uclibc-conf-noupstream.patch   |   13    13     0     0 +
 /trunk/patches/gcc/4.3.1/175-gcc-4.1-cross-compile.patch        |   44    44     0     0 +
 /trunk/patches/gcc/4.3.1/400-gcc4-noteGNUstack.patch            |  198   198     0     0 +
 /trunk/patches/gcc/4.3.1/600-205-uclibc-locale-update.patch     |  355   355     0     0 ++
 /trunk/patches/gcc/4.3.1/725-306-libstdc++-namespace.patch      |   38    38     0     0 +
 /trunk/patches/gcc/4.3.1/350-gcc43-pr24170.patch                |   61    61     0     0 +
 /trunk/patches/gcc/4.3.1/300-gcc4-superh-default-multilib.patch |   25    25     0     0 +
 /trunk/patches/gcc/4.3.1/575-204-uclibc-locale-wchar_fix.patch  |   51    51     0     0 +
 /trunk/patches/gcc/4.3.1/200-gcc-netbsd-symbolic.patch          |   14    14     0     0 +
 /trunk/patches/gcc/4.3.1/225-gcc-sparc64-bsd.patch              |   30    30     0     0 +
 /trunk/patches/gcc/4.3.1/450-gcc43-pr25343.patch                |   21    21     0     0 +
 /trunk/patches/gcc/4.3.1/625-301-missing-execinfo_h.patch       |   13    13     0     0 +
 /trunk/patches/gcc/4.3.1/325-300-libstdc++-pic.patch            |   56    56     0     0 +
 /trunk/patches/gcc/4.3.1/425-gcc43-pr34571.patch                |   35    35     0     0 +
 /trunk/patches/gcc/4.3.1/375-gcc4-ia64-noteGNUstack.patch       |   96    96     0     0 +
 /trunk/patches/gcc/4.3.1/125-gcc-trampolinewarn.patch           |   35    35     0     0 +
 /trunk/patches/gcc/4.3.1/275-gcc-3.4-libiberty-pic.patch        |   12    12     0     0 +
 /trunk/patches/gcc/4.3.1/650-303-c99-complex-ugly-hack.patch    |   14    14     0     0 +
 /trunk/patches/gcc/4.3.1/525-200-uclibc-locale.patch            | 2794  2794     0     0 +++++++++++++++
 /trunk/patches/gcc/4.3.1/550-203-uclibc-locale-no__x.patch      |  224   224     0     0 +
 /trunk/patches/gcc/4.3.1/150-gcc43-java-nomulti.patch           |   47    47     0     0 +
 /trunk/patches/gcc/4.3.1/700-305-libmudflap-susv3-legacy.patch  |   49    49     0     0 +
 /trunk/patches/gcc/4.3.1/675-304-index_macro.patch              |   27    27     0     0 +
 /trunk/patches/gcc/4.3.1/250-904-flatten-switch-stmt-00.patch   |   76    76     0     0 +
 /trunk/patches/gcc/4.3.1/475-sh-pr24836.patch                   |   28    28     0     0 +
 57 files changed, 9058 insertions(+)
2008-06-10 22:10:40 +00:00

52 lines
2.4 KiB
Diff

Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.0/uclibc/90_all_204-uclibc-locale-wchar_fix.patch
diff -durN gcc-4.3.0.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc gcc-4.3.0/libstdc++-v3/config/locale/uclibc/monetary_members.cc
--- gcc-4.3.0.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2008-06-10 14:45:43.000000000 +0200
+++ gcc-4.3.0/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2008-06-10 14:45:43.000000000 +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
diff -durN gcc-4.3.0.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc gcc-4.3.0/libstdc++-v3/config/locale/uclibc/numeric_members.cc
--- gcc-4.3.0.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2008-06-10 14:45:43.000000000 +0200
+++ gcc-4.3.0/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2008-06-10 14:45:43.000000000 +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 = "";