patches/gcc/4.3.1/575-uclibc-locale-wchar_fix.patch
changeset 746 b150d6f590fc
parent 552 4edbcdb17e3d
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/patches/gcc/4.3.1/575-uclibc-locale-wchar_fix.patch	Mon Jul 28 21:08:01 2008 +0000
     1.3 @@ -0,0 +1,51 @@
     1.4 +Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_204-uclibc-locale-wchar_fix.patch
     1.5 +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
     1.6 +--- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc	2008-06-10 14:58:47.000000000 +0200
     1.7 ++++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc	2008-06-10 14:58:47.000000000 +0200
     1.8 +@@ -401,7 +401,7 @@
     1.9 + # ifdef __UCLIBC_HAS_XLOCALE__
    1.10 + 	  _M_data->_M_decimal_point = __cloc->decimal_point_wc;
    1.11 + 	  _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
    1.12 +-# else
    1.13 ++# elif defined __UCLIBC_HAS_LOCALE__
    1.14 + 	  _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
    1.15 + 	  _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
    1.16 + # endif
    1.17 +@@ -556,7 +556,7 @@
    1.18 + # ifdef __UCLIBC_HAS_XLOCALE__
    1.19 + 	  _M_data->_M_decimal_point = __cloc->decimal_point_wc;
    1.20 + 	  _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
    1.21 +-# else
    1.22 ++# elif defined __UCLIBC_HAS_LOCALE__
    1.23 + 	  _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
    1.24 + 	  _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
    1.25 + # endif
    1.26 +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
    1.27 +--- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc	2008-06-10 14:58:47.000000000 +0200
    1.28 ++++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc	2008-06-10 14:58:47.000000000 +0200
    1.29 +@@ -127,12 +127,25 @@
    1.30 + 	{
    1.31 + 	  // Named locale.
    1.32 + 	  // NB: In the GNU model wchar_t is always 32 bit wide.
    1.33 ++#ifdef __UCLIBC_MJN3_ONLY__
    1.34 ++#warning fix this... should be numeric
    1.35 ++#endif
    1.36 ++#ifdef __UCLIBC__
    1.37 ++# ifdef __UCLIBC_HAS_XLOCALE__
    1.38 ++	  _M_data->_M_decimal_point = __cloc->decimal_point_wc;
    1.39 ++	  _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
    1.40 ++# elif defined __UCLIBC_HAS_LOCALE__
    1.41 ++	  _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
    1.42 ++	  _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
    1.43 ++# endif
    1.44 ++#else
    1.45 + 	  union { char *__s; wchar_t __w; } __u;
    1.46 + 	  __u.__s = __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc);
    1.47 + 	  _M_data->_M_decimal_point = __u.__w;
    1.48 + 
    1.49 + 	  __u.__s = __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc);
    1.50 + 	  _M_data->_M_thousands_sep = __u.__w;
    1.51 ++#endif
    1.52 + 
    1.53 + 	  if (_M_data->_M_thousands_sep == L'\0')
    1.54 + 	    _M_data->_M_grouping = "";