Mercurialcrosstool-ng / annotate
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/gcc/4.2.2/140-uclibc-locale-wchar_fix.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Tue Jan 27 21:37:03 2009 +0000 (2009-01-27)
changeset 1162 31348b787bed
parent 431 8bde4c6ea47a
permissions -rw-r--r--
Add the latest gcc-4.3.3 with the forward-ported patchset from gcc-4.3.2.

/trunk/patches/gcc/4.3.3/210-noteGNUstack-00.patch | 47 26 21 0 ++++---
/trunk/patches/gcc/4.3.3/270-missing-execinfo_h.patch | 11 8 3 0 +-
/trunk/patches/gcc/4.3.3/260-uclibc-conf-noupstream.patch | 13 9 4 0 +-
/trunk/patches/gcc/4.3.3/220-noteGNUstack-01.patch | 97 51 46 0 +++++++-------
/trunk/patches/gcc/4.3.3/240-pr25343.patch | 11 8 3 0 +-
/trunk/patches/gcc/4.3.3/100-alpha-mieee-default.patch | 17 11 6 0 +-
/trunk/patches/gcc/4.3.3/230-pr34571.patch | 23 8 15 0 +--
/trunk/patches/gcc/4.3.3/350-sh-without-headers.patch | 17 10 7 0 +-
/trunk/patches/gcc/4.3.3/330-unwind-for-uClibc.patch | 19 12 7 0 ++-
/trunk/patches/gcc/4.3.3/190-libstdc++-pic.patch | 17 11 6 0 +-
/trunk/patches/gcc/4.3.3/150-sparc64-bsd.patch | 11 8 3 0 +-
/trunk/patches/gcc/4.3.3/290-index_macro.patch | 17 11 6 0 +-
/trunk/patches/gcc/4.3.3/140-netbsd-symbolic.patch | 11 8 3 0 +-
/trunk/patches/gcc/4.3.3/110-trampolinewarn.patch | 17 11 6 0 +-
/trunk/patches/gcc/4.3.3/160-flatten-switch-stmt-00.patch | 11 8 3 0 +-
/trunk/patches/gcc/4.3.3/280-c99-complex-ugly-hack.patch | 11 8 3 0 +-
/trunk/patches/gcc/4.3.3/300-libmudflap-susv3-legacy.patch | 11 8 3 0 +-
/trunk/patches/gcc/4.3.3/170-libiberty-pic.patch | 11 8 3 0 +-
/trunk/patches/gcc/4.3.3/250-sh-pr24836.patch | 17 11 6 0 +-
/trunk/patches/gcc/4.3.3/120-java-nomulti.patch | 17 11 6 0 +-
/trunk/patches/gcc/4.3.3/320-alpha-signal_h.patch | 14 10 4 0 +-
/trunk/patches/gcc/4.3.3/180-superh-default-multilib.patch | 13 9 4 0 +-
/trunk/patches/gcc/4.3.3/340-make-mno-spe-work-as-expected.patch | 41 23 18 0 +++---
/trunk/patches/gcc/4.3.3/200-pr24170.patch | 23 14 9 0 ++-
/trunk/patches/gcc/4.3.3/310-arm-softfloat.patch | 17 11 6 0 +-
/trunk/patches/gcc/4.3.3/130-cross-compile.patch | 23 14 9 0 ++-
/trunk/config/cc/gcc.in | 7 7 0 0 +
27 files changed, 334 insertions(+), 210 deletions(-)
yann@313 
     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
yann@313 
     2
 
--- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc	2007-08-03 20:30:53.000000000 +0200
yann@313 
     3
 
+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc	2007-08-03 20:31:24.000000000 +0200
yann@313 
     4
 
@@ -401,7 +401,7 @@
yann@313 
     5
 
 # ifdef __UCLIBC_HAS_XLOCALE__
yann@313 
     6
 
 	  _M_data->_M_decimal_point = __cloc->decimal_point_wc;
yann@313 
     7
 
 	  _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
yann@313 
     8
 
-# else
yann@313 
     9
 
+# elif defined __UCLIBC_HAS_LOCALE__
yann@313 
    10
 
 	  _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
yann@313 
    11
 
 	  _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
yann@313 
    12
 
 # endif
yann@313 
    13
 
@@ -556,7 +556,7 @@
yann@313 
    14
 
 # ifdef __UCLIBC_HAS_XLOCALE__
yann@313 
    15
 
 	  _M_data->_M_decimal_point = __cloc->decimal_point_wc;
yann@313 
    16
 
 	  _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
yann@313 
    17
 
-# else
yann@313 
    18
 
+# elif defined __UCLIBC_HAS_LOCALE__
yann@313 
    19
 
 	  _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
yann@313 
    20
 
 	  _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
yann@313 
    21
 
 # endif
yann@313 
    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
yann@313 
    23
 
--- gcc-4.2.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc	2007-08-03 20:30:53.000000000 +0200
yann@313 
    24
 
+++ gcc-4.2.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc	2007-08-03 20:31:24.000000000 +0200
yann@313 
    25
 
@@ -127,12 +127,25 @@
yann@313 
    26
 
 	{
yann@313 
    27
 
 	  // Named locale.
yann@313 
    28
 
 	  // NB: In the GNU model wchar_t is always 32 bit wide.
yann@313 
    29
 
+#ifdef __UCLIBC_MJN3_ONLY__
yann@313 
    30
 
+#warning fix this... should be numeric
yann@313 
    31
 
+#endif
yann@313 
    32
 
+#ifdef __UCLIBC__
yann@313 
    33
 
+# ifdef __UCLIBC_HAS_XLOCALE__
yann@313 
    34
 
+	  _M_data->_M_decimal_point = __cloc->decimal_point_wc;
yann@313 
    35
 
+	  _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
yann@313 
    36
 
+# elif defined __UCLIBC_HAS_LOCALE__
yann@313 
    37
 
+	  _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
yann@313 
    38
 
+	  _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
yann@313 
    39
 
+# endif
yann@313 
    40
 
+#else
yann@313 
    41
 
 	  union { char *__s; wchar_t __w; } __u;
yann@313 
    42
 
 	  __u.__s = __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc);
yann@313 
    43
 
 	  _M_data->_M_decimal_point = __u.__w;
yann@313 
    44
yann@313 
    45
 
 	  __u.__s = __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc);
yann@313 
    46
 
 	  _M_data->_M_thousands_sep = __u.__w;
yann@313 
    47
 
+#endif
yann@313 
    48
yann@313 
    49
 
 	  if (_M_data->_M_thousands_sep == L'\0')
yann@313 
    50
 
 	    _M_data->_M_grouping = "";
crosstool-ng