fix locale stuff (and there was much rejoicing)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5671 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/toolchain/gcc/patches/4.1.1/200-uclibc-locale.patch b/toolchain/gcc/patches/4.1.1/200-uclibc-locale.patch
index 681e81e..e5d712e 100644 (file)
--- a/toolchain/gcc/patches/4.1.1/200-uclibc-locale.patch
+++ b/toolchain/gcc/patches/4.1.1/200-uclibc-locale.patch
@@ -1747,7 +1747,7 @@
 +# ifdef __UCLIBC_HAS_XLOCALE__
 +        _M_data->_M_decimal_point = __cloc->decimal_point_wc;
 +        _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
 +# ifdef __UCLIBC_HAS_XLOCALE__
 +        _M_data->_M_decimal_point = __cloc->decimal_point_wc;
 +        _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;

-+# else
++# elif defined __UCLIBC_HAS_LOCALE__

 +        _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
 +        _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
 +# endif
 +        _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
 +        _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
 +# endif


@@ -1902,7 +1902,7 @@
 +# ifdef __UCLIBC_HAS_XLOCALE__
 +        _M_data->_M_decimal_point = __cloc->decimal_point_wc;
 +        _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
 +# ifdef __UCLIBC_HAS_XLOCALE__
 +        _M_data->_M_decimal_point = __cloc->decimal_point_wc;
 +        _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;

-+# else
++# elif defined __UCLIBC_HAS_LOCALE__

 +        _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
 +        _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
 +# endif
 +        _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
 +        _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
 +# endif


@@ -2174,7 +2174,7 @@
 +# ifdef __UCLIBC_HAS_XLOCALE__
 +        _M_data->_M_decimal_point = __cloc->decimal_point_wc;
 +        _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
 +# ifdef __UCLIBC_HAS_XLOCALE__
 +        _M_data->_M_decimal_point = __cloc->decimal_point_wc;
 +        _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;

-+# else
++# elif defined __UCLIBC_HAS_LOCALE__

 +        _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
 +        _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
 +# endif
 +        _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
 +        _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
 +# endif


@@ -3120,13 +3120,13 @@
 +    GLIBCXX_CHECK_WCHAR_T_SUPPORT
 +
 +    # For LFS.
 +    GLIBCXX_CHECK_WCHAR_T_SUPPORT
 +
 +    # For LFS.

-+    GLIBCXX_CHECK_INT64_T
++    AC_DEFINE(HAVE_INT64_T)

 +    case "$target" in
 +      *-uclinux*)
 +        # Don't enable LFS with uClinux
 +        ;;
 +      *)
 +    case "$target" in
 +      *-uclinux*)
 +        # Don't enable LFS with uClinux
 +        ;;
 +      *)

-+        GLIBCXX_USE_LFS
++        AC_DEFINE(_GLIBCXX_USE_LFS)

 +    esac
 +
 +    # For showmanyc_helper().
 +    esac
 +
 +    # For showmanyc_helper().