Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/gcc/4.2.1/140-uclibc-locale-wchar_fix.patch
author Cody Schafer <dev@codyps.com>
Fri May 09 19:13:49 2014 -0700 (2014-05-09)
changeset 3312 4876ff97e039
parent 313 2f223aafc7cb
permissions -rw-r--r--
cc/gcc: allow CC_EXTRA_CONFIG_ARRAY on baremetal

The final bare-metal compiler is built using the core backend.
Currently the core uses the CC_CORE_EXTRA_CONFIG_ARRAY variable.

While this works as supposed to, this can leave the user puzzled
in the menuconfig, since all he can see is the core options, not
the final options.

Only show the core options if any of the core passes are needed,
and use the final options in the core-backend if we're issuing
the bare-metal compiler.

Signed-off-by: Cody P Schafer <dev@codyps.com>
[yann.morin.1998@free.fr: hide core options if no core pass needed;
use final option in core backend if issuing the bare-metal compiler]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Message-Id: <22181e546ba746202489.1399688067@localhost>
Patchwork-Id: 347586 
     1 diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc

     2 --- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc	2007-08-03 20:30:53.000000000 +0200

     3 +++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc	2007-08-03 20:31:24.000000000 +0200

     4 @@ -401,7 +401,7 @@

     5  # ifdef __UCLIBC_HAS_XLOCALE__

     6  	  _M_data->_M_decimal_point = __cloc->decimal_point_wc;

     7  	  _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;

     8 -# else

     9 +# elif defined __UCLIBC_HAS_LOCALE__

    10  	  _M_data->_M_decimal_point = __global_locale->decimal_point_wc;

    11  	  _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;

    12  # endif

    13 @@ -556,7 +556,7 @@

    14  # ifdef __UCLIBC_HAS_XLOCALE__

    15  	  _M_data->_M_decimal_point = __cloc->decimal_point_wc;

    16  	  _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;

    17 -# else

    18 +# elif defined __UCLIBC_HAS_LOCALE__

    19  	  _M_data->_M_decimal_point = __global_locale->decimal_point_wc;

    20  	  _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;

    21  # endif

    22 diff -durN gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc gcc-4.2.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc

    23 --- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc	2007-08-03 20:30:53.000000000 +0200

    24 +++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc	2007-08-03 20:31:24.000000000 +0200

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

    26  	{

    27  	  // Named locale.

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

    29 +#ifdef __UCLIBC_MJN3_ONLY__

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

    31 +#endif

    32 +#ifdef __UCLIBC__

    33 +# ifdef __UCLIBC_HAS_XLOCALE__

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

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

    36 +# elif defined __UCLIBC_HAS_LOCALE__

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

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

    39 +# endif

    40 +#else

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

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

    43  	  _M_data->_M_decimal_point = __u.__w;

    44  

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

    46  	  _M_data->_M_thousands_sep = __u.__w;

    47 +#endif

    48  

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

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