aboutsummaryrefslogtreecommitdiffstats
path: root/toolchain/gcc
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2006-11-28 22:20:06 +0000
committerImre Kaloz <kaloz@openwrt.org>2006-11-28 22:20:06 +0000
commit7b9e1271ef5340cd6effbf583c09241a1d71ab12 (patch)
tree3183e7afbc581b3977459362ac9a49b487930e12 /toolchain/gcc
parent760bb5647cab8ca1ff6a75a7e78d43559ebe39b5 (diff)
downloadupstream-7b9e1271ef5340cd6effbf583c09241a1d71ab12.tar.gz
upstream-7b9e1271ef5340cd6effbf583c09241a1d71ab12.tar.bz2
upstream-7b9e1271ef5340cd6effbf583c09241a1d71ab12.zip
fix locale stuff (and there was much rejoicing)
SVN-Revision: 5671
Diffstat (limited to 'toolchain/gcc')
-rw-r--r--toolchain/gcc/patches/4.1.1/200-uclibc-locale.patch10
1 files changed, 5 insertions, 5 deletions
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 681e81e27c..e5d712e723 100644
--- 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;
-+# 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
@@ -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;
-+# 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
@@ -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;
-+# 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
@@ -3120,13 +3120,13 @@
+ 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
+ ;;
+ *)
-+ GLIBCXX_USE_LFS
++ AC_DEFINE(_GLIBCXX_USE_LFS)
+ esac
+
+ # For showmanyc_helper().