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