Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/gcc/4.3.0/340-uclibc-locale-wchar_fix.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Mon Jul 28 21:32:33 2008 +0000 (2008-07-28)
changeset 747 d3e603e7c17c
parent 746 patches/gcc/4.3.0/700-uclibc-locale-wchar_fix.patch@b150d6f590fc
permissions -rw-r--r--
Fourth step at renaming patches: renumber all patches with a 10-step. 
     1 Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.0/uclibc/90_all_204-uclibc-locale-wchar_fix.patch

     2 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

     3 --- gcc-4.3.0.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc	2008-06-10 14:45:43.000000000 +0200

     4 +++ gcc-4.3.0/libstdc++-v3/config/locale/uclibc/monetary_members.cc	2008-06-10 14:45:43.000000000 +0200

     5 @@ -401,7 +401,7 @@

     6  # ifdef __UCLIBC_HAS_XLOCALE__

     7  	  _M_data->_M_decimal_point = __cloc->decimal_point_wc;

     8  	  _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;

     9 -# else

    10 +# elif defined __UCLIBC_HAS_LOCALE__

    11  	  _M_data->_M_decimal_point = __global_locale->decimal_point_wc;

    12  	  _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;

    13  # endif

    14 @@ -556,7 +556,7 @@

    15  # ifdef __UCLIBC_HAS_XLOCALE__

    16  	  _M_data->_M_decimal_point = __cloc->decimal_point_wc;

    17  	  _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;

    18 -# else

    19 +# elif defined __UCLIBC_HAS_LOCALE__

    20  	  _M_data->_M_decimal_point = __global_locale->decimal_point_wc;

    21  	  _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;

    22  # endif

    23 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

    24 --- gcc-4.3.0.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc	2008-06-10 14:45:43.000000000 +0200

    25 +++ gcc-4.3.0/libstdc++-v3/config/locale/uclibc/numeric_members.cc	2008-06-10 14:45:43.000000000 +0200

    26 @@ -127,12 +127,25 @@

    27  	{

    28  	  // Named locale.

    29  	  // NB: In the GNU model wchar_t is always 32 bit wide.

    30 +#ifdef __UCLIBC_MJN3_ONLY__

    31 +#warning fix this... should be numeric

    32 +#endif

    33 +#ifdef __UCLIBC__

    34 +# ifdef __UCLIBC_HAS_XLOCALE__

    35 +	  _M_data->_M_decimal_point = __cloc->decimal_point_wc;

    36 +	  _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;

    37 +# elif defined __UCLIBC_HAS_LOCALE__

    38 +	  _M_data->_M_decimal_point = __global_locale->decimal_point_wc;

    39 +	  _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;

    40 +# endif

    41 +#else

    42  	  union { char *__s; wchar_t __w; } __u;

    43  	  __u.__s = __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc);

    44  	  _M_data->_M_decimal_point = __u.__w;

    45  

    46  	  __u.__s = __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc);

    47  	  _M_data->_M_thousands_sep = __u.__w;

    48 +#endif

    49  

    50  	  if (_M_data->_M_thousands_sep == L'\0')

    51  	    _M_data->_M_grouping = "";
crosstool-ng