Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/gcc/4.2.0/140-uclibc-locale-wchar_fix.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Tue Jul 31 22:27:29 2012 +0200 (2012-07-31)
changeset 3018 7776e8369284
parent 111 2e16b9fc302d
permissions -rw-r--r--
complibs/cloog: create missing m4 dir

Because we now patch configure.in and configure, the Makefile quicks
in a re-build rule as the source files are now more recent than the
bundled generated files, and that fails because the m4 directory
is missing, although on some systems where aclocal is not installed,
the re-build rule does nothing (except a warning).

Always create tht directory.

Reported-by: Per Arnold Blaasmo <per-arnold.blaasmo@atmel.com>
[Also thanks to Thomas De Schampheleire <patrickdepinguin@gmail.com>
for some digging works on this issue]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> 
     1 --- gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc.uclibc200_wchar~	2006-03-10 15:32:37 +0100

     2 +++ gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc	2006-03-10 15:37:27 +0100

     3 @@ -401,7 +401,7 @@

     4  # ifdef __UCLIBC_HAS_XLOCALE__

     5  	  _M_data->_M_decimal_point = __cloc->decimal_point_wc;

     6  	  _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;

     7 -# else

     8 +# elif defined __UCLIBC_HAS_LOCALE__

     9  	  _M_data->_M_decimal_point = __global_locale->decimal_point_wc;

    10  	  _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;

    11  # endif

    12 @@ -556,7 +556,7 @@

    13  # ifdef __UCLIBC_HAS_XLOCALE__

    14  	  _M_data->_M_decimal_point = __cloc->decimal_point_wc;

    15  	  _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;

    16 -# else

    17 +# elif defined __UCLIBC_HAS_LOCALE__

    18  	  _M_data->_M_decimal_point = __global_locale->decimal_point_wc;

    19  	  _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;

    20  # endif

    21 --- gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc.uclibc200_wchar~	2006-03-10 15:32:37 +0100

    22 +++ gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc	2006-03-10 15:37:27 +0100

    23 @@ -127,12 +127,25 @@

    24  	{

    25  	  // Named locale.

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

    27 +#ifdef __UCLIBC_MJN3_ONLY__

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

    29 +#endif

    30 +#ifdef __UCLIBC__

    31 +# ifdef __UCLIBC_HAS_XLOCALE__

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

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

    34 +# elif defined __UCLIBC_HAS_LOCALE__

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

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

    37 +# endif

    38 +#else

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

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

    41  	  _M_data->_M_decimal_point = __u.__w;

    42  

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

    44  	  _M_data->_M_thousands_sep = __u.__w;

    45 +#endif

    46  

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

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