crosstool-ng: patches/gcc/4.2.0/140-uclibc-locale-wchar

Merge the uClinux/noMMU stuff back to /trunk:
- merge Linux and uClinux back to a single kernel
- add ARCH_USE_MMU and acquainted config options that
architectures can auto-select
- make binutils and elf2flt two "Binary utilities" that
go in a single common sub-{menu,directory} structure

-------- diffstat follows --------
/trunk/scripts/build/kernel/uclinux.sh | 2 0 2 0 -
/trunk/scripts/build/kernel/linux.sh | 206 204 2 0 +++++++++++++++++++++++++++++
/trunk/scripts/build/kernel/linux-common.sh | 198 0 198 0 ----------------------------
/trunk/scripts/build/binutils.sh | 232 0 232 0 --------------------------------
/trunk/scripts/build/elf2flt.sh | 150 0 150 0 ---------------------
/trunk/scripts/crosstool-NG.sh.in | 6 4 2 0 +
/trunk/config/kernel/linux.in | 249 249 0 0 +++++++++++++++++++++++++++++++++++
/trunk/config/kernel/linux.in-common | 252 0 252 0 -----------------------------------
/trunk/config/kernel/uclinux.in | 21 0 21 0 ---
/trunk/config/target.in | 23 22 1 0 +++
/trunk/config/elf2flt.in | 49 0 49 0 -------
/trunk/config/libc/glibc.in | 2 1 1 0
/trunk/config/libc/eglibc.in | 2 1 1 0
/trunk/config/config.in | 1 0 1 0 -
/trunk/config/arch/sh.in | 1 1 0 0 +
/trunk/config/arch/arm.in | 2 1 1 0
/trunk/config/arch/powerpc.in | 1 1 0 0 +
/trunk/config/arch/ia64.in | 1 1 0 0 +
/trunk/config/arch/alpha.in | 1 1 0 0 +
/trunk/config/arch/x86.in | 1 1 0 0 +
/trunk/config/arch/mips.in | 1 1 0 0 +
/trunk/config/arch/powerpc64.in | 1 1 0 0 +
22 files changed, 489 insertions(+), 913 deletions(-)

     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;

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

    44  	  _M_data->_M_thousands_sep = __u.__w;

    45 +#endif

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

    48  	    _M_data->_M_grouping = "";

author	"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
	Wed May 20 20:13:13 2009 +0000 (2009-05-20)
changeset 1345	27fec561af53
parent 111	2e16b9fc302d
permissions	-rw-r--r--