crosstool-ng: patches/gcc/4.0.3/200-uclibc-locale.patch@eeea35fbf182 (annotated)

yann@1	1	diff -urN gcc-4.0.0-100/libstdc++-v3/acinclude.m4 gcc-4.0.0/libstdc++-v3/acinclude.m4
yann@1	2	--- gcc-4.0.0-100/libstdc++-v3/acinclude.m4 2005-04-30 13:06:53.000000000 -0500
yann@1	3	+++ gcc-4.0.0/libstdc++-v3/acinclude.m4 2005-04-28 20:19:01.000000000 -0500
yann@1	4	@@ -1104,7 +1104,7 @@
yann@1	5	AC_MSG_CHECKING([for C locale to use])
yann@1	6	GLIBCXX_ENABLE(clocale,auto,[@<:@=MODEL@:>@],
yann@1	7	[use MODEL for target locale package],
yann@1	8	- [permit generic\|gnu\|ieee_1003.1-2001\|yes\|no\|auto])
yann@1	9	+ [permit generic\|gnu\|ieee_1003.1-2001\|uclibc\|yes\|no\|auto])
yann@1	10
yann@1	11	# If they didn't use this option switch, or if they specified --enable
yann@1	12	# with no specific model, we'll have to look for one. If they
yann@1	13	@@ -1120,6 +1120,9 @@
yann@1	14	# Default to "generic".
yann@1	15	if test $enable_clocale_flag = auto; then
yann@1	16	case ${target_os} in
yann@1	17	+ -uclibc)
yann@1	18	+ enable_clocale_flag=uclibc
yann@1	19	+ ;;
yann@1	20	linux* \| gnu* \| kfreebsd-gnu \| knetbsd-gnu)
yann@1	21	AC_EGREP_CPP([_GLIBCXX_ok], [
yann@1	22	#include <features.h>
yann@1	23	@@ -1263,6 +1266,40 @@
yann@1	24	CTIME_CC=config/locale/generic/time_members.cc
yann@1	25	CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
yann@1	26	;;
yann@1	27	+ uclibc)
yann@1	28	+ AC_MSG_RESULT(uclibc)
yann@1	29	+
yann@1	30	+ # Declare intention to use gettext, and add support for specific
yann@1	31	+ # languages.
yann@1	32	+ # For some reason, ALL_LINGUAS has to be before AM-GNU-GETTEXT
yann@1	33	+ ALL_LINGUAS="de fr"
yann@1	34	+
yann@1	35	+ # Don't call AM-GNU-GETTEXT here. Instead, assume glibc.
yann@1	36	+ AC_CHECK_PROG(check_msgfmt, msgfmt, yes, no)
yann@1	37	+ if test x"$check_msgfmt" = x"yes" && test x"$enable_nls" = x"yes"; then
yann@1	38	+ USE_NLS=yes
yann@1	39	+ fi
yann@1	40	+ # Export the build objects.
yann@1	41	+ for ling in $ALL_LINGUAS; do \
yann@1	42	+ glibcxx_MOFILES="$glibcxx_MOFILES $ling.mo"; \
yann@1	43	+ glibcxx_POFILES="$glibcxx_POFILES $ling.po"; \
yann@1	44	+ done
yann@1	45	+ AC_SUBST(glibcxx_MOFILES)
yann@1	46	+ AC_SUBST(glibcxx_POFILES)
yann@1	47	+
yann@1	48	+ CLOCALE_H=config/locale/uclibc/c_locale.h
yann@1	49	+ CLOCALE_CC=config/locale/uclibc/c_locale.cc
yann@1	50	+ CCODECVT_CC=config/locale/uclibc/codecvt_members.cc
yann@1	51	+ CCOLLATE_CC=config/locale/uclibc/collate_members.cc
yann@1	52	+ CCTYPE_CC=config/locale/uclibc/ctype_members.cc
yann@1	53	+ CMESSAGES_H=config/locale/uclibc/messages_members.h
yann@1	54	+ CMESSAGES_CC=config/locale/uclibc/messages_members.cc
yann@1	55	+ CMONEY_CC=config/locale/uclibc/monetary_members.cc
yann@1	56	+ CNUMERIC_CC=config/locale/uclibc/numeric_members.cc
yann@1	57	+ CTIME_H=config/locale/uclibc/time_members.h
yann@1	58	+ CTIME_CC=config/locale/uclibc/time_members.cc
yann@1	59	+ CLOCALE_INTERNAL_H=config/locale/uclibc/c++locale_internal.h
yann@1	60	+ ;;
yann@1	61	esac
yann@1	62
yann@1	63	# This is where the testsuite looks for locale catalogs, using the
yann@1	64	diff -urN gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/c++locale_internal.h gcc-4.0.0/libstdc++-v3/config/locale/uclibc/c++locale_internal.h
yann@1	65	--- gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 1969-12-31 18:00:00.000000000 -0600
yann@1	66	+++ gcc-4.0.0/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 2005-04-28 01:13:15.000000000 -0500
yann@1	67	@@ -0,0 +1,59 @@
yann@1	68	+// Prototypes for GLIBC thread locale __-prefixed functions -- C++ --
yann@1	69	+
yann@1	70	+// Copyright (C) 2002, 2004 Free Software Foundation, Inc.
yann@1	71	+//
yann@1	72	+// This file is part of the GNU ISO C++ Library. This library is free
yann@1	73	+// software; you can redistribute it and/or modify it under the
yann@1	74	+// terms of the GNU General Public License as published by the
yann@1	75	+// Free Software Foundation; either version 2, or (at your option)
yann@1	76	+// any later version.
yann@1	77	+
yann@1	78	+// This library is distributed in the hope that it will be useful,
yann@1	79	+// but WITHOUT ANY WARRANTY; without even the implied warranty of
yann@1	80	+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
yann@1	81	+// GNU General Public License for more details.
yann@1	82	+
yann@1	83	+// You should have received a copy of the GNU General Public License along
yann@1	84	+// with this library; see the file COPYING. If not, write to the Free
yann@1	85	+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
yann@1	86	+// USA.
yann@1	87	+
yann@1	88	+// As a special exception, you may use this file as part of a free software
yann@1	89	+// library without restriction. Specifically, if other files instantiate
yann@1	90	+// templates or use macros or inline functions from this file, or you compile
yann@1	91	+// this file and link it with other files to produce an executable, this
yann@1	92	+// file does not by itself cause the resulting executable to be covered by
yann@1	93	+// the GNU General Public License. This exception does not however
yann@1	94	+// invalidate any other reasons why the executable file might be covered by
yann@1	95	+// the GNU General Public License.
yann@1	96	+
yann@1	97	+// Written by Jakub Jelinek <jakub@redhat.com>
yann@1	98	+
yann@1	99	+#include <clocale>
yann@1	100	+
yann@1	101	+#ifdef __UCLIBC_MJN3_ONLY__
yann@1	102	+#warning clean this up
yann@1	103	+#endif
yann@1	104	+
yann@1	105	+#ifdef __UCLIBC_HAS_XLOCALE__
yann@1	106	+
yann@1	107	+extern "C" __typeof(iswctype_l) __iswctype_l;
yann@1	108	+extern "C" __typeof(nl_langinfo_l) __nl_langinfo_l;
yann@1	109	+extern "C" __typeof(strcoll_l) __strcoll_l;
yann@1	110	+extern "C" __typeof(strftime_l) __strftime_l;
yann@1	111	+extern "C" __typeof(strtod_l) __strtod_l;
yann@1	112	+extern "C" __typeof(strtof_l) __strtof_l;
yann@1	113	+extern "C" __typeof(strtold_l) __strtold_l;
yann@1	114	+extern "C" __typeof(strxfrm_l) __strxfrm_l;
yann@1	115	+extern "C" __typeof(towlower_l) __towlower_l;
yann@1	116	+extern "C" __typeof(towupper_l) __towupper_l;
yann@1	117	+extern "C" __typeof(wcscoll_l) __wcscoll_l;
yann@1	118	+extern "C" __typeof(wcsftime_l) __wcsftime_l;
yann@1	119	+extern "C" __typeof(wcsxfrm_l) __wcsxfrm_l;
yann@1	120	+extern "C" __typeof(wctype_l) __wctype_l;
yann@1	121	+extern "C" __typeof(newlocale) __newlocale;
yann@1	122	+extern "C" __typeof(freelocale) __freelocale;
yann@1	123	+extern "C" __typeof(duplocale) __duplocale;
yann@1	124	+extern "C" __typeof(uselocale) __uselocale;
yann@1	125	+
yann@1	126	+#endif // GLIBC 2.3 and later
yann@1	127	diff -urN gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/c_locale.cc gcc-4.0.0/libstdc++-v3/config/locale/uclibc/c_locale.cc
yann@1	128	--- gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/c_locale.cc 1969-12-31 18:00:00.000000000 -0600
yann@1	129	+++ gcc-4.0.0/libstdc++-v3/config/locale/uclibc/c_locale.cc 2005-04-28 01:13:15.000000000 -0500
yann@1	130	@@ -0,0 +1,160 @@
yann@1	131	+// Wrapper for underlying C-language localization -- C++ --
yann@1	132	+
yann@1	133	+// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
yann@1	134	+//
yann@1	135	+// This file is part of the GNU ISO C++ Library. This library is free
yann@1	136	+// software; you can redistribute it and/or modify it under the
yann@1	137	+// terms of the GNU General Public License as published by the
yann@1	138	+// Free Software Foundation; either version 2, or (at your option)
yann@1	139	+// any later version.
yann@1	140	+
yann@1	141	+// This library is distributed in the hope that it will be useful,
yann@1	142	+// but WITHOUT ANY WARRANTY; without even the implied warranty of
yann@1	143	+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
yann@1	144	+// GNU General Public License for more details.
yann@1	145	+
yann@1	146	+// You should have received a copy of the GNU General Public License along
yann@1	147	+// with this library; see the file COPYING. If not, write to the Free
yann@1	148	+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
yann@1	149	+// USA.
yann@1	150	+
yann@1	151	+// As a special exception, you may use this file as part of a free software
yann@1	152	+// library without restriction. Specifically, if other files instantiate
yann@1	153	+// templates or use macros or inline functions from this file, or you compile
yann@1	154	+// this file and link it with other files to produce an executable, this
yann@1	155	+// file does not by itself cause the resulting executable to be covered by
yann@1	156	+// the GNU General Public License. This exception does not however
yann@1	157	+// invalidate any other reasons why the executable file might be covered by
yann@1	158	+// the GNU General Public License.
yann@1	159	+
yann@1	160	+//
yann@1	161	+// ISO C++ 14882: 22.8 Standard locale categories.
yann@1	162	+//
yann@1	163	+
yann@1	164	+// Written by Benjamin Kosnik <bkoz@redhat.com>
yann@1	165	+
yann@1	166	+#include <cerrno> // For errno
yann@1	167	+#include <locale>
yann@1	168	+#include <stdexcept>
yann@1	169	+#include <langinfo.h>
yann@1	170	+#include <bits/c++locale_internal.h>
yann@1	171	+
yann@1	172	+#ifndef __UCLIBC_HAS_XLOCALE__
yann@1	173	+#define __strtol_l(S, E, B, L) strtol((S), (E), (B))
yann@1	174	+#define __strtoul_l(S, E, B, L) strtoul((S), (E), (B))
yann@1	175	+#define __strtoll_l(S, E, B, L) strtoll((S), (E), (B))
yann@1	176	+#define __strtoull_l(S, E, B, L) strtoull((S), (E), (B))
yann@1	177	+#define __strtof_l(S, E, L) strtof((S), (E))
yann@1	178	+#define __strtod_l(S, E, L) strtod((S), (E))
yann@1	179	+#define __strtold_l(S, E, L) strtold((S), (E))
yann@1	180	+#warning should dummy __newlocale check for C\|POSIX ?
yann@1	181	+#define __newlocale(a, b, c) NULL
yann@1	182	+#define __freelocale(a) ((void)0)
yann@1	183	+#define __duplocale(a) __c_locale()
yann@1	184	+#endif
yann@1	185	+
yann@1	186	+namespace std
yann@1	187	+{
yann@1	188	+ template<>
yann@1	189	+ void
yann@1	190	+ __convert_to_v(const char* __s, float& __v, ios_base::iostate& __err,
yann@1	191	+ const __c_locale& __cloc)
yann@1	192	+ {
yann@1	193	+ if (!(__err & ios_base::failbit))
yann@1	194	+ {
yann@1	195	+ char* __sanity;
yann@1	196	+ errno = 0;
yann@1	197	+ float __f = __strtof_l(__s, &__sanity, __cloc);
yann@1	198	+ if (__sanity != __s && errno != ERANGE)
yann@1	199	+ __v = __f;
yann@1	200	+ else
yann@1	201	+ __err \|= ios_base::failbit;
yann@1	202	+ }
yann@1	203	+ }
yann@1	204	+
yann@1	205	+ template<>
yann@1	206	+ void
yann@1	207	+ __convert_to_v(const char* __s, double& __v, ios_base::iostate& __err,
yann@1	208	+ const __c_locale& __cloc)
yann@1	209	+ {
yann@1	210	+ if (!(__err & ios_base::failbit))
yann@1	211	+ {
yann@1	212	+ char* __sanity;
yann@1	213	+ errno = 0;
yann@1	214	+ double __d = __strtod_l(__s, &__sanity, __cloc);
yann@1	215	+ if (__sanity != __s && errno != ERANGE)
yann@1	216	+ __v = __d;
yann@1	217	+ else
yann@1	218	+ __err \|= ios_base::failbit;
yann@1	219	+ }
yann@1	220	+ }
yann@1	221	+
yann@1	222	+ template<>
yann@1	223	+ void
yann@1	224	+ __convert_to_v(const char* __s, long double& __v, ios_base::iostate& __err,
yann@1	225	+ const __c_locale& __cloc)
yann@1	226	+ {
yann@1	227	+ if (!(__err & ios_base::failbit))
yann@1	228	+ {
yann@1	229	+ char* __sanity;
yann@1	230	+ errno = 0;
yann@1	231	+ long double __ld = __strtold_l(__s, &__sanity, __cloc);
yann@1	232	+ if (__sanity != __s && errno != ERANGE)
yann@1	233	+ __v = __ld;
yann@1	234	+ else
yann@1	235	+ __err \|= ios_base::failbit;
yann@1	236	+ }
yann@1	237	+ }
yann@1	238	+
yann@1	239	+ void
yann@1	240	+ locale::facet::_S_create_c_locale(__c_locale& __cloc, const char* __s,
yann@1	241	+ __c_locale __old)
yann@1	242	+ {
yann@1	243	+ __cloc = __newlocale(1 << LC_ALL, __s, __old);
yann@1	244	+#ifdef __UCLIBC_HAS_XLOCALE__
yann@1	245	+ if (!__cloc)
yann@1	246	+ {
yann@1	247	+ // This named locale is not supported by the underlying OS.
yann@1	248	+ __throw_runtime_error(__N("locale::facet::_S_create_c_locale "
yann@1	249	+ "name not valid"));
yann@1	250	+ }
yann@1	251	+#endif
yann@1	252	+ }
yann@1	253	+
yann@1	254	+ void
yann@1	255	+ locale::facet::_S_destroy_c_locale(__c_locale& __cloc)
yann@1	256	+ {
yann@1	257	+ if (_S_get_c_locale() != __cloc)
yann@1	258	+ __freelocale(__cloc);
yann@1	259	+ }
yann@1	260	+
yann@1	261	+ __c_locale
yann@1	262	+ locale::facet::_S_clone_c_locale(__c_locale& __cloc)
yann@1	263	+ { return __duplocale(__cloc); }
yann@1	264	+} // namespace std
yann@1	265	+
yann@1	266	+namespace __gnu_cxx
yann@1	267	+{
yann@1	268	+ const char* const category_names[6 + _GLIBCXX_NUM_CATEGORIES] =
yann@1	269	+ {
yann@1	270	+ "LC_CTYPE",
yann@1	271	+ "LC_NUMERIC",
yann@1	272	+ "LC_TIME",
yann@1	273	+ "LC_COLLATE",
yann@1	274	+ "LC_MONETARY",
yann@1	275	+ "LC_MESSAGES",
yann@1	276	+#if _GLIBCXX_NUM_CATEGORIES != 0
yann@1	277	+ "LC_PAPER",
yann@1	278	+ "LC_NAME",
yann@1	279	+ "LC_ADDRESS",
yann@1	280	+ "LC_TELEPHONE",
yann@1	281	+ "LC_MEASUREMENT",
yann@1	282	+ "LC_IDENTIFICATION"
yann@1	283	+#endif
yann@1	284	+ };
yann@1	285	+}
yann@1	286	+
yann@1	287	+namespace std
yann@1	288	+{
yann@1	289	+ const char* const* const locale::_S_categories = __gnu_cxx::category_names;
yann@1	290	+} // namespace std
yann@1	291	diff -urN gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/c_locale.h gcc-4.0.0/libstdc++-v3/config/locale/uclibc/c_locale.h
yann@1	292	--- gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/c_locale.h 1969-12-31 18:00:00.000000000 -0600
yann@1	293	+++ gcc-4.0.0/libstdc++-v3/config/locale/uclibc/c_locale.h 2005-04-28 01:13:15.000000000 -0500
yann@1	294	@@ -0,0 +1,115 @@
yann@1	295	+// Wrapper for underlying C-language localization -- C++ --
yann@1	296	+
yann@1	297	+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
yann@1	298	+//
yann@1	299	+// This file is part of the GNU ISO C++ Library. This library is free
yann@1	300	+// software; you can redistribute it and/or modify it under the
yann@1	301	+// terms of the GNU General Public License as published by the
yann@1	302	+// Free Software Foundation; either version 2, or (at your option)
yann@1	303	+// any later version.
yann@1	304	+
yann@1	305	+// This library is distributed in the hope that it will be useful,
yann@1	306	+// but WITHOUT ANY WARRANTY; without even the implied warranty of
yann@1	307	+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
yann@1	308	+// GNU General Public License for more details.
yann@1	309	+
yann@1	310	+// You should have received a copy of the GNU General Public License along
yann@1	311	+// with this library; see the file COPYING. If not, write to the Free
yann@1	312	+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
yann@1	313	+// USA.
yann@1	314	+
yann@1	315	+// As a special exception, you may use this file as part of a free software
yann@1	316	+// library without restriction. Specifically, if other files instantiate
yann@1	317	+// templates or use macros or inline functions from this file, or you compile
yann@1	318	+// this file and link it with other files to produce an executable, this
yann@1	319	+// file does not by itself cause the resulting executable to be covered by
yann@1	320	+// the GNU General Public License. This exception does not however
yann@1	321	+// invalidate any other reasons why the executable file might be covered by
yann@1	322	+// the GNU General Public License.
yann@1	323	+
yann@1	324	+//
yann@1	325	+// ISO C++ 14882: 22.8 Standard locale categories.
yann@1	326	+//
yann@1	327	+
yann@1	328	+// Written by Benjamin Kosnik <bkoz@redhat.com>
yann@1	329	+
yann@1	330	+#ifndef _C_LOCALE_H
yann@1	331	+#define _C_LOCALE_H 1
yann@1	332	+
yann@1	333	+#pragma GCC system_header
yann@1	334	+
yann@1	335	+#include <cstring> // get std::strlen
yann@1	336	+#include <cstdio> // get std::snprintf or std::sprintf
yann@1	337	+#include <clocale>
yann@1	338	+#include <langinfo.h> // For codecvt
yann@1	339	+#ifdef __UCLIBC_MJN3_ONLY__
yann@1	340	+#warning fix this
yann@1	341	+#endif
yann@1	342	+#ifdef __UCLIBC_HAS_LOCALE__
yann@1	343	+#include <iconv.h> // For codecvt using iconv, iconv_t
yann@1	344	+#endif
yann@1	345	+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
yann@1	346	+#include <libintl.h> // For messages
yann@1	347	+#endif
yann@1	348	+
yann@1	349	+#ifdef __UCLIBC_MJN3_ONLY__
yann@1	350	+#warning what is _GLIBCXX_C_LOCALE_GNU for
yann@1	351	+#endif
yann@1	352	+#define _GLIBCXX_C_LOCALE_GNU 1
yann@1	353	+
yann@1	354	+#ifdef __UCLIBC_MJN3_ONLY__
yann@1	355	+#warning fix categories
yann@1	356	+#endif
yann@1	357	+// #define _GLIBCXX_NUM_CATEGORIES 6
yann@1	358	+#define _GLIBCXX_NUM_CATEGORIES 0
yann@1	359	+
yann@1	360	+#ifdef __UCLIBC_HAS_XLOCALE__
yann@1	361	+namespace __gnu_cxx
yann@1	362	+{
yann@1	363	+ extern "C" __typeof(uselocale) __uselocale;
yann@1	364	+}
yann@1	365	+#endif
yann@1	366	+
yann@1	367	+namespace std
yann@1	368	+{
yann@1	369	+#ifdef __UCLIBC_HAS_XLOCALE__
yann@1	370	+ typedef __locale_t __c_locale;
yann@1	371	+#else
yann@1	372	+ typedef int* __c_locale;
yann@1	373	+#endif
yann@1	374	+
yann@1	375	+ // Convert numeric value of type _Tv to string and return length of
yann@1	376	+ // string. If snprintf is available use it, otherwise fall back to
yann@1	377	+ // the unsafe sprintf which, in general, can be dangerous and should
yann@1	378	+ // be avoided.
yann@1	379	+ template<typename _Tv>
yann@1	380	+ int
yann@1	381	+ __convert_from_v(char* __out, const int __size, const char* __fmt,
yann@1	382	+#ifdef __UCLIBC_HAS_XLOCALE__
yann@1	383	+ _Tv __v, const __c_locale& __cloc, int __prec)
yann@1	384	+ {
yann@1	385	+ __c_locale __old = __gnu_cxx::__uselocale(__cloc);
yann@1	386	+#else
yann@1	387	+ _Tv __v, const __c_locale&, int __prec)
yann@1	388	+ {
yann@1	389	+# ifdef __UCLIBC_HAS_LOCALE__
yann@1	390	+ char* __old = std::setlocale(LC_ALL, NULL);
yann@1	391	+ char* __sav = new char[std::strlen(__old) + 1];
yann@1	392	+ std::strcpy(__sav, __old);
yann@1	393	+ std::setlocale(LC_ALL, "C");
yann@1	394	+# endif
yann@1	395	+#endif
yann@1	396	+
yann@1	397	+ const int __ret = std::snprintf(__out, __size, __fmt, __prec, __v);
yann@1	398	+
yann@1	399	+#ifdef __UCLIBC_HAS_XLOCALE__
yann@1	400	+ __gnu_cxx::__uselocale(__old);
yann@1	401	+#elif defined __UCLIBC_HAS_LOCALE__
yann@1	402	+ std::setlocale(LC_ALL, __sav);
yann@1	403	+ delete [] __sav;
yann@1	404	+#endif
yann@1	405	+ return __ret;
yann@1	406	+ }
yann@1	407	+}
yann@1	408	+
yann@1	409	+#endif
yann@1	410	diff -urN gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/codecvt_members.cc gcc-4.0.0/libstdc++-v3/config/locale/uclibc/codecvt_members.cc
yann@1	411	--- gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/codecvt_members.cc 1969-12-31 18:00:00.000000000 -0600
yann@1	412	+++ gcc-4.0.0/libstdc++-v3/config/locale/uclibc/codecvt_members.cc 2005-04-28 01:13:15.000000000 -0500
yann@1	413	@@ -0,0 +1,306 @@
yann@1	414	+// std::codecvt implementation details, GNU version -- C++ --
yann@1	415	+
yann@1	416	+// Copyright (C) 2002, 2003 Free Software Foundation, Inc.
yann@1	417	+//
yann@1	418	+// This file is part of the GNU ISO C++ Library. This library is free
yann@1	419	+// software; you can redistribute it and/or modify it under the
yann@1	420	+// terms of the GNU General Public License as published by the
yann@1	421	+// Free Software Foundation; either version 2, or (at your option)
yann@1	422	+// any later version.
yann@1	423	+
yann@1	424	+// This library is distributed in the hope that it will be useful,
yann@1	425	+// but WITHOUT ANY WARRANTY; without even the implied warranty of
yann@1	426	+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
yann@1	427	+// GNU General Public License for more details.
yann@1	428	+
yann@1	429	+// You should have received a copy of the GNU General Public License along
yann@1	430	+// with this library; see the file COPYING. If not, write to the Free
yann@1	431	+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
yann@1	432	+// USA.
yann@1	433	+
yann@1	434	+// As a special exception, you may use this file as part of a free software
yann@1	435	+// library without restriction. Specifically, if other files instantiate
yann@1	436	+// templates or use macros or inline functions from this file, or you compile
yann@1	437	+// this file and link it with other files to produce an executable, this
yann@1	438	+// file does not by itself cause the resulting executable to be covered by
yann@1	439	+// the GNU General Public License. This exception does not however
yann@1	440	+// invalidate any other reasons why the executable file might be covered by
yann@1	441	+// the GNU General Public License.
yann@1	442	+
yann@1	443	+//
yann@1	444	+// ISO C++ 14882: 22.2.1.5 - Template class codecvt
yann@1	445	+//
yann@1	446	+
yann@1	447	+// Written by Benjamin Kosnik <bkoz@redhat.com>
yann@1	448	+
yann@1	449	+#include <locale>
yann@1	450	+#include <bits/c++locale_internal.h>
yann@1	451	+
yann@1	452	+namespace std
yann@1	453	+{
yann@1	454	+ // Specializations.
yann@1	455	+#ifdef _GLIBCXX_USE_WCHAR_T
yann@1	456	+ codecvt_base::result
yann@1	457	+ codecvt<wchar_t, char, mbstate_t>::
yann@1	458	+ do_out(state_type& __state, const intern_type* __from,
yann@1	459	+ const intern_type* __from_end, const intern_type*& __from_next,
yann@1	460	+ extern_type* __to, extern_type* __to_end,
yann@1	461	+ extern_type*& __to_next) const
yann@1	462	+ {
yann@1	463	+ result __ret = ok;
yann@1	464	+ state_type __tmp_state(__state);
yann@1	465	+
yann@1	466	+#ifdef __UCLIBC_HAS_XLOCALE__
yann@1	467	+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
yann@1	468	+#endif
yann@1	469	+
yann@1	470	+ // wcsnrtombs is very fast but stops if encounters NUL characters:
yann@1	471	+ // in case we fall back to wcrtomb and then continue, in a loop.
yann@1	472	+ // NB: wcsnrtombs is a GNU extension
yann@1	473	+ for (__from_next = __from, __to_next = __to;
yann@1	474	+ __from_next < __from_end && __to_next < __to_end
yann@1	475	+ && __ret == ok;)
yann@1	476	+ {
yann@1	477	+ const intern_type* __from_chunk_end = wmemchr(__from_next, L'\0',
yann@1	478	+ __from_end - __from_next);
yann@1	479	+ if (!__from_chunk_end)
yann@1	480	+ __from_chunk_end = __from_end;
yann@1	481	+
yann@1	482	+ __from = __from_next;
yann@1	483	+ const size_t __conv = wcsnrtombs(__to_next, &__from_next,
yann@1	484	+ __from_chunk_end - __from_next,
yann@1	485	+ __to_end - __to_next, &__state);
yann@1	486	+ if (__conv == static_cast<size_t>(-1))
yann@1	487	+ {
yann@1	488	+ // In case of error, in order to stop at the exact place we
yann@1	489	+ // have to start again from the beginning with a series of
yann@1	490	+ // wcrtomb.
yann@1	491	+ for (; __from < __from_next; ++__from)
yann@1	492	+ __to_next += wcrtomb(__to_next, *__from, &__tmp_state);
yann@1	493	+ __state = __tmp_state;
yann@1	494	+ __ret = error;
yann@1	495	+ }
yann@1	496	+ else if (__from_next && __from_next < __from_chunk_end)
yann@1	497	+ {
yann@1	498	+ __to_next += __conv;
yann@1	499	+ __ret = partial;
yann@1	500	+ }
yann@1	501	+ else
yann@1	502	+ {
yann@1	503	+ __from_next = __from_chunk_end;
yann@1	504	+ __to_next += __conv;
yann@1	505	+ }
yann@1	506	+
yann@1	507	+ if (__from_next < __from_end && __ret == ok)
yann@1	508	+ {
yann@1	509	+ extern_type __buf[MB_LEN_MAX];
yann@1	510	+ __tmp_state = __state;
yann@1	511	+ const size_t __conv = wcrtomb(__buf, *__from_next, &__tmp_state);
yann@1	512	+ if (__conv > static_cast<size_t>(__to_end - __to_next))
yann@1	513	+ __ret = partial;
yann@1	514	+ else
yann@1	515	+ {
yann@1	516	+ memcpy(__to_next, __buf, __conv);
yann@1	517	+ __state = __tmp_state;
yann@1	518	+ __to_next += __conv;
yann@1	519	+ ++__from_next;
yann@1	520	+ }
yann@1	521	+ }
yann@1	522	+ }
yann@1	523	+
yann@1	524	+#ifdef __UCLIBC_HAS_XLOCALE__
yann@1	525	+ __uselocale(__old);
yann@1	526	+#endif
yann@1	527	+
yann@1	528	+ return __ret;
yann@1	529	+ }
yann@1	530	+
yann@1	531	+ codecvt_base::result
yann@1	532	+ codecvt<wchar_t, char, mbstate_t>::
yann@1	533	+ do_in(state_type& __state, const extern_type* __from,
yann@1	534	+ const extern_type* __from_end, const extern_type*& __from_next,
yann@1	535	+ intern_type* __to, intern_type* __to_end,
yann@1	536	+ intern_type*& __to_next) const
yann@1	537	+ {
yann@1	538	+ result __ret = ok;
yann@1	539	+ state_type __tmp_state(__state);
yann@1	540	+
yann@1	541	+#ifdef __UCLIBC_HAS_XLOCALE__
yann@1	542	+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
yann@1	543	+#endif
yann@1	544	+
yann@1	545	+ // mbsnrtowcs is very fast but stops if encounters NUL characters:
yann@1	546	+ // in case we store a L'\0' and then continue, in a loop.
yann@1	547	+ // NB: mbsnrtowcs is a GNU extension
yann@1	548	+ for (__from_next = __from, __to_next = __to;
yann@1	549	+ __from_next < __from_end && __to_next < __to_end
yann@1	550	+ && __ret == ok;)
yann@1	551	+ {
yann@1	552	+ const extern_type* __from_chunk_end;
yann@1	553	+ __from_chunk_end = static_cast<const extern_type*>(memchr(__from_next, '\0',
yann@1	554	+ __from_end
yann@1	555	+ - __from_next));
yann@1	556	+ if (!__from_chunk_end)
yann@1	557	+ __from_chunk_end = __from_end;
yann@1	558	+
yann@1	559	+ __from = __from_next;
yann@1	560	+ size_t __conv = mbsnrtowcs(__to_next, &__from_next,
yann@1	561	+ __from_chunk_end - __from_next,
yann@1	562	+ __to_end - __to_next, &__state);
yann@1	563	+ if (__conv == static_cast<size_t>(-1))
yann@1	564	+ {
yann@1	565	+ // In case of error, in order to stop at the exact place we
yann@1	566	+ // have to start again from the beginning with a series of
yann@1	567	+ // mbrtowc.
yann@1	568	+ for (;; ++__to_next, __from += __conv)
yann@1	569	+ {
yann@1	570	+ __conv = mbrtowc(__to_next, __from, __from_end - __from,
yann@1	571	+ &__tmp_state);
yann@1	572	+ if (__conv == static_cast<size_t>(-1)
yann@1	573	+ \|\| __conv == static_cast<size_t>(-2))
yann@1	574	+ break;
yann@1	575	+ }
yann@1	576	+ __from_next = __from;
yann@1	577	+ __state = __tmp_state;
yann@1	578	+ __ret = error;
yann@1	579	+ }
yann@1	580	+ else if (__from_next && __from_next < __from_chunk_end)
yann@1	581	+ {
yann@1	582	+ // It is unclear what to return in this case (see DR 382).
yann@1	583	+ __to_next += __conv;
yann@1	584	+ __ret = partial;
yann@1	585	+ }
yann@1	586	+ else
yann@1	587	+ {
yann@1	588	+ __from_next = __from_chunk_end;
yann@1	589	+ __to_next += __conv;
yann@1	590	+ }
yann@1	591	+
yann@1	592	+ if (__from_next < __from_end && __ret == ok)
yann@1	593	+ {
yann@1	594	+ if (__to_next < __to_end)
yann@1	595	+ {
yann@1	596	+ // XXX Probably wrong for stateful encodings
yann@1	597	+ __tmp_state = __state;
yann@1	598	+ ++__from_next;
yann@1	599	+ *__to_next++ = L'\0';
yann@1	600	+ }
yann@1	601	+ else
yann@1	602	+ __ret = partial;
yann@1	603	+ }
yann@1	604	+ }
yann@1	605	+
yann@1	606	+#ifdef __UCLIBC_HAS_XLOCALE__
yann@1	607	+ __uselocale(__old);
yann@1	608	+#endif
yann@1	609	+
yann@1	610	+ return __ret;
yann@1	611	+ }
yann@1	612	+
yann@1	613	+ int
yann@1	614	+ codecvt<wchar_t, char, mbstate_t>::
yann@1	615	+ do_encoding() const throw()
yann@1	616	+ {
yann@1	617	+ // XXX This implementation assumes that the encoding is
yann@1	618	+ // stateless and is either single-byte or variable-width.
yann@1	619	+ int __ret = 0;
yann@1	620	+#ifdef __UCLIBC_HAS_XLOCALE__
yann@1	621	+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
yann@1	622	+#endif
yann@1	623	+ if (MB_CUR_MAX == 1)
yann@1	624	+ __ret = 1;
yann@1	625	+#ifdef __UCLIBC_HAS_XLOCALE__
yann@1	626	+ __uselocale(__old);
yann@1	627	+#endif
yann@1	628	+ return __ret;
yann@1	629	+ }
yann@1	630	+
yann@1	631	+ int
yann@1	632	+ codecvt<wchar_t, char, mbstate_t>::
yann@1	633	+ do_max_length() const throw()
yann@1	634	+ {
yann@1	635	+#ifdef __UCLIBC_HAS_XLOCALE__
yann@1	636	+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
yann@1	637	+#endif
yann@1	638	+ // XXX Probably wrong for stateful encodings.
yann@1	639	+ int __ret = MB_CUR_MAX;
yann@1	640	+#ifdef __UCLIBC_HAS_XLOCALE__
yann@1	641	+ __uselocale(__old);
yann@1	642	+#endif
yann@1	643	+ return __ret;
yann@1	644	+ }
yann@1	645	+
yann@1	646	+ int
yann@1	647	+ codecvt<wchar_t, char, mbstate_t>::
yann@1	648	+ do_length(state_type& __state, const extern_type* __from,
yann@1	649	+ const extern_type* __end, size_t __max) const
yann@1	650	+ {
yann@1	651	+ int __ret = 0;
yann@1	652	+ state_type __tmp_state(__state);
yann@1	653	+
yann@1	654	+#ifdef __UCLIBC_HAS_XLOCALE__
yann@1	655	+ __c_locale __old = __uselocale(_M_c_locale_codecvt);
yann@1	656	+#endif
yann@1	657	+
yann@1	658	+ // mbsnrtowcs is very fast but stops if encounters NUL characters:
yann@1	659	+ // in case we advance past it and then continue, in a loop.
yann@1	660	+ // NB: mbsnrtowcs is a GNU extension
yann@1	661	+
yann@1	662	+ // A dummy internal buffer is needed in order for mbsnrtocws to consider
yann@1	663	+ // its fourth parameter (it wouldn't with NULL as first parameter).
yann@1	664	+ wchar_t* __to = static_cast<wchar_t*>(__builtin_alloca(sizeof(wchar_t)
yann@1	665	+ * __max));
yann@1	666	+ while (__from < __end && __max)
yann@1	667	+ {
yann@1	668	+ const extern_type* __from_chunk_end;
yann@1	669	+ __from_chunk_end = static_cast<const extern_type*>(memchr(__from, '\0',
yann@1	670	+ __end
yann@1	671	+ - __from));
yann@1	672	+ if (!__from_chunk_end)
yann@1	673	+ __from_chunk_end = __end;
yann@1	674	+
yann@1	675	+ const extern_type* __tmp_from = __from;
yann@1	676	+ size_t __conv = mbsnrtowcs(__to, &__from,
yann@1	677	+ __from_chunk_end - __from,
yann@1	678	+ __max, &__state);
yann@1	679	+ if (__conv == static_cast<size_t>(-1))
yann@1	680	+ {
yann@1	681	+ // In case of error, in order to stop at the exact place we
yann@1	682	+ // have to start again from the beginning with a series of
yann@1	683	+ // mbrtowc.
yann@1	684	+ for (__from = __tmp_from;; __from += __conv)
yann@1	685	+ {
yann@1	686	+ __conv = mbrtowc(NULL, __from, __end - __from,
yann@1	687	+ &__tmp_state);
yann@1	688	+ if (__conv == static_cast<size_t>(-1)
yann@1	689	+ \|\| __conv == static_cast<size_t>(-2))
yann@1	690	+ break;
yann@1	691	+ }
yann@1	692	+ __state = __tmp_state;
yann@1	693	+ __ret += __from - __tmp_from;
yann@1	694	+ break;
yann@1	695	+ }
yann@1	696	+ if (!__from)
yann@1	697	+ __from = __from_chunk_end;
yann@1	698	+
yann@1	699	+ __ret += __from - __tmp_from;
yann@1	700	+ __max -= __conv;
yann@1	701	+
yann@1	702	+ if (__from < __end && __max)
yann@1	703	+ {
yann@1	704	+ // XXX Probably wrong for stateful encodings
yann@1	705	+ __tmp_state = __state;
yann@1	706	+ ++__from;
yann@1	707	+ ++__ret;
yann@1	708	+ --__max;
yann@1	709	+ }
yann@1	710	+ }
yann@1	711	+
yann@1	712	+#ifdef __UCLIBC_HAS_XLOCALE__
yann@1	713	+ __uselocale(__old);
yann@1	714	+#endif
yann@1	715	+
yann@1	716	+ return __ret;
yann@1	717	+ }
yann@1	718	+#endif
yann@1	719	+}
yann@1	720	diff -urN gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/collate_members.cc gcc-4.0.0/libstdc++-v3/config/locale/uclibc/collate_members.cc
yann@1	721	--- gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/collate_members.cc 1969-12-31 18:00:00.000000000 -0600
yann@1	722	+++ gcc-4.0.0/libstdc++-v3/config/locale/uclibc/collate_members.cc 2005-04-28 01:13:15.000000000 -0500
yann@1	723	@@ -0,0 +1,80 @@
yann@1	724	+// std::collate implementation details, GNU version -- C++ --
yann@1	725	+
yann@1	726	+// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
yann@1	727	+//
yann@1	728	+// This file is part of the GNU ISO C++ Library. This library is free
yann@1	729	+// software; you can redistribute it and/or modify it under the
yann@1	730	+// terms of the GNU General Public License as published by the
yann@1	731	+// Free Software Foundation; either version 2, or (at your option)
yann@1	732	+// any later version.
yann@1	733	+
yann@1	734	+// This library is distributed in the hope that it will be useful,
yann@1	735	+// but WITHOUT ANY WARRANTY; without even the implied warranty of
yann@1	736	+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
yann@1	737	+// GNU General Public License for more details.
yann@1	738	+
yann@1	739	+// You should have received a copy of the GNU General Public License along
yann@1	740	+// with this library; see the file COPYING. If not, write to the Free
yann@1	741	+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
yann@1	742	+// USA.
yann@1	743	+
yann@1	744	+// As a special exception, you may use this file as part of a free software
yann@1	745	+// library without restriction. Specifically, if other files instantiate
yann@1	746	+// templates or use macros or inline functions from this file, or you compile
yann@1	747	+// this file and link it with other files to produce an executable, this
yann@1	748	+// file does not by itself cause the resulting executable to be covered by
yann@1	749	+// the GNU General Public License. This exception does not however
yann@1	750	+// invalidate any other reasons why the executable file might be covered by
yann@1	751	+// the GNU General Public License.
yann@1	752	+
yann@1	753	+//
yann@1	754	+// ISO C++ 14882: 22.2.4.1.2 collate virtual functions
yann@1	755	+//
yann@1	756	+
yann@1	757	+// Written by Benjamin Kosnik <bkoz@redhat.com>
yann@1	758	+
yann@1	759	+#include <locale>
yann@1	760	+#include <bits/c++locale_internal.h>
yann@1	761	+
yann@1	762	+#ifndef __UCLIBC_HAS_XLOCALE__
yann@1	763	+#define __strcoll_l(S1, S2, L) strcoll((S1), (S2))
yann@1	764	+#define __strxfrm_l(S1, S2, N, L) strxfrm((S1), (S2), (N))
yann@1	765	+#define __wcscoll_l(S1, S2, L) wcscoll((S1), (S2))
yann@1	766	+#define __wcsxfrm_l(S1, S2, N, L) wcsxfrm((S1), (S2), (N))
yann@1	767	+#endif
yann@1	768	+
yann@1	769	+namespace std
yann@1	770	+{
yann@1	771	+ // These are basically extensions to char_traits, and perhaps should
yann@1	772	+ // be put there instead of here.
yann@1	773	+ template<>
yann@1	774	+ int
yann@1	775	+ collate<char>::_M_compare(const char* __one, const char* __two) const
yann@1	776	+ {
yann@1	777	+ int __cmp = __strcoll_l(__one, __two, _M_c_locale_collate);
yann@1	778	+ return (__cmp >> (8 * sizeof (int) - 2)) \| (__cmp != 0);
yann@1	779	+ }
yann@1	780	+
yann@1	781	+ template<>
yann@1	782	+ size_t
yann@1	783	+ collate<char>::_M_transform(char* __to, const char* __from,
yann@1	784	+ size_t __n) const
yann@1	785	+ { return __strxfrm_l(__to, __from, __n, _M_c_locale_collate); }
yann@1	786	+
yann@1	787	+#ifdef _GLIBCXX_USE_WCHAR_T
yann@1	788	+ template<>
yann@1	789	+ int
yann@1	790	+ collate<wchar_t>::_M_compare(const wchar_t* __one,
yann@1	791	+ const wchar_t* __two) const
yann@1	792	+ {
yann@1	793	+ int __cmp = __wcscoll_l(__one, __two, _M_c_locale_collate);
yann@1	794	+ return (__cmp >> (8 * sizeof (int) - 2)) \| (__cmp != 0);
yann@1	795	+ }
yann@1	796	+
yann@1	797	+ template<>
yann@1	798	+ size_t
yann@1	799	+ collate<wchar_t>::_M_transform(wchar_t* __to, const wchar_t* __from,
yann@1	800	+ size_t __n) const
yann@1	801	+ { return __wcsxfrm_l(__to, __from, __n, _M_c_locale_collate); }
yann@1	802	+#endif
yann@1	803	+}
yann@1	804	diff -urN gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/ctype_members.cc gcc-4.0.0/libstdc++-v3/config/locale/uclibc/ctype_members.cc
yann@1	805	--- gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/ctype_members.cc 1969-12-31 18:00:00.000000000 -0600
yann@1	806	+++ gcc-4.0.0/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2005-04-28 01:13:15.000000000 -0500
yann@1	807	@@ -0,0 +1,300 @@
yann@1	808	+// std::ctype implementation details, GNU version -- C++ --
yann@1	809	+
yann@1	810	+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
yann@1	811	+//
yann@1	812	+// This file is part of the GNU ISO C++ Library. This library is free
yann@1	813	+// software; you can redistribute it and/or modify it under the
yann@1	814	+// terms of the GNU General Public License as published by the
yann@1	815	+// Free Software Foundation; either version 2, or (at your option)
yann@1	816	+// any later version.
yann@1	817	+
yann@1	818	+// This library is distributed in the hope that it will be useful,
yann@1	819	+// but WITHOUT ANY WARRANTY; without even the implied warranty of
yann@1	820	+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
yann@1	821	+// GNU General Public License for more details.
yann@1	822	+
yann@1	823	+// You should have received a copy of the GNU General Public License along
yann@1	824	+// with this library; see the file COPYING. If not, write to the Free
yann@1	825	+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
yann@1	826	+// USA.
yann@1	827	+
yann@1	828	+// As a special exception, you may use this file as part of a free software
yann@1	829	+// library without restriction. Specifically, if other files instantiate
yann@1	830	+// templates or use macros or inline functions from this file, or you compile
yann@1	831	+// this file and link it with other files to produce an executable, this
yann@1	832	+// file does not by itself cause the resulting executable to be covered by
yann@1	833	+// the GNU General Public License. This exception does not however
yann@1	834	+// invalidate any other reasons why the executable file might be covered by
yann@1	835	+// the GNU General Public License.
yann@1	836	+
yann@1	837	+//
yann@1	838	+// ISO C++ 14882: 22.2.1.1.2 ctype virtual functions.
yann@1	839	+//
yann@1	840	+
yann@1	841	+// Written by Benjamin Kosnik <bkoz@redhat.com>
yann@1	842	+
yann@1	843	+#define _LIBC
yann@1	844	+#include <locale>
yann@1	845	+#undef _LIBC
yann@1	846	+#include <bits/c++locale_internal.h>
yann@1	847	+
yann@1	848	+#ifndef __UCLIBC_HAS_XLOCALE__
yann@1	849	+#define __wctype_l(S, L) wctype((S))
yann@1	850	+#define __towupper_l(C, L) towupper((C))
yann@1	851	+#define __towlower_l(C, L) towlower((C))
yann@1	852	+#define __iswctype_l(C, M, L) iswctype((C), (M))
yann@1	853	+#endif
yann@1	854	+
yann@1	855	+namespace std
yann@1	856	+{
yann@1	857	+ // NB: The other ctype<char> specializations are in src/locale.cc and
yann@1	858	+ // various /config/os/* files.
yann@1	859	+ template<>
yann@1	860	+ ctype_byname<char>::ctype_byname(const char* __s, size_t __refs)
yann@1	861	+ : ctype<char>(0, false, __refs)
yann@1	862	+ {
yann@1	863	+ if (std::strcmp(__s, "C") != 0 && std::strcmp(__s, "POSIX") != 0)
yann@1	864	+ {
yann@1	865	+ this->_S_destroy_c_locale(this->_M_c_locale_ctype);
yann@1	866	+ this->_S_create_c_locale(this->_M_c_locale_ctype, __s);
yann@1	867	+#ifdef __UCLIBC_HAS_XLOCALE__
yann@1	868	+ this->_M_toupper = this->_M_c_locale_ctype->__ctype_toupper;
yann@1	869	+ this->_M_tolower = this->_M_c_locale_ctype->__ctype_tolower;
yann@1	870	+ this->_M_table = this->_M_c_locale_ctype->__ctype_b;
yann@1	871	+#endif
yann@1	872	+ }
yann@1	873	+ }
yann@1	874	+
yann@1	875	+#ifdef _GLIBCXX_USE_WCHAR_T
yann@1	876	+ ctype<wchar_t>::__wmask_type
yann@1	877	+ ctype<wchar_t>::_M_convert_to_wmask(const mask __m) const
yann@1	878	+ {
yann@1	879	+ __wmask_type __ret;
yann@1	880	+ switch (__m)
yann@1	881	+ {
yann@1	882	+ case space:
yann@1	883	+ __ret = __wctype_l("space", _M_c_locale_ctype);
yann@1	884	+ break;
yann@1	885	+ case print:
yann@1	886	+ __ret = __wctype_l("print", _M_c_locale_ctype);
yann@1	887	+ break;
yann@1	888	+ case cntrl:
yann@1	889	+ __ret = __wctype_l("cntrl", _M_c_locale_ctype);
yann@1	890	+ break;
yann@1	891	+ case upper:
yann@1	892	+ __ret = __wctype_l("upper", _M_c_locale_ctype);
yann@1	893	+ break;
yann@1	894	+ case lower:
yann@1	895	+ __ret = __wctype_l("lower", _M_c_locale_ctype);
yann@1	896	+ break;
yann@1	897	+ case alpha:
yann@1	898	+ __ret = __wctype_l("alpha", _M_c_locale_ctype);
yann@1	899	+ break;
yann@1	900	+ case digit:
yann@1	901	+ __ret = __wctype_l("digit", _M_c_locale_ctype);
yann@1	902	+ break;
yann@1	903	+ case punct:
yann@1	904	+ __ret = __wctype_l("punct", _M_c_locale_ctype);
yann@1	905	+ break;
yann@1	906	+ case xdigit:
yann@1	907	+ __ret = __wctype_l("xdigit", _M_c_locale_ctype);
yann@1	908	+ break;
yann@1	909	+ case alnum:
yann@1	910	+ __ret = __wctype_l("alnum", _M_c_locale_ctype);
yann@1	911	+ break;
yann@1	912	+ case graph:
yann@1	913	+ __ret = __wctype_l("graph", _M_c_locale_ctype);
yann@1	914	+ break;
yann@1	915	+ default:
yann@1	916	+ __ret = __wmask_type();
yann@1	917	+ }
yann@1	918	+ return __ret;
yann@1	919	+ }
yann@1	920	+
yann@1	921	+ wchar_t
yann@1	922	+ ctype<wchar_t>::do_toupper(wchar_t __c) const
yann@1	923	+ { return __towupper_l(__c, _M_c_locale_ctype); }
yann@1	924	+
yann@1	925	+ const wchar_t*
yann@1	926	+ ctype<wchar_t>::do_toupper(wchar_t* __lo, const wchar_t* __hi) const
yann@1	927	+ {
yann@1	928	+ while (__lo < __hi)
yann@1	929	+ {
yann@1	930	+ __lo = __towupper_l(__lo, _M_c_locale_ctype);
yann@1	931	+ ++__lo;
yann@1	932	+ }
yann@1	933	+ return __hi;
yann@1	934	+ }
yann@1	935	+
yann@1	936	+ wchar_t
yann@1	937	+ ctype<wchar_t>::do_tolower(wchar_t __c) const
yann@1	938	+ { return __towlower_l(__c, _M_c_locale_ctype); }
yann@1	939	+
yann@1	940	+ const wchar_t*
yann@1	941	+ ctype<wchar_t>::do_tolower(wchar_t* __lo, const wchar_t* __hi) const
yann@1	942	+ {
yann@1	943	+ while (__lo < __hi)
yann@1	944	+ {
yann@1	945	+ __lo = __towlower_l(__lo, _M_c_locale_ctype);
yann@1	946	+ ++__lo;
yann@1	947	+ }
yann@1	948	+ return __hi;
yann@1	949	+ }
yann@1	950	+
yann@1	951	+ bool
yann@1	952	+ ctype<wchar_t>::
yann@1	953	+ do_is(mask __m, wchar_t __c) const
yann@1	954	+ {
yann@1	955	+ // Highest bitmask in ctype_base == 10, but extra in "C"
yann@1	956	+ // library for blank.
yann@1	957	+ bool __ret = false;
yann@1	958	+ const size_t __bitmasksize = 11;
yann@1	959	+ for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
yann@1	960	+ if (__m & _M_bit[__bitcur]
yann@1	961	+ && __iswctype_l(__c, _M_wmask[__bitcur], _M_c_locale_ctype))
yann@1	962	+ {
yann@1	963	+ __ret = true;
yann@1	964	+ break;
yann@1	965	+ }
yann@1	966	+ return __ret;
yann@1	967	+ }
yann@1	968	+
yann@1	969	+ const wchar_t*
yann@1	970	+ ctype<wchar_t>::
yann@1	971	+ do_is(const wchar_t* __lo, const wchar_t* __hi, mask* __vec) const
yann@1	972	+ {
yann@1	973	+ for (; __lo < __hi; ++__vec, ++__lo)
yann@1	974	+ {
yann@1	975	+ // Highest bitmask in ctype_base == 10, but extra in "C"
yann@1	976	+ // library for blank.
yann@1	977	+ const size_t __bitmasksize = 11;
yann@1	978	+ mask __m = 0;
yann@1	979	+ for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
yann@1	980	+ if (__iswctype_l(*__lo, _M_wmask[__bitcur], _M_c_locale_ctype))
yann@1	981	+ __m \|= _M_bit[__bitcur];
yann@1	982	+ *__vec = __m;
yann@1	983	+ }
yann@1	984	+ return __hi;
yann@1	985	+ }
yann@1	986	+
yann@1	987	+ const wchar_t*
yann@1	988	+ ctype<wchar_t>::
yann@1	989	+ do_scan_is(mask __m, const wchar_t* __lo, const wchar_t* __hi) const
yann@1	990	+ {
yann@1	991	+ while (__lo < __hi && !this->do_is(__m, *__lo))
yann@1	992	+ ++__lo;
yann@1	993	+ return __lo;
yann@1	994	+ }
yann@1	995	+
yann@1	996	+ const wchar_t*
yann@1	997	+ ctype<wchar_t>::
yann@1	998	+ do_scan_not(mask __m, const char_type* __lo, const char_type* __hi) const
yann@1	999	+ {
yann@1	1000	+ while (__lo < __hi && this->do_is(__m, *__lo) != 0)
yann@1	1001	+ ++__lo;
yann@1	1002	+ return __lo;
yann@1	1003	+ }
yann@1	1004	+
yann@1	1005	+ wchar_t
yann@1	1006	+ ctype<wchar_t>::
yann@1	1007	+ do_widen(char __c) const
yann@1	1008	+ { return _M_widen[static_cast<unsigned char>(__c)]; }
yann@1	1009	+
yann@1	1010	+ const char*
yann@1	1011	+ ctype<wchar_t>::
yann@1	1012	+ do_widen(const char* __lo, const char* __hi, wchar_t* __dest) const
yann@1	1013	+ {
yann@1	1014	+ while (__lo < __hi)
yann@1	1015	+ {
yann@1	1016	+ __dest = _M_widen[static_cast<unsigned char>(__lo)];
yann@1	1017	+ ++__lo;
yann@1	1018	+ ++__dest;
yann@1	1019	+ }
yann@1	1020	+ return __hi;
yann@1	1021	+ }
yann@1	1022	+
yann@1	1023	+ char
yann@1	1024	+ ctype<wchar_t>::
yann@1	1025	+ do_narrow(wchar_t __wc, char __dfault) const
yann@1	1026	+ {
yann@1	1027	+ if (__wc >= 0 && __wc < 128 && _M_narrow_ok)
yann@1	1028	+ return _M_narrow[__wc];
yann@1	1029	+#ifdef __UCLIBC_HAS_XLOCALE__
yann@1	1030	+ __c_locale __old = __uselocale(_M_c_locale_ctype);
yann@1	1031	+#endif
yann@1	1032	+ const int __c = wctob(__wc);
yann@1	1033	+#ifdef __UCLIBC_HAS_XLOCALE__
yann@1	1034	+ __uselocale(__old);
yann@1	1035	+#endif
yann@1	1036	+ return (__c == EOF ? __dfault : static_cast<char>(__c));
yann@1	1037	+ }
yann@1	1038	+
yann@1	1039	+ const wchar_t*
yann@1	1040	+ ctype<wchar_t>::
yann@1	1041	+ do_narrow(const wchar_t* __lo, const wchar_t* __hi, char __dfault,
yann@1	1042	+ char* __dest) const
yann@1	1043	+ {
yann@1	1044	+#ifdef __UCLIBC_HAS_XLOCALE__
yann@1	1045	+ __c_locale __old = __uselocale(_M_c_locale_ctype);
yann@1	1046	+#endif
yann@1	1047	+ if (_M_narrow_ok)
yann@1	1048	+ while (__lo < __hi)
yann@1	1049	+ {
yann@1	1050	+ if (__lo >= 0 && __lo < 128)
yann@1	1051	+ __dest = _M_narrow[__lo];
yann@1	1052	+ else
yann@1	1053	+ {
yann@1	1054	+ const int __c = wctob(*__lo);
yann@1	1055	+ *__dest = (__c == EOF ? __dfault : static_cast<char>(__c));
yann@1	1056	+ }
yann@1	1057	+ ++__lo;
yann@1	1058	+ ++__dest;
yann@1	1059	+ }
yann@1	1060	+ else
yann@1	1061	+ while (__lo < __hi)
yann@1	1062	+ {
yann@1	1063	+ const int __c = wctob(*__lo);
yann@1	1064	+ *__dest = (__c == EOF ? __dfault : static_cast<char>(__c));
yann@1	1065	+ ++__lo;
yann@1	1066	+ ++__dest;
yann@1	1067	+ }
yann@1	1068	+#ifdef __UCLIBC_HAS_XLOCALE__
yann@1	1069	+ __uselocale(__old);
yann@1	1070	+#endif
yann@1	1071	+ return __hi;
yann@1	1072	+ }
yann@1	1073	+
yann@1	1074	+ void
yann@1	1075	+ ctype<wchar_t>::_M_initialize_ctype()
yann@1	1076	+ {
yann@1	1077	+#ifdef __UCLIBC_HAS_XLOCALE__
yann@1	1078	+ __c_locale __old = __uselocale(_M_c_locale_ctype);
yann@1	1079	+#endif
yann@1	1080	+ wint_t __i;
yann@1	1081	+ for (__i = 0; __i < 128; ++__i)
yann@1	1082	+ {
yann@1	1083	+ const int __c = wctob(__i);
yann@1	1084	+ if (__c == EOF)
yann@1	1085	+ break;
yann@1	1086	+ else
yann@1	1087	+ _M_narrow[__i] = static_cast<char>(__c);
yann@1	1088	+ }
yann@1	1089	+ if (__i == 128)
yann@1	1090	+ _M_narrow_ok = true;
yann@1	1091	+ else
yann@1	1092	+ _M_narrow_ok = false;
yann@1	1093	+ for (size_t __j = 0;
yann@1	1094	+ __j < sizeof(_M_widen) / sizeof(wint_t); ++__j)
yann@1	1095	+ _M_widen[__j] = btowc(__j);
yann@1	1096	+
yann@1	1097	+ for (size_t __k = 0; __k <= 11; ++__k)
yann@1	1098	+ {
yann@1	1099	+ _M_bit[__k] = static_cast<mask>(_ISbit(__k));
yann@1	1100	+ _M_wmask[__k] = _M_convert_to_wmask(_M_bit[__k]);
yann@1	1101	+ }
yann@1	1102	+#ifdef __UCLIBC_HAS_XLOCALE__
yann@1	1103	+ __uselocale(__old);
yann@1	1104	+#endif
yann@1	1105	+ }
yann@1	1106	+#endif // _GLIBCXX_USE_WCHAR_T
yann@1	1107	+}
yann@1	1108	diff -urN gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/messages_members.cc gcc-4.0.0/libstdc++-v3/config/locale/uclibc/messages_members.cc
yann@1	1109	--- gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/messages_members.cc 1969-12-31 18:00:00.000000000 -0600
yann@1	1110	+++ gcc-4.0.0/libstdc++-v3/config/locale/uclibc/messages_members.cc 2005-04-28 01:13:15.000000000 -0500
yann@1	1111	@@ -0,0 +1,100 @@
yann@1	1112	+// std::messages implementation details, GNU version -- C++ --
yann@1	1113	+
yann@1	1114	+// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
yann@1	1115	+//
yann@1	1116	+// This file is part of the GNU ISO C++ Library. This library is free
yann@1	1117	+// software; you can redistribute it and/or modify it under the
yann@1	1118	+// terms of the GNU General Public License as published by the
yann@1	1119	+// Free Software Foundation; either version 2, or (at your option)
yann@1	1120	+// any later version.
yann@1	1121	+
yann@1	1122	+// This library is distributed in the hope that it will be useful,
yann@1	1123	+// but WITHOUT ANY WARRANTY; without even the implied warranty of
yann@1	1124	+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
yann@1	1125	+// GNU General Public License for more details.
yann@1	1126	+
yann@1	1127	+// You should have received a copy of the GNU General Public License along
yann@1	1128	+// with this library; see the file COPYING. If not, write to the Free
yann@1	1129	+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
yann@1	1130	+// USA.
yann@1	1131	+
yann@1	1132	+// As a special exception, you may use this file as part of a free software
yann@1	1133	+// library without restriction. Specifically, if other files instantiate
yann@1	1134	+// templates or use macros or inline functions from this file, or you compile
yann@1	1135	+// this file and link it with other files to produce an executable, this
yann@1	1136	+// file does not by itself cause the resulting executable to be covered by
yann@1	1137	+// the GNU General Public License. This exception does not however
yann@1	1138	+// invalidate any other reasons why the executable file might be covered by
yann@1	1139	+// the GNU General Public License.
yann@1	1140	+
yann@1	1141	+//
yann@1	1142	+// ISO C++ 14882: 22.2.7.1.2 messages virtual functions
yann@1	1143	+//
yann@1	1144	+
yann@1	1145	+// Written by Benjamin Kosnik <bkoz@redhat.com>
yann@1	1146	+
yann@1	1147	+#include <locale>
yann@1	1148	+#include <bits/c++locale_internal.h>
yann@1	1149	+
yann@1	1150	+#ifdef __UCLIBC_MJN3_ONLY__
yann@1	1151	+#warning fix gettext stuff
yann@1	1152	+#endif
yann@1	1153	+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
yann@1	1154	+extern "C" char __dcgettext(const char domainname,
yann@1	1155	+ const char *msgid, int category);
yann@1	1156	+#undef gettext
yann@1	1157	+#define gettext(msgid) __dcgettext(NULL, msgid, LC_MESSAGES)
yann@1	1158	+#else
yann@1	1159	+#undef gettext
yann@1	1160	+#define gettext(msgid) (msgid)
yann@1	1161	+#endif
yann@1	1162	+
yann@1	1163	+namespace std
yann@1	1164	+{
yann@1	1165	+ // Specializations.
yann@1	1166	+ template<>
yann@1	1167	+ string
yann@1	1168	+ messages<char>::do_get(catalog, int, int, const string& __dfault) const
yann@1	1169	+ {
yann@1	1170	+#ifdef __UCLIBC_HAS_XLOCALE__
yann@1	1171	+ __c_locale __old = __uselocale(_M_c_locale_messages);
yann@1	1172	+ const char* __msg = const_cast<const char*>(gettext(__dfault.c_str()));
yann@1	1173	+ __uselocale(__old);
yann@1	1174	+ return string(__msg);
yann@1	1175	+#elif defined __UCLIBC_HAS_LOCALE__
yann@1	1176	+ char* __old = strdup(setlocale(LC_ALL, NULL));
yann@1	1177	+ setlocale(LC_ALL, _M_name_messages);
yann@1	1178	+ const char* __msg = gettext(__dfault.c_str());
yann@1	1179	+ setlocale(LC_ALL, __old);
yann@1	1180	+ free(__old);
yann@1	1181	+ return string(__msg);
yann@1	1182	+#else
yann@1	1183	+ const char* __msg = gettext(__dfault.c_str());
yann@1	1184	+ return string(__msg);
yann@1	1185	+#endif
yann@1	1186	+ }
yann@1	1187	+
yann@1	1188	+#ifdef _GLIBCXX_USE_WCHAR_T
yann@1	1189	+ template<>
yann@1	1190	+ wstring
yann@1	1191	+ messages<wchar_t>::do_get(catalog, int, int, const wstring& __dfault) const
yann@1	1192	+ {
yann@1	1193	+# ifdef __UCLIBC_HAS_XLOCALE__
yann@1	1194	+ __c_locale __old = __uselocale(_M_c_locale_messages);
yann@1	1195	+ char* __msg = gettext(_M_convert_to_char(__dfault));
yann@1	1196	+ __uselocale(__old);
yann@1	1197	+ return _M_convert_from_char(__msg);
yann@1	1198	+# elif defined __UCLIBC_HAS_LOCALE__
yann@1	1199	+ char* __old = strdup(setlocale(LC_ALL, NULL));
yann@1	1200	+ setlocale(LC_ALL, _M_name_messages);
yann@1	1201	+ char* __msg = gettext(_M_convert_to_char(__dfault));
yann@1	1202	+ setlocale(LC_ALL, __old);
yann@1	1203	+ free(__old);
yann@1	1204	+ return _M_convert_from_char(__msg);
yann@1	1205	+# else
yann@1	1206	+ char* __msg = gettext(_M_convert_to_char(__dfault));
yann@1	1207	+ return _M_convert_from_char(__msg);
yann@1	1208	+# endif
yann@1	1209	+ }
yann@1	1210	+#endif
yann@1	1211	+}
yann@1	1212	diff -urN gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/messages_members.h gcc-4.0.0/libstdc++-v3/config/locale/uclibc/messages_members.h
yann@1	1213	--- gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/messages_members.h 1969-12-31 18:00:00.000000000 -0600
yann@1	1214	+++ gcc-4.0.0/libstdc++-v3/config/locale/uclibc/messages_members.h 2005-04-28 01:13:15.000000000 -0500
yann@1	1215	@@ -0,0 +1,118 @@
yann@1	1216	+// std::messages implementation details, GNU version -- C++ --
yann@1	1217	+
yann@1	1218	+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
yann@1	1219	+//
yann@1	1220	+// This file is part of the GNU ISO C++ Library. This library is free
yann@1	1221	+// software; you can redistribute it and/or modify it under the
yann@1	1222	+// terms of the GNU General Public License as published by the
yann@1	1223	+// Free Software Foundation; either version 2, or (at your option)
yann@1	1224	+// any later version.
yann@1	1225	+
yann@1	1226	+// This library is distributed in the hope that it will be useful,
yann@1	1227	+// but WITHOUT ANY WARRANTY; without even the implied warranty of
yann@1	1228	+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
yann@1	1229	+// GNU General Public License for more details.
yann@1	1230	+
yann@1	1231	+// You should have received a copy of the GNU General Public License along
yann@1	1232	+// with this library; see the file COPYING. If not, write to the Free
yann@1	1233	+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
yann@1	1234	+// USA.
yann@1	1235	+
yann@1	1236	+// As a special exception, you may use this file as part of a free software
yann@1	1237	+// library without restriction. Specifically, if other files instantiate
yann@1	1238	+// templates or use macros or inline functions from this file, or you compile
yann@1	1239	+// this file and link it with other files to produce an executable, this
yann@1	1240	+// file does not by itself cause the resulting executable to be covered by
yann@1	1241	+// the GNU General Public License. This exception does not however
yann@1	1242	+// invalidate any other reasons why the executable file might be covered by
yann@1	1243	+// the GNU General Public License.
yann@1	1244	+
yann@1	1245	+//
yann@1	1246	+// ISO C++ 14882: 22.2.7.1.2 messages functions
yann@1	1247	+//
yann@1	1248	+
yann@1	1249	+// Written by Benjamin Kosnik <bkoz@redhat.com>
yann@1	1250	+
yann@1	1251	+#ifdef __UCLIBC_MJN3_ONLY__
yann@1	1252	+#warning fix prototypes for *textdomain funcs
yann@1	1253	+#endif
yann@1	1254	+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
yann@1	1255	+extern "C" char __textdomain(const char domainname);
yann@1	1256	+extern "C" char __bindtextdomain(const char domainname,
yann@1	1257	+ const char *dirname);
yann@1	1258	+#else
yann@1	1259	+#undef __textdomain
yann@1	1260	+#undef __bindtextdomain
yann@1	1261	+#define __textdomain(D) ((void)0)
yann@1	1262	+#define __bindtextdomain(D,P) ((void)0)
yann@1	1263	+#endif
yann@1	1264	+
yann@1	1265	+ // Non-virtual member functions.
yann@1	1266	+ template<typename _CharT>
yann@1	1267	+ messages<_CharT>::messages(size_t __refs)
yann@1	1268	+ : facet(__refs), _M_c_locale_messages(_S_get_c_locale()),
yann@1	1269	+ _M_name_messages(_S_get_c_name())
yann@1	1270	+ { }
yann@1	1271	+
yann@1	1272	+ template<typename _CharT>
yann@1	1273	+ messages<_CharT>::messages(__c_locale __cloc, const char* __s,
yann@1	1274	+ size_t __refs)
yann@1	1275	+ : facet(__refs), _M_c_locale_messages(_S_clone_c_locale(__cloc)),
yann@1	1276	+ _M_name_messages(__s)
yann@1	1277	+ {
yann@1	1278	+ char* __tmp = new char[std::strlen(__s) + 1];
yann@1	1279	+ std::strcpy(__tmp, __s);
yann@1	1280	+ _M_name_messages = __tmp;
yann@1	1281	+ }
yann@1	1282	+
yann@1	1283	+ template<typename _CharT>
yann@1	1284	+ typename messages<_CharT>::catalog
yann@1	1285	+ messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc,
yann@1	1286	+ const char* __dir) const
yann@1	1287	+ {
yann@1	1288	+ __bindtextdomain(__s.c_str(), __dir);
yann@1	1289	+ return this->do_open(__s, __loc);
yann@1	1290	+ }
yann@1	1291	+
yann@1	1292	+ // Virtual member functions.
yann@1	1293	+ template<typename _CharT>
yann@1	1294	+ messages<_CharT>::~messages()
yann@1	1295	+ {
yann@1	1296	+ if (_M_name_messages != _S_get_c_name())
yann@1	1297	+ delete [] _M_name_messages;
yann@1	1298	+ _S_destroy_c_locale(_M_c_locale_messages);
yann@1	1299	+ }
yann@1	1300	+
yann@1	1301	+ template<typename _CharT>
yann@1	1302	+ typename messages<_CharT>::catalog
yann@1	1303	+ messages<_CharT>::do_open(const basic_string<char>& __s,
yann@1	1304	+ const locale&) const
yann@1	1305	+ {
yann@1	1306	+ // No error checking is done, assume the catalog exists and can
yann@1	1307	+ // be used.
yann@1	1308	+ __textdomain(__s.c_str());
yann@1	1309	+ return 0;
yann@1	1310	+ }
yann@1	1311	+
yann@1	1312	+ template<typename _CharT>
yann@1	1313	+ void
yann@1	1314	+ messages<_CharT>::do_close(catalog) const
yann@1	1315	+ { }
yann@1	1316	+
yann@1	1317	+ // messages_byname
yann@1	1318	+ template<typename _CharT>
yann@1	1319	+ messages_byname<_CharT>::messages_byname(const char* __s, size_t __refs)
yann@1	1320	+ : messages<_CharT>(__refs)
yann@1	1321	+ {
yann@1	1322	+ if (this->_M_name_messages != locale::facet::_S_get_c_name())
yann@1	1323	+ delete [] this->_M_name_messages;
yann@1	1324	+ char* __tmp = new char[std::strlen(__s) + 1];
yann@1	1325	+ std::strcpy(__tmp, __s);
yann@1	1326	+ this->_M_name_messages = __tmp;
yann@1	1327	+
yann@1	1328	+ if (std::strcmp(__s, "C") != 0 && std::strcmp(__s, "POSIX") != 0)
yann@1	1329	+ {
yann@1	1330	+ this->_S_destroy_c_locale(this->_M_c_locale_messages);
yann@1	1331	+ this->_S_create_c_locale(this->_M_c_locale_messages, __s);
yann@1	1332	+ }
yann@1	1333	+ }
yann@1	1334	diff -urN gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/monetary_members.cc gcc-4.0.0/libstdc++-v3/config/locale/uclibc/monetary_members.cc
yann@1	1335	--- gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/monetary_members.cc 1969-12-31 18:00:00.000000000 -0600
yann@1	1336	+++ gcc-4.0.0/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2005-04-28 01:23:02.000000000 -0500
yann@1	1337	@@ -0,0 +1,692 @@
yann@1	1338	+// std::moneypunct implementation details, GNU version -- C++ --
yann@1	1339	+
yann@1	1340	+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
yann@1	1341	+//
yann@1	1342	+// This file is part of the GNU ISO C++ Library. This library is free
yann@1	1343	+// software; you can redistribute it and/or modify it under the
yann@1	1344	+// terms of the GNU General Public License as published by the
yann@1	1345	+// Free Software Foundation; either version 2, or (at your option)
yann@1	1346	+// any later version.
yann@1	1347	+
yann@1	1348	+// This library is distributed in the hope that it will be useful,
yann@1	1349	+// but WITHOUT ANY WARRANTY; without even the implied warranty of
yann@1	1350	+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
yann@1	1351	+// GNU General Public License for more details.
yann@1	1352	+
yann@1	1353	+// You should have received a copy of the GNU General Public License along
yann@1	1354	+// with this library; see the file COPYING. If not, write to the Free
yann@1	1355	+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
yann@1	1356	+// USA.
yann@1	1357	+
yann@1	1358	+// As a special exception, you may use this file as part of a free software
yann@1	1359	+// library without restriction. Specifically, if other files instantiate
yann@1	1360	+// templates or use macros or inline functions from this file, or you compile
yann@1	1361	+// this file and link it with other files to produce an executable, this
yann@1	1362	+// file does not by itself cause the resulting executable to be covered by
yann@1	1363	+// the GNU General Public License. This exception does not however
yann@1	1364	+// invalidate any other reasons why the executable file might be covered by
yann@1	1365	+// the GNU General Public License.
yann@1	1366	+
yann@1	1367	+//
yann@1	1368	+// ISO C++ 14882: 22.2.6.3.2 moneypunct virtual functions
yann@1	1369	+//
yann@1	1370	+
yann@1	1371	+// Written by Benjamin Kosnik <bkoz@redhat.com>
yann@1	1372	+
yann@1	1373	+#define _LIBC
yann@1	1374	+#include <locale>
yann@1	1375	+#undef _LIBC
yann@1	1376	+#include <bits/c++locale_internal.h>
yann@1	1377	+
yann@1	1378	+#ifdef __UCLIBC_MJN3_ONLY__
yann@1	1379	+#warning optimize this for uclibc
yann@1	1380	+#warning tailor for stub locale support
yann@1	1381	+#endif
yann@1	1382	+
yann@1	1383	+#ifndef __UCLIBC_HAS_XLOCALE__
yann@1	1384	+#define __nl_langinfo_l(N, L) nl_langinfo((N))
yann@1	1385	+#endif
yann@1	1386	+
yann@1	1387	+namespace std
yann@1	1388	+{
yann@1	1389	+ // Construct and return valid pattern consisting of some combination of:
yann@1	1390	+ // space none symbol sign value
yann@1	1391	+ money_base::pattern
yann@1	1392	+ money_base::_S_construct_pattern(char __precedes, char __space, char __posn)
yann@1	1393	+ {
yann@1	1394	+ pattern __ret;
yann@1	1395	+
yann@1	1396	+ // This insanely complicated routine attempts to construct a valid
yann@1	1397	+ // pattern for use with monyepunct. A couple of invariants:
yann@1	1398	+
yann@1	1399	+ // if (__precedes) symbol -> value
yann@1	1400	+ // else value -> symbol
yann@1	1401	+
yann@1	1402	+ // if (__space) space
yann@1	1403	+ // else none
yann@1	1404	+
yann@1	1405	+ // none == never first
yann@1	1406	+ // space never first or last
yann@1	1407	+
yann@1	1408	+ // Any elegant implementations of this are welcome.
yann@1	1409	+ switch (__posn)
yann@1	1410	+ {
yann@1	1411	+ case 0:
yann@1	1412	+ case 1:
yann@1	1413	+ // 1 The sign precedes the value and symbol.
yann@1	1414	+ __ret.field[0] = sign;
yann@1	1415	+ if (__space)
yann@1	1416	+ {
yann@1	1417	+ // Pattern starts with sign.
yann@1	1418	+ if (__precedes)
yann@1	1419	+ {
yann@1	1420	+ __ret.field[1] = symbol;
yann@1	1421	+ __ret.field[3] = value;
yann@1	1422	+ }
yann@1	1423	+ else
yann@1	1424	+ {
yann@1	1425	+ __ret.field[1] = value;
yann@1	1426	+ __ret.field[3] = symbol;
yann@1	1427	+ }
yann@1	1428	+ __ret.field[2] = space;
yann@1	1429	+ }
yann@1	1430	+ else
yann@1	1431	+ {
yann@1	1432	+ // Pattern starts with sign and ends with none.
yann@1	1433	+ if (__precedes)
yann@1	1434	+ {
yann@1	1435	+ __ret.field[1] = symbol;
yann@1	1436	+ __ret.field[2] = value;
yann@1	1437	+ }
yann@1	1438	+ else
yann@1	1439	+ {
yann@1	1440	+ __ret.field[1] = value;
yann@1	1441	+ __ret.field[2] = symbol;
yann@1	1442	+ }
yann@1	1443	+ __ret.field[3] = none;
yann@1	1444	+ }
yann@1	1445	+ break;
yann@1	1446	+ case 2:
yann@1	1447	+ // 2 The sign follows the value and symbol.
yann@1	1448	+ if (__space)
yann@1	1449	+ {
yann@1	1450	+ // Pattern either ends with sign.
yann@1	1451	+ if (__precedes)
yann@1	1452	+ {
yann@1	1453	+ __ret.field[0] = symbol;
yann@1	1454	+ __ret.field[2] = value;
yann@1	1455	+ }
yann@1	1456	+ else
yann@1	1457	+ {
yann@1	1458	+ __ret.field[0] = value;
yann@1	1459	+ __ret.field[2] = symbol;
yann@1	1460	+ }
yann@1	1461	+ __ret.field[1] = space;
yann@1	1462	+ __ret.field[3] = sign;
yann@1	1463	+ }
yann@1	1464	+ else
yann@1	1465	+ {
yann@1	1466	+ // Pattern ends with sign then none.
yann@1	1467	+ if (__precedes)
yann@1	1468	+ {
yann@1	1469	+ __ret.field[0] = symbol;
yann@1	1470	+ __ret.field[1] = value;
yann@1	1471	+ }
yann@1	1472	+ else
yann@1	1473	+ {
yann@1	1474	+ __ret.field[0] = value;
yann@1	1475	+ __ret.field[1] = symbol;
yann@1	1476	+ }
yann@1	1477	+ __ret.field[2] = sign;
yann@1	1478	+ __ret.field[3] = none;
yann@1	1479	+ }
yann@1	1480	+ break;
yann@1	1481	+ case 3:
yann@1	1482	+ // 3 The sign immediately precedes the symbol.
yann@1	1483	+ if (__precedes)
yann@1	1484	+ {
yann@1	1485	+ __ret.field[0] = sign;
yann@1	1486	+ __ret.field[1] = symbol;
yann@1	1487	+ if (__space)
yann@1	1488	+ {
yann@1	1489	+ __ret.field[2] = space;
yann@1	1490	+ __ret.field[3] = value;
yann@1	1491	+ }
yann@1	1492	+ else
yann@1	1493	+ {
yann@1	1494	+ __ret.field[2] = value;
yann@1	1495	+ __ret.field[3] = none;
yann@1	1496	+ }
yann@1	1497	+ }
yann@1	1498	+ else
yann@1	1499	+ {
yann@1	1500	+ __ret.field[0] = value;
yann@1	1501	+ if (__space)
yann@1	1502	+ {
yann@1	1503	+ __ret.field[1] = space;
yann@1	1504	+ __ret.field[2] = sign;
yann@1	1505	+ __ret.field[3] = symbol;
yann@1	1506	+ }
yann@1	1507	+ else
yann@1	1508	+ {
yann@1	1509	+ __ret.field[1] = sign;
yann@1	1510	+ __ret.field[2] = symbol;
yann@1	1511	+ __ret.field[3] = none;
yann@1	1512	+ }
yann@1	1513	+ }
yann@1	1514	+ break;
yann@1	1515	+ case 4:
yann@1	1516	+ // 4 The sign immediately follows the symbol.
yann@1	1517	+ if (__precedes)
yann@1	1518	+ {
yann@1	1519	+ __ret.field[0] = symbol;
yann@1	1520	+ __ret.field[1] = sign;
yann@1	1521	+ if (__space)
yann@1	1522	+ {
yann@1	1523	+ __ret.field[2] = space;
yann@1	1524	+ __ret.field[3] = value;
yann@1	1525	+ }
yann@1	1526	+ else
yann@1	1527	+ {
yann@1	1528	+ __ret.field[2] = value;
yann@1	1529	+ __ret.field[3] = none;
yann@1	1530	+ }
yann@1	1531	+ }
yann@1	1532	+ else
yann@1	1533	+ {
yann@1	1534	+ __ret.field[0] = value;
yann@1	1535	+ if (__space)
yann@1	1536	+ {
yann@1	1537	+ __ret.field[1] = space;
yann@1	1538	+ __ret.field[2] = symbol;
yann@1	1539	+ __ret.field[3] = sign;
yann@1	1540	+ }
yann@1	1541	+ else
yann@1	1542	+ {
yann@1	1543	+ __ret.field[1] = symbol;
yann@1	1544	+ __ret.field[2] = sign;
yann@1	1545	+ __ret.field[3] = none;
yann@1	1546	+ }
yann@1	1547	+ }
yann@1	1548	+ break;
yann@1	1549	+ default:
yann@1	1550	+ __ret = pattern();
yann@1	1551	+ }
yann@1	1552	+ return __ret;
yann@1	1553	+ }
yann@1	1554	+
yann@1	1555	+ template<>
yann@1	1556	+ void
yann@1	1557	+ moneypunct<char, true>::_M_initialize_moneypunct(__c_locale __cloc,
yann@1	1558	+ const char*)
yann@1	1559	+ {
yann@1	1560	+ if (!_M_data)
yann@1	1561	+ _M_data = new __moneypunct_cache<char, true>;
yann@1	1562	+
yann@1	1563	+ if (!__cloc)
yann@1	1564	+ {
yann@1	1565	+ // "C" locale
yann@1	1566	+ _M_data->_M_decimal_point = '.';
yann@1	1567	+ _M_data->_M_thousands_sep = ',';
yann@1	1568	+ _M_data->_M_grouping = "";
yann@1	1569	+ _M_data->_M_grouping_size = 0;
yann@1	1570	+ _M_data->_M_curr_symbol = "";
yann@1	1571	+ _M_data->_M_curr_symbol_size = 0;
yann@1	1572	+ _M_data->_M_positive_sign = "";
yann@1	1573	+ _M_data->_M_positive_sign_size = 0;
yann@1	1574	+ _M_data->_M_negative_sign = "";
yann@1	1575	+ _M_data->_M_negative_sign_size = 0;
yann@1	1576	+ _M_data->_M_frac_digits = 0;
yann@1	1577	+ _M_data->_M_pos_format = money_base::_S_default_pattern;
yann@1	1578	+ _M_data->_M_neg_format = money_base::_S_default_pattern;
yann@1	1579	+
yann@1	1580	+ for (size_t __i = 0; __i < money_base::_S_end; ++__i)
yann@1	1581	+ _M_data->_M_atoms[__i] = money_base::_S_atoms[__i];
yann@1	1582	+ }
yann@1	1583	+ else
yann@1	1584	+ {
yann@1	1585	+ // Named locale.
yann@1	1586	+ _M_data->_M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT,
yann@1	1587	+ __cloc));
yann@1	1588	+ _M_data->_M_thousands_sep = *(__nl_langinfo_l(__MON_THOUSANDS_SEP,
yann@1	1589	+ __cloc));
yann@1	1590	+ _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
yann@1	1591	+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
yann@1	1592	+ _M_data->_M_positive_sign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
yann@1	1593	+ _M_data->_M_positive_sign_size = strlen(_M_data->_M_positive_sign);
yann@1	1594	+
yann@1	1595	+ char __nposn = *(__nl_langinfo_l(__INT_N_SIGN_POSN, __cloc));
yann@1	1596	+ if (!__nposn)
yann@1	1597	+ _M_data->_M_negative_sign = "()";
yann@1	1598	+ else
yann@1	1599	+ _M_data->_M_negative_sign = __nl_langinfo_l(__NEGATIVE_SIGN,
yann@1	1600	+ __cloc);
yann@1	1601	+ _M_data->_M_negative_sign_size = strlen(_M_data->_M_negative_sign);
yann@1	1602	+
yann@1	1603	+ // _Intl == true
yann@1	1604	+ _M_data->_M_curr_symbol = __nl_langinfo_l(__INT_CURR_SYMBOL, __cloc);
yann@1	1605	+ _M_data->_M_curr_symbol_size = strlen(_M_data->_M_curr_symbol);
yann@1	1606	+ _M_data->_M_frac_digits = *(__nl_langinfo_l(__INT_FRAC_DIGITS,
yann@1	1607	+ __cloc));
yann@1	1608	+ char __pprecedes = *(__nl_langinfo_l(__INT_P_CS_PRECEDES, __cloc));
yann@1	1609	+ char __pspace = *(__nl_langinfo_l(__INT_P_SEP_BY_SPACE, __cloc));
yann@1	1610	+ char __pposn = *(__nl_langinfo_l(__INT_P_SIGN_POSN, __cloc));
yann@1	1611	+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
yann@1	1612	+ __pposn);
yann@1	1613	+ char __nprecedes = *(__nl_langinfo_l(__INT_N_CS_PRECEDES, __cloc));
yann@1	1614	+ char __nspace = *(__nl_langinfo_l(__INT_N_SEP_BY_SPACE, __cloc));
yann@1	1615	+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
yann@1	1616	+ __nposn);
yann@1	1617	+ }
yann@1	1618	+ }
yann@1	1619	+
yann@1	1620	+ template<>
yann@1	1621	+ void
yann@1	1622	+ moneypunct<char, false>::_M_initialize_moneypunct(__c_locale __cloc,
yann@1	1623	+ const char*)
yann@1	1624	+ {
yann@1	1625	+ if (!_M_data)
yann@1	1626	+ _M_data = new __moneypunct_cache<char, false>;
yann@1	1627	+
yann@1	1628	+ if (!__cloc)
yann@1	1629	+ {
yann@1	1630	+ // "C" locale
yann@1	1631	+ _M_data->_M_decimal_point = '.';
yann@1	1632	+ _M_data->_M_thousands_sep = ',';
yann@1	1633	+ _M_data->_M_grouping = "";
yann@1	1634	+ _M_data->_M_grouping_size = 0;
yann@1	1635	+ _M_data->_M_curr_symbol = "";
yann@1	1636	+ _M_data->_M_curr_symbol_size = 0;
yann@1	1637	+ _M_data->_M_positive_sign = "";
yann@1	1638	+ _M_data->_M_positive_sign_size = 0;
yann@1	1639	+ _M_data->_M_negative_sign = "";
yann@1	1640	+ _M_data->_M_negative_sign_size = 0;
yann@1	1641	+ _M_data->_M_frac_digits = 0;
yann@1	1642	+ _M_data->_M_pos_format = money_base::_S_default_pattern;
yann@1	1643	+ _M_data->_M_neg_format = money_base::_S_default_pattern;
yann@1	1644	+
yann@1	1645	+ for (size_t __i = 0; __i < money_base::_S_end; ++__i)
yann@1	1646	+ _M_data->_M_atoms[__i] = money_base::_S_atoms[__i];
yann@1	1647	+ }
yann@1	1648	+ else
yann@1	1649	+ {
yann@1	1650	+ // Named locale.
yann@1	1651	+ _M_data->_M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT,
yann@1	1652	+ __cloc));
yann@1	1653	+ _M_data->_M_thousands_sep = *(__nl_langinfo_l(__MON_THOUSANDS_SEP,
yann@1	1654	+ __cloc));
yann@1	1655	+ _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
yann@1	1656	+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
yann@1	1657	+ _M_data->_M_positive_sign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
yann@1	1658	+ _M_data->_M_positive_sign_size = strlen(_M_data->_M_positive_sign);
yann@1	1659	+
yann@1	1660	+ char __nposn = *(__nl_langinfo_l(__N_SIGN_POSN, __cloc));
yann@1	1661	+ if (!__nposn)
yann@1	1662	+ _M_data->_M_negative_sign = "()";
yann@1	1663	+ else
yann@1	1664	+ _M_data->_M_negative_sign = __nl_langinfo_l(__NEGATIVE_SIGN,
yann@1	1665	+ __cloc);
yann@1	1666	+ _M_data->_M_negative_sign_size = strlen(_M_data->_M_negative_sign);
yann@1	1667	+
yann@1	1668	+ // _Intl == false
yann@1	1669	+ _M_data->_M_curr_symbol = __nl_langinfo_l(__CURRENCY_SYMBOL, __cloc);
yann@1	1670	+ _M_data->_M_curr_symbol_size = strlen(_M_data->_M_curr_symbol);
yann@1	1671	+ _M_data->_M_frac_digits = *(__nl_langinfo_l(__FRAC_DIGITS, __cloc));
yann@1	1672	+ char __pprecedes = *(__nl_langinfo_l(__P_CS_PRECEDES, __cloc));
yann@1	1673	+ char __pspace = *(__nl_langinfo_l(__P_SEP_BY_SPACE, __cloc));
yann@1	1674	+ char __pposn = *(__nl_langinfo_l(__P_SIGN_POSN, __cloc));
yann@1	1675	+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
yann@1	1676	+ __pposn);
yann@1	1677	+ char __nprecedes = *(__nl_langinfo_l(__N_CS_PRECEDES, __cloc));
yann@1	1678	+ char __nspace = *(__nl_langinfo_l(__N_SEP_BY_SPACE, __cloc));
yann@1	1679	+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
yann@1	1680	+ __nposn);
yann@1	1681	+ }
yann@1	1682	+ }
yann@1	1683	+
yann@1	1684	+ template<>
yann@1	1685	+ moneypunct<char, true>::~moneypunct()
yann@1	1686	+ { delete _M_data; }
yann@1	1687	+
yann@1	1688	+ template<>
yann@1	1689	+ moneypunct<char, false>::~moneypunct()
yann@1	1690	+ { delete _M_data; }
yann@1	1691	+
yann@1	1692	+#ifdef _GLIBCXX_USE_WCHAR_T
yann@1	1693	+ template<>
yann@1	1694	+ void
yann@1	1695	+ moneypunct<wchar_t, true>::_M_initialize_moneypunct(__c_locale __cloc,
yann@1	1696	+#ifdef __UCLIBC_HAS_XLOCALE__
yann@1	1697	+ const char*)
yann@1	1698	+#else
yann@1	1699	+ const char* __name)
yann@1	1700	+#endif
yann@1	1701	+ {
yann@1	1702	+ if (!_M_data)
yann@1	1703	+ _M_data = new __moneypunct_cache<wchar_t, true>;
yann@1	1704	+
yann@1	1705	+ if (!__cloc)
yann@1	1706	+ {
yann@1	1707	+ // "C" locale
yann@1	1708	+ _M_data->_M_decimal_point = L'.';
yann@1	1709	+ _M_data->_M_thousands_sep = L',';
yann@1	1710	+ _M_data->_M_grouping = "";
yann@1	1711	+ _M_data->_M_grouping_size = 0;
yann@1	1712	+ _M_data->_M_curr_symbol = L"";
yann@1	1713	+ _M_data->_M_curr_symbol_size = 0;
yann@1	1714	+ _M_data->_M_positive_sign = L"";
yann@1	1715	+ _M_data->_M_positive_sign_size = 0;
yann@1	1716	+ _M_data->_M_negative_sign = L"";
yann@1	1717	+ _M_data->_M_negative_sign_size = 0;
yann@1	1718	+ _M_data->_M_frac_digits = 0;
yann@1	1719	+ _M_data->_M_pos_format = money_base::_S_default_pattern;
yann@1	1720	+ _M_data->_M_neg_format = money_base::_S_default_pattern;
yann@1	1721	+
yann@1	1722	+ // Use ctype::widen code without the facet...
yann@1	1723	+ for (size_t __i = 0; __i < money_base::_S_end; ++__i)
yann@1	1724	+ _M_data->_M_atoms[__i] =
yann@1	1725	+ static_cast<wchar_t>(money_base::_S_atoms[__i]);
yann@1	1726	+ }
yann@1	1727	+ else
yann@1	1728	+ {
yann@1	1729	+ // Named locale.
yann@1	1730	+#ifdef __UCLIBC_HAS_XLOCALE__
yann@1	1731	+ __c_locale __old = __uselocale(__cloc);
yann@1	1732	+#else
yann@1	1733	+ // Switch to named locale so that mbsrtowcs will work.
yann@1	1734	+ char* __old = strdup(setlocale(LC_ALL, NULL));
yann@1	1735	+ setlocale(LC_ALL, __name);
yann@1	1736	+#endif
yann@1	1737	+
yann@1	1738	+#ifdef __UCLIBC_MJN3_ONLY__
yann@1	1739	+#warning fix this... should be monetary
yann@1	1740	+#endif
yann@1	1741	+#ifdef __UCLIBC__
yann@1	1742	+# ifdef __UCLIBC_HAS_XLOCALE__
yann@1	1743	+ _M_data->_M_decimal_point = __cloc->decimal_point_wc;
yann@1	1744	+ _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
yann@1	1745	+# else
yann@1	1746	+ _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
yann@1	1747	+ _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
yann@1	1748	+# endif
yann@1	1749	+#else
yann@1	1750	+ union { char *__s; wchar_t __w; } __u;
yann@1	1751	+ __u.__s = __nl_langinfo_l(_NL_MONETARY_DECIMAL_POINT_WC, __cloc);
yann@1	1752	+ _M_data->_M_decimal_point = __u.__w;
yann@1	1753	+
yann@1	1754	+ __u.__s = __nl_langinfo_l(_NL_MONETARY_THOUSANDS_SEP_WC, __cloc);
yann@1	1755	+ _M_data->_M_thousands_sep = __u.__w;
yann@1	1756	+#endif
yann@1	1757	+ _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
yann@1	1758	+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
yann@1	1759	+
yann@1	1760	+ const char* __cpossign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
yann@1	1761	+ const char* __cnegsign = __nl_langinfo_l(__NEGATIVE_SIGN, __cloc);
yann@1	1762	+ const char* __ccurr = __nl_langinfo_l(__INT_CURR_SYMBOL, __cloc);
yann@1	1763	+
yann@1	1764	+ wchar_t* __wcs_ps = 0;
yann@1	1765	+ wchar_t* __wcs_ns = 0;
yann@1	1766	+ const char __nposn = *(__nl_langinfo_l(__INT_N_SIGN_POSN, __cloc));
yann@1	1767	+ try
yann@1	1768	+ {
yann@1	1769	+ mbstate_t __state;
yann@1	1770	+ size_t __len = strlen(__cpossign);
yann@1	1771	+ if (__len)
yann@1	1772	+ {
yann@1	1773	+ ++__len;
yann@1	1774	+ memset(&__state, 0, sizeof(mbstate_t));
yann@1	1775	+ __wcs_ps = new wchar_t[__len];
yann@1	1776	+ mbsrtowcs(__wcs_ps, &__cpossign, __len, &__state);
yann@1	1777	+ _M_data->_M_positive_sign = __wcs_ps;
yann@1	1778	+ }
yann@1	1779	+ else
yann@1	1780	+ _M_data->_M_positive_sign = L"";
yann@1	1781	+ _M_data->_M_positive_sign_size = wcslen(_M_data->_M_positive_sign);
yann@1	1782	+
yann@1	1783	+ __len = strlen(__cnegsign);
yann@1	1784	+ if (!__nposn)
yann@1	1785	+ _M_data->_M_negative_sign = L"()";
yann@1	1786	+ else if (__len)
yann@1	1787	+ {
yann@1	1788	+ ++__len;
yann@1	1789	+ memset(&__state, 0, sizeof(mbstate_t));
yann@1	1790	+ __wcs_ns = new wchar_t[__len];
yann@1	1791	+ mbsrtowcs(__wcs_ns, &__cnegsign, __len, &__state);
yann@1	1792	+ _M_data->_M_negative_sign = __wcs_ns;
yann@1	1793	+ }
yann@1	1794	+ else
yann@1	1795	+ _M_data->_M_negative_sign = L"";
yann@1	1796	+ _M_data->_M_negative_sign_size = wcslen(_M_data->_M_negative_sign);
yann@1	1797	+
yann@1	1798	+ // _Intl == true.
yann@1	1799	+ __len = strlen(__ccurr);
yann@1	1800	+ if (__len)
yann@1	1801	+ {
yann@1	1802	+ ++__len;
yann@1	1803	+ memset(&__state, 0, sizeof(mbstate_t));
yann@1	1804	+ wchar_t* __wcs = new wchar_t[__len];
yann@1	1805	+ mbsrtowcs(__wcs, &__ccurr, __len, &__state);
yann@1	1806	+ _M_data->_M_curr_symbol = __wcs;
yann@1	1807	+ }
yann@1	1808	+ else
yann@1	1809	+ _M_data->_M_curr_symbol = L"";
yann@1	1810	+ _M_data->_M_curr_symbol_size = wcslen(_M_data->_M_curr_symbol);
yann@1	1811	+ }
yann@1	1812	+ catch (...)
yann@1	1813	+ {
yann@1	1814	+ delete _M_data;
yann@1	1815	+ _M_data = 0;
yann@1	1816	+ delete __wcs_ps;
yann@1	1817	+ delete __wcs_ns;
yann@1	1818	+#ifdef __UCLIBC_HAS_XLOCALE__
yann@1	1819	+ __uselocale(__old);
yann@1	1820	+#else
yann@1	1821	+ setlocale(LC_ALL, __old);
yann@1	1822	+ free(__old);
yann@1	1823	+#endif
yann@1	1824	+ __throw_exception_again;
yann@1	1825	+ }
yann@1	1826	+
yann@1	1827	+ _M_data->_M_frac_digits = *(__nl_langinfo_l(__INT_FRAC_DIGITS,
yann@1	1828	+ __cloc));
yann@1	1829	+ char __pprecedes = *(__nl_langinfo_l(__INT_P_CS_PRECEDES, __cloc));
yann@1	1830	+ char __pspace = *(__nl_langinfo_l(__INT_P_SEP_BY_SPACE, __cloc));
yann@1	1831	+ char __pposn = *(__nl_langinfo_l(__INT_P_SIGN_POSN, __cloc));
yann@1	1832	+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
yann@1	1833	+ __pposn);
yann@1	1834	+ char __nprecedes = *(__nl_langinfo_l(__INT_N_CS_PRECEDES, __cloc));
yann@1	1835	+ char __nspace = *(__nl_langinfo_l(__INT_N_SEP_BY_SPACE, __cloc));
yann@1	1836	+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
yann@1	1837	+ __nposn);
yann@1	1838	+
yann@1	1839	+#ifdef __UCLIBC_HAS_XLOCALE__
yann@1	1840	+ __uselocale(__old);
yann@1	1841	+#else
yann@1	1842	+ setlocale(LC_ALL, __old);
yann@1	1843	+ free(__old);
yann@1	1844	+#endif
yann@1	1845	+ }
yann@1	1846	+ }
yann@1	1847	+
yann@1	1848	+ template<>
yann@1	1849	+ void
yann@1	1850	+ moneypunct<wchar_t, false>::_M_initialize_moneypunct(__c_locale __cloc,
yann@1	1851	+#ifdef __UCLIBC_HAS_XLOCALE__
yann@1	1852	+ const char*)
yann@1	1853	+#else
yann@1	1854	+ const char* __name)
yann@1	1855	+#endif
yann@1	1856	+ {
yann@1	1857	+ if (!_M_data)
yann@1	1858	+ _M_data = new __moneypunct_cache<wchar_t, false>;
yann@1	1859	+
yann@1	1860	+ if (!__cloc)
yann@1	1861	+ {
yann@1	1862	+ // "C" locale
yann@1	1863	+ _M_data->_M_decimal_point = L'.';
yann@1	1864	+ _M_data->_M_thousands_sep = L',';
yann@1	1865	+ _M_data->_M_grouping = "";
yann@1	1866	+ _M_data->_M_grouping_size = 0;
yann@1	1867	+ _M_data->_M_curr_symbol = L"";
yann@1	1868	+ _M_data->_M_curr_symbol_size = 0;
yann@1	1869	+ _M_data->_M_positive_sign = L"";
yann@1	1870	+ _M_data->_M_positive_sign_size = 0;
yann@1	1871	+ _M_data->_M_negative_sign = L"";
yann@1	1872	+ _M_data->_M_negative_sign_size = 0;
yann@1	1873	+ _M_data->_M_frac_digits = 0;
yann@1	1874	+ _M_data->_M_pos_format = money_base::_S_default_pattern;
yann@1	1875	+ _M_data->_M_neg_format = money_base::_S_default_pattern;
yann@1	1876	+
yann@1	1877	+ // Use ctype::widen code without the facet...
yann@1	1878	+ for (size_t __i = 0; __i < money_base::_S_end; ++__i)
yann@1	1879	+ _M_data->_M_atoms[__i] =
yann@1	1880	+ static_cast<wchar_t>(money_base::_S_atoms[__i]);
yann@1	1881	+ }
yann@1	1882	+ else
yann@1	1883	+ {
yann@1	1884	+ // Named locale.
yann@1	1885	+#ifdef __UCLIBC_HAS_XLOCALE__
yann@1	1886	+ __c_locale __old = __uselocale(__cloc);
yann@1	1887	+#else
yann@1	1888	+ // Switch to named locale so that mbsrtowcs will work.
yann@1	1889	+ char* __old = strdup(setlocale(LC_ALL, NULL));
yann@1	1890	+ setlocale(LC_ALL, __name);
yann@1	1891	+#endif
yann@1	1892	+
yann@1	1893	+#ifdef __UCLIBC_MJN3_ONLY__
yann@1	1894	+#warning fix this... should be monetary
yann@1	1895	+#endif
yann@1	1896	+#ifdef __UCLIBC__
yann@1	1897	+# ifdef __UCLIBC_HAS_XLOCALE__
yann@1	1898	+ _M_data->_M_decimal_point = __cloc->decimal_point_wc;
yann@1	1899	+ _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
yann@1	1900	+# else
yann@1	1901	+ _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
yann@1	1902	+ _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
yann@1	1903	+# endif
yann@1	1904	+#else
yann@1	1905	+ union { char *__s; wchar_t __w; } __u;
yann@1	1906	+ __u.__s = __nl_langinfo_l(_NL_MONETARY_DECIMAL_POINT_WC, __cloc);
yann@1	1907	+ _M_data->_M_decimal_point = __u.__w;
yann@1	1908	+
yann@1	1909	+ __u.__s = __nl_langinfo_l(_NL_MONETARY_THOUSANDS_SEP_WC, __cloc);
yann@1	1910	+ _M_data->_M_thousands_sep = __u.__w;
yann@1	1911	+#endif
yann@1	1912	+ _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
yann@1	1913	+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
yann@1	1914	+
yann@1	1915	+ const char* __cpossign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
yann@1	1916	+ const char* __cnegsign = __nl_langinfo_l(__NEGATIVE_SIGN, __cloc);
yann@1	1917	+ const char* __ccurr = __nl_langinfo_l(__CURRENCY_SYMBOL, __cloc);
yann@1	1918	+
yann@1	1919	+ wchar_t* __wcs_ps = 0;
yann@1	1920	+ wchar_t* __wcs_ns = 0;
yann@1	1921	+ const char __nposn = *(__nl_langinfo_l(__N_SIGN_POSN, __cloc));
yann@1	1922	+ try
yann@1	1923	+ {
yann@1	1924	+ mbstate_t __state;
yann@1	1925	+ size_t __len;
yann@1	1926	+ __len = strlen(__cpossign);
yann@1	1927	+ if (__len)
yann@1	1928	+ {
yann@1	1929	+ ++__len;
yann@1	1930	+ memset(&__state, 0, sizeof(mbstate_t));
yann@1	1931	+ __wcs_ps = new wchar_t[__len];
yann@1	1932	+ mbsrtowcs(__wcs_ps, &__cpossign, __len, &__state);
yann@1	1933	+ _M_data->_M_positive_sign = __wcs_ps;
yann@1	1934	+ }
yann@1	1935	+ else
yann@1	1936	+ _M_data->_M_positive_sign = L"";
yann@1	1937	+ _M_data->_M_positive_sign_size = wcslen(_M_data->_M_positive_sign);
yann@1	1938	+
yann@1	1939	+ __len = strlen(__cnegsign);
yann@1	1940	+ if (!__nposn)
yann@1	1941	+ _M_data->_M_negative_sign = L"()";
yann@1	1942	+ else if (__len)
yann@1	1943	+ {
yann@1	1944	+ ++__len;
yann@1	1945	+ memset(&__state, 0, sizeof(mbstate_t));
yann@1	1946	+ __wcs_ns = new wchar_t[__len];
yann@1	1947	+ mbsrtowcs(__wcs_ns, &__cnegsign, __len, &__state);
yann@1	1948	+ _M_data->_M_negative_sign = __wcs_ns;
yann@1	1949	+ }
yann@1	1950	+ else
yann@1	1951	+ _M_data->_M_negative_sign = L"";
yann@1	1952	+ _M_data->_M_negative_sign_size = wcslen(_M_data->_M_negative_sign);
yann@1	1953	+
yann@1	1954	+ // _Intl == true.
yann@1	1955	+ __len = strlen(__ccurr);
yann@1	1956	+ if (__len)
yann@1	1957	+ {
yann@1	1958	+ ++__len;
yann@1	1959	+ memset(&__state, 0, sizeof(mbstate_t));
yann@1	1960	+ wchar_t* __wcs = new wchar_t[__len];
yann@1	1961	+ mbsrtowcs(__wcs, &__ccurr, __len, &__state);
yann@1	1962	+ _M_data->_M_curr_symbol = __wcs;
yann@1	1963	+ }
yann@1	1964	+ else
yann@1	1965	+ _M_data->_M_curr_symbol = L"";
yann@1	1966	+ _M_data->_M_curr_symbol_size = wcslen(_M_data->_M_curr_symbol);
yann@1	1967	+ }
yann@1	1968	+ catch (...)
yann@1	1969	+ {
yann@1	1970	+ delete _M_data;
yann@1	1971	+ _M_data = 0;
yann@1	1972	+ delete __wcs_ps;
yann@1	1973	+ delete __wcs_ns;
yann@1	1974	+#ifdef __UCLIBC_HAS_XLOCALE__
yann@1	1975	+ __uselocale(__old);
yann@1	1976	+#else
yann@1	1977	+ setlocale(LC_ALL, __old);
yann@1	1978	+ free(__old);
yann@1	1979	+#endif
yann@1	1980	+ __throw_exception_again;
yann@1	1981	+ }
yann@1	1982	+
yann@1	1983	+ _M_data->_M_frac_digits = *(__nl_langinfo_l(__FRAC_DIGITS, __cloc));
yann@1	1984	+ char __pprecedes = *(__nl_langinfo_l(__P_CS_PRECEDES, __cloc));
yann@1	1985	+ char __pspace = *(__nl_langinfo_l(__P_SEP_BY_SPACE, __cloc));
yann@1	1986	+ char __pposn = *(__nl_langinfo_l(__P_SIGN_POSN, __cloc));
yann@1	1987	+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace,
yann@1	1988	+ __pposn);
yann@1	1989	+ char __nprecedes = *(__nl_langinfo_l(__N_CS_PRECEDES, __cloc));
yann@1	1990	+ char __nspace = *(__nl_langinfo_l(__N_SEP_BY_SPACE, __cloc));
yann@1	1991	+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
yann@1	1992	+ __nposn);
yann@1	1993	+
yann@1	1994	+#ifdef __UCLIBC_HAS_XLOCALE__
yann@1	1995	+ __uselocale(__old);
yann@1	1996	+#else
yann@1	1997	+ setlocale(LC_ALL, __old);
yann@1	1998	+ free(__old);
yann@1	1999	+#endif
yann@1	2000	+ }
yann@1	2001	+ }
yann@1	2002	+
yann@1	2003	+ template<>
yann@1	2004	+ moneypunct<wchar_t, true>::~moneypunct()
yann@1	2005	+ {
yann@1	2006	+ if (_M_data->_M_positive_sign_size)
yann@1	2007	+ delete [] _M_data->_M_positive_sign;
yann@1	2008	+ if (_M_data->_M_negative_sign_size
yann@1	2009	+ && wcscmp(_M_data->_M_negative_sign, L"()") != 0)
yann@1	2010	+ delete [] _M_data->_M_negative_sign;
yann@1	2011	+ if (_M_data->_M_curr_symbol_size)
yann@1	2012	+ delete [] _M_data->_M_curr_symbol;
yann@1	2013	+ delete _M_data;
yann@1	2014	+ }
yann@1	2015	+
yann@1	2016	+ template<>
yann@1	2017	+ moneypunct<wchar_t, false>::~moneypunct()
yann@1	2018	+ {
yann@1	2019	+ if (_M_data->_M_positive_sign_size)
yann@1	2020	+ delete [] _M_data->_M_positive_sign;
yann@1	2021	+ if (_M_data->_M_negative_sign_size
yann@1	2022	+ && wcscmp(_M_data->_M_negative_sign, L"()") != 0)
yann@1	2023	+ delete [] _M_data->_M_negative_sign;
yann@1	2024	+ if (_M_data->_M_curr_symbol_size)
yann@1	2025	+ delete [] _M_data->_M_curr_symbol;
yann@1	2026	+ delete _M_data;
yann@1	2027	+ }
yann@1	2028	+#endif
yann@1	2029	+}
yann@1	2030	diff -urN gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/numeric_members.cc gcc-4.0.0/libstdc++-v3/config/locale/uclibc/numeric_members.cc
yann@1	2031	--- gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/numeric_members.cc 1969-12-31 18:00:00.000000000 -0600
yann@1	2032	+++ gcc-4.0.0/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2005-04-28 01:20:20.000000000 -0500
yann@1	2033	@@ -0,0 +1,173 @@
yann@1	2034	+// std::numpunct implementation details, GNU version -- C++ --
yann@1	2035	+
yann@1	2036	+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
yann@1	2037	+//
yann@1	2038	+// This file is part of the GNU ISO C++ Library. This library is free
yann@1	2039	+// software; you can redistribute it and/or modify it under the
yann@1	2040	+// terms of the GNU General Public License as published by the
yann@1	2041	+// Free Software Foundation; either version 2, or (at your option)
yann@1	2042	+// any later version.
yann@1	2043	+
yann@1	2044	+// This library is distributed in the hope that it will be useful,
yann@1	2045	+// but WITHOUT ANY WARRANTY; without even the implied warranty of
yann@1	2046	+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
yann@1	2047	+// GNU General Public License for more details.
yann@1	2048	+
yann@1	2049	+// You should have received a copy of the GNU General Public License along
yann@1	2050	+// with this library; see the file COPYING. If not, write to the Free
yann@1	2051	+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
yann@1	2052	+// USA.
yann@1	2053	+
yann@1	2054	+// As a special exception, you may use this file as part of a free software
yann@1	2055	+// library without restriction. Specifically, if other files instantiate
yann@1	2056	+// templates or use macros or inline functions from this file, or you compile
yann@1	2057	+// this file and link it with other files to produce an executable, this
yann@1	2058	+// file does not by itself cause the resulting executable to be covered by
yann@1	2059	+// the GNU General Public License. This exception does not however
yann@1	2060	+// invalidate any other reasons why the executable file might be covered by
yann@1	2061	+// the GNU General Public License.
yann@1	2062	+
yann@1	2063	+//
yann@1	2064	+// ISO C++ 14882: 22.2.3.1.2 numpunct virtual functions
yann@1	2065	+//
yann@1	2066	+
yann@1	2067	+// Written by Benjamin Kosnik <bkoz@redhat.com>
yann@1	2068	+
yann@1	2069	+#define _LIBC
yann@1	2070	+#include <locale>
yann@1	2071	+#undef _LIBC
yann@1	2072	+#include <bits/c++locale_internal.h>
yann@1	2073	+
yann@1	2074	+#ifdef __UCLIBC_MJN3_ONLY__
yann@1	2075	+#warning tailor for stub locale support
yann@1	2076	+#endif
yann@1	2077	+#ifndef __UCLIBC_HAS_XLOCALE__
yann@1	2078	+#define __nl_langinfo_l(N, L) nl_langinfo((N))
yann@1	2079	+#endif
yann@1	2080	+
yann@1	2081	+namespace std
yann@1	2082	+{
yann@1	2083	+ template<>
yann@1	2084	+ void
yann@1	2085	+ numpunct<char>::_M_initialize_numpunct(__c_locale __cloc)
yann@1	2086	+ {
yann@1	2087	+ if (!_M_data)
yann@1	2088	+ _M_data = new __numpunct_cache<char>;
yann@1	2089	+
yann@1	2090	+ if (!__cloc)
yann@1	2091	+ {
yann@1	2092	+ // "C" locale
yann@1	2093	+ _M_data->_M_grouping = "";
yann@1	2094	+ _M_data->_M_grouping_size = 0;
yann@1	2095	+ _M_data->_M_use_grouping = false;
yann@1	2096	+
yann@1	2097	+ _M_data->_M_decimal_point = '.';
yann@1	2098	+ _M_data->_M_thousands_sep = ',';
yann@1	2099	+
yann@1	2100	+ for (size_t __i = 0; __i < __num_base::_S_oend; ++__i)
yann@1	2101	+ _M_data->_M_atoms_out[__i] = __num_base::_S_atoms_out[__i];
yann@1	2102	+
yann@1	2103	+ for (size_t __j = 0; __j < __num_base::_S_iend; ++__j)
yann@1	2104	+ _M_data->_M_atoms_in[__j] = __num_base::_S_atoms_in[__j];
yann@1	2105	+ }
yann@1	2106	+ else
yann@1	2107	+ {
yann@1	2108	+ // Named locale.
yann@1	2109	+ _M_data->_M_decimal_point = *(__nl_langinfo_l(DECIMAL_POINT,
yann@1	2110	+ __cloc));
yann@1	2111	+ _M_data->_M_thousands_sep = *(__nl_langinfo_l(THOUSANDS_SEP,
yann@1	2112	+ __cloc));
yann@1	2113	+
yann@1	2114	+ // Check for NULL, which implies no grouping.
yann@1	2115	+ if (_M_data->_M_thousands_sep == '\0')
yann@1	2116	+ _M_data->_M_grouping = "";
yann@1	2117	+ else
yann@1	2118	+ _M_data->_M_grouping = __nl_langinfo_l(GROUPING, __cloc);
yann@1	2119	+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
yann@1	2120	+ }
yann@1	2121	+
yann@1	2122	+ // NB: There is no way to extact this info from posix locales.
yann@1	2123	+ // _M_truename = __nl_langinfo_l(YESSTR, __cloc);
yann@1	2124	+ _M_data->_M_truename = "true";
yann@1	2125	+ _M_data->_M_truename_size = 4;
yann@1	2126	+ // _M_falsename = __nl_langinfo_l(NOSTR, __cloc);
yann@1	2127	+ _M_data->_M_falsename = "false";
yann@1	2128	+ _M_data->_M_falsename_size = 5;
yann@1	2129	+ }
yann@1	2130	+
yann@1	2131	+ template<>
yann@1	2132	+ numpunct<char>::~numpunct()
yann@1	2133	+ { delete _M_data; }
yann@1	2134	+
yann@1	2135	+#ifdef _GLIBCXX_USE_WCHAR_T
yann@1	2136	+ template<>
yann@1	2137	+ void
yann@1	2138	+ numpunct<wchar_t>::_M_initialize_numpunct(__c_locale __cloc)
yann@1	2139	+ {
yann@1	2140	+ if (!_M_data)
yann@1	2141	+ _M_data = new __numpunct_cache<wchar_t>;
yann@1	2142	+
yann@1	2143	+ if (!__cloc)
yann@1	2144	+ {
yann@1	2145	+ // "C" locale
yann@1	2146	+ _M_data->_M_grouping = "";
yann@1	2147	+ _M_data->_M_grouping_size = 0;
yann@1	2148	+ _M_data->_M_use_grouping = false;
yann@1	2149	+
yann@1	2150	+ _M_data->_M_decimal_point = L'.';
yann@1	2151	+ _M_data->_M_thousands_sep = L',';
yann@1	2152	+
yann@1	2153	+ // Use ctype::widen code without the facet...
yann@1	2154	+ for (size_t __i = 0; __i < __num_base::_S_oend; ++__i)
yann@1	2155	+ _M_data->_M_atoms_out[__i] =
yann@1	2156	+ static_cast<wchar_t>(__num_base::_S_atoms_out[__i]);
yann@1	2157	+
yann@1	2158	+ for (size_t __j = 0; __j < __num_base::_S_iend; ++__j)
yann@1	2159	+ _M_data->_M_atoms_in[__j] =
yann@1	2160	+ static_cast<wchar_t>(__num_base::_S_atoms_in[__j]);
yann@1	2161	+ }
yann@1	2162	+ else
yann@1	2163	+ {
yann@1	2164	+ // Named locale.
yann@1	2165	+ // NB: In the GNU model wchar_t is always 32 bit wide.
yann@1	2166	+#ifdef __UCLIBC_MJN3_ONLY__
yann@1	2167	+#warning fix this
yann@1	2168	+#endif
yann@1	2169	+#ifdef __UCLIBC__
yann@1	2170	+# ifdef __UCLIBC_HAS_XLOCALE__
yann@1	2171	+ _M_data->_M_decimal_point = __cloc->decimal_point_wc;
yann@1	2172	+ _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
yann@1	2173	+# else
yann@1	2174	+ _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
yann@1	2175	+ _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
yann@1	2176	+# endif
yann@1	2177	+#else
yann@1	2178	+ union { char *__s; wchar_t __w; } __u;
yann@1	2179	+ __u.__s = __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc);
yann@1	2180	+ _M_data->_M_decimal_point = __u.__w;
yann@1	2181	+
yann@1	2182	+ __u.__s = __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc);
yann@1	2183	+ _M_data->_M_thousands_sep = __u.__w;
yann@1	2184	+#endif
yann@1	2185	+
yann@1	2186	+ if (_M_data->_M_thousands_sep == L'\0')
yann@1	2187	+ _M_data->_M_grouping = "";
yann@1	2188	+ else
yann@1	2189	+ _M_data->_M_grouping = __nl_langinfo_l(GROUPING, __cloc);
yann@1	2190	+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
yann@1	2191	+ }
yann@1	2192	+
yann@1	2193	+ // NB: There is no way to extact this info from posix locales.
yann@1	2194	+ // _M_truename = __nl_langinfo_l(YESSTR, __cloc);
yann@1	2195	+ _M_data->_M_truename = L"true";
yann@1	2196	+ _M_data->_M_truename_size = 4;
yann@1	2197	+ // _M_falsename = __nl_langinfo_l(NOSTR, __cloc);
yann@1	2198	+ _M_data->_M_falsename = L"false";
yann@1	2199	+ _M_data->_M_falsename_size = 5;
yann@1	2200	+ }
yann@1	2201	+
yann@1	2202	+ template<>
yann@1	2203	+ numpunct<wchar_t>::~numpunct()
yann@1	2204	+ { delete _M_data; }
yann@1	2205	+ #endif
yann@1	2206	+}
yann@1	2207	diff -urN gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/time_members.cc gcc-4.0.0/libstdc++-v3/config/locale/uclibc/time_members.cc
yann@1	2208	--- gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/time_members.cc 1969-12-31 18:00:00.000000000 -0600
yann@1	2209	+++ gcc-4.0.0/libstdc++-v3/config/locale/uclibc/time_members.cc 2005-04-28 01:13:15.000000000 -0500
yann@1	2210	@@ -0,0 +1,406 @@
yann@1	2211	+// std::time_get, std::time_put implementation, GNU version -- C++ --
yann@1	2212	+
yann@1	2213	+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
yann@1	2214	+//
yann@1	2215	+// This file is part of the GNU ISO C++ Library. This library is free
yann@1	2216	+// software; you can redistribute it and/or modify it under the
yann@1	2217	+// terms of the GNU General Public License as published by the
yann@1	2218	+// Free Software Foundation; either version 2, or (at your option)
yann@1	2219	+// any later version.
yann@1	2220	+
yann@1	2221	+// This library is distributed in the hope that it will be useful,
yann@1	2222	+// but WITHOUT ANY WARRANTY; without even the implied warranty of
yann@1	2223	+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
yann@1	2224	+// GNU General Public License for more details.
yann@1	2225	+
yann@1	2226	+// You should have received a copy of the GNU General Public License along
yann@1	2227	+// with this library; see the file COPYING. If not, write to the Free
yann@1	2228	+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
yann@1	2229	+// USA.
yann@1	2230	+
yann@1	2231	+// As a special exception, you may use this file as part of a free software
yann@1	2232	+// library without restriction. Specifically, if other files instantiate
yann@1	2233	+// templates or use macros or inline functions from this file, or you compile
yann@1	2234	+// this file and link it with other files to produce an executable, this
yann@1	2235	+// file does not by itself cause the resulting executable to be covered by
yann@1	2236	+// the GNU General Public License. This exception does not however
yann@1	2237	+// invalidate any other reasons why the executable file might be covered by
yann@1	2238	+// the GNU General Public License.
yann@1	2239	+
yann@1	2240	+//
yann@1	2241	+// ISO C++ 14882: 22.2.5.1.2 - time_get virtual functions
yann@1	2242	+// ISO C++ 14882: 22.2.5.3.2 - time_put virtual functions
yann@1	2243	+//
yann@1	2244	+
yann@1	2245	+// Written by Benjamin Kosnik <bkoz@redhat.com>
yann@1	2246	+
yann@1	2247	+#include <locale>
yann@1	2248	+#include <bits/c++locale_internal.h>
yann@1	2249	+
yann@1	2250	+#ifdef __UCLIBC_MJN3_ONLY__
yann@1	2251	+#warning tailor for stub locale support
yann@1	2252	+#endif
yann@1	2253	+#ifndef __UCLIBC_HAS_XLOCALE__
yann@1	2254	+#define __nl_langinfo_l(N, L) nl_langinfo((N))
yann@1	2255	+#endif
yann@1	2256	+
yann@1	2257	+namespace std
yann@1	2258	+{
yann@1	2259	+ template<>
yann@1	2260	+ void
yann@1	2261	+ __timepunct<char>::
yann@1	2262	+ _M_put(char* __s, size_t __maxlen, const char* __format,
yann@1	2263	+ const tm* __tm) const
yann@1	2264	+ {
yann@1	2265	+#ifdef __UCLIBC_HAS_XLOCALE__
yann@1	2266	+ const size_t __len = __strftime_l(__s, __maxlen, __format, __tm,
yann@1	2267	+ _M_c_locale_timepunct);
yann@1	2268	+#else
yann@1	2269	+ char* __old = strdup(setlocale(LC_ALL, NULL));
yann@1	2270	+ setlocale(LC_ALL, _M_name_timepunct);
yann@1	2271	+ const size_t __len = strftime(__s, __maxlen, __format, __tm);
yann@1	2272	+ setlocale(LC_ALL, __old);
yann@1	2273	+ free(__old);
yann@1	2274	+#endif
yann@1	2275	+ // Make sure __s is null terminated.
yann@1	2276	+ if (__len == 0)
yann@1	2277	+ __s[0] = '\0';
yann@1	2278	+ }
yann@1	2279	+
yann@1	2280	+ template<>
yann@1	2281	+ void
yann@1	2282	+ __timepunct<char>::_M_initialize_timepunct(__c_locale __cloc)
yann@1	2283	+ {
yann@1	2284	+ if (!_M_data)
yann@1	2285	+ _M_data = new __timepunct_cache<char>;
yann@1	2286	+
yann@1	2287	+ if (!__cloc)
yann@1	2288	+ {
yann@1	2289	+ // "C" locale
yann@1	2290	+ _M_c_locale_timepunct = _S_get_c_locale();
yann@1	2291	+
yann@1	2292	+ _M_data->_M_date_format = "%m/%d/%y";
yann@1	2293	+ _M_data->_M_date_era_format = "%m/%d/%y";
yann@1	2294	+ _M_data->_M_time_format = "%H:%M:%S";
yann@1	2295	+ _M_data->_M_time_era_format = "%H:%M:%S";
yann@1	2296	+ _M_data->_M_date_time_format = "";
yann@1	2297	+ _M_data->_M_date_time_era_format = "";
yann@1	2298	+ _M_data->_M_am = "AM";
yann@1	2299	+ _M_data->_M_pm = "PM";
yann@1	2300	+ _M_data->_M_am_pm_format = "";
yann@1	2301	+
yann@1	2302	+ // Day names, starting with "C"'s Sunday.
yann@1	2303	+ _M_data->_M_day1 = "Sunday";
yann@1	2304	+ _M_data->_M_day2 = "Monday";
yann@1	2305	+ _M_data->_M_day3 = "Tuesday";
yann@1	2306	+ _M_data->_M_day4 = "Wednesday";
yann@1	2307	+ _M_data->_M_day5 = "Thursday";
yann@1	2308	+ _M_data->_M_day6 = "Friday";
yann@1	2309	+ _M_data->_M_day7 = "Saturday";
yann@1	2310	+
yann@1	2311	+ // Abbreviated day names, starting with "C"'s Sun.
yann@1	2312	+ _M_data->_M_aday1 = "Sun";
yann@1	2313	+ _M_data->_M_aday2 = "Mon";
yann@1	2314	+ _M_data->_M_aday3 = "Tue";
yann@1	2315	+ _M_data->_M_aday4 = "Wed";
yann@1	2316	+ _M_data->_M_aday5 = "Thu";
yann@1	2317	+ _M_data->_M_aday6 = "Fri";
yann@1	2318	+ _M_data->_M_aday7 = "Sat";
yann@1	2319	+
yann@1	2320	+ // Month names, starting with "C"'s January.
yann@1	2321	+ _M_data->_M_month01 = "January";
yann@1	2322	+ _M_data->_M_month02 = "February";
yann@1	2323	+ _M_data->_M_month03 = "March";
yann@1	2324	+ _M_data->_M_month04 = "April";
yann@1	2325	+ _M_data->_M_month05 = "May";
yann@1	2326	+ _M_data->_M_month06 = "June";
yann@1	2327	+ _M_data->_M_month07 = "July";
yann@1	2328	+ _M_data->_M_month08 = "August";
yann@1	2329	+ _M_data->_M_month09 = "September";
yann@1	2330	+ _M_data->_M_month10 = "October";
yann@1	2331	+ _M_data->_M_month11 = "November";
yann@1	2332	+ _M_data->_M_month12 = "December";
yann@1	2333	+
yann@1	2334	+ // Abbreviated month names, starting with "C"'s Jan.
yann@1	2335	+ _M_data->_M_amonth01 = "Jan";
yann@1	2336	+ _M_data->_M_amonth02 = "Feb";
yann@1	2337	+ _M_data->_M_amonth03 = "Mar";
yann@1	2338	+ _M_data->_M_amonth04 = "Apr";
yann@1	2339	+ _M_data->_M_amonth05 = "May";
yann@1	2340	+ _M_data->_M_amonth06 = "Jun";
yann@1	2341	+ _M_data->_M_amonth07 = "Jul";
yann@1	2342	+ _M_data->_M_amonth08 = "Aug";
yann@1	2343	+ _M_data->_M_amonth09 = "Sep";
yann@1	2344	+ _M_data->_M_amonth10 = "Oct";
yann@1	2345	+ _M_data->_M_amonth11 = "Nov";
yann@1	2346	+ _M_data->_M_amonth12 = "Dec";
yann@1	2347	+ }
yann@1	2348	+ else
yann@1	2349	+ {
yann@1	2350	+ _M_c_locale_timepunct = _S_clone_c_locale(__cloc);
yann@1	2351	+
yann@1	2352	+ _M_data->_M_date_format = __nl_langinfo_l(D_FMT, __cloc);
yann@1	2353	+ _M_data->_M_date_era_format = __nl_langinfo_l(ERA_D_FMT, __cloc);
yann@1	2354	+ _M_data->_M_time_format = __nl_langinfo_l(T_FMT, __cloc);
yann@1	2355	+ _M_data->_M_time_era_format = __nl_langinfo_l(ERA_T_FMT, __cloc);
yann@1	2356	+ _M_data->_M_date_time_format = __nl_langinfo_l(D_T_FMT, __cloc);
yann@1	2357	+ _M_data->_M_date_time_era_format = __nl_langinfo_l(ERA_D_T_FMT,
yann@1	2358	+ __cloc);
yann@1	2359	+ _M_data->_M_am = __nl_langinfo_l(AM_STR, __cloc);
yann@1	2360	+ _M_data->_M_pm = __nl_langinfo_l(PM_STR, __cloc);
yann@1	2361	+ _M_data->_M_am_pm_format = __nl_langinfo_l(T_FMT_AMPM, __cloc);
yann@1	2362	+
yann@1	2363	+ // Day names, starting with "C"'s Sunday.
yann@1	2364	+ _M_data->_M_day1 = __nl_langinfo_l(DAY_1, __cloc);
yann@1	2365	+ _M_data->_M_day2 = __nl_langinfo_l(DAY_2, __cloc);
yann@1	2366	+ _M_data->_M_day3 = __nl_langinfo_l(DAY_3, __cloc);
yann@1	2367	+ _M_data->_M_day4 = __nl_langinfo_l(DAY_4, __cloc);
yann@1	2368	+ _M_data->_M_day5 = __nl_langinfo_l(DAY_5, __cloc);
yann@1	2369	+ _M_data->_M_day6 = __nl_langinfo_l(DAY_6, __cloc);
yann@1	2370	+ _M_data->_M_day7 = __nl_langinfo_l(DAY_7, __cloc);
yann@1	2371	+
yann@1	2372	+ // Abbreviated day names, starting with "C"'s Sun.
yann@1	2373	+ _M_data->_M_aday1 = __nl_langinfo_l(ABDAY_1, __cloc);
yann@1	2374	+ _M_data->_M_aday2 = __nl_langinfo_l(ABDAY_2, __cloc);
yann@1	2375	+ _M_data->_M_aday3 = __nl_langinfo_l(ABDAY_3, __cloc);
yann@1	2376	+ _M_data->_M_aday4 = __nl_langinfo_l(ABDAY_4, __cloc);
yann@1	2377	+ _M_data->_M_aday5 = __nl_langinfo_l(ABDAY_5, __cloc);
yann@1	2378	+ _M_data->_M_aday6 = __nl_langinfo_l(ABDAY_6, __cloc);
yann@1	2379	+ _M_data->_M_aday7 = __nl_langinfo_l(ABDAY_7, __cloc);
yann@1	2380	+
yann@1	2381	+ // Month names, starting with "C"'s January.
yann@1	2382	+ _M_data->_M_month01 = __nl_langinfo_l(MON_1, __cloc);
yann@1	2383	+ _M_data->_M_month02 = __nl_langinfo_l(MON_2, __cloc);
yann@1	2384	+ _M_data->_M_month03 = __nl_langinfo_l(MON_3, __cloc);
yann@1	2385	+ _M_data->_M_month04 = __nl_langinfo_l(MON_4, __cloc);
yann@1	2386	+ _M_data->_M_month05 = __nl_langinfo_l(MON_5, __cloc);
yann@1	2387	+ _M_data->_M_month06 = __nl_langinfo_l(MON_6, __cloc);
yann@1	2388	+ _M_data->_M_month07 = __nl_langinfo_l(MON_7, __cloc);
yann@1	2389	+ _M_data->_M_month08 = __nl_langinfo_l(MON_8, __cloc);
yann@1	2390	+ _M_data->_M_month09 = __nl_langinfo_l(MON_9, __cloc);
yann@1	2391	+ _M_data->_M_month10 = __nl_langinfo_l(MON_10, __cloc);
yann@1	2392	+ _M_data->_M_month11 = __nl_langinfo_l(MON_11, __cloc);
yann@1	2393	+ _M_data->_M_month12 = __nl_langinfo_l(MON_12, __cloc);
yann@1	2394	+
yann@1	2395	+ // Abbreviated month names, starting with "C"'s Jan.
yann@1	2396	+ _M_data->_M_amonth01 = __nl_langinfo_l(ABMON_1, __cloc);
yann@1	2397	+ _M_data->_M_amonth02 = __nl_langinfo_l(ABMON_2, __cloc);
yann@1	2398	+ _M_data->_M_amonth03 = __nl_langinfo_l(ABMON_3, __cloc);
yann@1	2399	+ _M_data->_M_amonth04 = __nl_langinfo_l(ABMON_4, __cloc);
yann@1	2400	+ _M_data->_M_amonth05 = __nl_langinfo_l(ABMON_5, __cloc);
yann@1	2401	+ _M_data->_M_amonth06 = __nl_langinfo_l(ABMON_6, __cloc);
yann@1	2402	+ _M_data->_M_amonth07 = __nl_langinfo_l(ABMON_7, __cloc);
yann@1	2403	+ _M_data->_M_amonth08 = __nl_langinfo_l(ABMON_8, __cloc);
yann@1	2404	+ _M_data->_M_amonth09 = __nl_langinfo_l(ABMON_9, __cloc);
yann@1	2405	+ _M_data->_M_amonth10 = __nl_langinfo_l(ABMON_10, __cloc);
yann@1	2406	+ _M_data->_M_amonth11 = __nl_langinfo_l(ABMON_11, __cloc);
yann@1	2407	+ _M_data->_M_amonth12 = __nl_langinfo_l(ABMON_12, __cloc);
yann@1	2408	+ }
yann@1	2409	+ }
yann@1	2410	+
yann@1	2411	+#ifdef _GLIBCXX_USE_WCHAR_T
yann@1	2412	+ template<>
yann@1	2413	+ void
yann@1	2414	+ __timepunct<wchar_t>::
yann@1	2415	+ _M_put(wchar_t* __s, size_t __maxlen, const wchar_t* __format,
yann@1	2416	+ const tm* __tm) const
yann@1	2417	+ {
yann@1	2418	+#ifdef __UCLIBC_HAS_XLOCALE__
yann@1	2419	+ __wcsftime_l(__s, __maxlen, __format, __tm, _M_c_locale_timepunct);
yann@1	2420	+ const size_t __len = __wcsftime_l(__s, __maxlen, __format, __tm,
yann@1	2421	+ _M_c_locale_timepunct);
yann@1	2422	+#else
yann@1	2423	+ char* __old = strdup(setlocale(LC_ALL, NULL));
yann@1	2424	+ setlocale(LC_ALL, _M_name_timepunct);
yann@1	2425	+ const size_t __len = wcsftime(__s, __maxlen, __format, __tm);
yann@1	2426	+ setlocale(LC_ALL, __old);
yann@1	2427	+ free(__old);
yann@1	2428	+#endif
yann@1	2429	+ // Make sure __s is null terminated.
yann@1	2430	+ if (__len == 0)
yann@1	2431	+ __s[0] = L'\0';
yann@1	2432	+ }
yann@1	2433	+
yann@1	2434	+ template<>
yann@1	2435	+ void
yann@1	2436	+ __timepunct<wchar_t>::_M_initialize_timepunct(__c_locale __cloc)
yann@1	2437	+ {
yann@1	2438	+ if (!_M_data)
yann@1	2439	+ _M_data = new __timepunct_cache<wchar_t>;
yann@1	2440	+
yann@1	2441	+#warning wide time stuff
yann@1	2442	+// if (!__cloc)
yann@1	2443	+ {
yann@1	2444	+ // "C" locale
yann@1	2445	+ _M_c_locale_timepunct = _S_get_c_locale();
yann@1	2446	+
yann@1	2447	+ _M_data->_M_date_format = L"%m/%d/%y";
yann@1	2448	+ _M_data->_M_date_era_format = L"%m/%d/%y";
yann@1	2449	+ _M_data->_M_time_format = L"%H:%M:%S";
yann@1	2450	+ _M_data->_M_time_era_format = L"%H:%M:%S";
yann@1	2451	+ _M_data->_M_date_time_format = L"";
yann@1	2452	+ _M_data->_M_date_time_era_format = L"";
yann@1	2453	+ _M_data->_M_am = L"AM";
yann@1	2454	+ _M_data->_M_pm = L"PM";
yann@1	2455	+ _M_data->_M_am_pm_format = L"";
yann@1	2456	+
yann@1	2457	+ // Day names, starting with "C"'s Sunday.
yann@1	2458	+ _M_data->_M_day1 = L"Sunday";
yann@1	2459	+ _M_data->_M_day2 = L"Monday";
yann@1	2460	+ _M_data->_M_day3 = L"Tuesday";
yann@1	2461	+ _M_data->_M_day4 = L"Wednesday";
yann@1	2462	+ _M_data->_M_day5 = L"Thursday";
yann@1	2463	+ _M_data->_M_day6 = L"Friday";
yann@1	2464	+ _M_data->_M_day7 = L"Saturday";
yann@1	2465	+
yann@1	2466	+ // Abbreviated day names, starting with "C"'s Sun.
yann@1	2467	+ _M_data->_M_aday1 = L"Sun";
yann@1	2468	+ _M_data->_M_aday2 = L"Mon";
yann@1	2469	+ _M_data->_M_aday3 = L"Tue";
yann@1	2470	+ _M_data->_M_aday4 = L"Wed";
yann@1	2471	+ _M_data->_M_aday5 = L"Thu";
yann@1	2472	+ _M_data->_M_aday6 = L"Fri";
yann@1	2473	+ _M_data->_M_aday7 = L"Sat";
yann@1	2474	+
yann@1	2475	+ // Month names, starting with "C"'s January.
yann@1	2476	+ _M_data->_M_month01 = L"January";
yann@1	2477	+ _M_data->_M_month02 = L"February";
yann@1	2478	+ _M_data->_M_month03 = L"March";
yann@1	2479	+ _M_data->_M_month04 = L"April";
yann@1	2480	+ _M_data->_M_month05 = L"May";
yann@1	2481	+ _M_data->_M_month06 = L"June";
yann@1	2482	+ _M_data->_M_month07 = L"July";
yann@1	2483	+ _M_data->_M_month08 = L"August";
yann@1	2484	+ _M_data->_M_month09 = L"September";
yann@1	2485	+ _M_data->_M_month10 = L"October";
yann@1	2486	+ _M_data->_M_month11 = L"November";
yann@1	2487	+ _M_data->_M_month12 = L"December";
yann@1	2488	+
yann@1	2489	+ // Abbreviated month names, starting with "C"'s Jan.
yann@1	2490	+ _M_data->_M_amonth01 = L"Jan";
yann@1	2491	+ _M_data->_M_amonth02 = L"Feb";
yann@1	2492	+ _M_data->_M_amonth03 = L"Mar";
yann@1	2493	+ _M_data->_M_amonth04 = L"Apr";
yann@1	2494	+ _M_data->_M_amonth05 = L"May";
yann@1	2495	+ _M_data->_M_amonth06 = L"Jun";
yann@1	2496	+ _M_data->_M_amonth07 = L"Jul";
yann@1	2497	+ _M_data->_M_amonth08 = L"Aug";
yann@1	2498	+ _M_data->_M_amonth09 = L"Sep";
yann@1	2499	+ _M_data->_M_amonth10 = L"Oct";
yann@1	2500	+ _M_data->_M_amonth11 = L"Nov";
yann@1	2501	+ _M_data->_M_amonth12 = L"Dec";
yann@1	2502	+ }
yann@1	2503	+#if 0
yann@1	2504	+ else
yann@1	2505	+ {
yann@1	2506	+ _M_c_locale_timepunct = _S_clone_c_locale(__cloc);
yann@1	2507	+
yann@1	2508	+ union { char __s; wchar_t __w; } __u;
yann@1	2509	+
yann@1	2510	+ __u.__s = __nl_langinfo_l(_NL_WD_FMT, __cloc);
yann@1	2511	+ _M_data->_M_date_format = __u.__w;
yann@1	2512	+ __u.__s = __nl_langinfo_l(_NL_WERA_D_FMT, __cloc);
yann@1	2513	+ _M_data->_M_date_era_format = __u.__w;
yann@1	2514	+ __u.__s = __nl_langinfo_l(_NL_WT_FMT, __cloc);
yann@1	2515	+ _M_data->_M_time_format = __u.__w;
yann@1	2516	+ __u.__s = __nl_langinfo_l(_NL_WERA_T_FMT, __cloc);
yann@1	2517	+ _M_data->_M_time_era_format = __u.__w;
yann@1	2518	+ __u.__s = __nl_langinfo_l(_NL_WD_T_FMT, __cloc);
yann@1	2519	+ _M_data->_M_date_time_format = __u.__w;
yann@1	2520	+ __u.__s = __nl_langinfo_l(_NL_WERA_D_T_FMT, __cloc);
yann@1	2521	+ _M_data->_M_date_time_era_format = __u.__w;
yann@1	2522	+ __u.__s = __nl_langinfo_l(_NL_WAM_STR, __cloc);
yann@1	2523	+ _M_data->_M_am = __u.__w;
yann@1	2524	+ __u.__s = __nl_langinfo_l(_NL_WPM_STR, __cloc);
yann@1	2525	+ _M_data->_M_pm = __u.__w;
yann@1	2526	+ __u.__s = __nl_langinfo_l(_NL_WT_FMT_AMPM, __cloc);
yann@1	2527	+ _M_data->_M_am_pm_format = __u.__w;
yann@1	2528	+
yann@1	2529	+ // Day names, starting with "C"'s Sunday.
yann@1	2530	+ __u.__s = __nl_langinfo_l(_NL_WDAY_1, __cloc);
yann@1	2531	+ _M_data->_M_day1 = __u.__w;
yann@1	2532	+ __u.__s = __nl_langinfo_l(_NL_WDAY_2, __cloc);
yann@1	2533	+ _M_data->_M_day2 = __u.__w;
yann@1	2534	+ __u.__s = __nl_langinfo_l(_NL_WDAY_3, __cloc);
yann@1	2535	+ _M_data->_M_day3 = __u.__w;
yann@1	2536	+ __u.__s = __nl_langinfo_l(_NL_WDAY_4, __cloc);
yann@1	2537	+ _M_data->_M_day4 = __u.__w;
yann@1	2538	+ __u.__s = __nl_langinfo_l(_NL_WDAY_5, __cloc);
yann@1	2539	+ _M_data->_M_day5 = __u.__w;
yann@1	2540	+ __u.__s = __nl_langinfo_l(_NL_WDAY_6, __cloc);
yann@1	2541	+ _M_data->_M_day6 = __u.__w;
yann@1	2542	+ __u.__s = __nl_langinfo_l(_NL_WDAY_7, __cloc);
yann@1	2543	+ _M_data->_M_day7 = __u.__w;
yann@1	2544	+
yann@1	2545	+ // Abbreviated day names, starting with "C"'s Sun.
yann@1	2546	+ __u.__s = __nl_langinfo_l(_NL_WABDAY_1, __cloc);
yann@1	2547	+ _M_data->_M_aday1 = __u.__w;
yann@1	2548	+ __u.__s = __nl_langinfo_l(_NL_WABDAY_2, __cloc);
yann@1	2549	+ _M_data->_M_aday2 = __u.__w;
yann@1	2550	+ __u.__s = __nl_langinfo_l(_NL_WABDAY_3, __cloc);
yann@1	2551	+ _M_data->_M_aday3 = __u.__w;
yann@1	2552	+ __u.__s = __nl_langinfo_l(_NL_WABDAY_4, __cloc);
yann@1	2553	+ _M_data->_M_aday4 = __u.__w;
yann@1	2554	+ __u.__s = __nl_langinfo_l(_NL_WABDAY_5, __cloc);
yann@1	2555	+ _M_data->_M_aday5 = __u.__w;
yann@1	2556	+ __u.__s = __nl_langinfo_l(_NL_WABDAY_6, __cloc);
yann@1	2557	+ _M_data->_M_aday6 = __u.__w;
yann@1	2558	+ __u.__s = __nl_langinfo_l(_NL_WABDAY_7, __cloc);
yann@1	2559	+ _M_data->_M_aday7 = __u.__w;
yann@1	2560	+
yann@1	2561	+ // Month names, starting with "C"'s January.
yann@1	2562	+ __u.__s = __nl_langinfo_l(_NL_WMON_1, __cloc);
yann@1	2563	+ _M_data->_M_month01 = __u.__w;
yann@1	2564	+ __u.__s = __nl_langinfo_l(_NL_WMON_2, __cloc);
yann@1	2565	+ _M_data->_M_month02 = __u.__w;
yann@1	2566	+ __u.__s = __nl_langinfo_l(_NL_WMON_3, __cloc);
yann@1	2567	+ _M_data->_M_month03 = __u.__w;
yann@1	2568	+ __u.__s = __nl_langinfo_l(_NL_WMON_4, __cloc);
yann@1	2569	+ _M_data->_M_month04 = __u.__w;
yann@1	2570	+ __u.__s = __nl_langinfo_l(_NL_WMON_5, __cloc);
yann@1	2571	+ _M_data->_M_month05 = __u.__w;
yann@1	2572	+ __u.__s = __nl_langinfo_l(_NL_WMON_6, __cloc);
yann@1	2573	+ _M_data->_M_month06 = __u.__w;
yann@1	2574	+ __u.__s = __nl_langinfo_l(_NL_WMON_7, __cloc);
yann@1	2575	+ _M_data->_M_month07 = __u.__w;
yann@1	2576	+ __u.__s = __nl_langinfo_l(_NL_WMON_8, __cloc);
yann@1	2577	+ _M_data->_M_month08 = __u.__w;
yann@1	2578	+ __u.__s = __nl_langinfo_l(_NL_WMON_9, __cloc);
yann@1	2579	+ _M_data->_M_month09 = __u.__w;
yann@1	2580	+ __u.__s = __nl_langinfo_l(_NL_WMON_10, __cloc);
yann@1	2581	+ _M_data->_M_month10 = __u.__w;
yann@1	2582	+ __u.__s = __nl_langinfo_l(_NL_WMON_11, __cloc);
yann@1	2583	+ _M_data->_M_month11 = __u.__w;
yann@1	2584	+ __u.__s = __nl_langinfo_l(_NL_WMON_12, __cloc);
yann@1	2585	+ _M_data->_M_month12 = __u.__w;
yann@1	2586	+
yann@1	2587	+ // Abbreviated month names, starting with "C"'s Jan.
yann@1	2588	+ __u.__s = __nl_langinfo_l(_NL_WABMON_1, __cloc);
yann@1	2589	+ _M_data->_M_amonth01 = __u.__w;
yann@1	2590	+ __u.__s = __nl_langinfo_l(_NL_WABMON_2, __cloc);
yann@1	2591	+ _M_data->_M_amonth02 = __u.__w;
yann@1	2592	+ __u.__s = __nl_langinfo_l(_NL_WABMON_3, __cloc);
yann@1	2593	+ _M_data->_M_amonth03 = __u.__w;
yann@1	2594	+ __u.__s = __nl_langinfo_l(_NL_WABMON_4, __cloc);
yann@1	2595	+ _M_data->_M_amonth04 = __u.__w;
yann@1	2596	+ __u.__s = __nl_langinfo_l(_NL_WABMON_5, __cloc);
yann@1	2597	+ _M_data->_M_amonth05 = __u.__w;
yann@1	2598	+ __u.__s = __nl_langinfo_l(_NL_WABMON_6, __cloc);
yann@1	2599	+ _M_data->_M_amonth06 = __u.__w;
yann@1	2600	+ __u.__s = __nl_langinfo_l(_NL_WABMON_7, __cloc);
yann@1	2601	+ _M_data->_M_amonth07 = __u.__w;
yann@1	2602	+ __u.__s = __nl_langinfo_l(_NL_WABMON_8, __cloc);
yann@1	2603	+ _M_data->_M_amonth08 = __u.__w;
yann@1	2604	+ __u.__s = __nl_langinfo_l(_NL_WABMON_9, __cloc);
yann@1	2605	+ _M_data->_M_amonth09 = __u.__w;
yann@1	2606	+ __u.__s = __nl_langinfo_l(_NL_WABMON_10, __cloc);
yann@1	2607	+ _M_data->_M_amonth10 = __u.__w;
yann@1	2608	+ __u.__s = __nl_langinfo_l(_NL_WABMON_11, __cloc);
yann@1	2609	+ _M_data->_M_amonth11 = __u.__w;
yann@1	2610	+ __u.__s = __nl_langinfo_l(_NL_WABMON_12, __cloc);
yann@1	2611	+ _M_data->_M_amonth12 = __u.__w;
yann@1	2612	+ }
yann@1	2613	+#endif // 0
yann@1	2614	+ }
yann@1	2615	+#endif
yann@1	2616	+}
yann@1	2617	diff -urN gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/time_members.h gcc-4.0.0/libstdc++-v3/config/locale/uclibc/time_members.h
yann@1	2618	--- gcc-4.0.0-100/libstdc++-v3/config/locale/uclibc/time_members.h 1969-12-31 18:00:00.000000000 -0600
yann@1	2619	+++ gcc-4.0.0/libstdc++-v3/config/locale/uclibc/time_members.h 2004-05-22 18:46:31.000000000 -0500
yann@1	2620	@@ -0,0 +1,68 @@
yann@1	2621	+// std::time_get, std::time_put implementation, GNU version -- C++ --
yann@1	2622	+
yann@1	2623	+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
yann@1	2624	+//
yann@1	2625	+// This file is part of the GNU ISO C++ Library. This library is free
yann@1	2626	+// software; you can redistribute it and/or modify it under the
yann@1	2627	+// terms of the GNU General Public License as published by the
yann@1	2628	+// Free Software Foundation; either version 2, or (at your option)
yann@1	2629	+// any later version.
yann@1	2630	+
yann@1	2631	+// This library is distributed in the hope that it will be useful,
yann@1	2632	+// but WITHOUT ANY WARRANTY; without even the implied warranty of
yann@1	2633	+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
yann@1	2634	+// GNU General Public License for more details.
yann@1	2635	+
yann@1	2636	+// You should have received a copy of the GNU General Public License along
yann@1	2637	+// with this library; see the file COPYING. If not, write to the Free
yann@1	2638	+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
yann@1	2639	+// USA.
yann@1	2640	+
yann@1	2641	+// As a special exception, you may use this file as part of a free software
yann@1	2642	+// library without restriction. Specifically, if other files instantiate
yann@1	2643	+// templates or use macros or inline functions from this file, or you compile
yann@1	2644	+// this file and link it with other files to produce an executable, this
yann@1	2645	+// file does not by itself cause the resulting executable to be covered by
yann@1	2646	+// the GNU General Public License. This exception does not however
yann@1	2647	+// invalidate any other reasons why the executable file might be covered by
yann@1	2648	+// the GNU General Public License.
yann@1	2649	+
yann@1	2650	+//
yann@1	2651	+// ISO C++ 14882: 22.2.5.1.2 - time_get functions
yann@1	2652	+// ISO C++ 14882: 22.2.5.3.2 - time_put functions
yann@1	2653	+//
yann@1	2654	+
yann@1	2655	+// Written by Benjamin Kosnik <bkoz@redhat.com>
yann@1	2656	+
yann@1	2657	+ template<typename _CharT>
yann@1	2658	+ __timepunct<_CharT>::__timepunct(size_t __refs)
yann@1	2659	+ : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL),
yann@1	2660	+ _M_name_timepunct(_S_get_c_name())
yann@1	2661	+ { _M_initialize_timepunct(); }
yann@1	2662	+
yann@1	2663	+ template<typename _CharT>
yann@1	2664	+ __timepunct<_CharT>::__timepunct(__cache_type* __cache, size_t __refs)
yann@1	2665	+ : facet(__refs), _M_data(__cache), _M_c_locale_timepunct(NULL),
yann@1	2666	+ _M_name_timepunct(_S_get_c_name())
yann@1	2667	+ { _M_initialize_timepunct(); }
yann@1	2668	+
yann@1	2669	+ template<typename _CharT>
yann@1	2670	+ __timepunct<_CharT>::__timepunct(__c_locale __cloc, const char* __s,
yann@1	2671	+ size_t __refs)
yann@1	2672	+ : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL),
yann@1	2673	+ _M_name_timepunct(__s)
yann@1	2674	+ {
yann@1	2675	+ char* __tmp = new char[std::strlen(__s) + 1];
yann@1	2676	+ std::strcpy(__tmp, __s);
yann@1	2677	+ _M_name_timepunct = __tmp;
yann@1	2678	+ _M_initialize_timepunct(__cloc);
yann@1	2679	+ }
yann@1	2680	+
yann@1	2681	+ template<typename _CharT>
yann@1	2682	+ __timepunct<_CharT>::~__timepunct()
yann@1	2683	+ {
yann@1	2684	+ if (_M_name_timepunct != _S_get_c_name())
yann@1	2685	+ delete [] _M_name_timepunct;
yann@1	2686	+ delete _M_data;
yann@1	2687	+ _S_destroy_c_locale(_M_c_locale_timepunct);
yann@1	2688	+ }
yann@1	2689	diff -urN gcc-4.0.0-100/libstdc++-v3/config/os/uclibc/ctype_base.h gcc-4.0.0/libstdc++-v3/config/os/uclibc/ctype_base.h
yann@1	2690	--- gcc-4.0.0-100/libstdc++-v3/config/os/uclibc/ctype_base.h 1969-12-31 18:00:00.000000000 -0600
yann@1	2691	+++ gcc-4.0.0/libstdc++-v3/config/os/uclibc/ctype_base.h 2005-04-28 01:10:27.000000000 -0500
yann@1	2692	@@ -0,0 +1,64 @@
yann@1	2693	+// Locale support -- C++ --
yann@1	2694	+
yann@1	2695	+// Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004
yann@1	2696	+// Free Software Foundation, Inc.
yann@1	2697	+//
yann@1	2698	+// This file is part of the GNU ISO C++ Library. This library is free
yann@1	2699	+// software; you can redistribute it and/or modify it under the
yann@1	2700	+// terms of the GNU General Public License as published by the
yann@1	2701	+// Free Software Foundation; either version 2, or (at your option)
yann@1	2702	+// any later version.
yann@1	2703	+
yann@1	2704	+// This library is distributed in the hope that it will be useful,
yann@1	2705	+// but WITHOUT ANY WARRANTY; without even the implied warranty of
yann@1	2706	+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
yann@1	2707	+// GNU General Public License for more details.
yann@1	2708	+
yann@1	2709	+// You should have received a copy of the GNU General Public License along
yann@1	2710	+// with this library; see the file COPYING. If not, write to the Free
yann@1	2711	+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
yann@1	2712	+// USA.
yann@1	2713	+
yann@1	2714	+// As a special exception, you may use this file as part of a free software
yann@1	2715	+// library without restriction. Specifically, if other files instantiate
yann@1	2716	+// templates or use macros or inline functions from this file, or you compile
yann@1	2717	+// this file and link it with other files to produce an executable, this
yann@1	2718	+// file does not by itself cause the resulting executable to be covered by
yann@1	2719	+// the GNU General Public License. This exception does not however
yann@1	2720	+// invalidate any other reasons why the executable file might be covered by
yann@1	2721	+// the GNU General Public License.
yann@1	2722	+
yann@1	2723	+//
yann@1	2724	+// ISO C++ 14882: 22.1 Locales
yann@1	2725	+//
yann@1	2726	+
yann@1	2727	+/** @file ctype_base.h
yann@1	2728	+ * This is an internal header file, included by other library headers.
yann@1	2729	+ * You should not attempt to use it directly.
yann@1	2730	+ */
yann@1	2731	+
yann@1	2732	+// Information as gleaned from /usr/include/ctype.h
yann@1	2733	+
yann@1	2734	+ /// @brief Base class for ctype.
yann@1	2735	+ struct ctype_base
yann@1	2736	+ {
yann@1	2737	+ // Note: In uClibc, the following two types depend on configuration.
yann@1	2738	+
yann@1	2739	+ // Non-standard typedefs.
yann@1	2740	+ typedef const __ctype_touplow_t* __to_type;
yann@1	2741	+
yann@1	2742	+ // NB: Offsets into ctype<char>::_M_table force a particular size
yann@1	2743	+ // on the mask type. Because of this, we don't use an enum.
yann@1	2744	+ typedef __ctype_mask_t mask;
yann@1	2745	+ static const mask upper = _ISupper;
yann@1	2746	+ static const mask lower = _ISlower;
yann@1	2747	+ static const mask alpha = _ISalpha;
yann@1	2748	+ static const mask digit = _ISdigit;
yann@1	2749	+ static const mask xdigit = _ISxdigit;
yann@1	2750	+ static const mask space = _ISspace;
yann@1	2751	+ static const mask print = _ISprint;
yann@1	2752	+ static const mask graph = _ISalpha \| _ISdigit \| _ISpunct;
yann@1	2753	+ static const mask cntrl = _IScntrl;
yann@1	2754	+ static const mask punct = _ISpunct;
yann@1	2755	+ static const mask alnum = _ISalpha \| _ISdigit;
yann@1	2756	+ };
yann@1	2757	diff -urN gcc-4.0.0-100/libstdc++-v3/config/os/uclibc/ctype_inline.h gcc-4.0.0/libstdc++-v3/config/os/uclibc/ctype_inline.h
yann@1	2758	--- gcc-4.0.0-100/libstdc++-v3/config/os/uclibc/ctype_inline.h 1969-12-31 18:00:00.000000000 -0600
yann@1	2759	+++ gcc-4.0.0/libstdc++-v3/config/os/uclibc/ctype_inline.h 2002-06-24 00:49:19.000000000 -0500
yann@1	2760	@@ -0,0 +1,69 @@
yann@1	2761	+// Locale support -- C++ --
yann@1	2762	+
yann@1	2763	+// Copyright (C) 2000, 2002 Free Software Foundation, Inc.
yann@1	2764	+//
yann@1	2765	+// This file is part of the GNU ISO C++ Library. This library is free
yann@1	2766	+// software; you can redistribute it and/or modify it under the
yann@1	2767	+// terms of the GNU General Public License as published by the
yann@1	2768	+// Free Software Foundation; either version 2, or (at your option)
yann@1	2769	+// any later version.
yann@1	2770	+
yann@1	2771	+// This library is distributed in the hope that it will be useful,
yann@1	2772	+// but WITHOUT ANY WARRANTY; without even the implied warranty of
yann@1	2773	+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
yann@1	2774	+// GNU General Public License for more details.
yann@1	2775	+
yann@1	2776	+// You should have received a copy of the GNU General Public License along
yann@1	2777	+// with this library; see the file COPYING. If not, write to the Free
yann@1	2778	+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
yann@1	2779	+// USA.
yann@1	2780	+
yann@1	2781	+// As a special exception, you may use this file as part of a free software
yann@1	2782	+// library without restriction. Specifically, if other files instantiate
yann@1	2783	+// templates or use macros or inline functions from this file, or you compile
yann@1	2784	+// this file and link it with other files to produce an executable, this
yann@1	2785	+// file does not by itself cause the resulting executable to be covered by
yann@1	2786	+// the GNU General Public License. This exception does not however
yann@1	2787	+// invalidate any other reasons why the executable file might be covered by
yann@1	2788	+// the GNU General Public License.
yann@1	2789	+
yann@1	2790	+//
yann@1	2791	+// ISO C++ 14882: 22.1 Locales
yann@1	2792	+//
yann@1	2793	+
yann@1	2794	+// ctype bits to be inlined go here. Non-inlinable (ie virtual do_*)
yann@1	2795	+// functions go in ctype.cc
yann@1	2796	+
yann@1	2797	+ bool
yann@1	2798	+ ctype<char>::
yann@1	2799	+ is(mask __m, char __c) const
yann@1	2800	+ { return _M_table[static_cast<unsigned char>(__c)] & __m; }
yann@1	2801	+
yann@1	2802	+ const char*
yann@1	2803	+ ctype<char>::
yann@1	2804	+ is(const char* __low, const char* __high, mask* __vec) const
yann@1	2805	+ {
yann@1	2806	+ while (__low < __high)
yann@1	2807	+ __vec++ = _M_table[static_cast<unsigned char>(__low++)];
yann@1	2808	+ return __high;
yann@1	2809	+ }
yann@1	2810	+
yann@1	2811	+ const char*
yann@1	2812	+ ctype<char>::
yann@1	2813	+ scan_is(mask __m, const char* __low, const char* __high) const
yann@1	2814	+ {
yann@1	2815	+ while (__low < __high
yann@1	2816	+ && !(_M_table[static_cast<unsigned char>(*__low)] & __m))
yann@1	2817	+ ++__low;
yann@1	2818	+ return __low;
yann@1	2819	+ }
yann@1	2820	+
yann@1	2821	+ const char*
yann@1	2822	+ ctype<char>::
yann@1	2823	+ scan_not(mask __m, const char* __low, const char* __high) const
yann@1	2824	+ {
yann@1	2825	+ while (__low < __high
yann@1	2826	+ && (_M_table[static_cast<unsigned char>(*__low)] & __m) != 0)
yann@1	2827	+ ++__low;
yann@1	2828	+ return __low;
yann@1	2829	+ }
yann@1	2830	diff -urN gcc-4.0.0-100/libstdc++-v3/config/os/uclibc/ctype_noninline.h gcc-4.0.0/libstdc++-v3/config/os/uclibc/ctype_noninline.h
yann@1	2831	--- gcc-4.0.0-100/libstdc++-v3/config/os/uclibc/ctype_noninline.h 1969-12-31 18:00:00.000000000 -0600
yann@1	2832	+++ gcc-4.0.0/libstdc++-v3/config/os/uclibc/ctype_noninline.h 2005-04-28 01:10:27.000000000 -0500
yann@1	2833	@@ -0,0 +1,92 @@
yann@1	2834	+// Locale support -- C++ --
yann@1	2835	+
yann@1	2836	+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2004
yann@1	2837	+// Free Software Foundation, Inc.
yann@1	2838	+//
yann@1	2839	+// This file is part of the GNU ISO C++ Library. This library is free
yann@1	2840	+// software; you can redistribute it and/or modify it under the
yann@1	2841	+// terms of the GNU General Public License as published by the
yann@1	2842	+// Free Software Foundation; either version 2, or (at your option)
yann@1	2843	+// any later version.
yann@1	2844	+
yann@1	2845	+// This library is distributed in the hope that it will be useful,
yann@1	2846	+// but WITHOUT ANY WARRANTY; without even the implied warranty of
yann@1	2847	+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
yann@1	2848	+// GNU General Public License for more details.
yann@1	2849	+
yann@1	2850	+// You should have received a copy of the GNU General Public License along
yann@1	2851	+// with this library; see the file COPYING. If not, write to the Free
yann@1	2852	+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
yann@1	2853	+// USA.
yann@1	2854	+
yann@1	2855	+// As a special exception, you may use this file as part of a free software
yann@1	2856	+// library without restriction. Specifically, if other files instantiate
yann@1	2857	+// templates or use macros or inline functions from this file, or you compile
yann@1	2858	+// this file and link it with other files to produce an executable, this
yann@1	2859	+// file does not by itself cause the resulting executable to be covered by
yann@1	2860	+// the GNU General Public License. This exception does not however
yann@1	2861	+// invalidate any other reasons why the executable file might be covered by
yann@1	2862	+// the GNU General Public License.
yann@1	2863	+
yann@1	2864	+//
yann@1	2865	+// ISO C++ 14882: 22.1 Locales
yann@1	2866	+//
yann@1	2867	+
yann@1	2868	+// Information as gleaned from /usr/include/ctype.h
yann@1	2869	+
yann@1	2870	+ const ctype_base::mask*
yann@1	2871	+ ctype<char>::classic_table() throw()
yann@1	2872	+ { return __C_ctype_b; }
yann@1	2873	+
yann@1	2874	+ ctype<char>::ctype(__c_locale, const mask* __table, bool __del,
yann@1	2875	+ size_t __refs)
yann@1	2876	+ : facet(__refs), _M_c_locale_ctype(_S_get_c_locale()),
yann@1	2877	+ _M_del(__table != 0 && __del), _M_widen_ok(0), _M_narrow_ok(0)
yann@1	2878	+ {
yann@1	2879	+ _M_toupper = __C_ctype_toupper;
yann@1	2880	+ _M_tolower = __C_ctype_tolower;
yann@1	2881	+ _M_table = __table ? __table : __C_ctype_b;
yann@1	2882	+ memset(_M_widen, 0, sizeof(_M_widen));
yann@1	2883	+ memset(_M_narrow, 0, sizeof(_M_narrow));
yann@1	2884	+ }
yann@1	2885	+
yann@1	2886	+ ctype<char>::ctype(const mask* __table, bool __del, size_t __refs)
yann@1	2887	+ : facet(__refs), _M_c_locale_ctype(_S_get_c_locale()),
yann@1	2888	+ _M_del(__table != 0 && __del), _M_widen_ok(0), _M_narrow_ok(0)
yann@1	2889	+ {
yann@1	2890	+ _M_toupper = __C_ctype_toupper;
yann@1	2891	+ _M_tolower = __C_ctype_tolower;
yann@1	2892	+ _M_table = __table ? __table : __C_ctype_b;
yann@1	2893	+ memset(_M_widen, 0, sizeof(_M_widen));
yann@1	2894	+ memset(_M_narrow, 0, sizeof(_M_narrow));
yann@1	2895	+ }
yann@1	2896	+
yann@1	2897	+ char
yann@1	2898	+ ctype<char>::do_toupper(char __c) const
yann@1	2899	+ { return _M_toupper[static_cast<unsigned char>(__c)]; }
yann@1	2900	+
yann@1	2901	+ const char*
yann@1	2902	+ ctype<char>::do_toupper(char* __low, const char* __high) const
yann@1	2903	+ {
yann@1	2904	+ while (__low < __high)
yann@1	2905	+ {
yann@1	2906	+ __low = _M_toupper[static_cast<unsigned char>(__low)];
yann@1	2907	+ ++__low;
yann@1	2908	+ }
yann@1	2909	+ return __high;
yann@1	2910	+ }
yann@1	2911	+
yann@1	2912	+ char
yann@1	2913	+ ctype<char>::do_tolower(char __c) const
yann@1	2914	+ { return _M_tolower[static_cast<unsigned char>(__c)]; }
yann@1	2915	+
yann@1	2916	+ const char*
yann@1	2917	+ ctype<char>::do_tolower(char* __low, const char* __high) const
yann@1	2918	+ {
yann@1	2919	+ while (__low < __high)
yann@1	2920	+ {
yann@1	2921	+ __low = _M_tolower[static_cast<unsigned char>(__low)];
yann@1	2922	+ ++__low;
yann@1	2923	+ }
yann@1	2924	+ return __high;
yann@1	2925	+ }
yann@1	2926	diff -urN gcc-4.0.0-100/libstdc++-v3/config/os/uclibc/os_defines.h gcc-4.0.0/libstdc++-v3/config/os/uclibc/os_defines.h
yann@1	2927	--- gcc-4.0.0-100/libstdc++-v3/config/os/uclibc/os_defines.h 1969-12-31 18:00:00.000000000 -0600
yann@1	2928	+++ gcc-4.0.0/libstdc++-v3/config/os/uclibc/os_defines.h 2005-04-28 01:10:27.000000000 -0500
yann@1	2929	@@ -0,0 +1,44 @@
yann@1	2930	+// Specific definitions for GNU/Linux -- C++ --
yann@1	2931	+
yann@1	2932	+// Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
yann@1	2933	+//
yann@1	2934	+// This file is part of the GNU ISO C++ Library. This library is free
yann@1	2935	+// software; you can redistribute it and/or modify it under the
yann@1	2936	+// terms of the GNU General Public License as published by the
yann@1	2937	+// Free Software Foundation; either version 2, or (at your option)
yann@1	2938	+// any later version.
yann@1	2939	+
yann@1	2940	+// This library is distributed in the hope that it will be useful,
yann@1	2941	+// but WITHOUT ANY WARRANTY; without even the implied warranty of
yann@1	2942	+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
yann@1	2943	+// GNU General Public License for more details.
yann@1	2944	+
yann@1	2945	+// You should have received a copy of the GNU General Public License along
yann@1	2946	+// with this library; see the file COPYING. If not, write to the Free
yann@1	2947	+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
yann@1	2948	+// USA.
yann@1	2949	+
yann@1	2950	+// As a special exception, you may use this file as part of a free software
yann@1	2951	+// library without restriction. Specifically, if other files instantiate
yann@1	2952	+// templates or use macros or inline functions from this file, or you compile
yann@1	2953	+// this file and link it with other files to produce an executable, this
yann@1	2954	+// file does not by itself cause the resulting executable to be covered by
yann@1	2955	+// the GNU General Public License. This exception does not however
yann@1	2956	+// invalidate any other reasons why the executable file might be covered by
yann@1	2957	+// the GNU General Public License.
yann@1	2958	+
yann@1	2959	+#ifndef _GLIBCXX_OS_DEFINES
yann@1	2960	+#define _GLIBCXX_OS_DEFINES 1
yann@1	2961	+
yann@1	2962	+// System-specific #define, typedefs, corrections, etc, go here. This
yann@1	2963	+// file will come before all others.
yann@1	2964	+
yann@1	2965	+// This keeps isanum, et al from being propagated as macros.
yann@1	2966	+#define __NO_CTYPE 1
yann@1	2967	+
yann@1	2968	+#include <features.h>
yann@1	2969	+
yann@1	2970	+// We must not see the optimized string functions GNU libc defines.
yann@1	2971	+#define __NO_STRING_INLINES
yann@1	2972	+
yann@1	2973	+#endif
yann@1	2974	diff -urN gcc-4.0.0-100/libstdc++-v3/configure gcc-4.0.0/libstdc++-v3/configure
yann@1	2975	--- gcc-4.0.0-100/libstdc++-v3/configure 2005-04-30 13:06:53.683055232 -0500
yann@1	2976	+++ gcc-4.0.0/libstdc++-v3/configure 2005-04-30 12:24:24.000000000 -0500
yann@1	2977	@@ -3998,6 +3998,11 @@
yann@1	2978	lt_cv_deplibs_check_method=pass_all
yann@1	2979	;;
yann@1	2980
yann@1	2981	+linux-uclibc*)
yann@1	2982	+ lt_cv_deplibs_check_method=pass_all
yann@1	2983	+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
yann@1	2984	+ ;;
yann@1	2985	+
yann@1	2986	netbsd* \| knetbsd*-gnu)
yann@1	2987	if echo __ELF__ \| $CC -E - \| grep __ELF__ > /dev/null; then
yann@1	2988	lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
yann@1	2989	@@ -5672,7 +5677,7 @@
yann@1	2990	enableval="$enable_clocale"
yann@1	2991
yann@1	2992	case "$enableval" in
yann@1	2993	- generic\|gnu\|ieee_1003.1-2001\|yes\|no\|auto) ;;
yann@1	2994	+ generic\|gnu\|ieee_1003.1-2001\|uclibc\|yes\|no\|auto) ;;
yann@1	2995	*) { { echo "$as_me:$LINENO: error: Unknown argument to enable/disable clocale" >&5
yann@1	2996	echo "$as_me: error: Unknown argument to enable/disable clocale" >&2;}
yann@1	2997	{ (exit 1); exit 1; }; } ;;
yann@1	2998	@@ -5697,6 +5702,9 @@
yann@1	2999	# Default to "generic".
yann@1	3000	if test $enable_clocale_flag = auto; then
yann@1	3001	case ${target_os} in
yann@1	3002	+ linux-uclibc*)
yann@1	3003	+ enable_clocale_flag=uclibc
yann@1	3004	+ ;;
yann@1	3005	linux* \| gnu* \| kfreebsd-gnu \| knetbsd-gnu)
yann@1	3006	cat >conftest.$ac_ext <<_ACEOF
yann@1	3007	/* confdefs.h. */
yann@1	3008	@@ -5927,6 +5935,76 @@
yann@1	3009	CTIME_CC=config/locale/generic/time_members.cc
yann@1	3010	CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
yann@1	3011	;;
yann@1	3012	+ uclibc)
yann@1	3013	+ echo "$as_me:$LINENO: result: uclibc" >&5
yann@1	3014	+echo "${ECHO_T}uclibc" >&6
yann@1	3015	+
yann@1	3016	+ # Declare intention to use gettext, and add support for specific
yann@1	3017	+ # languages.
yann@1	3018	+ # For some reason, ALL_LINGUAS has to be before AM-GNU-GETTEXT
yann@1	3019	+ ALL_LINGUAS="de fr"
yann@1	3020	+
yann@1	3021	+ # Don't call AM-GNU-GETTEXT here. Instead, assume glibc.
yann@1	3022	+ # Extract the first word of "msgfmt", so it can be a program name with args.
yann@1	3023	+set dummy msgfmt; ac_word=$2
yann@1	3024	+echo "$as_me:$LINENO: checking for $ac_word" >&5
yann@1	3025	+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
yann@1	3026	+if test "${ac_cv_prog_check_msgfmt+set}" = set; then
yann@1	3027	+ echo $ECHO_N "(cached) $ECHO_C" >&6
yann@1	3028	+else
yann@1	3029	+ if test -n "$check_msgfmt"; then
yann@1	3030	+ ac_cv_prog_check_msgfmt="$check_msgfmt" # Let the user override the test.
yann@1	3031	+else
yann@1	3032	+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
yann@1	3033	+for as_dir in $PATH
yann@1	3034	+do
yann@1	3035	+ IFS=$as_save_IFS
yann@1	3036	+ test -z "$as_dir" && as_dir=.
yann@1	3037	+ for ac_exec_ext in '' $ac_executable_extensions; do
yann@1	3038	+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
yann@1	3039	+ ac_cv_prog_check_msgfmt="yes"
yann@1	3040	+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
yann@1	3041	+ break 2
yann@1	3042	+ fi
yann@1	3043	+done
yann@1	3044	+done
yann@1	3045	+
yann@1	3046	+ test -z "$ac_cv_prog_check_msgfmt" && ac_cv_prog_check_msgfmt="no"
yann@1	3047	+fi
yann@1	3048	+fi
yann@1	3049	+check_msgfmt=$ac_cv_prog_check_msgfmt
yann@1	3050	+if test -n "$check_msgfmt"; then
yann@1	3051	+ echo "$as_me:$LINENO: result: $check_msgfmt" >&5
yann@1	3052	+echo "${ECHO_T}$check_msgfmt" >&6
yann@1	3053	+else
yann@1	3054	+ echo "$as_me:$LINENO: result: no" >&5
yann@1	3055	+echo "${ECHO_T}no" >&6
yann@1	3056	+fi
yann@1	3057	+
yann@1	3058	+ if test x"$check_msgfmt" = x"yes" && test x"$enable_nls" = x"yes"; then
yann@1	3059	+ USE_NLS=yes
yann@1	3060	+ fi
yann@1	3061	+ # Export the build objects.
yann@1	3062	+ for ling in $ALL_LINGUAS; do \
yann@1	3063	+ glibcxx_MOFILES="$glibcxx_MOFILES $ling.mo"; \
yann@1	3064	+ glibcxx_POFILES="$glibcxx_POFILES $ling.po"; \
yann@1	3065	+ done
yann@1	3066	+
yann@1	3067	+
yann@1	3068	+
yann@1	3069	+ CLOCALE_H=config/locale/uclibc/c_locale.h
yann@1	3070	+ CLOCALE_CC=config/locale/uclibc/c_locale.cc
yann@1	3071	+ CCODECVT_CC=config/locale/uclibc/codecvt_members.cc
yann@1	3072	+ CCOLLATE_CC=config/locale/uclibc/collate_members.cc
yann@1	3073	+ CCTYPE_CC=config/locale/uclibc/ctype_members.cc
yann@1	3074	+ CMESSAGES_H=config/locale/uclibc/messages_members.h
yann@1	3075	+ CMESSAGES_CC=config/locale/uclibc/messages_members.cc
yann@1	3076	+ CMONEY_CC=config/locale/uclibc/monetary_members.cc
yann@1	3077	+ CNUMERIC_CC=config/locale/uclibc/numeric_members.cc
yann@1	3078	+ CTIME_H=config/locale/uclibc/time_members.h
yann@1	3079	+ CTIME_CC=config/locale/uclibc/time_members.cc
yann@1	3080	+ CLOCALE_INTERNAL_H=config/locale/uclibc/c++locale_internal.h
yann@1	3081	+ ;;
yann@1	3082	esac
yann@1	3083
yann@1	3084	# This is where the testsuite looks for locale catalogs, using the
yann@1	3085	diff -urN gcc-4.0.0-100/libstdc++-v3/configure.host gcc-4.0.0/libstdc++-v3/configure.host
yann@1	3086	--- gcc-4.0.0-100/libstdc++-v3/configure.host 2005-04-30 13:06:53.688054472 -0500
yann@1	3087	+++ gcc-4.0.0/libstdc++-v3/configure.host 2005-04-28 20:20:32.000000000 -0500
yann@1	3088	@@ -249,6 +249,12 @@
yann@1	3089	;;
yann@1	3090	esac
yann@1	3091
yann@1	3092	+# Override for uClibc since linux-uclibc gets mishandled above.
yann@1	3093	+case "${host_os}" in
yann@1	3094	+ -uclibc)
yann@1	3095	+ os_include_dir="os/uclibc"
yann@1	3096	+ ;;
yann@1	3097	+esac
yann@1	3098
yann@1	3099	# Set any OS-dependent and CPU-dependent bits.
yann@1	3100	# THIS TABLE IS SORTED. KEEP IT THAT WAY.
yann@1	3101	diff -urN gcc-4.0.0-100/libstdc++-v3/crossconfig.m4 gcc-4.0.0/libstdc++-v3/crossconfig.m4
yann@1	3102	--- gcc-4.0.0-100/libstdc++-v3/crossconfig.m4 2005-04-30 13:06:53.689054320 -0500
yann@1	3103	+++ gcc-4.0.0/libstdc++-v3/crossconfig.m4 2005-04-28 20:27:15.000000000 -0500
yann@1	3104	@@ -142,6 +142,98 @@
yann@1	3105	;;
yann@1	3106	esac
yann@1	3107	;;
yann@1	3108	+ -uclibc)
yann@1	3109	+# Temporary hack until we implement the float versions of the libm funcs
yann@1	3110	+ AC_CHECK_HEADERS([nan.h ieeefp.h endian.h sys/isa_defs.h \
yann@1	3111	+ machine/endian.h machine/param.h sys/machine.h sys/types.h \
yann@1	3112	+ fp.h float.h endian.h inttypes.h locale.h float.h stdint.h])
yann@1	3113	+ SECTION_FLAGS='-ffunction-sections -fdata-sections'
yann@1	3114	+ AC_SUBST(SECTION_FLAGS)
yann@1	3115	+ GLIBCXX_CHECK_LINKER_FEATURES
yann@1	3116	+ GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT
yann@1	3117	+ GLIBCXX_CHECK_WCHAR_T_SUPPORT
yann@1	3118	+
yann@1	3119	+ # For LFS.
yann@1	3120	+ AC_DEFINE(HAVE_INT64_T)
yann@1	3121	+ case "$target" in
yann@1	3122	+ -uclinux)
yann@1	3123	+ # Don't enable LFS with uClinux
yann@1	3124	+ ;;
yann@1	3125	+ *)
yann@1	3126	+ AC_DEFINE(_GLIBCXX_USE_LFS)
yann@1	3127	+ esac
yann@1	3128	+
yann@1	3129	+ # For showmanyc_helper().
yann@1	3130	+ AC_CHECK_HEADERS(sys/ioctl.h sys/filio.h)
yann@1	3131	+ GLIBCXX_CHECK_POLL
yann@1	3132	+ GLIBCXX_CHECK_S_ISREG_OR_S_IFREG
yann@1	3133	+
yann@1	3134	+ # For xsputn_2().
yann@1	3135	+ AC_CHECK_HEADERS(sys/uio.h)
yann@1	3136	+ GLIBCXX_CHECK_WRITEV
yann@1	3137	+
yann@1	3138	+# AC_DEFINE(HAVE_ACOSF)
yann@1	3139	+# AC_DEFINE(HAVE_ASINF)
yann@1	3140	+# AC_DEFINE(HAVE_ATANF)
yann@1	3141	+# AC_DEFINE(HAVE_ATAN2F)
yann@1	3142	+ AC_DEFINE(HAVE_CEILF)
yann@1	3143	+ AC_DEFINE(HAVE_COPYSIGN)
yann@1	3144	+# AC_DEFINE(HAVE_COPYSIGNF)
yann@1	3145	+# AC_DEFINE(HAVE_COSF)
yann@1	3146	+# AC_DEFINE(HAVE_COSHF)
yann@1	3147	+# AC_DEFINE(HAVE_EXPF)
yann@1	3148	+# AC_DEFINE(HAVE_FABSF)
yann@1	3149	+ AC_DEFINE(HAVE_FINITE)
yann@1	3150	+ AC_DEFINE(HAVE_FINITEF)
yann@1	3151	+ AC_DEFINE(HAVE_FLOORF)
yann@1	3152	+# AC_DEFINE(HAVE_FMODF)
yann@1	3153	+# AC_DEFINE(HAVE_FREXPF)
yann@1	3154	+ AC_DEFINE(HAVE_HYPOT)
yann@1	3155	+# AC_DEFINE(HAVE_HYPOTF)
yann@1	3156	+ AC_DEFINE(HAVE_ISINF)
yann@1	3157	+ AC_DEFINE(HAVE_ISINFF)
yann@1	3158	+ AC_DEFINE(HAVE_ISNAN)
yann@1	3159	+ AC_DEFINE(HAVE_ISNANF)
yann@1	3160	+# AC_DEFINE(HAVE_LOGF)
yann@1	3161	+# AC_DEFINE(HAVE_LOG10F)
yann@1	3162	+# AC_DEFINE(HAVE_MODFF)
yann@1	3163	+# AC_DEFINE(HAVE_SINF)
yann@1	3164	+# AC_DEFINE(HAVE_SINHF)
yann@1	3165	+# AC_DEFINE(HAVE_SINCOS)
yann@1	3166	+# AC_DEFINE(HAVE_SINCOSF)
yann@1	3167	+ AC_DEFINE(HAVE_SQRTF)
yann@1	3168	+# AC_DEFINE(HAVE_TANF)
yann@1	3169	+# AC_DEFINE(HAVE_TANHF)
yann@1	3170	+ if test x"long_double_math_on_this_cpu" = x"yes"; then
yann@1	3171	+# AC_DEFINE(HAVE_ACOSL)
yann@1	3172	+# AC_DEFINE(HAVE_ASINL)
yann@1	3173	+# AC_DEFINE(HAVE_ATANL)
yann@1	3174	+# AC_DEFINE(HAVE_ATAN2L)
yann@1	3175	+# AC_DEFINE(HAVE_CEILL)
yann@1	3176	+# AC_DEFINE(HAVE_COPYSIGNL)
yann@1	3177	+# AC_DEFINE(HAVE_COSL)
yann@1	3178	+# AC_DEFINE(HAVE_COSHL)
yann@1	3179	+# AC_DEFINE(HAVE_EXPL)
yann@1	3180	+# AC_DEFINE(HAVE_FABSL)
yann@1	3181	+# AC_DEFINE(HAVE_FINITEL)
yann@1	3182	+# AC_DEFINE(HAVE_FLOORL)
yann@1	3183	+# AC_DEFINE(HAVE_FMODL)
yann@1	3184	+# AC_DEFINE(HAVE_FREXPL)
yann@1	3185	+# AC_DEFINE(HAVE_HYPOTL)
yann@1	3186	+# AC_DEFINE(HAVE_ISINFL)
yann@1	3187	+# AC_DEFINE(HAVE_ISNANL)
yann@1	3188	+# AC_DEFINE(HAVE_LOGL)
yann@1	3189	+# AC_DEFINE(HAVE_LOG10L)
yann@1	3190	+# AC_DEFINE(HAVE_MODFL)
yann@1	3191	+# AC_DEFINE(HAVE_POWL)
yann@1	3192	+# AC_DEFINE(HAVE_SINL)
yann@1	3193	+# AC_DEFINE(HAVE_SINHL)
yann@1	3194	+# AC_DEFINE(HAVE_SINCOSL)
yann@1	3195	+# AC_DEFINE(HAVE_SQRTL)
yann@1	3196	+# AC_DEFINE(HAVE_TANL)
yann@1	3197	+# AC_DEFINE(HAVE_TANHL)
yann@1	3198	+ fi
yann@1	3199	+ ;;
yann@1	3200	-linux \| -uclinux \| -gnu \| -kfreebsd-gnu \| -knetbsd-gnu)
yann@1	3201	AC_CHECK_HEADERS([nan.h ieeefp.h endian.h sys/isa_defs.h \
yann@1	3202	machine/endian.h machine/param.h sys/machine.h sys/types.h \
yann@1	3203	@@ -156,7 +248,7 @@
yann@1	3204	AC_DEFINE(HAVE_INT64_T)
yann@1	3205	case "$target" in
yann@1	3206	-uclinux)
yann@1	3207	- # Don't enable LFS with uClibc
yann@1	3208	+ # Don't enable LFS with uClinux
yann@1	3209	;;
yann@1	3210	*)
yann@1	3211	AC_DEFINE(_GLIBCXX_USE_LFS)
yann@1	3212	diff -urN gcc-4.0.0-100/libstdc++-v3/include/c_compatibility/wchar.h gcc-4.0.0/libstdc++-v3/include/c_compatibility/wchar.h
yann@1	3213	--- gcc-4.0.0-100/libstdc++-v3/include/c_compatibility/wchar.h 2005-04-30 13:06:53.690054168 -0500
yann@1	3214	+++ gcc-4.0.0/libstdc++-v3/include/c_compatibility/wchar.h 2005-04-28 20:15:56.000000000 -0500
yann@1	3215	@@ -101,7 +101,9 @@
yann@1	3216	using std::wmemcpy;
yann@1	3217	using std::wmemmove;
yann@1	3218	using std::wmemset;
yann@1	3219	+#if _GLIBCXX_HAVE_WCSFTIME
yann@1	3220	using std::wcsftime;
yann@1	3221	+#endif
yann@1	3222
yann@1	3223	#if _GLIBCXX_USE_C99
yann@1	3224	using std::wcstold;
yann@1	3225	diff -urN gcc-4.0.0-100/libstdc++-v3/include/c_std/std_cwchar.h gcc-4.0.0/libstdc++-v3/include/c_std/std_cwchar.h
yann@1	3226	--- gcc-4.0.0-100/libstdc++-v3/include/c_std/std_cwchar.h 2005-04-30 13:06:53.691054016 -0500
yann@1	3227	+++ gcc-4.0.0/libstdc++-v3/include/c_std/std_cwchar.h 2005-04-28 20:15:56.000000000 -0500
yann@1	3228	@@ -179,7 +179,9 @@
yann@1	3229	using ::wcscoll;
yann@1	3230	using ::wcscpy;
yann@1	3231	using ::wcscspn;
yann@1	3232	+#if _GLIBCXX_HAVE_WCSFTIME
yann@1	3233	using ::wcsftime;
yann@1	3234	+#endif
yann@1	3235	using ::wcslen;
yann@1	3236	using ::wcsncat;
yann@1	3237	using ::wcsncmp;

author	"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
	Sat Feb 24 11:00:05 2007 +0000 (2007-02-24)
changeset 1	eeea35fbf182
permissions	-rw-r--r--