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