1.1 --- a/patches/gcc/4.3.1/525-uclibc-locale.patch Mon Jul 28 21:08:01 2008 +0000
1.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
1.3 @@ -1,2794 +0,0 @@
1.4 -Original patch from gentoo: gentoo/src/patchsets/gcc/4.3.1/uclibc/90_all_200-uclibc-locale.patch
1.5 -diff -durN gcc-4.3.1.orig/libstdc++-v3/acinclude.m4 gcc-4.3.1/libstdc++-v3/acinclude.m4
1.6 ---- gcc-4.3.1.orig/libstdc++-v3/acinclude.m4 2008-04-25 18:52:57.000000000 +0200
1.7 -+++ gcc-4.3.1/libstdc++-v3/acinclude.m4 2008-06-10 14:58:39.000000000 +0200
1.8 -@@ -1349,7 +1349,7 @@
1.9 - AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [
1.10 - GLIBCXX_ENABLE(clocale,auto,[@<:@=MODEL@:>@],
1.11 - [use MODEL for target locale package],
1.12 -- [permit generic|gnu|ieee_1003.1-2001|yes|no|auto])
1.13 -+ [permit generic|gnu|ieee_1003.1-2001|uclibc|yes|no|auto])
1.14 -
1.15 - # Deal with gettext issues. Default to not using it (=no) until we detect
1.16 - # support for it later. Let the user turn it off via --e/d, but let that
1.17 -@@ -1370,6 +1370,9 @@
1.18 - # Default to "generic".
1.19 - if test $enable_clocale_flag = auto; then
1.20 - case ${target_os} in
1.21 -+ *-uclibc*)
1.22 -+ enable_clocale_flag=uclibc
1.23 -+ ;;
1.24 - linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu)
1.25 - enable_clocale_flag=gnu
1.26 - ;;
1.27 -@@ -1541,6 +1544,40 @@
1.28 - CTIME_CC=config/locale/generic/time_members.cc
1.29 - CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
1.30 - ;;
1.31 -+ uclibc)
1.32 -+ AC_MSG_RESULT(uclibc)
1.33 -+
1.34 -+ # Declare intention to use gettext, and add support for specific
1.35 -+ # languages.
1.36 -+ # For some reason, ALL_LINGUAS has to be before AM-GNU-GETTEXT
1.37 -+ ALL_LINGUAS="de fr"
1.38 -+
1.39 -+ # Don't call AM-GNU-GETTEXT here. Instead, assume glibc.
1.40 -+ AC_CHECK_PROG(check_msgfmt, msgfmt, yes, no)
1.41 -+ if test x"$check_msgfmt" = x"yes" && test x"$enable_nls" = x"yes"; then
1.42 -+ USE_NLS=yes
1.43 -+ fi
1.44 -+ # Export the build objects.
1.45 -+ for ling in $ALL_LINGUAS; do \
1.46 -+ glibcxx_MOFILES="$glibcxx_MOFILES $ling.mo"; \
1.47 -+ glibcxx_POFILES="$glibcxx_POFILES $ling.po"; \
1.48 -+ done
1.49 -+ AC_SUBST(glibcxx_MOFILES)
1.50 -+ AC_SUBST(glibcxx_POFILES)
1.51 -+
1.52 -+ CLOCALE_H=config/locale/uclibc/c_locale.h
1.53 -+ CLOCALE_CC=config/locale/uclibc/c_locale.cc
1.54 -+ CCODECVT_CC=config/locale/uclibc/codecvt_members.cc
1.55 -+ CCOLLATE_CC=config/locale/uclibc/collate_members.cc
1.56 -+ CCTYPE_CC=config/locale/uclibc/ctype_members.cc
1.57 -+ CMESSAGES_H=config/locale/uclibc/messages_members.h
1.58 -+ CMESSAGES_CC=config/locale/uclibc/messages_members.cc
1.59 -+ CMONEY_CC=config/locale/uclibc/monetary_members.cc
1.60 -+ CNUMERIC_CC=config/locale/uclibc/numeric_members.cc
1.61 -+ CTIME_H=config/locale/uclibc/time_members.h
1.62 -+ CTIME_CC=config/locale/uclibc/time_members.cc
1.63 -+ CLOCALE_INTERNAL_H=config/locale/uclibc/c++locale_internal.h
1.64 -+ ;;
1.65 - esac
1.66 -
1.67 - # This is where the testsuite looks for locale catalogs, using the
1.68 -diff -durN gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/c++locale_internal.h gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c++locale_internal.h
1.69 ---- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 1970-01-01 01:00:00.000000000 +0100
1.70 -+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 2008-06-10 14:58:39.000000000 +0200
1.71 -@@ -0,0 +1,63 @@
1.72 -+// Prototypes for GLIBC thread locale __-prefixed functions -*- C++ -*-
1.73 -+
1.74 -+// Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
1.75 -+//
1.76 -+// This file is part of the GNU ISO C++ Library. This library is free
1.77 -+// software; you can redistribute it and/or modify it under the
1.78 -+// terms of the GNU General Public License as published by the
1.79 -+// Free Software Foundation; either version 2, or (at your option)
1.80 -+// any later version.
1.81 -+
1.82 -+// This library is distributed in the hope that it will be useful,
1.83 -+// but WITHOUT ANY WARRANTY; without even the implied warranty of
1.84 -+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1.85 -+// GNU General Public License for more details.
1.86 -+
1.87 -+// You should have received a copy of the GNU General Public License along
1.88 -+// with this library; see the file COPYING. If not, write to the Free
1.89 -+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
1.90 -+// USA.
1.91 -+
1.92 -+// As a special exception, you may use this file as part of a free software
1.93 -+// library without restriction. Specifically, if other files instantiate
1.94 -+// templates or use macros or inline functions from this file, or you compile
1.95 -+// this file and link it with other files to produce an executable, this
1.96 -+// file does not by itself cause the resulting executable to be covered by
1.97 -+// the GNU General Public License. This exception does not however
1.98 -+// invalidate any other reasons why the executable file might be covered by
1.99 -+// the GNU General Public License.
1.100 -+
1.101 -+// Written by Jakub Jelinek <jakub@redhat.com>
1.102 -+
1.103 -+#include <bits/c++config.h>
1.104 -+#include <clocale>
1.105 -+
1.106 -+#ifdef __UCLIBC_MJN3_ONLY__
1.107 -+#warning clean this up
1.108 -+#endif
1.109 -+
1.110 -+#ifdef __UCLIBC_HAS_XLOCALE__
1.111 -+
1.112 -+extern "C" __typeof(nl_langinfo_l) __nl_langinfo_l;
1.113 -+extern "C" __typeof(strcoll_l) __strcoll_l;
1.114 -+extern "C" __typeof(strftime_l) __strftime_l;
1.115 -+extern "C" __typeof(strtod_l) __strtod_l;
1.116 -+extern "C" __typeof(strtof_l) __strtof_l;
1.117 -+extern "C" __typeof(strtold_l) __strtold_l;
1.118 -+extern "C" __typeof(strxfrm_l) __strxfrm_l;
1.119 -+extern "C" __typeof(newlocale) __newlocale;
1.120 -+extern "C" __typeof(freelocale) __freelocale;
1.121 -+extern "C" __typeof(duplocale) __duplocale;
1.122 -+extern "C" __typeof(uselocale) __uselocale;
1.123 -+
1.124 -+#ifdef _GLIBCXX_USE_WCHAR_T
1.125 -+extern "C" __typeof(iswctype_l) __iswctype_l;
1.126 -+extern "C" __typeof(towlower_l) __towlower_l;
1.127 -+extern "C" __typeof(towupper_l) __towupper_l;
1.128 -+extern "C" __typeof(wcscoll_l) __wcscoll_l;
1.129 -+extern "C" __typeof(wcsftime_l) __wcsftime_l;
1.130 -+extern "C" __typeof(wcsxfrm_l) __wcsxfrm_l;
1.131 -+extern "C" __typeof(wctype_l) __wctype_l;
1.132 -+#endif
1.133 -+
1.134 -+#endif // GLIBC 2.3 and later
1.135 -diff -durN gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c_locale.cc
1.136 ---- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc 1970-01-01 01:00:00.000000000 +0100
1.137 -+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c_locale.cc 2008-06-10 14:58:39.000000000 +0200
1.138 -@@ -0,0 +1,160 @@
1.139 -+// Wrapper for underlying C-language localization -*- C++ -*-
1.140 -+
1.141 -+// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
1.142 -+//
1.143 -+// This file is part of the GNU ISO C++ Library. This library is free
1.144 -+// software; you can redistribute it and/or modify it under the
1.145 -+// terms of the GNU General Public License as published by the
1.146 -+// Free Software Foundation; either version 2, or (at your option)
1.147 -+// any later version.
1.148 -+
1.149 -+// This library is distributed in the hope that it will be useful,
1.150 -+// but WITHOUT ANY WARRANTY; without even the implied warranty of
1.151 -+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1.152 -+// GNU General Public License for more details.
1.153 -+
1.154 -+// You should have received a copy of the GNU General Public License along
1.155 -+// with this library; see the file COPYING. If not, write to the Free
1.156 -+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
1.157 -+// USA.
1.158 -+
1.159 -+// As a special exception, you may use this file as part of a free software
1.160 -+// library without restriction. Specifically, if other files instantiate
1.161 -+// templates or use macros or inline functions from this file, or you compile
1.162 -+// this file and link it with other files to produce an executable, this
1.163 -+// file does not by itself cause the resulting executable to be covered by
1.164 -+// the GNU General Public License. This exception does not however
1.165 -+// invalidate any other reasons why the executable file might be covered by
1.166 -+// the GNU General Public License.
1.167 -+
1.168 -+//
1.169 -+// ISO C++ 14882: 22.8 Standard locale categories.
1.170 -+//
1.171 -+
1.172 -+// Written by Benjamin Kosnik <bkoz@redhat.com>
1.173 -+
1.174 -+#include <cerrno> // For errno
1.175 -+#include <locale>
1.176 -+#include <stdexcept>
1.177 -+#include <langinfo.h>
1.178 -+#include <bits/c++locale_internal.h>
1.179 -+
1.180 -+#ifndef __UCLIBC_HAS_XLOCALE__
1.181 -+#define __strtol_l(S, E, B, L) strtol((S), (E), (B))
1.182 -+#define __strtoul_l(S, E, B, L) strtoul((S), (E), (B))
1.183 -+#define __strtoll_l(S, E, B, L) strtoll((S), (E), (B))
1.184 -+#define __strtoull_l(S, E, B, L) strtoull((S), (E), (B))
1.185 -+#define __strtof_l(S, E, L) strtof((S), (E))
1.186 -+#define __strtod_l(S, E, L) strtod((S), (E))
1.187 -+#define __strtold_l(S, E, L) strtold((S), (E))
1.188 -+#warning should dummy __newlocale check for C|POSIX ?
1.189 -+#define __newlocale(a, b, c) NULL
1.190 -+#define __freelocale(a) ((void)0)
1.191 -+#define __duplocale(a) __c_locale()
1.192 -+#endif
1.193 -+
1.194 -+namespace std
1.195 -+{
1.196 -+ template<>
1.197 -+ void
1.198 -+ __convert_to_v(const char* __s, float& __v, ios_base::iostate& __err,
1.199 -+ const __c_locale& __cloc)
1.200 -+ {
1.201 -+ if (!(__err & ios_base::failbit))
1.202 -+ {
1.203 -+ char* __sanity;
1.204 -+ errno = 0;
1.205 -+ float __f = __strtof_l(__s, &__sanity, __cloc);
1.206 -+ if (__sanity != __s && errno != ERANGE)
1.207 -+ __v = __f;
1.208 -+ else
1.209 -+ __err |= ios_base::failbit;
1.210 -+ }
1.211 -+ }
1.212 -+
1.213 -+ template<>
1.214 -+ void
1.215 -+ __convert_to_v(const char* __s, double& __v, ios_base::iostate& __err,
1.216 -+ const __c_locale& __cloc)
1.217 -+ {
1.218 -+ if (!(__err & ios_base::failbit))
1.219 -+ {
1.220 -+ char* __sanity;
1.221 -+ errno = 0;
1.222 -+ double __d = __strtod_l(__s, &__sanity, __cloc);
1.223 -+ if (__sanity != __s && errno != ERANGE)
1.224 -+ __v = __d;
1.225 -+ else
1.226 -+ __err |= ios_base::failbit;
1.227 -+ }
1.228 -+ }
1.229 -+
1.230 -+ template<>
1.231 -+ void
1.232 -+ __convert_to_v(const char* __s, long double& __v, ios_base::iostate& __err,
1.233 -+ const __c_locale& __cloc)
1.234 -+ {
1.235 -+ if (!(__err & ios_base::failbit))
1.236 -+ {
1.237 -+ char* __sanity;
1.238 -+ errno = 0;
1.239 -+ long double __ld = __strtold_l(__s, &__sanity, __cloc);
1.240 -+ if (__sanity != __s && errno != ERANGE)
1.241 -+ __v = __ld;
1.242 -+ else
1.243 -+ __err |= ios_base::failbit;
1.244 -+ }
1.245 -+ }
1.246 -+
1.247 -+ void
1.248 -+ locale::facet::_S_create_c_locale(__c_locale& __cloc, const char* __s,
1.249 -+ __c_locale __old)
1.250 -+ {
1.251 -+ __cloc = __newlocale(1 << LC_ALL, __s, __old);
1.252 -+#ifdef __UCLIBC_HAS_XLOCALE__
1.253 -+ if (!__cloc)
1.254 -+ {
1.255 -+ // This named locale is not supported by the underlying OS.
1.256 -+ __throw_runtime_error(__N("locale::facet::_S_create_c_locale "
1.257 -+ "name not valid"));
1.258 -+ }
1.259 -+#endif
1.260 -+ }
1.261 -+
1.262 -+ void
1.263 -+ locale::facet::_S_destroy_c_locale(__c_locale& __cloc)
1.264 -+ {
1.265 -+ if (_S_get_c_locale() != __cloc)
1.266 -+ __freelocale(__cloc);
1.267 -+ }
1.268 -+
1.269 -+ __c_locale
1.270 -+ locale::facet::_S_clone_c_locale(__c_locale& __cloc)
1.271 -+ { return __duplocale(__cloc); }
1.272 -+} // namespace std
1.273 -+
1.274 -+namespace __gnu_cxx
1.275 -+{
1.276 -+ const char* const category_names[6 + _GLIBCXX_NUM_CATEGORIES] =
1.277 -+ {
1.278 -+ "LC_CTYPE",
1.279 -+ "LC_NUMERIC",
1.280 -+ "LC_TIME",
1.281 -+ "LC_COLLATE",
1.282 -+ "LC_MONETARY",
1.283 -+ "LC_MESSAGES",
1.284 -+#if _GLIBCXX_NUM_CATEGORIES != 0
1.285 -+ "LC_PAPER",
1.286 -+ "LC_NAME",
1.287 -+ "LC_ADDRESS",
1.288 -+ "LC_TELEPHONE",
1.289 -+ "LC_MEASUREMENT",
1.290 -+ "LC_IDENTIFICATION"
1.291 -+#endif
1.292 -+ };
1.293 -+}
1.294 -+
1.295 -+namespace std
1.296 -+{
1.297 -+ const char* const* const locale::_S_categories = __gnu_cxx::category_names;
1.298 -+} // namespace std
1.299 -diff -durN gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.h gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c_locale.h
1.300 ---- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.h 1970-01-01 01:00:00.000000000 +0100
1.301 -+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c_locale.h 2008-06-10 14:58:39.000000000 +0200
1.302 -@@ -0,0 +1,117 @@
1.303 -+// Wrapper for underlying C-language localization -*- C++ -*-
1.304 -+
1.305 -+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
1.306 -+//
1.307 -+// This file is part of the GNU ISO C++ Library. This library is free
1.308 -+// software; you can redistribute it and/or modify it under the
1.309 -+// terms of the GNU General Public License as published by the
1.310 -+// Free Software Foundation; either version 2, or (at your option)
1.311 -+// any later version.
1.312 -+
1.313 -+// This library is distributed in the hope that it will be useful,
1.314 -+// but WITHOUT ANY WARRANTY; without even the implied warranty of
1.315 -+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1.316 -+// GNU General Public License for more details.
1.317 -+
1.318 -+// You should have received a copy of the GNU General Public License along
1.319 -+// with this library; see the file COPYING. If not, write to the Free
1.320 -+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
1.321 -+// USA.
1.322 -+
1.323 -+// As a special exception, you may use this file as part of a free software
1.324 -+// library without restriction. Specifically, if other files instantiate
1.325 -+// templates or use macros or inline functions from this file, or you compile
1.326 -+// this file and link it with other files to produce an executable, this
1.327 -+// file does not by itself cause the resulting executable to be covered by
1.328 -+// the GNU General Public License. This exception does not however
1.329 -+// invalidate any other reasons why the executable file might be covered by
1.330 -+// the GNU General Public License.
1.331 -+
1.332 -+//
1.333 -+// ISO C++ 14882: 22.8 Standard locale categories.
1.334 -+//
1.335 -+
1.336 -+// Written by Benjamin Kosnik <bkoz@redhat.com>
1.337 -+
1.338 -+#ifndef _C_LOCALE_H
1.339 -+#define _C_LOCALE_H 1
1.340 -+
1.341 -+#pragma GCC system_header
1.342 -+
1.343 -+#include <cstring> // get std::strlen
1.344 -+#include <cstdio> // get std::snprintf or std::sprintf
1.345 -+#include <clocale>
1.346 -+#include <langinfo.h> // For codecvt
1.347 -+#ifdef __UCLIBC_MJN3_ONLY__
1.348 -+#warning fix this
1.349 -+#endif
1.350 -+#ifdef __UCLIBC_HAS_LOCALE__
1.351 -+#include <iconv.h> // For codecvt using iconv, iconv_t
1.352 -+#endif
1.353 -+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
1.354 -+#include <libintl.h> // For messages
1.355 -+#endif
1.356 -+
1.357 -+#ifdef __UCLIBC_MJN3_ONLY__
1.358 -+#warning what is _GLIBCXX_C_LOCALE_GNU for
1.359 -+#endif
1.360 -+#define _GLIBCXX_C_LOCALE_GNU 1
1.361 -+
1.362 -+#ifdef __UCLIBC_MJN3_ONLY__
1.363 -+#warning fix categories
1.364 -+#endif
1.365 -+// #define _GLIBCXX_NUM_CATEGORIES 6
1.366 -+#define _GLIBCXX_NUM_CATEGORIES 0
1.367 -+
1.368 -+#ifdef __UCLIBC_HAS_XLOCALE__
1.369 -+namespace __gnu_cxx
1.370 -+{
1.371 -+ extern "C" __typeof(uselocale) __uselocale;
1.372 -+}
1.373 -+#endif
1.374 -+
1.375 -+namespace std
1.376 -+{
1.377 -+#ifdef __UCLIBC_HAS_XLOCALE__
1.378 -+ typedef __locale_t __c_locale;
1.379 -+#else
1.380 -+ typedef int* __c_locale;
1.381 -+#endif
1.382 -+
1.383 -+ // Convert numeric value of type _Tv to string and return length of
1.384 -+ // string. If snprintf is available use it, otherwise fall back to
1.385 -+ // the unsafe sprintf which, in general, can be dangerous and should
1.386 -+ // be avoided.
1.387 -+ template<typename _Tv>
1.388 -+ int
1.389 -+ __convert_from_v(char* __out,
1.390 -+ const int __size __attribute__ ((__unused__)),
1.391 -+ const char* __fmt,
1.392 -+#ifdef __UCLIBC_HAS_XCLOCALE__
1.393 -+ _Tv __v, const __c_locale& __cloc, int __prec)
1.394 -+ {
1.395 -+ __c_locale __old = __gnu_cxx::__uselocale(__cloc);
1.396 -+#else
1.397 -+ _Tv __v, const __c_locale&, int __prec)
1.398 -+ {
1.399 -+# ifdef __UCLIBC_HAS_LOCALE__
1.400 -+ char* __old = std::setlocale(LC_ALL, NULL);
1.401 -+ char* __sav = new char[std::strlen(__old) + 1];
1.402 -+ std::strcpy(__sav, __old);
1.403 -+ std::setlocale(LC_ALL, "C");
1.404 -+# endif
1.405 -+#endif
1.406 -+
1.407 -+ const int __ret = std::snprintf(__out, __size, __fmt, __prec, __v);
1.408 -+
1.409 -+#ifdef __UCLIBC_HAS_XCLOCALE__
1.410 -+ __gnu_cxx::__uselocale(__old);
1.411 -+#elif defined __UCLIBC_HAS_LOCALE__
1.412 -+ std::setlocale(LC_ALL, __sav);
1.413 -+ delete [] __sav;
1.414 -+#endif
1.415 -+ return __ret;
1.416 -+ }
1.417 -+}
1.418 -+
1.419 -+#endif
1.420 -diff -durN gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/codecvt_members.cc gcc-4.3.1/libstdc++-v3/config/locale/uclibc/codecvt_members.cc
1.421 ---- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/codecvt_members.cc 1970-01-01 01:00:00.000000000 +0100
1.422 -+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/codecvt_members.cc 2008-06-10 14:58:39.000000000 +0200
1.423 -@@ -0,0 +1,306 @@
1.424 -+// std::codecvt implementation details, GNU version -*- C++ -*-
1.425 -+
1.426 -+// Copyright (C) 2002, 2003 Free Software Foundation, Inc.
1.427 -+//
1.428 -+// This file is part of the GNU ISO C++ Library. This library is free
1.429 -+// software; you can redistribute it and/or modify it under the
1.430 -+// terms of the GNU General Public License as published by the
1.431 -+// Free Software Foundation; either version 2, or (at your option)
1.432 -+// any later version.
1.433 -+
1.434 -+// This library is distributed in the hope that it will be useful,
1.435 -+// but WITHOUT ANY WARRANTY; without even the implied warranty of
1.436 -+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1.437 -+// GNU General Public License for more details.
1.438 -+
1.439 -+// You should have received a copy of the GNU General Public License along
1.440 -+// with this library; see the file COPYING. If not, write to the Free
1.441 -+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
1.442 -+// USA.
1.443 -+
1.444 -+// As a special exception, you may use this file as part of a free software
1.445 -+// library without restriction. Specifically, if other files instantiate
1.446 -+// templates or use macros or inline functions from this file, or you compile
1.447 -+// this file and link it with other files to produce an executable, this
1.448 -+// file does not by itself cause the resulting executable to be covered by
1.449 -+// the GNU General Public License. This exception does not however
1.450 -+// invalidate any other reasons why the executable file might be covered by
1.451 -+// the GNU General Public License.
1.452 -+
1.453 -+//
1.454 -+// ISO C++ 14882: 22.2.1.5 - Template class codecvt
1.455 -+//
1.456 -+
1.457 -+// Written by Benjamin Kosnik <bkoz@redhat.com>
1.458 -+
1.459 -+#include <locale>
1.460 -+#include <bits/c++locale_internal.h>
1.461 -+
1.462 -+namespace std
1.463 -+{
1.464 -+ // Specializations.
1.465 -+#ifdef _GLIBCXX_USE_WCHAR_T
1.466 -+ codecvt_base::result
1.467 -+ codecvt<wchar_t, char, mbstate_t>::
1.468 -+ do_out(state_type& __state, const intern_type* __from,
1.469 -+ const intern_type* __from_end, const intern_type*& __from_next,
1.470 -+ extern_type* __to, extern_type* __to_end,
1.471 -+ extern_type*& __to_next) const
1.472 -+ {
1.473 -+ result __ret = ok;
1.474 -+ state_type __tmp_state(__state);
1.475 -+
1.476 -+#ifdef __UCLIBC_HAS_XLOCALE__
1.477 -+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
1.478 -+#endif
1.479 -+
1.480 -+ // wcsnrtombs is *very* fast but stops if encounters NUL characters:
1.481 -+ // in case we fall back to wcrtomb and then continue, in a loop.
1.482 -+ // NB: wcsnrtombs is a GNU extension
1.483 -+ for (__from_next = __from, __to_next = __to;
1.484 -+ __from_next < __from_end && __to_next < __to_end
1.485 -+ && __ret == ok;)
1.486 -+ {
1.487 -+ const intern_type* __from_chunk_end = wmemchr(__from_next, L'\0',
1.488 -+ __from_end - __from_next);
1.489 -+ if (!__from_chunk_end)
1.490 -+ __from_chunk_end = __from_end;
1.491 -+
1.492 -+ __from = __from_next;
1.493 -+ const size_t __conv = wcsnrtombs(__to_next, &__from_next,
1.494 -+ __from_chunk_end - __from_next,
1.495 -+ __to_end - __to_next, &__state);
1.496 -+ if (__conv == static_cast<size_t>(-1))
1.497 -+ {
1.498 -+ // In case of error, in order to stop at the exact place we
1.499 -+ // have to start again from the beginning with a series of
1.500 -+ // wcrtomb.
1.501 -+ for (; __from < __from_next; ++__from)
1.502 -+ __to_next += wcrtomb(__to_next, *__from, &__tmp_state);
1.503 -+ __state = __tmp_state;
1.504 -+ __ret = error;
1.505 -+ }
1.506 -+ else if (__from_next && __from_next < __from_chunk_end)
1.507 -+ {
1.508 -+ __to_next += __conv;
1.509 -+ __ret = partial;
1.510 -+ }
1.511 -+ else
1.512 -+ {
1.513 -+ __from_next = __from_chunk_end;
1.514 -+ __to_next += __conv;
1.515 -+ }
1.516 -+
1.517 -+ if (__from_next < __from_end && __ret == ok)
1.518 -+ {
1.519 -+ extern_type __buf[MB_LEN_MAX];
1.520 -+ __tmp_state = __state;
1.521 -+ const size_t __conv = wcrtomb(__buf, *__from_next, &__tmp_state);
1.522 -+ if (__conv > static_cast<size_t>(__to_end - __to_next))
1.523 -+ __ret = partial;
1.524 -+ else
1.525 -+ {
1.526 -+ memcpy(__to_next, __buf, __conv);
1.527 -+ __state = __tmp_state;
1.528 -+ __to_next += __conv;
1.529 -+ ++__from_next;
1.530 -+ }
1.531 -+ }
1.532 -+ }
1.533 -+
1.534 -+#ifdef __UCLIBC_HAS_XLOCALE__
1.535 -+ __uselocale(__old);
1.536 -+#endif
1.537 -+
1.538 -+ return __ret;
1.539 -+ }
1.540 -+
1.541 -+ codecvt_base::result
1.542 -+ codecvt<wchar_t, char, mbstate_t>::
1.543 -+ do_in(state_type& __state, const extern_type* __from,
1.544 -+ const extern_type* __from_end, const extern_type*& __from_next,
1.545 -+ intern_type* __to, intern_type* __to_end,
1.546 -+ intern_type*& __to_next) const
1.547 -+ {
1.548 -+ result __ret = ok;
1.549 -+ state_type __tmp_state(__state);
1.550 -+
1.551 -+#ifdef __UCLIBC_HAS_XLOCALE__
1.552 -+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
1.553 -+#endif
1.554 -+
1.555 -+ // mbsnrtowcs is *very* fast but stops if encounters NUL characters:
1.556 -+ // in case we store a L'\0' and then continue, in a loop.
1.557 -+ // NB: mbsnrtowcs is a GNU extension
1.558 -+ for (__from_next = __from, __to_next = __to;
1.559 -+ __from_next < __from_end && __to_next < __to_end
1.560 -+ && __ret == ok;)
1.561 -+ {
1.562 -+ const extern_type* __from_chunk_end;
1.563 -+ __from_chunk_end = static_cast<const extern_type*>(memchr(__from_next, '\0',
1.564 -+ __from_end
1.565 -+ - __from_next));
1.566 -+ if (!__from_chunk_end)
1.567 -+ __from_chunk_end = __from_end;
1.568 -+
1.569 -+ __from = __from_next;
1.570 -+ size_t __conv = mbsnrtowcs(__to_next, &__from_next,
1.571 -+ __from_chunk_end - __from_next,
1.572 -+ __to_end - __to_next, &__state);
1.573 -+ if (__conv == static_cast<size_t>(-1))
1.574 -+ {
1.575 -+ // In case of error, in order to stop at the exact place we
1.576 -+ // have to start again from the beginning with a series of
1.577 -+ // mbrtowc.
1.578 -+ for (;; ++__to_next, __from += __conv)
1.579 -+ {
1.580 -+ __conv = mbrtowc(__to_next, __from, __from_end - __from,
1.581 -+ &__tmp_state);
1.582 -+ if (__conv == static_cast<size_t>(-1)
1.583 -+ || __conv == static_cast<size_t>(-2))
1.584 -+ break;
1.585 -+ }
1.586 -+ __from_next = __from;
1.587 -+ __state = __tmp_state;
1.588 -+ __ret = error;
1.589 -+ }
1.590 -+ else if (__from_next && __from_next < __from_chunk_end)
1.591 -+ {
1.592 -+ // It is unclear what to return in this case (see DR 382).
1.593 -+ __to_next += __conv;
1.594 -+ __ret = partial;
1.595 -+ }
1.596 -+ else
1.597 -+ {
1.598 -+ __from_next = __from_chunk_end;
1.599 -+ __to_next += __conv;
1.600 -+ }
1.601 -+
1.602 -+ if (__from_next < __from_end && __ret == ok)
1.603 -+ {
1.604 -+ if (__to_next < __to_end)
1.605 -+ {
1.606 -+ // XXX Probably wrong for stateful encodings
1.607 -+ __tmp_state = __state;
1.608 -+ ++__from_next;
1.609 -+ *__to_next++ = L'\0';
1.610 -+ }
1.611 -+ else
1.612 -+ __ret = partial;
1.613 -+ }
1.614 -+ }
1.615 -+
1.616 -+#ifdef __UCLIBC_HAS_XLOCALE__
1.617 -+ __uselocale(__old);
1.618 -+#endif
1.619 -+
1.620 -+ return __ret;
1.621 -+ }
1.622 -+
1.623 -+ int
1.624 -+ codecvt<wchar_t, char, mbstate_t>::
1.625 -+ do_encoding() const throw()
1.626 -+ {
1.627 -+ // XXX This implementation assumes that the encoding is
1.628 -+ // stateless and is either single-byte or variable-width.
1.629 -+ int __ret = 0;
1.630 -+#ifdef __UCLIBC_HAS_XLOCALE__
1.631 -+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
1.632 -+#endif
1.633 -+ if (MB_CUR_MAX == 1)
1.634 -+ __ret = 1;
1.635 -+#ifdef __UCLIBC_HAS_XLOCALE__
1.636 -+ __uselocale(__old);
1.637 -+#endif
1.638 -+ return __ret;
1.639 -+ }
1.640 -+
1.641 -+ int
1.642 -+ codecvt<wchar_t, char, mbstate_t>::
1.643 -+ do_max_length() const throw()
1.644 -+ {
1.645 -+#ifdef __UCLIBC_HAS_XLOCALE__
1.646 -+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
1.647 -+#endif
1.648 -+ // XXX Probably wrong for stateful encodings.
1.649 -+ int __ret = MB_CUR_MAX;
1.650 -+#ifdef __UCLIBC_HAS_XLOCALE__
1.651 -+ __uselocale(__old);
1.652 -+#endif
1.653 -+ return __ret;
1.654 -+ }
1.655 -+
1.656 -+ int
1.657 -+ codecvt<wchar_t, char, mbstate_t>::
1.658 -+ do_length(state_type& __state, const extern_type* __from,
1.659 -+ const extern_type* __end, size_t __max) const
1.660 -+ {
1.661 -+ int __ret = 0;
1.662 -+ state_type __tmp_state(__state);
1.663 -+
1.664 -+#ifdef __UCLIBC_HAS_XLOCALE__
1.665 -+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
1.666 -+#endif
1.667 -+
1.668 -+ // mbsnrtowcs is *very* fast but stops if encounters NUL characters:
1.669 -+ // in case we advance past it and then continue, in a loop.
1.670 -+ // NB: mbsnrtowcs is a GNU extension
1.671 -+
1.672 -+ // A dummy internal buffer is needed in order for mbsnrtocws to consider
1.673 -+ // its fourth parameter (it wouldn't with NULL as first parameter).
1.674 -+ wchar_t* __to = static_cast<wchar_t*>(__builtin_alloca(sizeof(wchar_t)
1.675 -+ * __max));
1.676 -+ while (__from < __end && __max)
1.677 -+ {
1.678 -+ const extern_type* __from_chunk_end;
1.679 -+ __from_chunk_end = static_cast<const extern_type*>(memchr(__from, '\0',
1.680 -+ __end
1.681 -+ - __from));
1.682 -+ if (!__from_chunk_end)
1.683 -+ __from_chunk_end = __end;
1.684 -+
1.685 -+ const extern_type* __tmp_from = __from;
1.686 -+ size_t __conv = mbsnrtowcs(__to, &__from,
1.687 -+ __from_chunk_end - __from,
1.688 -+ __max, &__state);
1.689 -+ if (__conv == static_cast<size_t>(-1))
1.690 -+ {
1.691 -+ // In case of error, in order to stop at the exact place we
1.692 -+ // have to start again from the beginning with a series of
1.693 -+ // mbrtowc.
1.694 -+ for (__from = __tmp_from;; __from += __conv)
1.695 -+ {
1.696 -+ __conv = mbrtowc(NULL, __from, __end - __from,
1.697 -+ &__tmp_state);
1.698 -+ if (__conv == static_cast<size_t>(-1)
1.699 -+ || __conv == static_cast<size_t>(-2))
1.700 -+ break;
1.701 -+ }
1.702 -+ __state = __tmp_state;
1.703 -+ __ret += __from - __tmp_from;
1.704 -+ break;
1.705 -+ }
1.706 -+ if (!__from)
1.707 -+ __from = __from_chunk_end;
1.708 -+
1.709 -+ __ret += __from - __tmp_from;
1.710 -+ __max -= __conv;
1.711 -+
1.712 -+ if (__from < __end && __max)
1.713 -+ {
1.714 -+ // XXX Probably wrong for stateful encodings
1.715 -+ __tmp_state = __state;
1.716 -+ ++__from;
1.717 -+ ++__ret;
1.718 -+ --__max;
1.719 -+ }
1.720 -+ }
1.721 -+
1.722 -+#ifdef __UCLIBC_HAS_XLOCALE__
1.723 -+ __uselocale(__old);
1.724 -+#endif
1.725 -+
1.726 -+ return __ret;
1.727 -+ }
1.728 -+#endif
1.729 -+}
1.730 -diff -durN gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/collate_members.cc gcc-4.3.1/libstdc++-v3/config/locale/uclibc/collate_members.cc
1.731 ---- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/collate_members.cc 1970-01-01 01:00:00.000000000 +0100
1.732 -+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/collate_members.cc 2008-06-10 14:58:39.000000000 +0200
1.733 -@@ -0,0 +1,80 @@
1.734 -+// std::collate implementation details, GNU version -*- C++ -*-
1.735 -+
1.736 -+// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
1.737 -+//
1.738 -+// This file is part of the GNU ISO C++ Library. This library is free
1.739 -+// software; you can redistribute it and/or modify it under the
1.740 -+// terms of the GNU General Public License as published by the
1.741 -+// Free Software Foundation; either version 2, or (at your option)
1.742 -+// any later version.
1.743 -+
1.744 -+// This library is distributed in the hope that it will be useful,
1.745 -+// but WITHOUT ANY WARRANTY; without even the implied warranty of
1.746 -+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1.747 -+// GNU General Public License for more details.
1.748 -+
1.749 -+// You should have received a copy of the GNU General Public License along
1.750 -+// with this library; see the file COPYING. If not, write to the Free
1.751 -+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
1.752 -+// USA.
1.753 -+
1.754 -+// As a special exception, you may use this file as part of a free software
1.755 -+// library without restriction. Specifically, if other files instantiate
1.756 -+// templates or use macros or inline functions from this file, or you compile
1.757 -+// this file and link it with other files to produce an executable, this
1.758 -+// file does not by itself cause the resulting executable to be covered by
1.759 -+// the GNU General Public License. This exception does not however
1.760 -+// invalidate any other reasons why the executable file might be covered by
1.761 -+// the GNU General Public License.
1.762 -+
1.763 -+//
1.764 -+// ISO C++ 14882: 22.2.4.1.2 collate virtual functions
1.765 -+//
1.766 -+
1.767 -+// Written by Benjamin Kosnik <bkoz@redhat.com>
1.768 -+
1.769 -+#include <locale>
1.770 -+#include <bits/c++locale_internal.h>
1.771 -+
1.772 -+#ifndef __UCLIBC_HAS_XLOCALE__
1.773 -+#define __strcoll_l(S1, S2, L) strcoll((S1), (S2))
1.774 -+#define __strxfrm_l(S1, S2, N, L) strxfrm((S1), (S2), (N))
1.775 -+#define __wcscoll_l(S1, S2, L) wcscoll((S1), (S2))
1.776 -+#define __wcsxfrm_l(S1, S2, N, L) wcsxfrm((S1), (S2), (N))
1.777 -+#endif
1.778 -+
1.779 -+namespace std
1.780 -+{
1.781 -+ // These are basically extensions to char_traits, and perhaps should
1.782 -+ // be put there instead of here.
1.783 -+ template<>
1.784 -+ int
1.785 -+ collate<char>::_M_compare(const char* __one, const char* __two) const
1.786 -+ {
1.787 -+ int __cmp = __strcoll_l(__one, __two, _M_c_locale_collate);
1.788 -+ return (__cmp >> (8 * sizeof (int) - 2)) | (__cmp != 0);
1.789 -+ }
1.790 -+
1.791 -+ template<>
1.792 -+ size_t
1.793 -+ collate<char>::_M_transform(char* __to, const char* __from,
1.794 -+ size_t __n) const
1.795 -+ { return __strxfrm_l(__to, __from, __n, _M_c_locale_collate); }
1.796 -+
1.797 -+#ifdef _GLIBCXX_USE_WCHAR_T
1.798 -+ template<>
1.799 -+ int
1.800 -+ collate<wchar_t>::_M_compare(const wchar_t* __one,
1.801 -+ const wchar_t* __two) const
1.802 -+ {
1.803 -+ int __cmp = __wcscoll_l(__one, __two, _M_c_locale_collate);
1.804 -+ return (__cmp >> (8 * sizeof (int) - 2)) | (__cmp != 0);
1.805 -+ }
1.806 -+
1.807 -+ template<>
1.808 -+ size_t
1.809 -+ collate<wchar_t>::_M_transform(wchar_t* __to, const wchar_t* __from,
1.810 -+ size_t __n) const
1.811 -+ { return __wcsxfrm_l(__to, __from, __n, _M_c_locale_collate); }
1.812 -+#endif
1.813 -+}
1.814 -diff -durN gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc gcc-4.3.1/libstdc++-v3/config/locale/uclibc/ctype_members.cc
1.815 ---- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc 1970-01-01 01:00:00.000000000 +0100
1.816 -+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2008-06-10 14:58:39.000000000 +0200
1.817 -@@ -0,0 +1,300 @@
1.818 -+// std::ctype implementation details, GNU version -*- C++ -*-
1.819 -+
1.820 -+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
1.821 -+//
1.822 -+// This file is part of the GNU ISO C++ Library. This library is free
1.823 -+// software; you can redistribute it and/or modify it under the
1.824 -+// terms of the GNU General Public License as published by the
1.825 -+// Free Software Foundation; either version 2, or (at your option)
1.826 -+// any later version.
1.827 -+
1.828 -+// This library is distributed in the hope that it will be useful,
1.829 -+// but WITHOUT ANY WARRANTY; without even the implied warranty of
1.830 -+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1.831 -+// GNU General Public License for more details.
1.832 -+
1.833 -+// You should have received a copy of the GNU General Public License along
1.834 -+// with this library; see the file COPYING. If not, write to the Free
1.835 -+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
1.836 -+// USA.
1.837 -+
1.838 -+// As a special exception, you may use this file as part of a free software
1.839 -+// library without restriction. Specifically, if other files instantiate
1.840 -+// templates or use macros or inline functions from this file, or you compile
1.841 -+// this file and link it with other files to produce an executable, this
1.842 -+// file does not by itself cause the resulting executable to be covered by
1.843 -+// the GNU General Public License. This exception does not however
1.844 -+// invalidate any other reasons why the executable file might be covered by
1.845 -+// the GNU General Public License.
1.846 -+
1.847 -+//
1.848 -+// ISO C++ 14882: 22.2.1.1.2 ctype virtual functions.
1.849 -+//
1.850 -+
1.851 -+// Written by Benjamin Kosnik <bkoz@redhat.com>
1.852 -+
1.853 -+#define _LIBC
1.854 -+#include <locale>
1.855 -+#undef _LIBC
1.856 -+#include <bits/c++locale_internal.h>
1.857 -+
1.858 -+#ifndef __UCLIBC_HAS_XLOCALE__
1.859 -+#define __wctype_l(S, L) wctype((S))
1.860 -+#define __towupper_l(C, L) towupper((C))
1.861 -+#define __towlower_l(C, L) towlower((C))
1.862 -+#define __iswctype_l(C, M, L) iswctype((C), (M))
1.863 -+#endif
1.864 -+
1.865 -+namespace std
1.866 -+{
1.867 -+ // NB: The other ctype<char> specializations are in src/locale.cc and
1.868 -+ // various /config/os/* files.
1.869 -+ template<>
1.870 -+ ctype_byname<char>::ctype_byname(const char* __s, size_t __refs)
1.871 -+ : ctype<char>(0, false, __refs)
1.872 -+ {
1.873 -+ if (std::strcmp(__s, "C") != 0 && std::strcmp(__s, "POSIX") != 0)
1.874 -+ {
1.875 -+ this->_S_destroy_c_locale(this->_M_c_locale_ctype);
1.876 -+ this->_S_create_c_locale(this->_M_c_locale_ctype, __s);
1.877 -+#ifdef __UCLIBC_HAS_XLOCALE__
1.878 -+ this->_M_toupper = this->_M_c_locale_ctype->__ctype_toupper;
1.879 -+ this->_M_tolower = this->_M_c_locale_ctype->__ctype_tolower;
1.880 -+ this->_M_table = this->_M_c_locale_ctype->__ctype_b;
1.881 -+#endif
1.882 -+ }
1.883 -+ }
1.884 -+
1.885 -+#ifdef _GLIBCXX_USE_WCHAR_T
1.886 -+ ctype<wchar_t>::__wmask_type
1.887 -+ ctype<wchar_t>::_M_convert_to_wmask(const mask __m) const
1.888 -+ {
1.889 -+ __wmask_type __ret;
1.890 -+ switch (__m)
1.891 -+ {
1.892 -+ case space:
1.893 -+ __ret = __wctype_l("space", _M_c_locale_ctype);
1.894 -+ break;
1.895 -+ case print:
1.896 -+ __ret = __wctype_l("print", _M_c_locale_ctype);
1.897 -+ break;
1.898 -+ case cntrl:
1.899 -+ __ret = __wctype_l("cntrl", _M_c_locale_ctype);
1.900 -+ break;
1.901 -+ case upper:
1.902 -+ __ret = __wctype_l("upper", _M_c_locale_ctype);
1.903 -+ break;
1.904 -+ case lower:
1.905 -+ __ret = __wctype_l("lower", _M_c_locale_ctype);
1.906 -+ break;
1.907 -+ case alpha:
1.908 -+ __ret = __wctype_l("alpha", _M_c_locale_ctype);
1.909 -+ break;
1.910 -+ case digit:
1.911 -+ __ret = __wctype_l("digit", _M_c_locale_ctype);
1.912 -+ break;
1.913 -+ case punct:
1.914 -+ __ret = __wctype_l("punct", _M_c_locale_ctype);
1.915 -+ break;
1.916 -+ case xdigit:
1.917 -+ __ret = __wctype_l("xdigit", _M_c_locale_ctype);
1.918 -+ break;
1.919 -+ case alnum:
1.920 -+ __ret = __wctype_l("alnum", _M_c_locale_ctype);
1.921 -+ break;
1.922 -+ case graph:
1.923 -+ __ret = __wctype_l("graph", _M_c_locale_ctype);
1.924 -+ break;
1.925 -+ default:
1.926 -+ __ret = __wmask_type();
1.927 -+ }
1.928 -+ return __ret;
1.929 -+ }
1.930 -+
1.931 -+ wchar_t
1.932 -+ ctype<wchar_t>::do_toupper(wchar_t __c) const
1.933 -+ { return __towupper_l(__c, _M_c_locale_ctype); }
1.934 -+
1.935 -+ const wchar_t*
1.936 -+ ctype<wchar_t>::do_toupper(wchar_t* __lo, const wchar_t* __hi) const
1.937 -+ {
1.938 -+ while (__lo < __hi)
1.939 -+ {
1.940 -+ *__lo = __towupper_l(*__lo, _M_c_locale_ctype);
1.941 -+ ++__lo;
1.942 -+ }
1.943 -+ return __hi;
1.944 -+ }
1.945 -+
1.946 -+ wchar_t
1.947 -+ ctype<wchar_t>::do_tolower(wchar_t __c) const
1.948 -+ { return __towlower_l(__c, _M_c_locale_ctype); }
1.949 -+
1.950 -+ const wchar_t*
1.951 -+ ctype<wchar_t>::do_tolower(wchar_t* __lo, const wchar_t* __hi) const
1.952 -+ {
1.953 -+ while (__lo < __hi)
1.954 -+ {
1.955 -+ *__lo = __towlower_l(*__lo, _M_c_locale_ctype);
1.956 -+ ++__lo;
1.957 -+ }
1.958 -+ return __hi;
1.959 -+ }
1.960 -+
1.961 -+ bool
1.962 -+ ctype<wchar_t>::
1.963 -+ do_is(mask __m, wchar_t __c) const
1.964 -+ {
1.965 -+ // Highest bitmask in ctype_base == 10, but extra in "C"
1.966 -+ // library for blank.
1.967 -+ bool __ret = false;
1.968 -+ const size_t __bitmasksize = 11;
1.969 -+ for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
1.970 -+ if (__m & _M_bit[__bitcur]
1.971 -+ && __iswctype_l(__c, _M_wmask[__bitcur], _M_c_locale_ctype))
1.972 -+ {
1.973 -+ __ret = true;
1.974 -+ break;
1.975 -+ }
1.976 -+ return __ret;
1.977 -+ }
1.978 -+
1.979 -+ const wchar_t*
1.980 -+ ctype<wchar_t>::
1.981 -+ do_is(const wchar_t* __lo, const wchar_t* __hi, mask* __vec) const
1.982 -+ {
1.983 -+ for (; __lo < __hi; ++__vec, ++__lo)
1.984 -+ {
1.985 -+ // Highest bitmask in ctype_base == 10, but extra in "C"
1.986 -+ // library for blank.
1.987 -+ const size_t __bitmasksize = 11;
1.988 -+ mask __m = 0;
1.989 -+ for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
1.990 -+ if (__iswctype_l(*__lo, _M_wmask[__bitcur], _M_c_locale_ctype))
1.991 -+ __m |= _M_bit[__bitcur];
1.992 -+ *__vec = __m;
1.993 -+ }
1.994 -+ return __hi;
1.995 -+ }
1.996 -+
1.997 -+ const wchar_t*
1.998 -+ ctype<wchar_t>::
1.999 -+ do_scan_is(mask __m, const wchar_t* __lo, const wchar_t* __hi) const
1.1000 -+ {
1.1001 -+ while (__lo < __hi && !this->do_is(__m, *__lo))
1.1002 -+ ++__lo;
1.1003 -+ return __lo;
1.1004 -+ }
1.1005 -+
1.1006 -+ const wchar_t*
1.1007 -+ ctype<wchar_t>::
1.1008 -+ do_scan_not(mask __m, const char_type* __lo, const char_type* __hi) const
1.1009 -+ {
1.1010 -+ while (__lo < __hi && this->do_is(__m, *__lo) != 0)
1.1011 -+ ++__lo;
1.1012 -+ return __lo;
1.1013 -+ }
1.1014 -+
1.1015 -+ wchar_t
1.1016 -+ ctype<wchar_t>::
1.1017 -+ do_widen(char __c) const
1.1018 -+ { return _M_widen[static_cast<unsigned char>(__c)]; }
1.1019 -+
1.1020 -+ const char*
1.1021 -+ ctype<wchar_t>::
1.1022 -+ do_widen(const char* __lo, const char* __hi, wchar_t* __dest) const
1.1023 -+ {
1.1024 -+ while (__lo < __hi)
1.1025 -+ {
1.1026 -+ *__dest = _M_widen[static_cast<unsigned char>(*__lo)];
1.1027 -+ ++__lo;
1.1028 -+ ++__dest;
1.1029 -+ }
1.1030 -+ return __hi;
1.1031 -+ }
1.1032 -+
1.1033 -+ char
1.1034 -+ ctype<wchar_t>::
1.1035 -+ do_narrow(wchar_t __wc, char __dfault) const
1.1036 -+ {
1.1037 -+ if (__wc >= 0 && __wc < 128 && _M_narrow_ok)
1.1038 -+ return _M_narrow[__wc];
1.1039 -+#ifdef __UCLIBC_HAS_XLOCALE__
1.1040 -+ __c_locale __old = __uselocale(_M_c_locale_ctype);
1.1041 -+#endif
1.1042 -+ const int __c = wctob(__wc);
1.1043 -+#ifdef __UCLIBC_HAS_XLOCALE__
1.1044 -+ __uselocale(__old);
1.1045 -+#endif
1.1046 -+ return (__c == EOF ? __dfault : static_cast<char>(__c));
1.1047 -+ }
1.1048 -+
1.1049 -+ const wchar_t*
1.1050 -+ ctype<wchar_t>::
1.1051 -+ do_narrow(const wchar_t* __lo, const wchar_t* __hi, char __dfault,
1.1052 -+ char* __dest) const
1.1053 -+ {
1.1054 -+#ifdef __UCLIBC_HAS_XLOCALE__
1.1055 -+ __c_locale __old = __uselocale(_M_c_locale_ctype);
1.1056 -+#endif
1.1057 -+ if (_M_narrow_ok)
1.1058 -+ while (__lo < __hi)
1.1059 -+ {
1.1060 -+ if (*__lo >= 0 && *__lo < 128)
1.1061 -+ *__dest = _M_narrow[*__lo];
1.1062 -+ else
1.1063 -+ {
1.1064 -+ const int __c = wctob(*__lo);
1.1065 -+ *__dest = (__c == EOF ? __dfault : static_cast<char>(__c));
1.1066 -+ }
1.1067 -+ ++__lo;
1.1068 -+ ++__dest;
1.1069 -+ }
1.1070 -+ else
1.1071 -+ while (__lo < __hi)
1.1072 -+ {
1.1073 -+ const int __c = wctob(*__lo);
1.1074 -+ *__dest = (__c == EOF ? __dfault : static_cast<char>(__c));
1.1075 -+ ++__lo;
1.1076 -+ ++__dest;
1.1077 -+ }
1.1078 -+#ifdef __UCLIBC_HAS_XLOCALE__
1.1079 -+ __uselocale(__old);
1.1080 -+#endif
1.1081 -+ return __hi;
1.1082 -+ }
1.1083 -+
1.1084 -+ void
1.1085 -+ ctype<wchar_t>::_M_initialize_ctype()
1.1086 -+ {
1.1087 -+#ifdef __UCLIBC_HAS_XLOCALE__
1.1088 -+ __c_locale __old = __uselocale(_M_c_locale_ctype);
1.1089 -+#endif
1.1090 -+ wint_t __i;
1.1091 -+ for (__i = 0; __i < 128; ++__i)
1.1092 -+ {
1.1093 -+ const int __c = wctob(__i);
1.1094 -+ if (__c == EOF)
1.1095 -+ break;
1.1096 -+ else
1.1097 -+ _M_narrow[__i] = static_cast<char>(__c);
1.1098 -+ }
1.1099 -+ if (__i == 128)
1.1100 -+ _M_narrow_ok = true;
1.1101 -+ else
1.1102 -+ _M_narrow_ok = false;
1.1103 -+ for (size_t __j = 0;
1.1104 -+ __j < sizeof(_M_widen) / sizeof(wint_t); ++__j)
1.1105 -+ _M_widen[__j] = btowc(__j);
1.1106 -+
1.1107 -+ for (size_t __k = 0; __k <= 11; ++__k)
1.1108 -+ {
1.1109 -+ _M_bit[__k] = static_cast<mask>(_ISbit(__k));
1.1110 -+ _M_wmask[__k] = _M_convert_to_wmask(_M_bit[__k]);
1.1111 -+ }
1.1112 -+#ifdef __UCLIBC_HAS_XLOCALE__
1.1113 -+ __uselocale(__old);
1.1114 -+#endif
1.1115 -+ }
1.1116 -+#endif // _GLIBCXX_USE_WCHAR_T
1.1117 -+}
1.1118 -diff -durN gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.cc gcc-4.3.1/libstdc++-v3/config/locale/uclibc/messages_members.cc
1.1119 ---- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.cc 1970-01-01 01:00:00.000000000 +0100
1.1120 -+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/messages_members.cc 2008-06-10 14:58:39.000000000 +0200
1.1121 -@@ -0,0 +1,100 @@
1.1122 -+// std::messages implementation details, GNU version -*- C++ -*-
1.1123 -+
1.1124 -+// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
1.1125 -+//
1.1126 -+// This file is part of the GNU ISO C++ Library. This library is free
1.1127 -+// software; you can redistribute it and/or modify it under the
1.1128 -+// terms of the GNU General Public License as published by the
1.1129 -+// Free Software Foundation; either version 2, or (at your option)
1.1130 -+// any later version.
1.1131 -+
1.1132 -+// This library is distributed in the hope that it will be useful,
1.1133 -+// but WITHOUT ANY WARRANTY; without even the implied warranty of
1.1134 -+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1.1135 -+// GNU General Public License for more details.
1.1136 -+
1.1137 -+// You should have received a copy of the GNU General Public License along
1.1138 -+// with this library; see the file COPYING. If not, write to the Free
1.1139 -+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
1.1140 -+// USA.
1.1141 -+
1.1142 -+// As a special exception, you may use this file as part of a free software
1.1143 -+// library without restriction. Specifically, if other files instantiate
1.1144 -+// templates or use macros or inline functions from this file, or you compile
1.1145 -+// this file and link it with other files to produce an executable, this
1.1146 -+// file does not by itself cause the resulting executable to be covered by
1.1147 -+// the GNU General Public License. This exception does not however
1.1148 -+// invalidate any other reasons why the executable file might be covered by
1.1149 -+// the GNU General Public License.
1.1150 -+
1.1151 -+//
1.1152 -+// ISO C++ 14882: 22.2.7.1.2 messages virtual functions
1.1153 -+//
1.1154 -+
1.1155 -+// Written by Benjamin Kosnik <bkoz@redhat.com>
1.1156 -+
1.1157 -+#include <locale>
1.1158 -+#include <bits/c++locale_internal.h>
1.1159 -+
1.1160 -+#ifdef __UCLIBC_MJN3_ONLY__
1.1161 -+#warning fix gettext stuff
1.1162 -+#endif
1.1163 -+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
1.1164 -+extern "C" char *__dcgettext(const char *domainname,
1.1165 -+ const char *msgid, int category);
1.1166 -+#undef gettext
1.1167 -+#define gettext(msgid) __dcgettext(NULL, msgid, LC_MESSAGES)
1.1168 -+#else
1.1169 -+#undef gettext
1.1170 -+#define gettext(msgid) (msgid)
1.1171 -+#endif
1.1172 -+
1.1173 -+namespace std
1.1174 -+{
1.1175 -+ // Specializations.
1.1176 -+ template<>
1.1177 -+ string
1.1178 -+ messages<char>::do_get(catalog, int, int, const string& __dfault) const
1.1179 -+ {
1.1180 -+#ifdef __UCLIBC_HAS_XLOCALE__
1.1181 -+ __c_locale __old = __uselocale(_M_c_locale_messages);
1.1182 -+ const char* __msg = const_cast<const char*>(gettext(__dfault.c_str()));
1.1183 -+ __uselocale(__old);
1.1184 -+ return string(__msg);
1.1185 -+#elif defined __UCLIBC_HAS_LOCALE__
1.1186 -+ char* __old = strdup(setlocale(LC_ALL, NULL));
1.1187 -+ setlocale(LC_ALL, _M_name_messages);
1.1188 -+ const char* __msg = gettext(__dfault.c_str());
1.1189 -+ setlocale(LC_ALL, __old);
1.1190 -+ free(__old);
1.1191 -+ return string(__msg);
1.1192 -+#else
1.1193 -+ const char* __msg = gettext(__dfault.c_str());
1.1194 -+ return string(__msg);
1.1195 -+#endif
1.1196 -+ }
1.1197 -+
1.1198 -+#ifdef _GLIBCXX_USE_WCHAR_T
1.1199 -+ template<>
1.1200 -+ wstring
1.1201 -+ messages<wchar_t>::do_get(catalog, int, int, const wstring& __dfault) const
1.1202 -+ {
1.1203 -+# ifdef __UCLIBC_HAS_XLOCALE__
1.1204 -+ __c_locale __old = __uselocale(_M_c_locale_messages);
1.1205 -+ char* __msg = gettext(_M_convert_to_char(__dfault));
1.1206 -+ __uselocale(__old);
1.1207 -+ return _M_convert_from_char(__msg);
1.1208 -+# elif defined __UCLIBC_HAS_LOCALE__
1.1209 -+ char* __old = strdup(setlocale(LC_ALL, NULL));
1.1210 -+ setlocale(LC_ALL, _M_name_messages);
1.1211 -+ char* __msg = gettext(_M_convert_to_char(__dfault));
1.1212 -+ setlocale(LC_ALL, __old);
1.1213 -+ free(__old);
1.1214 -+ return _M_convert_from_char(__msg);
1.1215 -+# else
1.1216 -+ char* __msg = gettext(_M_convert_to_char(__dfault));
1.1217 -+ return _M_convert_from_char(__msg);
1.1218 -+# endif
1.1219 -+ }
1.1220 -+#endif
1.1221 -+}
1.1222 -diff -durN gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.h gcc-4.3.1/libstdc++-v3/config/locale/uclibc/messages_members.h
1.1223 ---- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.h 1970-01-01 01:00:00.000000000 +0100
1.1224 -+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/messages_members.h 2008-06-10 14:58:39.000000000 +0200
1.1225 -@@ -0,0 +1,118 @@
1.1226 -+// std::messages implementation details, GNU version -*- C++ -*-
1.1227 -+
1.1228 -+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
1.1229 -+//
1.1230 -+// This file is part of the GNU ISO C++ Library. This library is free
1.1231 -+// software; you can redistribute it and/or modify it under the
1.1232 -+// terms of the GNU General Public License as published by the
1.1233 -+// Free Software Foundation; either version 2, or (at your option)
1.1234 -+// any later version.
1.1235 -+
1.1236 -+// This library is distributed in the hope that it will be useful,
1.1237 -+// but WITHOUT ANY WARRANTY; without even the implied warranty of
1.1238 -+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1.1239 -+// GNU General Public License for more details.
1.1240 -+
1.1241 -+// You should have received a copy of the GNU General Public License along
1.1242 -+// with this library; see the file COPYING. If not, write to the Free
1.1243 -+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
1.1244 -+// USA.
1.1245 -+
1.1246 -+// As a special exception, you may use this file as part of a free software
1.1247 -+// library without restriction. Specifically, if other files instantiate
1.1248 -+// templates or use macros or inline functions from this file, or you compile
1.1249 -+// this file and link it with other files to produce an executable, this
1.1250 -+// file does not by itself cause the resulting executable to be covered by
1.1251 -+// the GNU General Public License. This exception does not however
1.1252 -+// invalidate any other reasons why the executable file might be covered by
1.1253 -+// the GNU General Public License.
1.1254 -+
1.1255 -+//
1.1256 -+// ISO C++ 14882: 22.2.7.1.2 messages functions
1.1257 -+//
1.1258 -+
1.1259 -+// Written by Benjamin Kosnik <bkoz@redhat.com>
1.1260 -+
1.1261 -+#ifdef __UCLIBC_MJN3_ONLY__
1.1262 -+#warning fix prototypes for *textdomain funcs
1.1263 -+#endif
1.1264 -+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
1.1265 -+extern "C" char *__textdomain(const char *domainname);
1.1266 -+extern "C" char *__bindtextdomain(const char *domainname,
1.1267 -+ const char *dirname);
1.1268 -+#else
1.1269 -+#undef __textdomain
1.1270 -+#undef __bindtextdomain
1.1271 -+#define __textdomain(D) ((void)0)
1.1272 -+#define __bindtextdomain(D,P) ((void)0)
1.1273 -+#endif
1.1274 -+
1.1275 -+ // Non-virtual member functions.
1.1276 -+ template<typename _CharT>
1.1277 -+ messages<_CharT>::messages(size_t __refs)
1.1278 -+ : facet(__refs), _M_c_locale_messages(_S_get_c_locale()),
1.1279 -+ _M_name_messages(_S_get_c_name())
1.1280 -+ { }
1.1281 -+
1.1282 -+ template<typename _CharT>
1.1283 -+ messages<_CharT>::messages(__c_locale __cloc, const char* __s,
1.1284 -+ size_t __refs)
1.1285 -+ : facet(__refs), _M_c_locale_messages(_S_clone_c_locale(__cloc)),
1.1286 -+ _M_name_messages(__s)
1.1287 -+ {
1.1288 -+ char* __tmp = new char[std::strlen(__s) + 1];
1.1289 -+ std::strcpy(__tmp, __s);
1.1290 -+ _M_name_messages = __tmp;
1.1291 -+ }
1.1292 -+
1.1293 -+ template<typename _CharT>
1.1294 -+ typename messages<_CharT>::catalog
1.1295 -+ messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc,
1.1296 -+ const char* __dir) const
1.1297 -+ {
1.1298 -+ __bindtextdomain(__s.c_str(), __dir);
1.1299 -+ return this->do_open(__s, __loc);
1.1300 -+ }
1.1301 -+
1.1302 -+ // Virtual member functions.
1.1303 -+ template<typename _CharT>
1.1304 -+ messages<_CharT>::~messages()
1.1305 -+ {
1.1306 -+ if (_M_name_messages != _S_get_c_name())
1.1307 -+ delete [] _M_name_messages;
1.1308 -+ _S_destroy_c_locale(_M_c_locale_messages);
1.1309 -+ }
1.1310 -+
1.1311 -+ template<typename _CharT>
1.1312 -+ typename messages<_CharT>::catalog
1.1313 -+ messages<_CharT>::do_open(const basic_string<char>& __s,
1.1314 -+ const locale&) const
1.1315 -+ {
1.1316 -+ // No error checking is done, assume the catalog exists and can
1.1317 -+ // be used.
1.1318 -+ __textdomain(__s.c_str());
1.1319 -+ return 0;
1.1320 -+ }
1.1321 -+
1.1322 -+ template<typename _CharT>
1.1323 -+ void
1.1324 -+ messages<_CharT>::do_close(catalog) const
1.1325 -+ { }
1.1326 -+
1.1327 -+ // messages_byname
1.1328 -+ template<typename _CharT>
1.1329 -+ messages_byname<_CharT>::messages_byname(const char* __s, size_t __refs)
1.1330 -+ : messages<_CharT>(__refs)
1.1331 -+ {
1.1332 -+ if (this->_M_name_messages != locale::facet::_S_get_c_name())
1.1333 -+ delete [] this->_M_name_messages;
1.1334 -+ char* __tmp = new char[std::strlen(__s) + 1];
1.1335 -+ std::strcpy(__tmp, __s);
1.1336 -+ this->_M_name_messages = __tmp;
1.1337 -+
1.1338 -+ if (std::strcmp(__s, "C") != 0 && std::strcmp(__s, "POSIX") != 0)
1.1339 -+ {
1.1340 -+ this->_S_destroy_c_locale(this->_M_c_locale_messages);
1.1341 -+ this->_S_create_c_locale(this->_M_c_locale_messages, __s);
1.1342 -+ }
1.1343 -+ }
1.1344 -diff -durN gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc gcc-4.3.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc
1.1345 ---- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc 1970-01-01 01:00:00.000000000 +0100
1.1346 -+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2008-06-10 14:58:39.000000000 +0200
1.1347 -@@ -0,0 +1,692 @@
1.1348 -+// std::moneypunct implementation details, GNU version -*- C++ -*-
1.1349 -+
1.1350 -+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
1.1351 -+//
1.1352 -+// This file is part of the GNU ISO C++ Library. This library is free
1.1353 -+// software; you can redistribute it and/or modify it under the
1.1354 -+// terms of the GNU General Public License as published by the
1.1355 -+// Free Software Foundation; either version 2, or (at your option)
1.1356 -+// any later version.
1.1357 -+
1.1358 -+// This library is distributed in the hope that it will be useful,
1.1359 -+// but WITHOUT ANY WARRANTY; without even the implied warranty of
1.1360 -+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1.1361 -+// GNU General Public License for more details.
1.1362 -+
1.1363 -+// You should have received a copy of the GNU General Public License along
1.1364 -+// with this library; see the file COPYING. If not, write to the Free
1.1365 -+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
1.1366 -+// USA.
1.1367 -+
1.1368 -+// As a special exception, you may use this file as part of a free software
1.1369 -+// library without restriction. Specifically, if other files instantiate
1.1370 -+// templates or use macros or inline functions from this file, or you compile
1.1371 -+// this file and link it with other files to produce an executable, this
1.1372 -+// file does not by itself cause the resulting executable to be covered by
1.1373 -+// the GNU General Public License. This exception does not however
1.1374 -+// invalidate any other reasons why the executable file might be covered by
1.1375 -+// the GNU General Public License.
1.1376 -+
1.1377 -+//
1.1378 -+// ISO C++ 14882: 22.2.6.3.2 moneypunct virtual functions
1.1379 -+//
1.1380 -+
1.1381 -+// Written by Benjamin Kosnik <bkoz@redhat.com>
1.1382 -+
1.1383 -+#define _LIBC
1.1384 -+#include <locale>
1.1385 -+#undef _LIBC
1.1386 -+#include <bits/c++locale_internal.h>
1.1387 -+
1.1388 -+#ifdef __UCLIBC_MJN3_ONLY__
1.1389 -+#warning optimize this for uclibc
1.1390 -+#warning tailor for stub locale support
1.1391 -+#endif
1.1392 -+
1.1393 -+#ifndef __UCLIBC_HAS_XLOCALE__
1.1394 -+#define __nl_langinfo_l(N, L) nl_langinfo((N))
1.1395 -+#endif
1.1396 -+
1.1397 -+namespace std
1.1398 -+{
1.1399 -+ // Construct and return valid pattern consisting of some combination of:
1.1400 -+ // space none symbol sign value
1.1401 -+ money_base::pattern
1.1402 -+ money_base::_S_construct_pattern(char __precedes, char __space, char __posn)
1.1403 -+ {
1.1404 -+ pattern __ret;
1.1405 -+
1.1406 -+ // This insanely complicated routine attempts to construct a valid
1.1407 -+ // pattern for use with monyepunct. A couple of invariants:
1.1408 -+
1.1409 -+ // if (__precedes) symbol -> value
1.1410 -+ // else value -> symbol
1.1411 -+
1.1412 -+ // if (__space) space
1.1413 -+ // else none
1.1414 -+
1.1415 -+ // none == never first
1.1416 -+ // space never first or last
1.1417 -+
1.1418 -+ // Any elegant implementations of this are welcome.
1.1419 -+ switch (__posn)
1.1420 -+ {
1.1421 -+ case 0:
1.1422 -+ case 1:
1.1423 -+ // 1 The sign precedes the value and symbol.
1.1424 -+ __ret.field[0] = sign;
1.1425 -+ if (__space)
1.1426 -+ {
1.1427 -+ // Pattern starts with sign.
1.1428 -+ if (__precedes)
1.1429 -+ {
1.1430 -+ __ret.field[1] = symbol;
1.1431 -+ __ret.field[3] = value;
1.1432 -+ }
1.1433 -+ else
1.1434 -+ {
1.1435 -+ __ret.field[1] = value;
1.1436 -+ __ret.field[3] = symbol;
1.1437 -+ }
1.1438 -+ __ret.field[2] = space;
1.1439 -+ }
1.1440 -+ else
1.1441 -+ {
1.1442 -+ // Pattern starts with sign and ends with none.
1.1443 -+ if (__precedes)
1.1444 -+ {
1.1445 -+ __ret.field[1] = symbol;
1.1446 -+ __ret.field[2] = value;
1.1447 -+ }
1.1448 -+ else
1.1449 -+ {
1.1450 -+ __ret.field[1] = value;
1.1451 -+ __ret.field[2] = symbol;
1.1452 -+ }
1.1453 -+ __ret.field[3] = none;
1.1454 -+ }
1.1455 -+ break;
1.1456 -+ case 2:
1.1457 -+ // 2 The sign follows the value and symbol.
1.1458 -+ if (__space)
1.1459 -+ {
1.1460 -+ // Pattern either ends with sign.
1.1461 -+ if (__precedes)
1.1462 -+ {
1.1463 -+ __ret.field[0] = symbol;
1.1464 -+ __ret.field[2] = value;
1.1465 -+ }
1.1466 -+ else
1.1467 -+ {
1.1468 -+ __ret.field[0] = value;
1.1469 -+ __ret.field[2] = symbol;
1.1470 -+ }
1.1471 -+ __ret.field[1] = space;
1.1472 -+ __ret.field[3] = sign;
1.1473 -+ }
1.1474 -+ else
1.1475 -+ {
1.1476 -+ // Pattern ends with sign then none.
1.1477 -+ if (__precedes)
1.1478 -+ {
1.1479 -+ __ret.field[0] = symbol;
1.1480 -+ __ret.field[1] = value;
1.1481 -+ }
1.1482 -+ else
1.1483 -+ {
1.1484 -+ __ret.field[0] = value;
1.1485 -+ __ret.field[1] = symbol;
1.1486 -+ }
1.1487 -+ __ret.field[2] = sign;
1.1488 -+ __ret.field[3] = none;
1.1489 -+ }
1.1490 -+ break;
1.1491 -+ case 3:
1.1492 -+ // 3 The sign immediately precedes the symbol.
1.1493 -+ if (__precedes)
1.1494 -+ {
1.1495 -+ __ret.field[0] = sign;
1.1496 -+ __ret.field[1] = symbol;
1.1497 -+ if (__space)
1.1498 -+ {
1.1499 -+ __ret.field[2] = space;
1.1500 -+ __ret.field[3] = value;
1.1501 -+ }
1.1502 -+ else
1.1503 -+ {
1.1504 -+ __ret.field[2] = value;
1.1505 -+ __ret.field[3] = none;
1.1506 -+ }
1.1507 -+ }
1.1508 -+ else
1.1509 -+ {
1.1510 -+ __ret.field[0] = value;
1.1511 -+ if (__space)
1.1512 -+ {
1.1513 -+ __ret.field[1] = space;
1.1514 -+ __ret.field[2] = sign;
1.1515 -+ __ret.field[3] = symbol;
1.1516 -+ }
1.1517 -+ else
1.1518 -+ {
1.1519 -+ __ret.field[1] = sign;
1.1520 -+ __ret.field[2] = symbol;
1.1521 -+ __ret.field[3] = none;
1.1522 -+ }
1.1523 -+ }
1.1524 -+ break;
1.1525 -+ case 4:
1.1526 -+ // 4 The sign immediately follows the symbol.
1.1527 -+ if (__precedes)
1.1528 -+ {
1.1529 -+ __ret.field[0] = symbol;
1.1530 -+ __ret.field[1] = sign;
1.1531 -+ if (__space)
1.1532 -+ {
1.1533 -+ __ret.field[2] = space;
1.1534 -+ __ret.field[3] = value;
1.1535 -+ }
1.1536 -+ else
1.1537 -+ {
1.1538 -+ __ret.field[2] = value;
1.1539 -+ __ret.field[3] = none;
1.1540 -+ }
1.1541 -+ }
1.1542 -+ else
1.1543 -+ {
1.1544 -+ __ret.field[0] = value;
1.1545 -+ if (__space)
1.1546 -+ {
1.1547 -+ __ret.field[1] = space;
1.1548 -+ __ret.field[2] = symbol;
1.1549 -+ __ret.field[3] = sign;
1.1550 -+ }
1.1551 -+ else
1.1552 -+ {
1.1553 -+ __ret.field[1] = symbol;
1.1554 -+ __ret.field[2] = sign;
1.1555 -+ __ret.field[3] = none;
1.1556 -+ }
1.1557 -+ }
1.1558 -+ break;
1.1559 -+ default:
1.1560 -+ ;
1.1561 -+ }
1.1562 -+ return __ret;
1.1563 -+ }
1.1564 -+
1.1565 -+ template<>
1.1566 -+ void
1.1567 -+ moneypunct<char, true>::_M_initialize_moneypunct(__c_locale __cloc,
1.1568 -+ const char*)
1.1569 -+ {
1.1570 -+ if (!_M_data)
1.1571 -+ _M_data = new __moneypunct_cache<char, true>;
1.1572 -+
1.1573 -+ if (!__cloc)
1.1574 -+ {
1.1575 -+ // "C" locale
1.1576 -+ _M_data->_M_decimal_point = '.';
1.1577 -+ _M_data->_M_thousands_sep = ',';
1.1578 -+ _M_data->_M_grouping = "";
1.1579 -+ _M_data->_M_grouping_size = 0;
1.1580 -+ _M_data->_M_curr_symbol = "";
1.1581 -+ _M_data->_M_curr_symbol_size = 0;
1.1582 -+ _M_data->_M_positive_sign = "";
1.1583 -+ _M_data->_M_positive_sign_size = 0;
1.1584 -+ _M_data->_M_negative_sign = "";
1.1585 -+ _M_data->_M_negative_sign_size = 0;
1.1586 -+ _M_data->_M_frac_digits = 0;
1.1587 -+ _M_data->_M_pos_format = money_base::_S_default_pattern;
1.1588 -+ _M_data->_M_neg_format = money_base::_S_default_pattern;
1.1589 -+
1.1590 -+ for (size_t __i = 0; __i < money_base::_S_end; ++__i)
1.1591 -+ _M_data->_M_atoms[__i] = money_base::_S_atoms[__i];
1.1592 -+ }
1.1593 -+ else
1.1594 -+ {
1.1595 -+ // Named locale.
1.1596 -+ _M_data->_M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT,
1.1597 -+ __cloc));
1.1598 -+ _M_data->_M_thousands_sep = *(__nl_langinfo_l(__MON_THOUSANDS_SEP,
1.1599 -+ __cloc));
1.1600 -+ _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
1.1601 -+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
1.1602 -+ _M_data->_M_positive_sign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
1.1603 -+ _M_data->_M_positive_sign_size = strlen(_M_data->_M_positive_sign);
1.1604 -+
1.1605 -+ char __nposn = *(__nl_langinfo_l(__INT_N_SIGN_POSN, __cloc));
1.1606 -+ if (!__nposn)
1.1607 -+ _M_data->_M_negative_sign = "()";
1.1608 -+ else
1.1609 -+ _M_data->_M_negative_sign = __nl_langinfo_l(__NEGATIVE_SIGN,
1.1610 -+ __cloc);
1.1611 -+ _M_data->_M_negative_sign_size = strlen(_M_data->_M_negative_sign);
1.1612 -+
1.1613 -+ // _Intl == true
1.1614 -+ _M_data->_M_curr_symbol = __nl_langinfo_l(__INT_CURR_SYMBOL, __cloc);
1.1615 -+ _M_data->_M_curr_symbol_size = strlen(_M_data->_M_curr_symbol);
1.1616 -+ _M_data->_M_frac_digits = *(__nl_langinfo_l(__INT_FRAC_DIGITS,
1.1617 -+ __cloc));
1.1618 -+ char __pprecedes = *(__nl_langinfo_l(__INT_P_CS_PRECEDES, __cloc));
1.1619 -+ char __pspace = *(__nl_langinfo_l(__INT_P_SEP_BY_SPACE, __cloc));
1.1620 -+ char __pposn = *(__nl_langinfo_l(__INT_P_SIGN_POSN, __cloc));
1.1621 -+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
1.1622 -+ __pposn);
1.1623 -+ char __nprecedes = *(__nl_langinfo_l(__INT_N_CS_PRECEDES, __cloc));
1.1624 -+ char __nspace = *(__nl_langinfo_l(__INT_N_SEP_BY_SPACE, __cloc));
1.1625 -+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
1.1626 -+ __nposn);
1.1627 -+ }
1.1628 -+ }
1.1629 -+
1.1630 -+ template<>
1.1631 -+ void
1.1632 -+ moneypunct<char, false>::_M_initialize_moneypunct(__c_locale __cloc,
1.1633 -+ const char*)
1.1634 -+ {
1.1635 -+ if (!_M_data)
1.1636 -+ _M_data = new __moneypunct_cache<char, false>;
1.1637 -+
1.1638 -+ if (!__cloc)
1.1639 -+ {
1.1640 -+ // "C" locale
1.1641 -+ _M_data->_M_decimal_point = '.';
1.1642 -+ _M_data->_M_thousands_sep = ',';
1.1643 -+ _M_data->_M_grouping = "";
1.1644 -+ _M_data->_M_grouping_size = 0;
1.1645 -+ _M_data->_M_curr_symbol = "";
1.1646 -+ _M_data->_M_curr_symbol_size = 0;
1.1647 -+ _M_data->_M_positive_sign = "";
1.1648 -+ _M_data->_M_positive_sign_size = 0;
1.1649 -+ _M_data->_M_negative_sign = "";
1.1650 -+ _M_data->_M_negative_sign_size = 0;
1.1651 -+ _M_data->_M_frac_digits = 0;
1.1652 -+ _M_data->_M_pos_format = money_base::_S_default_pattern;
1.1653 -+ _M_data->_M_neg_format = money_base::_S_default_pattern;
1.1654 -+
1.1655 -+ for (size_t __i = 0; __i < money_base::_S_end; ++__i)
1.1656 -+ _M_data->_M_atoms[__i] = money_base::_S_atoms[__i];
1.1657 -+ }
1.1658 -+ else
1.1659 -+ {
1.1660 -+ // Named locale.
1.1661 -+ _M_data->_M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT,
1.1662 -+ __cloc));
1.1663 -+ _M_data->_M_thousands_sep = *(__nl_langinfo_l(__MON_THOUSANDS_SEP,
1.1664 -+ __cloc));
1.1665 -+ _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
1.1666 -+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
1.1667 -+ _M_data->_M_positive_sign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
1.1668 -+ _M_data->_M_positive_sign_size = strlen(_M_data->_M_positive_sign);
1.1669 -+
1.1670 -+ char __nposn = *(__nl_langinfo_l(__N_SIGN_POSN, __cloc));
1.1671 -+ if (!__nposn)
1.1672 -+ _M_data->_M_negative_sign = "()";
1.1673 -+ else
1.1674 -+ _M_data->_M_negative_sign = __nl_langinfo_l(__NEGATIVE_SIGN,
1.1675 -+ __cloc);
1.1676 -+ _M_data->_M_negative_sign_size = strlen(_M_data->_M_negative_sign);
1.1677 -+
1.1678 -+ // _Intl == false
1.1679 -+ _M_data->_M_curr_symbol = __nl_langinfo_l(__CURRENCY_SYMBOL, __cloc);
1.1680 -+ _M_data->_M_curr_symbol_size = strlen(_M_data->_M_curr_symbol);
1.1681 -+ _M_data->_M_frac_digits = *(__nl_langinfo_l(__FRAC_DIGITS, __cloc));
1.1682 -+ char __pprecedes = *(__nl_langinfo_l(__P_CS_PRECEDES, __cloc));
1.1683 -+ char __pspace = *(__nl_langinfo_l(__P_SEP_BY_SPACE, __cloc));
1.1684 -+ char __pposn = *(__nl_langinfo_l(__P_SIGN_POSN, __cloc));
1.1685 -+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
1.1686 -+ __pposn);
1.1687 -+ char __nprecedes = *(__nl_langinfo_l(__N_CS_PRECEDES, __cloc));
1.1688 -+ char __nspace = *(__nl_langinfo_l(__N_SEP_BY_SPACE, __cloc));
1.1689 -+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
1.1690 -+ __nposn);
1.1691 -+ }
1.1692 -+ }
1.1693 -+
1.1694 -+ template<>
1.1695 -+ moneypunct<char, true>::~moneypunct()
1.1696 -+ { delete _M_data; }
1.1697 -+
1.1698 -+ template<>
1.1699 -+ moneypunct<char, false>::~moneypunct()
1.1700 -+ { delete _M_data; }
1.1701 -+
1.1702 -+#ifdef _GLIBCXX_USE_WCHAR_T
1.1703 -+ template<>
1.1704 -+ void
1.1705 -+ moneypunct<wchar_t, true>::_M_initialize_moneypunct(__c_locale __cloc,
1.1706 -+#ifdef __UCLIBC_HAS_XLOCALE__
1.1707 -+ const char*)
1.1708 -+#else
1.1709 -+ const char* __name)
1.1710 -+#endif
1.1711 -+ {
1.1712 -+ if (!_M_data)
1.1713 -+ _M_data = new __moneypunct_cache<wchar_t, true>;
1.1714 -+
1.1715 -+ if (!__cloc)
1.1716 -+ {
1.1717 -+ // "C" locale
1.1718 -+ _M_data->_M_decimal_point = L'.';
1.1719 -+ _M_data->_M_thousands_sep = L',';
1.1720 -+ _M_data->_M_grouping = "";
1.1721 -+ _M_data->_M_grouping_size = 0;
1.1722 -+ _M_data->_M_curr_symbol = L"";
1.1723 -+ _M_data->_M_curr_symbol_size = 0;
1.1724 -+ _M_data->_M_positive_sign = L"";
1.1725 -+ _M_data->_M_positive_sign_size = 0;
1.1726 -+ _M_data->_M_negative_sign = L"";
1.1727 -+ _M_data->_M_negative_sign_size = 0;
1.1728 -+ _M_data->_M_frac_digits = 0;
1.1729 -+ _M_data->_M_pos_format = money_base::_S_default_pattern;
1.1730 -+ _M_data->_M_neg_format = money_base::_S_default_pattern;
1.1731 -+
1.1732 -+ // Use ctype::widen code without the facet...
1.1733 -+ for (size_t __i = 0; __i < money_base::_S_end; ++__i)
1.1734 -+ _M_data->_M_atoms[__i] =
1.1735 -+ static_cast<wchar_t>(money_base::_S_atoms[__i]);
1.1736 -+ }
1.1737 -+ else
1.1738 -+ {
1.1739 -+ // Named locale.
1.1740 -+#ifdef __UCLIBC_HAS_XLOCALE__
1.1741 -+ __c_locale __old = __uselocale(__cloc);
1.1742 -+#else
1.1743 -+ // Switch to named locale so that mbsrtowcs will work.
1.1744 -+ char* __old = strdup(setlocale(LC_ALL, NULL));
1.1745 -+ setlocale(LC_ALL, __name);
1.1746 -+#endif
1.1747 -+
1.1748 -+#ifdef __UCLIBC_MJN3_ONLY__
1.1749 -+#warning fix this... should be monetary
1.1750 -+#endif
1.1751 -+#ifdef __UCLIBC__
1.1752 -+# ifdef __UCLIBC_HAS_XLOCALE__
1.1753 -+ _M_data->_M_decimal_point = __cloc->decimal_point_wc;
1.1754 -+ _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
1.1755 -+# else
1.1756 -+ _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
1.1757 -+ _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
1.1758 -+# endif
1.1759 -+#else
1.1760 -+ union { char *__s; wchar_t __w; } __u;
1.1761 -+ __u.__s = __nl_langinfo_l(_NL_MONETARY_DECIMAL_POINT_WC, __cloc);
1.1762 -+ _M_data->_M_decimal_point = __u.__w;
1.1763 -+
1.1764 -+ __u.__s = __nl_langinfo_l(_NL_MONETARY_THOUSANDS_SEP_WC, __cloc);
1.1765 -+ _M_data->_M_thousands_sep = __u.__w;
1.1766 -+#endif
1.1767 -+ _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
1.1768 -+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
1.1769 -+
1.1770 -+ const char* __cpossign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
1.1771 -+ const char* __cnegsign = __nl_langinfo_l(__NEGATIVE_SIGN, __cloc);
1.1772 -+ const char* __ccurr = __nl_langinfo_l(__INT_CURR_SYMBOL, __cloc);
1.1773 -+
1.1774 -+ wchar_t* __wcs_ps = 0;
1.1775 -+ wchar_t* __wcs_ns = 0;
1.1776 -+ const char __nposn = *(__nl_langinfo_l(__INT_N_SIGN_POSN, __cloc));
1.1777 -+ try
1.1778 -+ {
1.1779 -+ mbstate_t __state;
1.1780 -+ size_t __len = strlen(__cpossign);
1.1781 -+ if (__len)
1.1782 -+ {
1.1783 -+ ++__len;
1.1784 -+ memset(&__state, 0, sizeof(mbstate_t));
1.1785 -+ __wcs_ps = new wchar_t[__len];
1.1786 -+ mbsrtowcs(__wcs_ps, &__cpossign, __len, &__state);
1.1787 -+ _M_data->_M_positive_sign = __wcs_ps;
1.1788 -+ }
1.1789 -+ else
1.1790 -+ _M_data->_M_positive_sign = L"";
1.1791 -+ _M_data->_M_positive_sign_size = wcslen(_M_data->_M_positive_sign);
1.1792 -+
1.1793 -+ __len = strlen(__cnegsign);
1.1794 -+ if (!__nposn)
1.1795 -+ _M_data->_M_negative_sign = L"()";
1.1796 -+ else if (__len)
1.1797 -+ {
1.1798 -+ ++__len;
1.1799 -+ memset(&__state, 0, sizeof(mbstate_t));
1.1800 -+ __wcs_ns = new wchar_t[__len];
1.1801 -+ mbsrtowcs(__wcs_ns, &__cnegsign, __len, &__state);
1.1802 -+ _M_data->_M_negative_sign = __wcs_ns;
1.1803 -+ }
1.1804 -+ else
1.1805 -+ _M_data->_M_negative_sign = L"";
1.1806 -+ _M_data->_M_negative_sign_size = wcslen(_M_data->_M_negative_sign);
1.1807 -+
1.1808 -+ // _Intl == true.
1.1809 -+ __len = strlen(__ccurr);
1.1810 -+ if (__len)
1.1811 -+ {
1.1812 -+ ++__len;
1.1813 -+ memset(&__state, 0, sizeof(mbstate_t));
1.1814 -+ wchar_t* __wcs = new wchar_t[__len];
1.1815 -+ mbsrtowcs(__wcs, &__ccurr, __len, &__state);
1.1816 -+ _M_data->_M_curr_symbol = __wcs;
1.1817 -+ }
1.1818 -+ else
1.1819 -+ _M_data->_M_curr_symbol = L"";
1.1820 -+ _M_data->_M_curr_symbol_size = wcslen(_M_data->_M_curr_symbol);
1.1821 -+ }
1.1822 -+ catch (...)
1.1823 -+ {
1.1824 -+ delete _M_data;
1.1825 -+ _M_data = 0;
1.1826 -+ delete __wcs_ps;
1.1827 -+ delete __wcs_ns;
1.1828 -+#ifdef __UCLIBC_HAS_XLOCALE__
1.1829 -+ __uselocale(__old);
1.1830 -+#else
1.1831 -+ setlocale(LC_ALL, __old);
1.1832 -+ free(__old);
1.1833 -+#endif
1.1834 -+ __throw_exception_again;
1.1835 -+ }
1.1836 -+
1.1837 -+ _M_data->_M_frac_digits = *(__nl_langinfo_l(__INT_FRAC_DIGITS,
1.1838 -+ __cloc));
1.1839 -+ char __pprecedes = *(__nl_langinfo_l(__INT_P_CS_PRECEDES, __cloc));
1.1840 -+ char __pspace = *(__nl_langinfo_l(__INT_P_SEP_BY_SPACE, __cloc));
1.1841 -+ char __pposn = *(__nl_langinfo_l(__INT_P_SIGN_POSN, __cloc));
1.1842 -+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
1.1843 -+ __pposn);
1.1844 -+ char __nprecedes = *(__nl_langinfo_l(__INT_N_CS_PRECEDES, __cloc));
1.1845 -+ char __nspace = *(__nl_langinfo_l(__INT_N_SEP_BY_SPACE, __cloc));
1.1846 -+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
1.1847 -+ __nposn);
1.1848 -+
1.1849 -+#ifdef __UCLIBC_HAS_XLOCALE__
1.1850 -+ __uselocale(__old);
1.1851 -+#else
1.1852 -+ setlocale(LC_ALL, __old);
1.1853 -+ free(__old);
1.1854 -+#endif
1.1855 -+ }
1.1856 -+ }
1.1857 -+
1.1858 -+ template<>
1.1859 -+ void
1.1860 -+ moneypunct<wchar_t, false>::_M_initialize_moneypunct(__c_locale __cloc,
1.1861 -+#ifdef __UCLIBC_HAS_XLOCALE__
1.1862 -+ const char*)
1.1863 -+#else
1.1864 -+ const char* __name)
1.1865 -+#endif
1.1866 -+ {
1.1867 -+ if (!_M_data)
1.1868 -+ _M_data = new __moneypunct_cache<wchar_t, false>;
1.1869 -+
1.1870 -+ if (!__cloc)
1.1871 -+ {
1.1872 -+ // "C" locale
1.1873 -+ _M_data->_M_decimal_point = L'.';
1.1874 -+ _M_data->_M_thousands_sep = L',';
1.1875 -+ _M_data->_M_grouping = "";
1.1876 -+ _M_data->_M_grouping_size = 0;
1.1877 -+ _M_data->_M_curr_symbol = L"";
1.1878 -+ _M_data->_M_curr_symbol_size = 0;
1.1879 -+ _M_data->_M_positive_sign = L"";
1.1880 -+ _M_data->_M_positive_sign_size = 0;
1.1881 -+ _M_data->_M_negative_sign = L"";
1.1882 -+ _M_data->_M_negative_sign_size = 0;
1.1883 -+ _M_data->_M_frac_digits = 0;
1.1884 -+ _M_data->_M_pos_format = money_base::_S_default_pattern;
1.1885 -+ _M_data->_M_neg_format = money_base::_S_default_pattern;
1.1886 -+
1.1887 -+ // Use ctype::widen code without the facet...
1.1888 -+ for (size_t __i = 0; __i < money_base::_S_end; ++__i)
1.1889 -+ _M_data->_M_atoms[__i] =
1.1890 -+ static_cast<wchar_t>(money_base::_S_atoms[__i]);
1.1891 -+ }
1.1892 -+ else
1.1893 -+ {
1.1894 -+ // Named locale.
1.1895 -+#ifdef __UCLIBC_HAS_XLOCALE__
1.1896 -+ __c_locale __old = __uselocale(__cloc);
1.1897 -+#else
1.1898 -+ // Switch to named locale so that mbsrtowcs will work.
1.1899 -+ char* __old = strdup(setlocale(LC_ALL, NULL));
1.1900 -+ setlocale(LC_ALL, __name);
1.1901 -+#endif
1.1902 -+
1.1903 -+#ifdef __UCLIBC_MJN3_ONLY__
1.1904 -+#warning fix this... should be monetary
1.1905 -+#endif
1.1906 -+#ifdef __UCLIBC__
1.1907 -+# ifdef __UCLIBC_HAS_XLOCALE__
1.1908 -+ _M_data->_M_decimal_point = __cloc->decimal_point_wc;
1.1909 -+ _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
1.1910 -+# else
1.1911 -+ _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
1.1912 -+ _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
1.1913 -+# endif
1.1914 -+#else
1.1915 -+ union { char *__s; wchar_t __w; } __u;
1.1916 -+ __u.__s = __nl_langinfo_l(_NL_MONETARY_DECIMAL_POINT_WC, __cloc);
1.1917 -+ _M_data->_M_decimal_point = __u.__w;
1.1918 -+
1.1919 -+ __u.__s = __nl_langinfo_l(_NL_MONETARY_THOUSANDS_SEP_WC, __cloc);
1.1920 -+ _M_data->_M_thousands_sep = __u.__w;
1.1921 -+#endif
1.1922 -+ _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
1.1923 -+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
1.1924 -+
1.1925 -+ const char* __cpossign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
1.1926 -+ const char* __cnegsign = __nl_langinfo_l(__NEGATIVE_SIGN, __cloc);
1.1927 -+ const char* __ccurr = __nl_langinfo_l(__CURRENCY_SYMBOL, __cloc);
1.1928 -+
1.1929 -+ wchar_t* __wcs_ps = 0;
1.1930 -+ wchar_t* __wcs_ns = 0;
1.1931 -+ const char __nposn = *(__nl_langinfo_l(__N_SIGN_POSN, __cloc));
1.1932 -+ try
1.1933 -+ {
1.1934 -+ mbstate_t __state;
1.1935 -+ size_t __len;
1.1936 -+ __len = strlen(__cpossign);
1.1937 -+ if (__len)
1.1938 -+ {
1.1939 -+ ++__len;
1.1940 -+ memset(&__state, 0, sizeof(mbstate_t));
1.1941 -+ __wcs_ps = new wchar_t[__len];
1.1942 -+ mbsrtowcs(__wcs_ps, &__cpossign, __len, &__state);
1.1943 -+ _M_data->_M_positive_sign = __wcs_ps;
1.1944 -+ }
1.1945 -+ else
1.1946 -+ _M_data->_M_positive_sign = L"";
1.1947 -+ _M_data->_M_positive_sign_size = wcslen(_M_data->_M_positive_sign);
1.1948 -+
1.1949 -+ __len = strlen(__cnegsign);
1.1950 -+ if (!__nposn)
1.1951 -+ _M_data->_M_negative_sign = L"()";
1.1952 -+ else if (__len)
1.1953 -+ {
1.1954 -+ ++__len;
1.1955 -+ memset(&__state, 0, sizeof(mbstate_t));
1.1956 -+ __wcs_ns = new wchar_t[__len];
1.1957 -+ mbsrtowcs(__wcs_ns, &__cnegsign, __len, &__state);
1.1958 -+ _M_data->_M_negative_sign = __wcs_ns;
1.1959 -+ }
1.1960 -+ else
1.1961 -+ _M_data->_M_negative_sign = L"";
1.1962 -+ _M_data->_M_negative_sign_size = wcslen(_M_data->_M_negative_sign);
1.1963 -+
1.1964 -+ // _Intl == true.
1.1965 -+ __len = strlen(__ccurr);
1.1966 -+ if (__len)
1.1967 -+ {
1.1968 -+ ++__len;
1.1969 -+ memset(&__state, 0, sizeof(mbstate_t));
1.1970 -+ wchar_t* __wcs = new wchar_t[__len];
1.1971 -+ mbsrtowcs(__wcs, &__ccurr, __len, &__state);
1.1972 -+ _M_data->_M_curr_symbol = __wcs;
1.1973 -+ }
1.1974 -+ else
1.1975 -+ _M_data->_M_curr_symbol = L"";
1.1976 -+ _M_data->_M_curr_symbol_size = wcslen(_M_data->_M_curr_symbol);
1.1977 -+ }
1.1978 -+ catch (...)
1.1979 -+ {
1.1980 -+ delete _M_data;
1.1981 -+ _M_data = 0;
1.1982 -+ delete __wcs_ps;
1.1983 -+ delete __wcs_ns;
1.1984 -+#ifdef __UCLIBC_HAS_XLOCALE__
1.1985 -+ __uselocale(__old);
1.1986 -+#else
1.1987 -+ setlocale(LC_ALL, __old);
1.1988 -+ free(__old);
1.1989 -+#endif
1.1990 -+ __throw_exception_again;
1.1991 -+ }
1.1992 -+
1.1993 -+ _M_data->_M_frac_digits = *(__nl_langinfo_l(__FRAC_DIGITS, __cloc));
1.1994 -+ char __pprecedes = *(__nl_langinfo_l(__P_CS_PRECEDES, __cloc));
1.1995 -+ char __pspace = *(__nl_langinfo_l(__P_SEP_BY_SPACE, __cloc));
1.1996 -+ char __pposn = *(__nl_langinfo_l(__P_SIGN_POSN, __cloc));
1.1997 -+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
1.1998 -+ __pposn);
1.1999 -+ char __nprecedes = *(__nl_langinfo_l(__N_CS_PRECEDES, __cloc));
1.2000 -+ char __nspace = *(__nl_langinfo_l(__N_SEP_BY_SPACE, __cloc));
1.2001 -+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
1.2002 -+ __nposn);
1.2003 -+
1.2004 -+#ifdef __UCLIBC_HAS_XLOCALE__
1.2005 -+ __uselocale(__old);
1.2006 -+#else
1.2007 -+ setlocale(LC_ALL, __old);
1.2008 -+ free(__old);
1.2009 -+#endif
1.2010 -+ }
1.2011 -+ }
1.2012 -+
1.2013 -+ template<>
1.2014 -+ moneypunct<wchar_t, true>::~moneypunct()
1.2015 -+ {
1.2016 -+ if (_M_data->_M_positive_sign_size)
1.2017 -+ delete [] _M_data->_M_positive_sign;
1.2018 -+ if (_M_data->_M_negative_sign_size
1.2019 -+ && wcscmp(_M_data->_M_negative_sign, L"()") != 0)
1.2020 -+ delete [] _M_data->_M_negative_sign;
1.2021 -+ if (_M_data->_M_curr_symbol_size)
1.2022 -+ delete [] _M_data->_M_curr_symbol;
1.2023 -+ delete _M_data;
1.2024 -+ }
1.2025 -+
1.2026 -+ template<>
1.2027 -+ moneypunct<wchar_t, false>::~moneypunct()
1.2028 -+ {
1.2029 -+ if (_M_data->_M_positive_sign_size)
1.2030 -+ delete [] _M_data->_M_positive_sign;
1.2031 -+ if (_M_data->_M_negative_sign_size
1.2032 -+ && wcscmp(_M_data->_M_negative_sign, L"()") != 0)
1.2033 -+ delete [] _M_data->_M_negative_sign;
1.2034 -+ if (_M_data->_M_curr_symbol_size)
1.2035 -+ delete [] _M_data->_M_curr_symbol;
1.2036 -+ delete _M_data;
1.2037 -+ }
1.2038 -+#endif
1.2039 -+}
1.2040 -diff -durN gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc gcc-4.3.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc
1.2041 ---- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc 1970-01-01 01:00:00.000000000 +0100
1.2042 -+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2008-06-10 14:58:39.000000000 +0200
1.2043 -@@ -0,0 +1,160 @@
1.2044 -+// std::numpunct implementation details, GNU version -*- C++ -*-
1.2045 -+
1.2046 -+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
1.2047 -+//
1.2048 -+// This file is part of the GNU ISO C++ Library. This library is free
1.2049 -+// software; you can redistribute it and/or modify it under the
1.2050 -+// terms of the GNU General Public License as published by the
1.2051 -+// Free Software Foundation; either version 2, or (at your option)
1.2052 -+// any later version.
1.2053 -+
1.2054 -+// This library is distributed in the hope that it will be useful,
1.2055 -+// but WITHOUT ANY WARRANTY; without even the implied warranty of
1.2056 -+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1.2057 -+// GNU General Public License for more details.
1.2058 -+
1.2059 -+// You should have received a copy of the GNU General Public License along
1.2060 -+// with this library; see the file COPYING. If not, write to the Free
1.2061 -+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
1.2062 -+// USA.
1.2063 -+
1.2064 -+// As a special exception, you may use this file as part of a free software
1.2065 -+// library without restriction. Specifically, if other files instantiate
1.2066 -+// templates or use macros or inline functions from this file, or you compile
1.2067 -+// this file and link it with other files to produce an executable, this
1.2068 -+// file does not by itself cause the resulting executable to be covered by
1.2069 -+// the GNU General Public License. This exception does not however
1.2070 -+// invalidate any other reasons why the executable file might be covered by
1.2071 -+// the GNU General Public License.
1.2072 -+
1.2073 -+//
1.2074 -+// ISO C++ 14882: 22.2.3.1.2 numpunct virtual functions
1.2075 -+//
1.2076 -+
1.2077 -+// Written by Benjamin Kosnik <bkoz@redhat.com>
1.2078 -+
1.2079 -+#define _LIBC
1.2080 -+#include <locale>
1.2081 -+#undef _LIBC
1.2082 -+#include <bits/c++locale_internal.h>
1.2083 -+
1.2084 -+#ifdef __UCLIBC_MJN3_ONLY__
1.2085 -+#warning tailor for stub locale support
1.2086 -+#endif
1.2087 -+#ifndef __UCLIBC_HAS_XLOCALE__
1.2088 -+#define __nl_langinfo_l(N, L) nl_langinfo((N))
1.2089 -+#endif
1.2090 -+
1.2091 -+namespace std
1.2092 -+{
1.2093 -+ template<>
1.2094 -+ void
1.2095 -+ numpunct<char>::_M_initialize_numpunct(__c_locale __cloc)
1.2096 -+ {
1.2097 -+ if (!_M_data)
1.2098 -+ _M_data = new __numpunct_cache<char>;
1.2099 -+
1.2100 -+ if (!__cloc)
1.2101 -+ {
1.2102 -+ // "C" locale
1.2103 -+ _M_data->_M_grouping = "";
1.2104 -+ _M_data->_M_grouping_size = 0;
1.2105 -+ _M_data->_M_use_grouping = false;
1.2106 -+
1.2107 -+ _M_data->_M_decimal_point = '.';
1.2108 -+ _M_data->_M_thousands_sep = ',';
1.2109 -+
1.2110 -+ for (size_t __i = 0; __i < __num_base::_S_oend; ++__i)
1.2111 -+ _M_data->_M_atoms_out[__i] = __num_base::_S_atoms_out[__i];
1.2112 -+
1.2113 -+ for (size_t __j = 0; __j < __num_base::_S_iend; ++__j)
1.2114 -+ _M_data->_M_atoms_in[__j] = __num_base::_S_atoms_in[__j];
1.2115 -+ }
1.2116 -+ else
1.2117 -+ {
1.2118 -+ // Named locale.
1.2119 -+ _M_data->_M_decimal_point = *(__nl_langinfo_l(DECIMAL_POINT,
1.2120 -+ __cloc));
1.2121 -+ _M_data->_M_thousands_sep = *(__nl_langinfo_l(THOUSANDS_SEP,
1.2122 -+ __cloc));
1.2123 -+
1.2124 -+ // Check for NULL, which implies no grouping.
1.2125 -+ if (_M_data->_M_thousands_sep == '\0')
1.2126 -+ _M_data->_M_grouping = "";
1.2127 -+ else
1.2128 -+ _M_data->_M_grouping = __nl_langinfo_l(GROUPING, __cloc);
1.2129 -+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
1.2130 -+ }
1.2131 -+
1.2132 -+ // NB: There is no way to extact this info from posix locales.
1.2133 -+ // _M_truename = __nl_langinfo_l(YESSTR, __cloc);
1.2134 -+ _M_data->_M_truename = "true";
1.2135 -+ _M_data->_M_truename_size = 4;
1.2136 -+ // _M_falsename = __nl_langinfo_l(NOSTR, __cloc);
1.2137 -+ _M_data->_M_falsename = "false";
1.2138 -+ _M_data->_M_falsename_size = 5;
1.2139 -+ }
1.2140 -+
1.2141 -+ template<>
1.2142 -+ numpunct<char>::~numpunct()
1.2143 -+ { delete _M_data; }
1.2144 -+
1.2145 -+#ifdef _GLIBCXX_USE_WCHAR_T
1.2146 -+ template<>
1.2147 -+ void
1.2148 -+ numpunct<wchar_t>::_M_initialize_numpunct(__c_locale __cloc)
1.2149 -+ {
1.2150 -+ if (!_M_data)
1.2151 -+ _M_data = new __numpunct_cache<wchar_t>;
1.2152 -+
1.2153 -+ if (!__cloc)
1.2154 -+ {
1.2155 -+ // "C" locale
1.2156 -+ _M_data->_M_grouping = "";
1.2157 -+ _M_data->_M_grouping_size = 0;
1.2158 -+ _M_data->_M_use_grouping = false;
1.2159 -+
1.2160 -+ _M_data->_M_decimal_point = L'.';
1.2161 -+ _M_data->_M_thousands_sep = L',';
1.2162 -+
1.2163 -+ // Use ctype::widen code without the facet...
1.2164 -+ for (size_t __i = 0; __i < __num_base::_S_oend; ++__i)
1.2165 -+ _M_data->_M_atoms_out[__i] =
1.2166 -+ static_cast<wchar_t>(__num_base::_S_atoms_out[__i]);
1.2167 -+
1.2168 -+ for (size_t __j = 0; __j < __num_base::_S_iend; ++__j)
1.2169 -+ _M_data->_M_atoms_in[__j] =
1.2170 -+ static_cast<wchar_t>(__num_base::_S_atoms_in[__j]);
1.2171 -+ }
1.2172 -+ else
1.2173 -+ {
1.2174 -+ // Named locale.
1.2175 -+ // NB: In the GNU model wchar_t is always 32 bit wide.
1.2176 -+ union { char *__s; wchar_t __w; } __u;
1.2177 -+ __u.__s = __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc);
1.2178 -+ _M_data->_M_decimal_point = __u.__w;
1.2179 -+
1.2180 -+ __u.__s = __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc);
1.2181 -+ _M_data->_M_thousands_sep = __u.__w;
1.2182 -+
1.2183 -+ if (_M_data->_M_thousands_sep == L'\0')
1.2184 -+ _M_data->_M_grouping = "";
1.2185 -+ else
1.2186 -+ _M_data->_M_grouping = __nl_langinfo_l(GROUPING, __cloc);
1.2187 -+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
1.2188 -+ }
1.2189 -+
1.2190 -+ // NB: There is no way to extact this info from posix locales.
1.2191 -+ // _M_truename = __nl_langinfo_l(YESSTR, __cloc);
1.2192 -+ _M_data->_M_truename = L"true";
1.2193 -+ _M_data->_M_truename_size = 4;
1.2194 -+ // _M_falsename = __nl_langinfo_l(NOSTR, __cloc);
1.2195 -+ _M_data->_M_falsename = L"false";
1.2196 -+ _M_data->_M_falsename_size = 5;
1.2197 -+ }
1.2198 -+
1.2199 -+ template<>
1.2200 -+ numpunct<wchar_t>::~numpunct()
1.2201 -+ { delete _M_data; }
1.2202 -+ #endif
1.2203 -+}
1.2204 -diff -durN gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/time_members.cc gcc-4.3.1/libstdc++-v3/config/locale/uclibc/time_members.cc
1.2205 ---- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/time_members.cc 1970-01-01 01:00:00.000000000 +0100
1.2206 -+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/time_members.cc 2008-06-10 14:58:39.000000000 +0200
1.2207 -@@ -0,0 +1,406 @@
1.2208 -+// std::time_get, std::time_put implementation, GNU version -*- C++ -*-
1.2209 -+
1.2210 -+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
1.2211 -+//
1.2212 -+// This file is part of the GNU ISO C++ Library. This library is free
1.2213 -+// software; you can redistribute it and/or modify it under the
1.2214 -+// terms of the GNU General Public License as published by the
1.2215 -+// Free Software Foundation; either version 2, or (at your option)
1.2216 -+// any later version.
1.2217 -+
1.2218 -+// This library is distributed in the hope that it will be useful,
1.2219 -+// but WITHOUT ANY WARRANTY; without even the implied warranty of
1.2220 -+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1.2221 -+// GNU General Public License for more details.
1.2222 -+
1.2223 -+// You should have received a copy of the GNU General Public License along
1.2224 -+// with this library; see the file COPYING. If not, write to the Free
1.2225 -+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
1.2226 -+// USA.
1.2227 -+
1.2228 -+// As a special exception, you may use this file as part of a free software
1.2229 -+// library without restriction. Specifically, if other files instantiate
1.2230 -+// templates or use macros or inline functions from this file, or you compile
1.2231 -+// this file and link it with other files to produce an executable, this
1.2232 -+// file does not by itself cause the resulting executable to be covered by
1.2233 -+// the GNU General Public License. This exception does not however
1.2234 -+// invalidate any other reasons why the executable file might be covered by
1.2235 -+// the GNU General Public License.
1.2236 -+
1.2237 -+//
1.2238 -+// ISO C++ 14882: 22.2.5.1.2 - time_get virtual functions
1.2239 -+// ISO C++ 14882: 22.2.5.3.2 - time_put virtual functions
1.2240 -+//
1.2241 -+
1.2242 -+// Written by Benjamin Kosnik <bkoz@redhat.com>
1.2243 -+
1.2244 -+#include <locale>
1.2245 -+#include <bits/c++locale_internal.h>
1.2246 -+
1.2247 -+#ifdef __UCLIBC_MJN3_ONLY__
1.2248 -+#warning tailor for stub locale support
1.2249 -+#endif
1.2250 -+#ifndef __UCLIBC_HAS_XLOCALE__
1.2251 -+#define __nl_langinfo_l(N, L) nl_langinfo((N))
1.2252 -+#endif
1.2253 -+
1.2254 -+namespace std
1.2255 -+{
1.2256 -+ template<>
1.2257 -+ void
1.2258 -+ __timepunct<char>::
1.2259 -+ _M_put(char* __s, size_t __maxlen, const char* __format,
1.2260 -+ const tm* __tm) const
1.2261 -+ {
1.2262 -+#ifdef __UCLIBC_HAS_XLOCALE__
1.2263 -+ const size_t __len = __strftime_l(__s, __maxlen, __format, __tm,
1.2264 -+ _M_c_locale_timepunct);
1.2265 -+#else
1.2266 -+ char* __old = strdup(setlocale(LC_ALL, NULL));
1.2267 -+ setlocale(LC_ALL, _M_name_timepunct);
1.2268 -+ const size_t __len = strftime(__s, __maxlen, __format, __tm);
1.2269 -+ setlocale(LC_ALL, __old);
1.2270 -+ free(__old);
1.2271 -+#endif
1.2272 -+ // Make sure __s is null terminated.
1.2273 -+ if (__len == 0)
1.2274 -+ __s[0] = '\0';
1.2275 -+ }
1.2276 -+
1.2277 -+ template<>
1.2278 -+ void
1.2279 -+ __timepunct<char>::_M_initialize_timepunct(__c_locale __cloc)
1.2280 -+ {
1.2281 -+ if (!_M_data)
1.2282 -+ _M_data = new __timepunct_cache<char>;
1.2283 -+
1.2284 -+ if (!__cloc)
1.2285 -+ {
1.2286 -+ // "C" locale
1.2287 -+ _M_c_locale_timepunct = _S_get_c_locale();
1.2288 -+
1.2289 -+ _M_data->_M_date_format = "%m/%d/%y";
1.2290 -+ _M_data->_M_date_era_format = "%m/%d/%y";
1.2291 -+ _M_data->_M_time_format = "%H:%M:%S";
1.2292 -+ _M_data->_M_time_era_format = "%H:%M:%S";
1.2293 -+ _M_data->_M_date_time_format = "";
1.2294 -+ _M_data->_M_date_time_era_format = "";
1.2295 -+ _M_data->_M_am = "AM";
1.2296 -+ _M_data->_M_pm = "PM";
1.2297 -+ _M_data->_M_am_pm_format = "";
1.2298 -+
1.2299 -+ // Day names, starting with "C"'s Sunday.
1.2300 -+ _M_data->_M_day1 = "Sunday";
1.2301 -+ _M_data->_M_day2 = "Monday";
1.2302 -+ _M_data->_M_day3 = "Tuesday";
1.2303 -+ _M_data->_M_day4 = "Wednesday";
1.2304 -+ _M_data->_M_day5 = "Thursday";
1.2305 -+ _M_data->_M_day6 = "Friday";
1.2306 -+ _M_data->_M_day7 = "Saturday";
1.2307 -+
1.2308 -+ // Abbreviated day names, starting with "C"'s Sun.
1.2309 -+ _M_data->_M_aday1 = "Sun";
1.2310 -+ _M_data->_M_aday2 = "Mon";
1.2311 -+ _M_data->_M_aday3 = "Tue";
1.2312 -+ _M_data->_M_aday4 = "Wed";
1.2313 -+ _M_data->_M_aday5 = "Thu";
1.2314 -+ _M_data->_M_aday6 = "Fri";
1.2315 -+ _M_data->_M_aday7 = "Sat";
1.2316 -+
1.2317 -+ // Month names, starting with "C"'s January.
1.2318 -+ _M_data->_M_month01 = "January";
1.2319 -+ _M_data->_M_month02 = "February";
1.2320 -+ _M_data->_M_month03 = "March";
1.2321 -+ _M_data->_M_month04 = "April";
1.2322 -+ _M_data->_M_month05 = "May";
1.2323 -+ _M_data->_M_month06 = "June";
1.2324 -+ _M_data->_M_month07 = "July";
1.2325 -+ _M_data->_M_month08 = "August";
1.2326 -+ _M_data->_M_month09 = "September";
1.2327 -+ _M_data->_M_month10 = "October";
1.2328 -+ _M_data->_M_month11 = "November";
1.2329 -+ _M_data->_M_month12 = "December";
1.2330 -+
1.2331 -+ // Abbreviated month names, starting with "C"'s Jan.
1.2332 -+ _M_data->_M_amonth01 = "Jan";
1.2333 -+ _M_data->_M_amonth02 = "Feb";
1.2334 -+ _M_data->_M_amonth03 = "Mar";
1.2335 -+ _M_data->_M_amonth04 = "Apr";
1.2336 -+ _M_data->_M_amonth05 = "May";
1.2337 -+ _M_data->_M_amonth06 = "Jun";
1.2338 -+ _M_data->_M_amonth07 = "Jul";
1.2339 -+ _M_data->_M_amonth08 = "Aug";
1.2340 -+ _M_data->_M_amonth09 = "Sep";
1.2341 -+ _M_data->_M_amonth10 = "Oct";
1.2342 -+ _M_data->_M_amonth11 = "Nov";
1.2343 -+ _M_data->_M_amonth12 = "Dec";
1.2344 -+ }
1.2345 -+ else
1.2346 -+ {
1.2347 -+ _M_c_locale_timepunct = _S_clone_c_locale(__cloc);
1.2348 -+
1.2349 -+ _M_data->_M_date_format = __nl_langinfo_l(D_FMT, __cloc);
1.2350 -+ _M_data->_M_date_era_format = __nl_langinfo_l(ERA_D_FMT, __cloc);
1.2351 -+ _M_data->_M_time_format = __nl_langinfo_l(T_FMT, __cloc);
1.2352 -+ _M_data->_M_time_era_format = __nl_langinfo_l(ERA_T_FMT, __cloc);
1.2353 -+ _M_data->_M_date_time_format = __nl_langinfo_l(D_T_FMT, __cloc);
1.2354 -+ _M_data->_M_date_time_era_format = __nl_langinfo_l(ERA_D_T_FMT,
1.2355 -+ __cloc);
1.2356 -+ _M_data->_M_am = __nl_langinfo_l(AM_STR, __cloc);
1.2357 -+ _M_data->_M_pm = __nl_langinfo_l(PM_STR, __cloc);
1.2358 -+ _M_data->_M_am_pm_format = __nl_langinfo_l(T_FMT_AMPM, __cloc);
1.2359 -+
1.2360 -+ // Day names, starting with "C"'s Sunday.
1.2361 -+ _M_data->_M_day1 = __nl_langinfo_l(DAY_1, __cloc);
1.2362 -+ _M_data->_M_day2 = __nl_langinfo_l(DAY_2, __cloc);
1.2363 -+ _M_data->_M_day3 = __nl_langinfo_l(DAY_3, __cloc);
1.2364 -+ _M_data->_M_day4 = __nl_langinfo_l(DAY_4, __cloc);
1.2365 -+ _M_data->_M_day5 = __nl_langinfo_l(DAY_5, __cloc);
1.2366 -+ _M_data->_M_day6 = __nl_langinfo_l(DAY_6, __cloc);
1.2367 -+ _M_data->_M_day7 = __nl_langinfo_l(DAY_7, __cloc);
1.2368 -+
1.2369 -+ // Abbreviated day names, starting with "C"'s Sun.
1.2370 -+ _M_data->_M_aday1 = __nl_langinfo_l(ABDAY_1, __cloc);
1.2371 -+ _M_data->_M_aday2 = __nl_langinfo_l(ABDAY_2, __cloc);
1.2372 -+ _M_data->_M_aday3 = __nl_langinfo_l(ABDAY_3, __cloc);
1.2373 -+ _M_data->_M_aday4 = __nl_langinfo_l(ABDAY_4, __cloc);
1.2374 -+ _M_data->_M_aday5 = __nl_langinfo_l(ABDAY_5, __cloc);
1.2375 -+ _M_data->_M_aday6 = __nl_langinfo_l(ABDAY_6, __cloc);
1.2376 -+ _M_data->_M_aday7 = __nl_langinfo_l(ABDAY_7, __cloc);
1.2377 -+
1.2378 -+ // Month names, starting with "C"'s January.
1.2379 -+ _M_data->_M_month01 = __nl_langinfo_l(MON_1, __cloc);
1.2380 -+ _M_data->_M_month02 = __nl_langinfo_l(MON_2, __cloc);
1.2381 -+ _M_data->_M_month03 = __nl_langinfo_l(MON_3, __cloc);
1.2382 -+ _M_data->_M_month04 = __nl_langinfo_l(MON_4, __cloc);
1.2383 -+ _M_data->_M_month05 = __nl_langinfo_l(MON_5, __cloc);
1.2384 -+ _M_data->_M_month06 = __nl_langinfo_l(MON_6, __cloc);
1.2385 -+ _M_data->_M_month07 = __nl_langinfo_l(MON_7, __cloc);
1.2386 -+ _M_data->_M_month08 = __nl_langinfo_l(MON_8, __cloc);
1.2387 -+ _M_data->_M_month09 = __nl_langinfo_l(MON_9, __cloc);
1.2388 -+ _M_data->_M_month10 = __nl_langinfo_l(MON_10, __cloc);
1.2389 -+ _M_data->_M_month11 = __nl_langinfo_l(MON_11, __cloc);
1.2390 -+ _M_data->_M_month12 = __nl_langinfo_l(MON_12, __cloc);
1.2391 -+
1.2392 -+ // Abbreviated month names, starting with "C"'s Jan.
1.2393 -+ _M_data->_M_amonth01 = __nl_langinfo_l(ABMON_1, __cloc);
1.2394 -+ _M_data->_M_amonth02 = __nl_langinfo_l(ABMON_2, __cloc);
1.2395 -+ _M_data->_M_amonth03 = __nl_langinfo_l(ABMON_3, __cloc);
1.2396 -+ _M_data->_M_amonth04 = __nl_langinfo_l(ABMON_4, __cloc);
1.2397 -+ _M_data->_M_amonth05 = __nl_langinfo_l(ABMON_5, __cloc);
1.2398 -+ _M_data->_M_amonth06 = __nl_langinfo_l(ABMON_6, __cloc);
1.2399 -+ _M_data->_M_amonth07 = __nl_langinfo_l(ABMON_7, __cloc);
1.2400 -+ _M_data->_M_amonth08 = __nl_langinfo_l(ABMON_8, __cloc);
1.2401 -+ _M_data->_M_amonth09 = __nl_langinfo_l(ABMON_9, __cloc);
1.2402 -+ _M_data->_M_amonth10 = __nl_langinfo_l(ABMON_10, __cloc);
1.2403 -+ _M_data->_M_amonth11 = __nl_langinfo_l(ABMON_11, __cloc);
1.2404 -+ _M_data->_M_amonth12 = __nl_langinfo_l(ABMON_12, __cloc);
1.2405 -+ }
1.2406 -+ }
1.2407 -+
1.2408 -+#ifdef _GLIBCXX_USE_WCHAR_T
1.2409 -+ template<>
1.2410 -+ void
1.2411 -+ __timepunct<wchar_t>::
1.2412 -+ _M_put(wchar_t* __s, size_t __maxlen, const wchar_t* __format,
1.2413 -+ const tm* __tm) const
1.2414 -+ {
1.2415 -+#ifdef __UCLIBC_HAS_XLOCALE__
1.2416 -+ __wcsftime_l(__s, __maxlen, __format, __tm, _M_c_locale_timepunct);
1.2417 -+ const size_t __len = __wcsftime_l(__s, __maxlen, __format, __tm,
1.2418 -+ _M_c_locale_timepunct);
1.2419 -+#else
1.2420 -+ char* __old = strdup(setlocale(LC_ALL, NULL));
1.2421 -+ setlocale(LC_ALL, _M_name_timepunct);
1.2422 -+ const size_t __len = wcsftime(__s, __maxlen, __format, __tm);
1.2423 -+ setlocale(LC_ALL, __old);
1.2424 -+ free(__old);
1.2425 -+#endif
1.2426 -+ // Make sure __s is null terminated.
1.2427 -+ if (__len == 0)
1.2428 -+ __s[0] = L'\0';
1.2429 -+ }
1.2430 -+
1.2431 -+ template<>
1.2432 -+ void
1.2433 -+ __timepunct<wchar_t>::_M_initialize_timepunct(__c_locale __cloc)
1.2434 -+ {
1.2435 -+ if (!_M_data)
1.2436 -+ _M_data = new __timepunct_cache<wchar_t>;
1.2437 -+
1.2438 -+#warning wide time stuff
1.2439 -+// if (!__cloc)
1.2440 -+ {
1.2441 -+ // "C" locale
1.2442 -+ _M_c_locale_timepunct = _S_get_c_locale();
1.2443 -+
1.2444 -+ _M_data->_M_date_format = L"%m/%d/%y";
1.2445 -+ _M_data->_M_date_era_format = L"%m/%d/%y";
1.2446 -+ _M_data->_M_time_format = L"%H:%M:%S";
1.2447 -+ _M_data->_M_time_era_format = L"%H:%M:%S";
1.2448 -+ _M_data->_M_date_time_format = L"";
1.2449 -+ _M_data->_M_date_time_era_format = L"";
1.2450 -+ _M_data->_M_am = L"AM";
1.2451 -+ _M_data->_M_pm = L"PM";
1.2452 -+ _M_data->_M_am_pm_format = L"";
1.2453 -+
1.2454 -+ // Day names, starting with "C"'s Sunday.
1.2455 -+ _M_data->_M_day1 = L"Sunday";
1.2456 -+ _M_data->_M_day2 = L"Monday";
1.2457 -+ _M_data->_M_day3 = L"Tuesday";
1.2458 -+ _M_data->_M_day4 = L"Wednesday";
1.2459 -+ _M_data->_M_day5 = L"Thursday";
1.2460 -+ _M_data->_M_day6 = L"Friday";
1.2461 -+ _M_data->_M_day7 = L"Saturday";
1.2462 -+
1.2463 -+ // Abbreviated day names, starting with "C"'s Sun.
1.2464 -+ _M_data->_M_aday1 = L"Sun";
1.2465 -+ _M_data->_M_aday2 = L"Mon";
1.2466 -+ _M_data->_M_aday3 = L"Tue";
1.2467 -+ _M_data->_M_aday4 = L"Wed";
1.2468 -+ _M_data->_M_aday5 = L"Thu";
1.2469 -+ _M_data->_M_aday6 = L"Fri";
1.2470 -+ _M_data->_M_aday7 = L"Sat";
1.2471 -+
1.2472 -+ // Month names, starting with "C"'s January.
1.2473 -+ _M_data->_M_month01 = L"January";
1.2474 -+ _M_data->_M_month02 = L"February";
1.2475 -+ _M_data->_M_month03 = L"March";
1.2476 -+ _M_data->_M_month04 = L"April";
1.2477 -+ _M_data->_M_month05 = L"May";
1.2478 -+ _M_data->_M_month06 = L"June";
1.2479 -+ _M_data->_M_month07 = L"July";
1.2480 -+ _M_data->_M_month08 = L"August";
1.2481 -+ _M_data->_M_month09 = L"September";
1.2482 -+ _M_data->_M_month10 = L"October";
1.2483 -+ _M_data->_M_month11 = L"November";
1.2484 -+ _M_data->_M_month12 = L"December";
1.2485 -+
1.2486 -+ // Abbreviated month names, starting with "C"'s Jan.
1.2487 -+ _M_data->_M_amonth01 = L"Jan";
1.2488 -+ _M_data->_M_amonth02 = L"Feb";
1.2489 -+ _M_data->_M_amonth03 = L"Mar";
1.2490 -+ _M_data->_M_amonth04 = L"Apr";
1.2491 -+ _M_data->_M_amonth05 = L"May";
1.2492 -+ _M_data->_M_amonth06 = L"Jun";
1.2493 -+ _M_data->_M_amonth07 = L"Jul";
1.2494 -+ _M_data->_M_amonth08 = L"Aug";
1.2495 -+ _M_data->_M_amonth09 = L"Sep";
1.2496 -+ _M_data->_M_amonth10 = L"Oct";
1.2497 -+ _M_data->_M_amonth11 = L"Nov";
1.2498 -+ _M_data->_M_amonth12 = L"Dec";
1.2499 -+ }
1.2500 -+#if 0
1.2501 -+ else
1.2502 -+ {
1.2503 -+ _M_c_locale_timepunct = _S_clone_c_locale(__cloc);
1.2504 -+
1.2505 -+ union { char *__s; wchar_t *__w; } __u;
1.2506 -+
1.2507 -+ __u.__s = __nl_langinfo_l(_NL_WD_FMT, __cloc);
1.2508 -+ _M_data->_M_date_format = __u.__w;
1.2509 -+ __u.__s = __nl_langinfo_l(_NL_WERA_D_FMT, __cloc);
1.2510 -+ _M_data->_M_date_era_format = __u.__w;
1.2511 -+ __u.__s = __nl_langinfo_l(_NL_WT_FMT, __cloc);
1.2512 -+ _M_data->_M_time_format = __u.__w;
1.2513 -+ __u.__s = __nl_langinfo_l(_NL_WERA_T_FMT, __cloc);
1.2514 -+ _M_data->_M_time_era_format = __u.__w;
1.2515 -+ __u.__s = __nl_langinfo_l(_NL_WD_T_FMT, __cloc);
1.2516 -+ _M_data->_M_date_time_format = __u.__w;
1.2517 -+ __u.__s = __nl_langinfo_l(_NL_WERA_D_T_FMT, __cloc);
1.2518 -+ _M_data->_M_date_time_era_format = __u.__w;
1.2519 -+ __u.__s = __nl_langinfo_l(_NL_WAM_STR, __cloc);
1.2520 -+ _M_data->_M_am = __u.__w;
1.2521 -+ __u.__s = __nl_langinfo_l(_NL_WPM_STR, __cloc);
1.2522 -+ _M_data->_M_pm = __u.__w;
1.2523 -+ __u.__s = __nl_langinfo_l(_NL_WT_FMT_AMPM, __cloc);
1.2524 -+ _M_data->_M_am_pm_format = __u.__w;
1.2525 -+
1.2526 -+ // Day names, starting with "C"'s Sunday.
1.2527 -+ __u.__s = __nl_langinfo_l(_NL_WDAY_1, __cloc);
1.2528 -+ _M_data->_M_day1 = __u.__w;
1.2529 -+ __u.__s = __nl_langinfo_l(_NL_WDAY_2, __cloc);
1.2530 -+ _M_data->_M_day2 = __u.__w;
1.2531 -+ __u.__s = __nl_langinfo_l(_NL_WDAY_3, __cloc);
1.2532 -+ _M_data->_M_day3 = __u.__w;
1.2533 -+ __u.__s = __nl_langinfo_l(_NL_WDAY_4, __cloc);
1.2534 -+ _M_data->_M_day4 = __u.__w;
1.2535 -+ __u.__s = __nl_langinfo_l(_NL_WDAY_5, __cloc);
1.2536 -+ _M_data->_M_day5 = __u.__w;
1.2537 -+ __u.__s = __nl_langinfo_l(_NL_WDAY_6, __cloc);
1.2538 -+ _M_data->_M_day6 = __u.__w;
1.2539 -+ __u.__s = __nl_langinfo_l(_NL_WDAY_7, __cloc);
1.2540 -+ _M_data->_M_day7 = __u.__w;
1.2541 -+
1.2542 -+ // Abbreviated day names, starting with "C"'s Sun.
1.2543 -+ __u.__s = __nl_langinfo_l(_NL_WABDAY_1, __cloc);
1.2544 -+ _M_data->_M_aday1 = __u.__w;
1.2545 -+ __u.__s = __nl_langinfo_l(_NL_WABDAY_2, __cloc);
1.2546 -+ _M_data->_M_aday2 = __u.__w;
1.2547 -+ __u.__s = __nl_langinfo_l(_NL_WABDAY_3, __cloc);
1.2548 -+ _M_data->_M_aday3 = __u.__w;
1.2549 -+ __u.__s = __nl_langinfo_l(_NL_WABDAY_4, __cloc);
1.2550 -+ _M_data->_M_aday4 = __u.__w;
1.2551 -+ __u.__s = __nl_langinfo_l(_NL_WABDAY_5, __cloc);
1.2552 -+ _M_data->_M_aday5 = __u.__w;
1.2553 -+ __u.__s = __nl_langinfo_l(_NL_WABDAY_6, __cloc);
1.2554 -+ _M_data->_M_aday6 = __u.__w;
1.2555 -+ __u.__s = __nl_langinfo_l(_NL_WABDAY_7, __cloc);
1.2556 -+ _M_data->_M_aday7 = __u.__w;
1.2557 -+
1.2558 -+ // Month names, starting with "C"'s January.
1.2559 -+ __u.__s = __nl_langinfo_l(_NL_WMON_1, __cloc);
1.2560 -+ _M_data->_M_month01 = __u.__w;
1.2561 -+ __u.__s = __nl_langinfo_l(_NL_WMON_2, __cloc);
1.2562 -+ _M_data->_M_month02 = __u.__w;
1.2563 -+ __u.__s = __nl_langinfo_l(_NL_WMON_3, __cloc);
1.2564 -+ _M_data->_M_month03 = __u.__w;
1.2565 -+ __u.__s = __nl_langinfo_l(_NL_WMON_4, __cloc);
1.2566 -+ _M_data->_M_month04 = __u.__w;
1.2567 -+ __u.__s = __nl_langinfo_l(_NL_WMON_5, __cloc);
1.2568 -+ _M_data->_M_month05 = __u.__w;
1.2569 -+ __u.__s = __nl_langinfo_l(_NL_WMON_6, __cloc);
1.2570 -+ _M_data->_M_month06 = __u.__w;
1.2571 -+ __u.__s = __nl_langinfo_l(_NL_WMON_7, __cloc);
1.2572 -+ _M_data->_M_month07 = __u.__w;
1.2573 -+ __u.__s = __nl_langinfo_l(_NL_WMON_8, __cloc);
1.2574 -+ _M_data->_M_month08 = __u.__w;
1.2575 -+ __u.__s = __nl_langinfo_l(_NL_WMON_9, __cloc);
1.2576 -+ _M_data->_M_month09 = __u.__w;
1.2577 -+ __u.__s = __nl_langinfo_l(_NL_WMON_10, __cloc);
1.2578 -+ _M_data->_M_month10 = __u.__w;
1.2579 -+ __u.__s = __nl_langinfo_l(_NL_WMON_11, __cloc);
1.2580 -+ _M_data->_M_month11 = __u.__w;
1.2581 -+ __u.__s = __nl_langinfo_l(_NL_WMON_12, __cloc);
1.2582 -+ _M_data->_M_month12 = __u.__w;
1.2583 -+
1.2584 -+ // Abbreviated month names, starting with "C"'s Jan.
1.2585 -+ __u.__s = __nl_langinfo_l(_NL_WABMON_1, __cloc);
1.2586 -+ _M_data->_M_amonth01 = __u.__w;
1.2587 -+ __u.__s = __nl_langinfo_l(_NL_WABMON_2, __cloc);
1.2588 -+ _M_data->_M_amonth02 = __u.__w;
1.2589 -+ __u.__s = __nl_langinfo_l(_NL_WABMON_3, __cloc);
1.2590 -+ _M_data->_M_amonth03 = __u.__w;
1.2591 -+ __u.__s = __nl_langinfo_l(_NL_WABMON_4, __cloc);
1.2592 -+ _M_data->_M_amonth04 = __u.__w;
1.2593 -+ __u.__s = __nl_langinfo_l(_NL_WABMON_5, __cloc);
1.2594 -+ _M_data->_M_amonth05 = __u.__w;
1.2595 -+ __u.__s = __nl_langinfo_l(_NL_WABMON_6, __cloc);
1.2596 -+ _M_data->_M_amonth06 = __u.__w;
1.2597 -+ __u.__s = __nl_langinfo_l(_NL_WABMON_7, __cloc);
1.2598 -+ _M_data->_M_amonth07 = __u.__w;
1.2599 -+ __u.__s = __nl_langinfo_l(_NL_WABMON_8, __cloc);
1.2600 -+ _M_data->_M_amonth08 = __u.__w;
1.2601 -+ __u.__s = __nl_langinfo_l(_NL_WABMON_9, __cloc);
1.2602 -+ _M_data->_M_amonth09 = __u.__w;
1.2603 -+ __u.__s = __nl_langinfo_l(_NL_WABMON_10, __cloc);
1.2604 -+ _M_data->_M_amonth10 = __u.__w;
1.2605 -+ __u.__s = __nl_langinfo_l(_NL_WABMON_11, __cloc);
1.2606 -+ _M_data->_M_amonth11 = __u.__w;
1.2607 -+ __u.__s = __nl_langinfo_l(_NL_WABMON_12, __cloc);
1.2608 -+ _M_data->_M_amonth12 = __u.__w;
1.2609 -+ }
1.2610 -+#endif // 0
1.2611 -+ }
1.2612 -+#endif
1.2613 -+}
1.2614 -diff -durN gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/time_members.h gcc-4.3.1/libstdc++-v3/config/locale/uclibc/time_members.h
1.2615 ---- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/time_members.h 1970-01-01 01:00:00.000000000 +0100
1.2616 -+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/time_members.h 2008-06-10 14:58:39.000000000 +0200
1.2617 -@@ -0,0 +1,68 @@
1.2618 -+// std::time_get, std::time_put implementation, GNU version -*- C++ -*-
1.2619 -+
1.2620 -+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
1.2621 -+//
1.2622 -+// This file is part of the GNU ISO C++ Library. This library is free
1.2623 -+// software; you can redistribute it and/or modify it under the
1.2624 -+// terms of the GNU General Public License as published by the
1.2625 -+// Free Software Foundation; either version 2, or (at your option)
1.2626 -+// any later version.
1.2627 -+
1.2628 -+// This library is distributed in the hope that it will be useful,
1.2629 -+// but WITHOUT ANY WARRANTY; without even the implied warranty of
1.2630 -+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1.2631 -+// GNU General Public License for more details.
1.2632 -+
1.2633 -+// You should have received a copy of the GNU General Public License along
1.2634 -+// with this library; see the file COPYING. If not, write to the Free
1.2635 -+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
1.2636 -+// USA.
1.2637 -+
1.2638 -+// As a special exception, you may use this file as part of a free software
1.2639 -+// library without restriction. Specifically, if other files instantiate
1.2640 -+// templates or use macros or inline functions from this file, or you compile
1.2641 -+// this file and link it with other files to produce an executable, this
1.2642 -+// file does not by itself cause the resulting executable to be covered by
1.2643 -+// the GNU General Public License. This exception does not however
1.2644 -+// invalidate any other reasons why the executable file might be covered by
1.2645 -+// the GNU General Public License.
1.2646 -+
1.2647 -+//
1.2648 -+// ISO C++ 14882: 22.2.5.1.2 - time_get functions
1.2649 -+// ISO C++ 14882: 22.2.5.3.2 - time_put functions
1.2650 -+//
1.2651 -+
1.2652 -+// Written by Benjamin Kosnik <bkoz@redhat.com>
1.2653 -+
1.2654 -+ template<typename _CharT>
1.2655 -+ __timepunct<_CharT>::__timepunct(size_t __refs)
1.2656 -+ : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL),
1.2657 -+ _M_name_timepunct(_S_get_c_name())
1.2658 -+ { _M_initialize_timepunct(); }
1.2659 -+
1.2660 -+ template<typename _CharT>
1.2661 -+ __timepunct<_CharT>::__timepunct(__cache_type* __cache, size_t __refs)
1.2662 -+ : facet(__refs), _M_data(__cache), _M_c_locale_timepunct(NULL),
1.2663 -+ _M_name_timepunct(_S_get_c_name())
1.2664 -+ { _M_initialize_timepunct(); }
1.2665 -+
1.2666 -+ template<typename _CharT>
1.2667 -+ __timepunct<_CharT>::__timepunct(__c_locale __cloc, const char* __s,
1.2668 -+ size_t __refs)
1.2669 -+ : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL),
1.2670 -+ _M_name_timepunct(__s)
1.2671 -+ {
1.2672 -+ char* __tmp = new char[std::strlen(__s) + 1];
1.2673 -+ std::strcpy(__tmp, __s);
1.2674 -+ _M_name_timepunct = __tmp;
1.2675 -+ _M_initialize_timepunct(__cloc);
1.2676 -+ }
1.2677 -+
1.2678 -+ template<typename _CharT>
1.2679 -+ __timepunct<_CharT>::~__timepunct()
1.2680 -+ {
1.2681 -+ if (_M_name_timepunct != _S_get_c_name())
1.2682 -+ delete [] _M_name_timepunct;
1.2683 -+ delete _M_data;
1.2684 -+ _S_destroy_c_locale(_M_c_locale_timepunct);
1.2685 -+ }
1.2686 -diff -durN gcc-4.3.1.orig/libstdc++-v3/configure gcc-4.3.1/libstdc++-v3/configure
1.2687 ---- gcc-4.3.1.orig/libstdc++-v3/configure 2008-04-25 18:52:57.000000000 +0200
1.2688 -+++ gcc-4.3.1/libstdc++-v3/configure 2008-06-10 14:58:39.000000000 +0200
1.2689 -@@ -14001,7 +14001,7 @@
1.2690 - enableval="$enable_clocale"
1.2691 -
1.2692 - case "$enableval" in
1.2693 -- generic|gnu|ieee_1003.1-2001|yes|no|auto) ;;
1.2694 -+ generic|gnu|ieee_1003.1-2001|uclibc|yes|no|auto) ;;
1.2695 - *) { { echo "$as_me:$LINENO: error: Unknown argument to enable/disable clocale" >&5
1.2696 - echo "$as_me: error: Unknown argument to enable/disable clocale" >&2;}
1.2697 - { (exit 1); exit 1; }; } ;;
1.2698 -@@ -14034,6 +14034,9 @@
1.2699 - # Default to "generic".
1.2700 - if test $enable_clocale_flag = auto; then
1.2701 - case ${target_os} in
1.2702 -+ linux-uclibc*)
1.2703 -+ enable_clocale_flag=uclibc
1.2704 -+ ;;
1.2705 - linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu)
1.2706 - enable_clocale_flag=gnu
1.2707 - ;;
1.2708 -@@ -14422,6 +14425,76 @@
1.2709 - CTIME_CC=config/locale/generic/time_members.cc
1.2710 - CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
1.2711 - ;;
1.2712 -+ uclibc)
1.2713 -+ echo "$as_me:$LINENO: result: uclibc" >&5
1.2714 -+echo "${ECHO_T}uclibc" >&6
1.2715 -+
1.2716 -+ # Declare intention to use gettext, and add support for specific
1.2717 -+ # languages.
1.2718 -+ # For some reason, ALL_LINGUAS has to be before AM-GNU-GETTEXT
1.2719 -+ ALL_LINGUAS="de fr"
1.2720 -+
1.2721 -+ # Don't call AM-GNU-GETTEXT here. Instead, assume glibc.
1.2722 -+ # Extract the first word of "msgfmt", so it can be a program name with args.
1.2723 -+set dummy msgfmt; ac_word=$2
1.2724 -+echo "$as_me:$LINENO: checking for $ac_word" >&5
1.2725 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
1.2726 -+if test "${ac_cv_prog_check_msgfmt+set}" = set; then
1.2727 -+ echo $ECHO_N "(cached) $ECHO_C" >&6
1.2728 -+else
1.2729 -+ if test -n "$check_msgfmt"; then
1.2730 -+ ac_cv_prog_check_msgfmt="$check_msgfmt" # Let the user override the test.
1.2731 -+else
1.2732 -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.2733 -+for as_dir in $PATH
1.2734 -+do
1.2735 -+ IFS=$as_save_IFS
1.2736 -+ test -z "$as_dir" && as_dir=.
1.2737 -+ for ac_exec_ext in '' $ac_executable_extensions; do
1.2738 -+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1.2739 -+ ac_cv_prog_check_msgfmt="yes"
1.2740 -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1.2741 -+ break 2
1.2742 -+ fi
1.2743 -+done
1.2744 -+done
1.2745 -+
1.2746 -+ test -z "$ac_cv_prog_check_msgfmt" && ac_cv_prog_check_msgfmt="no"
1.2747 -+fi
1.2748 -+fi
1.2749 -+check_msgfmt=$ac_cv_prog_check_msgfmt
1.2750 -+if test -n "$check_msgfmt"; then
1.2751 -+ echo "$as_me:$LINENO: result: $check_msgfmt" >&5
1.2752 -+echo "${ECHO_T}$check_msgfmt" >&6
1.2753 -+else
1.2754 -+ echo "$as_me:$LINENO: result: no" >&5
1.2755 -+echo "${ECHO_T}no" >&6
1.2756 -+fi
1.2757 -+
1.2758 -+ if test x"$check_msgfmt" = x"yes" && test x"$enable_nls" = x"yes"; then
1.2759 -+ USE_NLS=yes
1.2760 -+ fi
1.2761 -+ # Export the build objects.
1.2762 -+ for ling in $ALL_LINGUAS; do \
1.2763 -+ glibcxx_MOFILES="$glibcxx_MOFILES $ling.mo"; \
1.2764 -+ glibcxx_POFILES="$glibcxx_POFILES $ling.po"; \
1.2765 -+ done
1.2766 -+
1.2767 -+
1.2768 -+
1.2769 -+ CLOCALE_H=config/locale/uclibc/c_locale.h
1.2770 -+ CLOCALE_CC=config/locale/uclibc/c_locale.cc
1.2771 -+ CCODECVT_CC=config/locale/uclibc/codecvt_members.cc
1.2772 -+ CCOLLATE_CC=config/locale/uclibc/collate_members.cc
1.2773 -+ CCTYPE_CC=config/locale/uclibc/ctype_members.cc
1.2774 -+ CMESSAGES_H=config/locale/uclibc/messages_members.h
1.2775 -+ CMESSAGES_CC=config/locale/uclibc/messages_members.cc
1.2776 -+ CMONEY_CC=config/locale/uclibc/monetary_members.cc
1.2777 -+ CNUMERIC_CC=config/locale/uclibc/numeric_members.cc
1.2778 -+ CTIME_H=config/locale/uclibc/time_members.h
1.2779 -+ CTIME_CC=config/locale/uclibc/time_members.cc
1.2780 -+ CLOCALE_INTERNAL_H=config/locale/uclibc/c++locale_internal.h
1.2781 -+ ;;
1.2782 - esac
1.2783 -
1.2784 - # This is where the testsuite looks for locale catalogs, using the
1.2785 -diff -durN gcc-4.3.1.orig/libstdc++-v3/include/c_compatibility/wchar.h gcc-4.3.1/libstdc++-v3/include/c_compatibility/wchar.h
1.2786 ---- gcc-4.3.1.orig/libstdc++-v3/include/c_compatibility/wchar.h 2007-03-04 23:59:49.000000000 +0100
1.2787 -+++ gcc-4.3.1/libstdc++-v3/include/c_compatibility/wchar.h 2008-06-10 14:58:39.000000000 +0200
1.2788 -@@ -106,7 +106,9 @@
1.2789 - using std::wmemcpy;
1.2790 - using std::wmemmove;
1.2791 - using std::wmemset;
1.2792 -+#if _GLIBCXX_HAVE_WCSFTIME
1.2793 - using std::wcsftime;
1.2794 -+#endif
1.2795 -
1.2796 - #if _GLIBCXX_USE_C99
1.2797 - using std::wcstold;