Mercurialcrosstool-ng / annotate
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@anciens.enib.fr>
Wed May 20 20:13:13 2009 +0000 (2009-05-20)
changeset 1345 27fec561af53
parent 111 2e16b9fc302d
permissions -rw-r--r--
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(-)
yann@111 
     1
 
--- gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc.uclibc200_wchar~	2006-03-10 15:32:37 +0100
yann@111 
     2
 
+++ gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc	2006-03-10 15:37:27 +0100
yann@111 
     3
 
@@ -401,7 +401,7 @@
yann@111 
     4
 
 # ifdef __UCLIBC_HAS_XLOCALE__
yann@111 
     5
 
 	  _M_data->_M_decimal_point = __cloc->decimal_point_wc;
yann@111 
     6
 
 	  _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
yann@111 
     7
 
-# else
yann@111 
     8
 
+# elif defined __UCLIBC_HAS_LOCALE__
yann@111 
     9
 
 	  _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
yann@111 
    10
 
 	  _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
yann@111 
    11
 
 # endif
yann@111 
    12
 
@@ -556,7 +556,7 @@
yann@111 
    13
 
 # ifdef __UCLIBC_HAS_XLOCALE__
yann@111 
    14
 
 	  _M_data->_M_decimal_point = __cloc->decimal_point_wc;
yann@111 
    15
 
 	  _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
yann@111 
    16
 
-# else
yann@111 
    17
 
+# elif defined __UCLIBC_HAS_LOCALE__
yann@111 
    18
 
 	  _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
yann@111 
    19
 
 	  _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
yann@111 
    20
 
 # endif
yann@111 
    21
 
--- gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc.uclibc200_wchar~	2006-03-10 15:32:37 +0100
yann@111 
    22
 
+++ gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc	2006-03-10 15:37:27 +0100
yann@111 
    23
 
@@ -127,12 +127,25 @@
yann@111 
    24
 
 	{
yann@111 
    25
 
 	  // Named locale.
yann@111 
    26
 
 	  // NB: In the GNU model wchar_t is always 32 bit wide.
yann@111 
    27
 
+#ifdef __UCLIBC_MJN3_ONLY__
yann@111 
    28
 
+#warning fix this... should be numeric
yann@111 
    29
 
+#endif
yann@111 
    30
 
+#ifdef __UCLIBC__
yann@111 
    31
 
+# ifdef __UCLIBC_HAS_XLOCALE__
yann@111 
    32
 
+	  _M_data->_M_decimal_point = __cloc->decimal_point_wc;
yann@111 
    33
 
+	  _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
yann@111 
    34
 
+# elif defined __UCLIBC_HAS_LOCALE__
yann@111 
    35
 
+	  _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
yann@111 
    36
 
+	  _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
yann@111 
    37
 
+# endif
yann@111 
    38
 
+#else
yann@111 
    39
 
 	  union { char *__s; wchar_t __w; } __u;
yann@111 
    40
 
 	  __u.__s = __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc);
yann@111 
    41
 
 	  _M_data->_M_decimal_point = __u.__w;
yann@111 
    42
yann@111 
    43
 
 	  __u.__s = __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc);
yann@111 
    44
 
 	  _M_data->_M_thousands_sep = __u.__w;
yann@111 
    45
 
+#endif
yann@111 
    46
yann@111 
    47
 
 	  if (_M_data->_M_thousands_sep == L'\0')
yann@111 
    48
 
 	    _M_data->_M_grouping = "";
crosstool-ng