yann@1: diff -urN gcc-3.4.2-dist/libstdc++-v3/acinclude.m4 gcc-3.4.2/libstdc++-v3/acinclude.m4 yann@1: --- gcc-3.4.2-dist/libstdc++-v3/acinclude.m4 2004-07-15 12:42:45.000000000 -0500 yann@1: +++ gcc-3.4.2/libstdc++-v3/acinclude.m4 2004-09-10 10:47:40.000000000 -0500 yann@1: @@ -996,7 +996,7 @@ yann@1: AC_MSG_CHECKING([for C locale to use]) yann@1: GLIBCXX_ENABLE(clocale,auto,[@<:@=MODEL@:>@], yann@1: [use MODEL for target locale package], yann@1: - [permit generic|gnu|ieee_1003.1-2001|yes|no|auto]) yann@1: + [permit generic|gnu|ieee_1003.1-2001|uclibc|yes|no|auto]) yann@1: yann@1: # If they didn't use this option switch, or if they specified --enable yann@1: # with no specific model, we'll have to look for one. If they yann@1: @@ -1012,6 +1012,9 @@ yann@1: # Default to "generic". yann@1: if test $enable_clocale_flag = auto; then yann@1: case x${target_os} in yann@1: + x*-uclibc*) yann@1: + enable_clocale_flag=uclibc yann@1: + ;; yann@1: xlinux* | xgnu* | xkfreebsd*-gnu | xknetbsd*-gnu) yann@1: AC_EGREP_CPP([_GLIBCXX_ok], [ yann@1: #include yann@1: @@ -1138,6 +1141,41 @@ yann@1: CTIME_CC=config/locale/generic/time_members.cc yann@1: CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h yann@1: ;; yann@1: + uclibc) yann@1: + AC_MSG_RESULT(uclibc) yann@1: + yann@1: + # Declare intention to use gettext, and add support for specific yann@1: + # languages. yann@1: + # For some reason, ALL_LINGUAS has to be before AM-GNU-GETTEXT yann@1: + ALL_LINGUAS="de fr" yann@1: + yann@1: + # Don't call AM-GNU-GETTEXT here. Instead, assume glibc. yann@1: + AC_CHECK_PROG(check_msgfmt, msgfmt, yes, no) yann@1: + if test x"$check_msgfmt" = x"yes" && test x"$enable_nls" = x"yes"; then yann@1: + USE_NLS=yes yann@1: + fi yann@1: + # Export the build objects. yann@1: + for ling in $ALL_LINGUAS; do \ yann@1: + glibcxx_MOFILES="$glibcxx_MOFILES $ling.mo"; \ yann@1: + glibcxx_POFILES="$glibcxx_POFILES $ling.po"; \ yann@1: + done yann@1: + AC_SUBST(glibcxx_MOFILES) yann@1: + AC_SUBST(glibcxx_POFILES) yann@1: + yann@1: + CLOCALE_H=config/locale/uclibc/c_locale.h yann@1: + CLOCALE_CC=config/locale/uclibc/c_locale.cc yann@1: + CCODECVT_H=config/locale/ieee_1003.1-2001/codecvt_specializations.h yann@1: + CCODECVT_CC=config/locale/uclibc/codecvt_members.cc yann@1: + CCOLLATE_CC=config/locale/uclibc/collate_members.cc yann@1: + CCTYPE_CC=config/locale/uclibc/ctype_members.cc yann@1: + CMESSAGES_H=config/locale/uclibc/messages_members.h yann@1: + CMESSAGES_CC=config/locale/uclibc/messages_members.cc yann@1: + CMONEY_CC=config/locale/uclibc/monetary_members.cc yann@1: + CNUMERIC_CC=config/locale/uclibc/numeric_members.cc yann@1: + CTIME_H=config/locale/uclibc/time_members.h yann@1: + CTIME_CC=config/locale/uclibc/time_members.cc yann@1: + CLOCALE_INTERNAL_H=config/locale/uclibc/c++locale_internal.h yann@1: + ;; yann@1: esac yann@1: yann@1: # This is where the testsuite looks for locale catalogs, using the yann@1: diff -urN gcc-3.4.2-dist/libstdc++-v3/aclocal.m4 gcc-3.4.2/libstdc++-v3/aclocal.m4 yann@1: --- gcc-3.4.2-dist/libstdc++-v3/aclocal.m4 2004-08-13 15:44:03.000000000 -0500 yann@1: +++ gcc-3.4.2/libstdc++-v3/aclocal.m4 2004-09-10 10:47:40.000000000 -0500 yann@1: @@ -1025,6 +1025,9 @@ yann@1: # Default to "generic". yann@1: if test $enable_clocale_flag = auto; then yann@1: case x${target_os} in yann@1: + x*-uclibc*) yann@1: + enable_clocale_flag=uclibc yann@1: + ;; yann@1: xlinux* | xgnu* | xkfreebsd*-gnu | xknetbsd*-gnu) yann@1: AC_EGREP_CPP([_GLIBCXX_ok], [ yann@1: #include yann@1: @@ -1151,6 +1154,41 @@ yann@1: CTIME_CC=config/locale/generic/time_members.cc yann@1: CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h yann@1: ;; yann@1: + uclibc) yann@1: + AC_MSG_RESULT(uclibc) yann@1: + yann@1: + # Declare intention to use gettext, and add support for specific yann@1: + # languages. yann@1: + # For some reason, ALL_LINGUAS has to be before AM-GNU-GETTEXT yann@1: + ALL_LINGUAS="de fr" yann@1: + yann@1: + # Don't call AM-GNU-GETTEXT here. Instead, assume glibc. yann@1: + AC_CHECK_PROG(check_msgfmt, msgfmt, yes, no) yann@1: + if test x"$check_msgfmt" = x"yes" && test x"$enable_nls" = x"yes"; then yann@1: + USE_NLS=yes yann@1: + fi yann@1: + # Export the build objects. yann@1: + for ling in $ALL_LINGUAS; do \ yann@1: + glibcxx_MOFILES="$glibcxx_MOFILES $ling.mo"; \ yann@1: + glibcxx_POFILES="$glibcxx_POFILES $ling.po"; \ yann@1: + done yann@1: + AC_SUBST(glibcxx_MOFILES) yann@1: + AC_SUBST(glibcxx_POFILES) yann@1: + yann@1: + CLOCALE_H=config/locale/uclibc/c_locale.h yann@1: + CLOCALE_CC=config/locale/uclibc/c_locale.cc yann@1: + CCODECVT_H=config/locale/ieee_1003.1-2001/codecvt_specializations.h yann@1: + CCODECVT_CC=config/locale/uclibc/codecvt_members.cc yann@1: + CCOLLATE_CC=config/locale/uclibc/collate_members.cc yann@1: + CCTYPE_CC=config/locale/uclibc/ctype_members.cc yann@1: + CMESSAGES_H=config/locale/uclibc/messages_members.h yann@1: + CMESSAGES_CC=config/locale/uclibc/messages_members.cc yann@1: + CMONEY_CC=config/locale/uclibc/monetary_members.cc yann@1: + CNUMERIC_CC=config/locale/uclibc/numeric_members.cc yann@1: + CTIME_H=config/locale/uclibc/time_members.h yann@1: + CTIME_CC=config/locale/uclibc/time_members.cc yann@1: + CLOCALE_INTERNAL_H=config/locale/uclibc/c++locale_internal.h yann@1: + ;; yann@1: esac yann@1: yann@1: # This is where the testsuite looks for locale catalogs, using the yann@1: diff -urN gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/c++locale_internal.h gcc-3.4.2/libstdc++-v3/config/locale/uclibc/c++locale_internal.h yann@1: --- gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 1969-12-31 18:00:00.000000000 -0600 yann@1: +++ gcc-3.4.2/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 2004-09-10 10:47:40.000000000 -0500 yann@1: @@ -0,0 +1,59 @@ yann@1: +// Prototypes for GLIBC thread locale __-prefixed functions -*- C++ -*- yann@1: + yann@1: +// Copyright (C) 2002, 2004 Free Software Foundation, Inc. yann@1: +// yann@1: +// This file is part of the GNU ISO C++ Library. This library is free yann@1: +// software; you can redistribute it and/or modify it under the yann@1: +// terms of the GNU General Public License as published by the yann@1: +// Free Software Foundation; either version 2, or (at your option) yann@1: +// any later version. yann@1: + yann@1: +// This library is distributed in the hope that it will be useful, yann@1: +// but WITHOUT ANY WARRANTY; without even the implied warranty of yann@1: +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the yann@1: +// GNU General Public License for more details. yann@1: + yann@1: +// You should have received a copy of the GNU General Public License along yann@1: +// with this library; see the file COPYING. If not, write to the Free yann@1: +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, yann@1: +// USA. yann@1: + yann@1: +// As a special exception, you may use this file as part of a free software yann@1: +// library without restriction. Specifically, if other files instantiate yann@1: +// templates or use macros or inline functions from this file, or you compile yann@1: +// this file and link it with other files to produce an executable, this yann@1: +// file does not by itself cause the resulting executable to be covered by yann@1: +// the GNU General Public License. This exception does not however yann@1: +// invalidate any other reasons why the executable file might be covered by yann@1: +// the GNU General Public License. yann@1: + yann@1: +// Written by Jakub Jelinek yann@1: + yann@1: +#include yann@1: + yann@1: +#ifdef __UCLIBC_MJN3_ONLY__ yann@1: +#warning clean this up yann@1: +#endif yann@1: + yann@1: +#ifdef __UCLIBC_HAS_XLOCALE__ yann@1: + yann@1: +extern "C" __typeof(iswctype_l) __iswctype_l; yann@1: +extern "C" __typeof(nl_langinfo_l) __nl_langinfo_l; yann@1: +extern "C" __typeof(strcoll_l) __strcoll_l; yann@1: +extern "C" __typeof(strftime_l) __strftime_l; yann@1: +extern "C" __typeof(strtod_l) __strtod_l; yann@1: +extern "C" __typeof(strtof_l) __strtof_l; yann@1: +extern "C" __typeof(strtold_l) __strtold_l; yann@1: +extern "C" __typeof(strxfrm_l) __strxfrm_l; yann@1: +extern "C" __typeof(towlower_l) __towlower_l; yann@1: +extern "C" __typeof(towupper_l) __towupper_l; yann@1: +extern "C" __typeof(wcscoll_l) __wcscoll_l; yann@1: +extern "C" __typeof(wcsftime_l) __wcsftime_l; yann@1: +extern "C" __typeof(wcsxfrm_l) __wcsxfrm_l; yann@1: +extern "C" __typeof(wctype_l) __wctype_l; yann@1: +extern "C" __typeof(newlocale) __newlocale; yann@1: +extern "C" __typeof(freelocale) __freelocale; yann@1: +extern "C" __typeof(duplocale) __duplocale; yann@1: +extern "C" __typeof(uselocale) __uselocale; yann@1: + yann@1: +#endif // GLIBC 2.3 and later yann@1: diff -urN gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/c_locale.cc gcc-3.4.2/libstdc++-v3/config/locale/uclibc/c_locale.cc yann@1: --- gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/c_locale.cc 1969-12-31 18:00:00.000000000 -0600 yann@1: +++ gcc-3.4.2/libstdc++-v3/config/locale/uclibc/c_locale.cc 2004-09-10 10:47:40.000000000 -0500 yann@1: @@ -0,0 +1,160 @@ yann@1: +// Wrapper for underlying C-language localization -*- C++ -*- yann@1: + yann@1: +// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. yann@1: +// yann@1: +// This file is part of the GNU ISO C++ Library. This library is free yann@1: +// software; you can redistribute it and/or modify it under the yann@1: +// terms of the GNU General Public License as published by the yann@1: +// Free Software Foundation; either version 2, or (at your option) yann@1: +// any later version. yann@1: + yann@1: +// This library is distributed in the hope that it will be useful, yann@1: +// but WITHOUT ANY WARRANTY; without even the implied warranty of yann@1: +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the yann@1: +// GNU General Public License for more details. yann@1: + yann@1: +// You should have received a copy of the GNU General Public License along yann@1: +// with this library; see the file COPYING. If not, write to the Free yann@1: +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, yann@1: +// USA. yann@1: + yann@1: +// As a special exception, you may use this file as part of a free software yann@1: +// library without restriction. Specifically, if other files instantiate yann@1: +// templates or use macros or inline functions from this file, or you compile yann@1: +// this file and link it with other files to produce an executable, this yann@1: +// file does not by itself cause the resulting executable to be covered by yann@1: +// the GNU General Public License. This exception does not however yann@1: +// invalidate any other reasons why the executable file might be covered by yann@1: +// the GNU General Public License. yann@1: + yann@1: +// yann@1: +// ISO C++ 14882: 22.8 Standard locale categories. yann@1: +// yann@1: + yann@1: +// Written by Benjamin Kosnik yann@1: + yann@1: +#include // For errno yann@1: +#include yann@1: +#include yann@1: +#include yann@1: +#include yann@1: + yann@1: +#ifndef __UCLIBC_HAS_XLOCALE__ yann@1: +#define __strtol_l(S, E, B, L) strtol((S), (E), (B)) yann@1: +#define __strtoul_l(S, E, B, L) strtoul((S), (E), (B)) yann@1: +#define __strtoll_l(S, E, B, L) strtoll((S), (E), (B)) yann@1: +#define __strtoull_l(S, E, B, L) strtoull((S), (E), (B)) yann@1: +#define __strtof_l(S, E, L) strtof((S), (E)) yann@1: +#define __strtod_l(S, E, L) strtod((S), (E)) yann@1: +#define __strtold_l(S, E, L) strtold((S), (E)) yann@1: +#warning should dummy __newlocale check for C|POSIX ? yann@1: +#define __newlocale(a, b, c) NULL yann@1: +#define __freelocale(a) ((void)0) yann@1: +#define __duplocale(a) __c_locale() yann@1: +#endif yann@1: + yann@1: +namespace std yann@1: +{ yann@1: + template<> yann@1: + void yann@1: + __convert_to_v(const char* __s, float& __v, ios_base::iostate& __err, yann@1: + const __c_locale& __cloc) yann@1: + { yann@1: + if (!(__err & ios_base::failbit)) yann@1: + { yann@1: + char* __sanity; yann@1: + errno = 0; yann@1: + float __f = __strtof_l(__s, &__sanity, __cloc); yann@1: + if (__sanity != __s && errno != ERANGE) yann@1: + __v = __f; yann@1: + else yann@1: + __err |= ios_base::failbit; yann@1: + } yann@1: + } yann@1: + yann@1: + template<> yann@1: + void yann@1: + __convert_to_v(const char* __s, double& __v, ios_base::iostate& __err, yann@1: + const __c_locale& __cloc) yann@1: + { yann@1: + if (!(__err & ios_base::failbit)) yann@1: + { yann@1: + char* __sanity; yann@1: + errno = 0; yann@1: + double __d = __strtod_l(__s, &__sanity, __cloc); yann@1: + if (__sanity != __s && errno != ERANGE) yann@1: + __v = __d; yann@1: + else yann@1: + __err |= ios_base::failbit; yann@1: + } yann@1: + } yann@1: + yann@1: + template<> yann@1: + void yann@1: + __convert_to_v(const char* __s, long double& __v, ios_base::iostate& __err, yann@1: + const __c_locale& __cloc) yann@1: + { yann@1: + if (!(__err & ios_base::failbit)) yann@1: + { yann@1: + char* __sanity; yann@1: + errno = 0; yann@1: + long double __ld = __strtold_l(__s, &__sanity, __cloc); yann@1: + if (__sanity != __s && errno != ERANGE) yann@1: + __v = __ld; yann@1: + else yann@1: + __err |= ios_base::failbit; yann@1: + } yann@1: + } yann@1: + yann@1: + void yann@1: + locale::facet::_S_create_c_locale(__c_locale& __cloc, const char* __s, yann@1: + __c_locale __old) yann@1: + { yann@1: + __cloc = __newlocale(1 << LC_ALL, __s, __old); yann@1: +#ifdef __UCLIBC_HAS_XLOCALE__ yann@1: + if (!__cloc) yann@1: + { yann@1: + // This named locale is not supported by the underlying OS. yann@1: + __throw_runtime_error(__N("locale::facet::_S_create_c_locale " yann@1: + "name not valid")); yann@1: + } yann@1: +#endif yann@1: + } yann@1: + yann@1: + void yann@1: + locale::facet::_S_destroy_c_locale(__c_locale& __cloc) yann@1: + { yann@1: + if (_S_get_c_locale() != __cloc) yann@1: + __freelocale(__cloc); yann@1: + } yann@1: + yann@1: + __c_locale yann@1: + locale::facet::_S_clone_c_locale(__c_locale& __cloc) yann@1: + { return __duplocale(__cloc); } yann@1: +} // namespace std yann@1: + yann@1: +namespace __gnu_cxx yann@1: +{ yann@1: + const char* const category_names[6 + _GLIBCXX_NUM_CATEGORIES] = yann@1: + { yann@1: + "LC_CTYPE", yann@1: + "LC_NUMERIC", yann@1: + "LC_TIME", yann@1: + "LC_COLLATE", yann@1: + "LC_MONETARY", yann@1: + "LC_MESSAGES", yann@1: +#if _GLIBCXX_NUM_CATEGORIES != 0 yann@1: + "LC_PAPER", yann@1: + "LC_NAME", yann@1: + "LC_ADDRESS", yann@1: + "LC_TELEPHONE", yann@1: + "LC_MEASUREMENT", yann@1: + "LC_IDENTIFICATION" yann@1: +#endif yann@1: + }; yann@1: +} yann@1: + yann@1: +namespace std yann@1: +{ yann@1: + const char* const* const locale::_S_categories = __gnu_cxx::category_names; yann@1: +} // namespace std yann@1: diff -urN gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/c_locale.h gcc-3.4.2/libstdc++-v3/config/locale/uclibc/c_locale.h yann@1: --- gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/c_locale.h 1969-12-31 18:00:00.000000000 -0600 yann@1: +++ gcc-3.4.2/libstdc++-v3/config/locale/uclibc/c_locale.h 2004-09-10 10:48:08.000000000 -0500 yann@1: @@ -0,0 +1,115 @@ yann@1: +// Wrapper for underlying C-language localization -*- C++ -*- yann@1: + yann@1: +// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc. yann@1: +// yann@1: +// This file is part of the GNU ISO C++ Library. This library is free yann@1: +// software; you can redistribute it and/or modify it under the yann@1: +// terms of the GNU General Public License as published by the yann@1: +// Free Software Foundation; either version 2, or (at your option) yann@1: +// any later version. yann@1: + yann@1: +// This library is distributed in the hope that it will be useful, yann@1: +// but WITHOUT ANY WARRANTY; without even the implied warranty of yann@1: +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the yann@1: +// GNU General Public License for more details. yann@1: + yann@1: +// You should have received a copy of the GNU General Public License along yann@1: +// with this library; see the file COPYING. If not, write to the Free yann@1: +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, yann@1: +// USA. yann@1: + yann@1: +// As a special exception, you may use this file as part of a free software yann@1: +// library without restriction. Specifically, if other files instantiate yann@1: +// templates or use macros or inline functions from this file, or you compile yann@1: +// this file and link it with other files to produce an executable, this yann@1: +// file does not by itself cause the resulting executable to be covered by yann@1: +// the GNU General Public License. This exception does not however yann@1: +// invalidate any other reasons why the executable file might be covered by yann@1: +// the GNU General Public License. yann@1: + yann@1: +// yann@1: +// ISO C++ 14882: 22.8 Standard locale categories. yann@1: +// yann@1: + yann@1: +// Written by Benjamin Kosnik yann@1: + yann@1: +#ifndef _C_LOCALE_H yann@1: +#define _C_LOCALE_H 1 yann@1: + yann@1: +#pragma GCC system_header yann@1: + yann@1: +#include // get std::strlen yann@1: +#include // get std::snprintf or std::sprintf yann@1: +#include yann@1: +#include // For codecvt yann@1: +#ifdef __UCLIBC_MJN3_ONLY__ yann@1: +#warning fix this yann@1: +#endif yann@1: +#ifdef __UCLIBC_HAS_LOCALE__ yann@1: +#include // For codecvt using iconv, iconv_t yann@1: +#endif yann@1: +#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__ yann@1: +#include // For messages yann@1: +#endif yann@1: + yann@1: +#ifdef __UCLIBC_MJN3_ONLY__ yann@1: +#warning what is _GLIBCXX_C_LOCALE_GNU for yann@1: +#endif yann@1: +#define _GLIBCXX_C_LOCALE_GNU 1 yann@1: + yann@1: +#ifdef __UCLIBC_MJN3_ONLY__ yann@1: +#warning fix categories yann@1: +#endif yann@1: +// #define _GLIBCXX_NUM_CATEGORIES 6 yann@1: +#define _GLIBCXX_NUM_CATEGORIES 0 yann@1: + yann@1: +#ifdef __UCLIBC_HAS_XLOCALE__ yann@1: +namespace __gnu_cxx yann@1: +{ yann@1: + extern "C" __typeof(uselocale) __uselocale; yann@1: +} yann@1: +#endif yann@1: + yann@1: +namespace std yann@1: +{ yann@1: +#ifdef __UCLIBC_HAS_XLOCALE__ yann@1: + typedef __locale_t __c_locale; yann@1: +#else yann@1: + typedef int* __c_locale; yann@1: +#endif yann@1: + yann@1: + // Convert numeric value of type _Tv to string and return length of yann@1: + // string. If snprintf is available use it, otherwise fall back to yann@1: + // the unsafe sprintf which, in general, can be dangerous and should yann@1: + // be avoided. yann@1: + template yann@1: + int yann@1: + __convert_from_v(char* __out, const int __size, const char* __fmt, yann@1: +#ifdef __UCLIBC_HAS_XLOCALE__ yann@1: + _Tv __v, const __c_locale& __cloc, int __prec) yann@1: + { yann@1: + __c_locale __old = __gnu_cxx::__uselocale(__cloc); yann@1: +#else yann@1: + _Tv __v, const __c_locale&, int __prec) yann@1: + { yann@1: +# ifdef __UCLIBC_HAS_LOCALE__ yann@1: + char* __old = std::setlocale(LC_ALL, NULL); yann@1: + char* __sav = new char[std::strlen(__old) + 1]; yann@1: + std::strcpy(__sav, __old); yann@1: + std::setlocale(LC_ALL, "C"); yann@1: +# endif yann@1: +#endif yann@1: + yann@1: + const int __ret = std::snprintf(__out, __size, __fmt, __prec, __v); yann@1: + yann@1: +#ifdef __UCLIBC_HAS_XLOCALE__ yann@1: + __gnu_cxx::__uselocale(__old); yann@1: +#elif defined __UCLIBC_HAS_LOCALE__ yann@1: + std::setlocale(LC_ALL, __sav); yann@1: + delete [] __sav; yann@1: +#endif yann@1: + return __ret; yann@1: + } yann@1: +} yann@1: + yann@1: +#endif yann@1: diff -urN gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/codecvt_members.cc gcc-3.4.2/libstdc++-v3/config/locale/uclibc/codecvt_members.cc yann@1: --- gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/codecvt_members.cc 1969-12-31 18:00:00.000000000 -0600 yann@1: +++ gcc-3.4.2/libstdc++-v3/config/locale/uclibc/codecvt_members.cc 2004-09-10 10:47:40.000000000 -0500 yann@1: @@ -0,0 +1,306 @@ yann@1: +// std::codecvt implementation details, GNU version -*- C++ -*- yann@1: + yann@1: +// Copyright (C) 2002, 2003 Free Software Foundation, Inc. yann@1: +// yann@1: +// This file is part of the GNU ISO C++ Library. This library is free yann@1: +// software; you can redistribute it and/or modify it under the yann@1: +// terms of the GNU General Public License as published by the yann@1: +// Free Software Foundation; either version 2, or (at your option) yann@1: +// any later version. yann@1: + yann@1: +// This library is distributed in the hope that it will be useful, yann@1: +// but WITHOUT ANY WARRANTY; without even the implied warranty of yann@1: +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the yann@1: +// GNU General Public License for more details. yann@1: + yann@1: +// You should have received a copy of the GNU General Public License along yann@1: +// with this library; see the file COPYING. If not, write to the Free yann@1: +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, yann@1: +// USA. yann@1: + yann@1: +// As a special exception, you may use this file as part of a free software yann@1: +// library without restriction. Specifically, if other files instantiate yann@1: +// templates or use macros or inline functions from this file, or you compile yann@1: +// this file and link it with other files to produce an executable, this yann@1: +// file does not by itself cause the resulting executable to be covered by yann@1: +// the GNU General Public License. This exception does not however yann@1: +// invalidate any other reasons why the executable file might be covered by yann@1: +// the GNU General Public License. yann@1: + yann@1: +// yann@1: +// ISO C++ 14882: 22.2.1.5 - Template class codecvt yann@1: +// yann@1: + yann@1: +// Written by Benjamin Kosnik yann@1: + yann@1: +#include yann@1: +#include yann@1: + yann@1: +namespace std yann@1: +{ yann@1: + // Specializations. yann@1: +#ifdef _GLIBCXX_USE_WCHAR_T yann@1: + codecvt_base::result yann@1: + codecvt:: yann@1: + do_out(state_type& __state, const intern_type* __from, yann@1: + const intern_type* __from_end, const intern_type*& __from_next, yann@1: + extern_type* __to, extern_type* __to_end, yann@1: + extern_type*& __to_next) const yann@1: + { yann@1: + result __ret = ok; yann@1: + state_type __tmp_state(__state); yann@1: + yann@1: +#ifdef __UCLIBC_HAS_XLOCALE__ yann@1: + __c_locale __old = __uselocale(_M_c_locale_codecvt); yann@1: +#endif yann@1: + yann@1: + // wcsnrtombs is *very* fast but stops if encounters NUL characters: yann@1: + // in case we fall back to wcrtomb and then continue, in a loop. yann@1: + // NB: wcsnrtombs is a GNU extension yann@1: + for (__from_next = __from, __to_next = __to; yann@1: + __from_next < __from_end && __to_next < __to_end yann@1: + && __ret == ok;) yann@1: + { yann@1: + const intern_type* __from_chunk_end = wmemchr(__from_next, L'\0', yann@1: + __from_end - __from_next); yann@1: + if (!__from_chunk_end) yann@1: + __from_chunk_end = __from_end; yann@1: + yann@1: + __from = __from_next; yann@1: + const size_t __conv = wcsnrtombs(__to_next, &__from_next, yann@1: + __from_chunk_end - __from_next, yann@1: + __to_end - __to_next, &__state); yann@1: + if (__conv == static_cast(-1)) yann@1: + { yann@1: + // In case of error, in order to stop at the exact place we yann@1: + // have to start again from the beginning with a series of yann@1: + // wcrtomb. yann@1: + for (; __from < __from_next; ++__from) yann@1: + __to_next += wcrtomb(__to_next, *__from, &__tmp_state); yann@1: + __state = __tmp_state; yann@1: + __ret = error; yann@1: + } yann@1: + else if (__from_next && __from_next < __from_chunk_end) yann@1: + { yann@1: + __to_next += __conv; yann@1: + __ret = partial; yann@1: + } yann@1: + else yann@1: + { yann@1: + __from_next = __from_chunk_end; yann@1: + __to_next += __conv; yann@1: + } yann@1: + yann@1: + if (__from_next < __from_end && __ret == ok) yann@1: + { yann@1: + extern_type __buf[MB_LEN_MAX]; yann@1: + __tmp_state = __state; yann@1: + const size_t __conv = wcrtomb(__buf, *__from_next, &__tmp_state); yann@1: + if (__conv > static_cast(__to_end - __to_next)) yann@1: + __ret = partial; yann@1: + else yann@1: + { yann@1: + memcpy(__to_next, __buf, __conv); yann@1: + __state = __tmp_state; yann@1: + __to_next += __conv; yann@1: + ++__from_next; yann@1: + } yann@1: + } yann@1: + } yann@1: + yann@1: +#ifdef __UCLIBC_HAS_XLOCALE__ yann@1: + __uselocale(__old); yann@1: +#endif yann@1: + yann@1: + return __ret; yann@1: + } yann@1: + yann@1: + codecvt_base::result yann@1: + codecvt:: yann@1: + do_in(state_type& __state, const extern_type* __from, yann@1: + const extern_type* __from_end, const extern_type*& __from_next, yann@1: + intern_type* __to, intern_type* __to_end, yann@1: + intern_type*& __to_next) const yann@1: + { yann@1: + result __ret = ok; yann@1: + state_type __tmp_state(__state); yann@1: + yann@1: +#ifdef __UCLIBC_HAS_XLOCALE__ yann@1: + __c_locale __old = __uselocale(_M_c_locale_codecvt); yann@1: +#endif yann@1: + yann@1: + // mbsnrtowcs is *very* fast but stops if encounters NUL characters: yann@1: + // in case we store a L'\0' and then continue, in a loop. yann@1: + // NB: mbsnrtowcs is a GNU extension yann@1: + for (__from_next = __from, __to_next = __to; yann@1: + __from_next < __from_end && __to_next < __to_end yann@1: + && __ret == ok;) yann@1: + { yann@1: + const extern_type* __from_chunk_end; yann@1: + __from_chunk_end = static_cast(memchr(__from_next, '\0', yann@1: + __from_end yann@1: + - __from_next)); yann@1: + if (!__from_chunk_end) yann@1: + __from_chunk_end = __from_end; yann@1: + yann@1: + __from = __from_next; yann@1: + size_t __conv = mbsnrtowcs(__to_next, &__from_next, yann@1: + __from_chunk_end - __from_next, yann@1: + __to_end - __to_next, &__state); yann@1: + if (__conv == static_cast(-1)) yann@1: + { yann@1: + // In case of error, in order to stop at the exact place we yann@1: + // have to start again from the beginning with a series of yann@1: + // mbrtowc. yann@1: + for (;; ++__to_next, __from += __conv) yann@1: + { yann@1: + __conv = mbrtowc(__to_next, __from, __from_end - __from, yann@1: + &__tmp_state); yann@1: + if (__conv == static_cast(-1) yann@1: + || __conv == static_cast(-2)) yann@1: + break; yann@1: + } yann@1: + __from_next = __from; yann@1: + __state = __tmp_state; yann@1: + __ret = error; yann@1: + } yann@1: + else if (__from_next && __from_next < __from_chunk_end) yann@1: + { yann@1: + // It is unclear what to return in this case (see DR 382). yann@1: + __to_next += __conv; yann@1: + __ret = partial; yann@1: + } yann@1: + else yann@1: + { yann@1: + __from_next = __from_chunk_end; yann@1: + __to_next += __conv; yann@1: + } yann@1: + yann@1: + if (__from_next < __from_end && __ret == ok) yann@1: + { yann@1: + if (__to_next < __to_end) yann@1: + { yann@1: + // XXX Probably wrong for stateful encodings yann@1: + __tmp_state = __state; yann@1: + ++__from_next; yann@1: + *__to_next++ = L'\0'; yann@1: + } yann@1: + else yann@1: + __ret = partial; yann@1: + } yann@1: + } yann@1: + yann@1: +#ifdef __UCLIBC_HAS_XLOCALE__ yann@1: + __uselocale(__old); yann@1: +#endif yann@1: + yann@1: + return __ret; yann@1: + } yann@1: + yann@1: + int yann@1: + codecvt:: yann@1: + do_encoding() const throw() yann@1: + { yann@1: + // XXX This implementation assumes that the encoding is yann@1: + // stateless and is either single-byte or variable-width. yann@1: + int __ret = 0; yann@1: +#ifdef __UCLIBC_HAS_XLOCALE__ yann@1: + __c_locale __old = __uselocale(_M_c_locale_codecvt); yann@1: +#endif yann@1: + if (MB_CUR_MAX == 1) yann@1: + __ret = 1; yann@1: +#ifdef __UCLIBC_HAS_XLOCALE__ yann@1: + __uselocale(__old); yann@1: +#endif yann@1: + return __ret; yann@1: + } yann@1: + yann@1: + int yann@1: + codecvt:: yann@1: + do_max_length() const throw() yann@1: + { yann@1: +#ifdef __UCLIBC_HAS_XLOCALE__ yann@1: + __c_locale __old = __uselocale(_M_c_locale_codecvt); yann@1: +#endif yann@1: + // XXX Probably wrong for stateful encodings. yann@1: + int __ret = MB_CUR_MAX; yann@1: +#ifdef __UCLIBC_HAS_XLOCALE__ yann@1: + __uselocale(__old); yann@1: +#endif yann@1: + return __ret; yann@1: + } yann@1: + yann@1: + int yann@1: + codecvt:: yann@1: + do_length(state_type& __state, const extern_type* __from, yann@1: + const extern_type* __end, size_t __max) const yann@1: + { yann@1: + int __ret = 0; yann@1: + state_type __tmp_state(__state); yann@1: + yann@1: +#ifdef __UCLIBC_HAS_XLOCALE__ yann@1: + __c_locale __old = __uselocale(_M_c_locale_codecvt); yann@1: +#endif yann@1: + yann@1: + // mbsnrtowcs is *very* fast but stops if encounters NUL characters: yann@1: + // in case we advance past it and then continue, in a loop. yann@1: + // NB: mbsnrtowcs is a GNU extension yann@1: + yann@1: + // A dummy internal buffer is needed in order for mbsnrtocws to consider yann@1: + // its fourth parameter (it wouldn't with NULL as first parameter). yann@1: + wchar_t* __to = static_cast(__builtin_alloca(sizeof(wchar_t) yann@1: + * __max)); yann@1: + while (__from < __end && __max) yann@1: + { yann@1: + const extern_type* __from_chunk_end; yann@1: + __from_chunk_end = static_cast(memchr(__from, '\0', yann@1: + __end yann@1: + - __from)); yann@1: + if (!__from_chunk_end) yann@1: + __from_chunk_end = __end; yann@1: + yann@1: + const extern_type* __tmp_from = __from; yann@1: + size_t __conv = mbsnrtowcs(__to, &__from, yann@1: + __from_chunk_end - __from, yann@1: + __max, &__state); yann@1: + if (__conv == static_cast(-1)) yann@1: + { yann@1: + // In case of error, in order to stop at the exact place we yann@1: + // have to start again from the beginning with a series of yann@1: + // mbrtowc. yann@1: + for (__from = __tmp_from;; __from += __conv) yann@1: + { yann@1: + __conv = mbrtowc(NULL, __from, __end - __from, yann@1: + &__tmp_state); yann@1: + if (__conv == static_cast(-1) yann@1: + || __conv == static_cast(-2)) yann@1: + break; yann@1: + } yann@1: + __state = __tmp_state; yann@1: + __ret += __from - __tmp_from; yann@1: + break; yann@1: + } yann@1: + if (!__from) yann@1: + __from = __from_chunk_end; yann@1: + yann@1: + __ret += __from - __tmp_from; yann@1: + __max -= __conv; yann@1: + yann@1: + if (__from < __end && __max) yann@1: + { yann@1: + // XXX Probably wrong for stateful encodings yann@1: + __tmp_state = __state; yann@1: + ++__from; yann@1: + ++__ret; yann@1: + --__max; yann@1: + } yann@1: + } yann@1: + yann@1: +#ifdef __UCLIBC_HAS_XLOCALE__ yann@1: + __uselocale(__old); yann@1: +#endif yann@1: + yann@1: + return __ret; yann@1: + } yann@1: +#endif yann@1: +} yann@1: diff -urN gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/collate_members.cc gcc-3.4.2/libstdc++-v3/config/locale/uclibc/collate_members.cc yann@1: --- gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/collate_members.cc 1969-12-31 18:00:00.000000000 -0600 yann@1: +++ gcc-3.4.2/libstdc++-v3/config/locale/uclibc/collate_members.cc 2004-09-10 10:47:40.000000000 -0500 yann@1: @@ -0,0 +1,80 @@ yann@1: +// std::collate implementation details, GNU version -*- C++ -*- yann@1: + yann@1: +// Copyright (C) 2001, 2002 Free Software Foundation, Inc. yann@1: +// yann@1: +// This file is part of the GNU ISO C++ Library. This library is free yann@1: +// software; you can redistribute it and/or modify it under the yann@1: +// terms of the GNU General Public License as published by the yann@1: +// Free Software Foundation; either version 2, or (at your option) yann@1: +// any later version. yann@1: + yann@1: +// This library is distributed in the hope that it will be useful, yann@1: +// but WITHOUT ANY WARRANTY; without even the implied warranty of yann@1: +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the yann@1: +// GNU General Public License for more details. yann@1: + yann@1: +// You should have received a copy of the GNU General Public License along yann@1: +// with this library; see the file COPYING. If not, write to the Free yann@1: +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, yann@1: +// USA. yann@1: + yann@1: +// As a special exception, you may use this file as part of a free software yann@1: +// library without restriction. Specifically, if other files instantiate yann@1: +// templates or use macros or inline functions from this file, or you compile yann@1: +// this file and link it with other files to produce an executable, this yann@1: +// file does not by itself cause the resulting executable to be covered by yann@1: +// the GNU General Public License. This exception does not however yann@1: +// invalidate any other reasons why the executable file might be covered by yann@1: +// the GNU General Public License. yann@1: + yann@1: +// yann@1: +// ISO C++ 14882: 22.2.4.1.2 collate virtual functions yann@1: +// yann@1: + yann@1: +// Written by Benjamin Kosnik yann@1: + yann@1: +#include yann@1: +#include yann@1: + yann@1: +#ifndef __UCLIBC_HAS_XLOCALE__ yann@1: +#define __strcoll_l(S1, S2, L) strcoll((S1), (S2)) yann@1: +#define __strxfrm_l(S1, S2, N, L) strxfrm((S1), (S2), (N)) yann@1: +#define __wcscoll_l(S1, S2, L) wcscoll((S1), (S2)) yann@1: +#define __wcsxfrm_l(S1, S2, N, L) wcsxfrm((S1), (S2), (N)) yann@1: +#endif yann@1: + yann@1: +namespace std yann@1: +{ yann@1: + // These are basically extensions to char_traits, and perhaps should yann@1: + // be put there instead of here. yann@1: + template<> yann@1: + int yann@1: + collate::_M_compare(const char* __one, const char* __two) const yann@1: + { yann@1: + int __cmp = __strcoll_l(__one, __two, _M_c_locale_collate); yann@1: + return (__cmp >> (8 * sizeof (int) - 2)) | (__cmp != 0); yann@1: + } yann@1: + yann@1: + template<> yann@1: + size_t yann@1: + collate::_M_transform(char* __to, const char* __from, yann@1: + size_t __n) const yann@1: + { return __strxfrm_l(__to, __from, __n, _M_c_locale_collate); } yann@1: + yann@1: +#ifdef _GLIBCXX_USE_WCHAR_T yann@1: + template<> yann@1: + int yann@1: + collate::_M_compare(const wchar_t* __one, yann@1: + const wchar_t* __two) const yann@1: + { yann@1: + int __cmp = __wcscoll_l(__one, __two, _M_c_locale_collate); yann@1: + return (__cmp >> (8 * sizeof (int) - 2)) | (__cmp != 0); yann@1: + } yann@1: + yann@1: + template<> yann@1: + size_t yann@1: + collate::_M_transform(wchar_t* __to, const wchar_t* __from, yann@1: + size_t __n) const yann@1: + { return __wcsxfrm_l(__to, __from, __n, _M_c_locale_collate); } yann@1: +#endif yann@1: +} yann@1: diff -urN gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/ctype_members.cc gcc-3.4.2/libstdc++-v3/config/locale/uclibc/ctype_members.cc yann@1: --- gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/ctype_members.cc 1969-12-31 18:00:00.000000000 -0600 yann@1: +++ gcc-3.4.2/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2004-09-10 10:47:40.000000000 -0500 yann@1: @@ -0,0 +1,300 @@ yann@1: +// std::ctype implementation details, GNU version -*- C++ -*- yann@1: + yann@1: +// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc. yann@1: +// yann@1: +// This file is part of the GNU ISO C++ Library. This library is free yann@1: +// software; you can redistribute it and/or modify it under the yann@1: +// terms of the GNU General Public License as published by the yann@1: +// Free Software Foundation; either version 2, or (at your option) yann@1: +// any later version. yann@1: + yann@1: +// This library is distributed in the hope that it will be useful, yann@1: +// but WITHOUT ANY WARRANTY; without even the implied warranty of yann@1: +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the yann@1: +// GNU General Public License for more details. yann@1: + yann@1: +// You should have received a copy of the GNU General Public License along yann@1: +// with this library; see the file COPYING. If not, write to the Free yann@1: +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, yann@1: +// USA. yann@1: + yann@1: +// As a special exception, you may use this file as part of a free software yann@1: +// library without restriction. Specifically, if other files instantiate yann@1: +// templates or use macros or inline functions from this file, or you compile yann@1: +// this file and link it with other files to produce an executable, this yann@1: +// file does not by itself cause the resulting executable to be covered by yann@1: +// the GNU General Public License. This exception does not however yann@1: +// invalidate any other reasons why the executable file might be covered by yann@1: +// the GNU General Public License. yann@1: + yann@1: +// yann@1: +// ISO C++ 14882: 22.2.1.1.2 ctype virtual functions. yann@1: +// yann@1: + yann@1: +// Written by Benjamin Kosnik yann@1: + yann@1: +#define _LIBC yann@1: +#include yann@1: +#undef _LIBC yann@1: +#include yann@1: + yann@1: +#ifndef __UCLIBC_HAS_XLOCALE__ yann@1: +#define __wctype_l(S, L) wctype((S)) yann@1: +#define __towupper_l(C, L) towupper((C)) yann@1: +#define __towlower_l(C, L) towlower((C)) yann@1: +#define __iswctype_l(C, M, L) iswctype((C), (M)) yann@1: +#endif yann@1: + yann@1: +namespace std yann@1: +{ yann@1: + // NB: The other ctype specializations are in src/locale.cc and yann@1: + // various /config/os/* files. yann@1: + template<> yann@1: + ctype_byname::ctype_byname(const char* __s, size_t __refs) yann@1: + : ctype(0, false, __refs) yann@1: + { yann@1: + if (std::strcmp(__s, "C") != 0 && std::strcmp(__s, "POSIX") != 0) yann@1: + { yann@1: + this->_S_destroy_c_locale(this->_M_c_locale_ctype); yann@1: + this->_S_create_c_locale(this->_M_c_locale_ctype, __s); yann@1: +#ifdef __UCLIBC_HAS_XLOCALE__ yann@1: + this->_M_toupper = this->_M_c_locale_ctype->__ctype_toupper; yann@1: + this->_M_tolower = this->_M_c_locale_ctype->__ctype_tolower; yann@1: + this->_M_table = this->_M_c_locale_ctype->__ctype_b; yann@1: +#endif yann@1: + } yann@1: + } yann@1: + yann@1: +#ifdef _GLIBCXX_USE_WCHAR_T yann@1: + ctype::__wmask_type yann@1: + ctype::_M_convert_to_wmask(const mask __m) const yann@1: + { yann@1: + __wmask_type __ret; yann@1: + switch (__m) yann@1: + { yann@1: + case space: yann@1: + __ret = __wctype_l("space", _M_c_locale_ctype); yann@1: + break; yann@1: + case print: yann@1: + __ret = __wctype_l("print", _M_c_locale_ctype); yann@1: + break; yann@1: + case cntrl: yann@1: + __ret = __wctype_l("cntrl", _M_c_locale_ctype); yann@1: + break; yann@1: + case upper: yann@1: + __ret = __wctype_l("upper", _M_c_locale_ctype); yann@1: + break; yann@1: + case lower: yann@1: + __ret = __wctype_l("lower", _M_c_locale_ctype); yann@1: + break; yann@1: + case alpha: yann@1: + __ret = __wctype_l("alpha", _M_c_locale_ctype); yann@1: + break; yann@1: + case digit: yann@1: + __ret = __wctype_l("digit", _M_c_locale_ctype); yann@1: + break; yann@1: + case punct: yann@1: + __ret = __wctype_l("punct", _M_c_locale_ctype); yann@1: + break; yann@1: + case xdigit: yann@1: + __ret = __wctype_l("xdigit", _M_c_locale_ctype); yann@1: + break; yann@1: + case alnum: yann@1: + __ret = __wctype_l("alnum", _M_c_locale_ctype); yann@1: + break; yann@1: + case graph: yann@1: + __ret = __wctype_l("graph", _M_c_locale_ctype); yann@1: + break; yann@1: + default: yann@1: + __ret = 0; yann@1: + } yann@1: + return __ret; yann@1: + } yann@1: + yann@1: + wchar_t yann@1: + ctype::do_toupper(wchar_t __c) const yann@1: + { return __towupper_l(__c, _M_c_locale_ctype); } yann@1: + yann@1: + const wchar_t* yann@1: + ctype::do_toupper(wchar_t* __lo, const wchar_t* __hi) const yann@1: + { yann@1: + while (__lo < __hi) yann@1: + { yann@1: + *__lo = __towupper_l(*__lo, _M_c_locale_ctype); yann@1: + ++__lo; yann@1: + } yann@1: + return __hi; yann@1: + } yann@1: + yann@1: + wchar_t yann@1: + ctype::do_tolower(wchar_t __c) const yann@1: + { return __towlower_l(__c, _M_c_locale_ctype); } yann@1: + yann@1: + const wchar_t* yann@1: + ctype::do_tolower(wchar_t* __lo, const wchar_t* __hi) const yann@1: + { yann@1: + while (__lo < __hi) yann@1: + { yann@1: + *__lo = __towlower_l(*__lo, _M_c_locale_ctype); yann@1: + ++__lo; yann@1: + } yann@1: + return __hi; yann@1: + } yann@1: + yann@1: + bool yann@1: + ctype:: yann@1: + do_is(mask __m, wchar_t __c) const yann@1: + { yann@1: + // Highest bitmask in ctype_base == 10, but extra in "C" yann@1: + // library for blank. yann@1: + bool __ret = false; yann@1: + const size_t __bitmasksize = 11; yann@1: + for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur) yann@1: + if (__m & _M_bit[__bitcur] yann@1: + && __iswctype_l(__c, _M_wmask[__bitcur], _M_c_locale_ctype)) yann@1: + { yann@1: + __ret = true; yann@1: + break; yann@1: + } yann@1: + return __ret; yann@1: + } yann@1: + yann@1: + const wchar_t* yann@1: + ctype:: yann@1: + do_is(const wchar_t* __lo, const wchar_t* __hi, mask* __vec) const yann@1: + { yann@1: + for (; __lo < __hi; ++__vec, ++__lo) yann@1: + { yann@1: + // Highest bitmask in ctype_base == 10, but extra in "C" yann@1: + // library for blank. yann@1: + const size_t __bitmasksize = 11; yann@1: + mask __m = 0; yann@1: + for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur) yann@1: + if (__iswctype_l(*__lo, _M_wmask[__bitcur], _M_c_locale_ctype)) yann@1: + __m |= _M_bit[__bitcur]; yann@1: + *__vec = __m; yann@1: + } yann@1: + return __hi; yann@1: + } yann@1: + yann@1: + const wchar_t* yann@1: + ctype:: yann@1: + do_scan_is(mask __m, const wchar_t* __lo, const wchar_t* __hi) const yann@1: + { yann@1: + while (__lo < __hi && !this->do_is(__m, *__lo)) yann@1: + ++__lo; yann@1: + return __lo; yann@1: + } yann@1: + yann@1: + const wchar_t* yann@1: + ctype:: yann@1: + do_scan_not(mask __m, const char_type* __lo, const char_type* __hi) const yann@1: + { yann@1: + while (__lo < __hi && this->do_is(__m, *__lo) != 0) yann@1: + ++__lo; yann@1: + return __lo; yann@1: + } yann@1: + yann@1: + wchar_t yann@1: + ctype:: yann@1: + do_widen(char __c) const yann@1: + { return _M_widen[static_cast(__c)]; } yann@1: + yann@1: + const char* yann@1: + ctype:: yann@1: + do_widen(const char* __lo, const char* __hi, wchar_t* __dest) const yann@1: + { yann@1: + while (__lo < __hi) yann@1: + { yann@1: + *__dest = _M_widen[static_cast(*__lo)]; yann@1: + ++__lo; yann@1: + ++__dest; yann@1: + } yann@1: + return __hi; yann@1: + } yann@1: + yann@1: + char yann@1: + ctype:: yann@1: + do_narrow(wchar_t __wc, char __dfault) const yann@1: + { yann@1: + if (__wc >= 0 && __wc < 128 && _M_narrow_ok) yann@1: + return _M_narrow[__wc]; yann@1: +#ifdef __UCLIBC_HAS_XLOCALE__ yann@1: + __c_locale __old = __uselocale(_M_c_locale_ctype); yann@1: +#endif yann@1: + const int __c = wctob(__wc); yann@1: +#ifdef __UCLIBC_HAS_XLOCALE__ yann@1: + __uselocale(__old); yann@1: +#endif yann@1: + return (__c == EOF ? __dfault : static_cast(__c)); yann@1: + } yann@1: + yann@1: + const wchar_t* yann@1: + ctype:: yann@1: + do_narrow(const wchar_t* __lo, const wchar_t* __hi, char __dfault, yann@1: + char* __dest) const yann@1: + { yann@1: +#ifdef __UCLIBC_HAS_XLOCALE__ yann@1: + __c_locale __old = __uselocale(_M_c_locale_ctype); yann@1: +#endif yann@1: + if (_M_narrow_ok) yann@1: + while (__lo < __hi) yann@1: + { yann@1: + if (*__lo >= 0 && *__lo < 128) yann@1: + *__dest = _M_narrow[*__lo]; yann@1: + else yann@1: + { yann@1: + const int __c = wctob(*__lo); yann@1: + *__dest = (__c == EOF ? __dfault : static_cast(__c)); yann@1: + } yann@1: + ++__lo; yann@1: + ++__dest; yann@1: + } yann@1: + else yann@1: + while (__lo < __hi) yann@1: + { yann@1: + const int __c = wctob(*__lo); yann@1: + *__dest = (__c == EOF ? __dfault : static_cast(__c)); yann@1: + ++__lo; yann@1: + ++__dest; yann@1: + } yann@1: +#ifdef __UCLIBC_HAS_XLOCALE__ yann@1: + __uselocale(__old); yann@1: +#endif yann@1: + return __hi; yann@1: + } yann@1: + yann@1: + void yann@1: + ctype::_M_initialize_ctype() yann@1: + { yann@1: +#ifdef __UCLIBC_HAS_XLOCALE__ yann@1: + __c_locale __old = __uselocale(_M_c_locale_ctype); yann@1: +#endif yann@1: + wint_t __i; yann@1: + for (__i = 0; __i < 128; ++__i) yann@1: + { yann@1: + const int __c = wctob(__i); yann@1: + if (__c == EOF) yann@1: + break; yann@1: + else yann@1: + _M_narrow[__i] = static_cast(__c); yann@1: + } yann@1: + if (__i == 128) yann@1: + _M_narrow_ok = true; yann@1: + else yann@1: + _M_narrow_ok = false; yann@1: + for (size_t __j = 0; yann@1: + __j < sizeof(_M_widen) / sizeof(wint_t); ++__j) yann@1: + _M_widen[__j] = btowc(__j); yann@1: + yann@1: + for (size_t __k = 0; __k <= 11; ++__k) yann@1: + { yann@1: + _M_bit[__k] = static_cast(_ISbit(__k)); yann@1: + _M_wmask[__k] = _M_convert_to_wmask(_M_bit[__k]); yann@1: + } yann@1: +#ifdef __UCLIBC_HAS_XLOCALE__ yann@1: + __uselocale(__old); yann@1: +#endif yann@1: + } yann@1: +#endif // _GLIBCXX_USE_WCHAR_T yann@1: +} yann@1: diff -urN gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/messages_members.cc gcc-3.4.2/libstdc++-v3/config/locale/uclibc/messages_members.cc yann@1: --- gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/messages_members.cc 1969-12-31 18:00:00.000000000 -0600 yann@1: +++ gcc-3.4.2/libstdc++-v3/config/locale/uclibc/messages_members.cc 2004-09-10 10:47:40.000000000 -0500 yann@1: @@ -0,0 +1,100 @@ yann@1: +// std::messages implementation details, GNU version -*- C++ -*- yann@1: + yann@1: +// Copyright (C) 2001, 2002 Free Software Foundation, Inc. yann@1: +// yann@1: +// This file is part of the GNU ISO C++ Library. This library is free yann@1: +// software; you can redistribute it and/or modify it under the yann@1: +// terms of the GNU General Public License as published by the yann@1: +// Free Software Foundation; either version 2, or (at your option) yann@1: +// any later version. yann@1: + yann@1: +// This library is distributed in the hope that it will be useful, yann@1: +// but WITHOUT ANY WARRANTY; without even the implied warranty of yann@1: +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the yann@1: +// GNU General Public License for more details. yann@1: + yann@1: +// You should have received a copy of the GNU General Public License along yann@1: +// with this library; see the file COPYING. If not, write to the Free yann@1: +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, yann@1: +// USA. yann@1: + yann@1: +// As a special exception, you may use this file as part of a free software yann@1: +// library without restriction. Specifically, if other files instantiate yann@1: +// templates or use macros or inline functions from this file, or you compile yann@1: +// this file and link it with other files to produce an executable, this yann@1: +// file does not by itself cause the resulting executable to be covered by yann@1: +// the GNU General Public License. This exception does not however yann@1: +// invalidate any other reasons why the executable file might be covered by yann@1: +// the GNU General Public License. yann@1: + yann@1: +// yann@1: +// ISO C++ 14882: 22.2.7.1.2 messages virtual functions yann@1: +// yann@1: + yann@1: +// Written by Benjamin Kosnik yann@1: + yann@1: +#include yann@1: +#include yann@1: + yann@1: +#ifdef __UCLIBC_MJN3_ONLY__ yann@1: +#warning fix gettext stuff yann@1: +#endif yann@1: +#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__ yann@1: +extern "C" char *__dcgettext(const char *domainname, yann@1: + const char *msgid, int category); yann@1: +#undef gettext yann@1: +#define gettext(msgid) __dcgettext(NULL, msgid, LC_MESSAGES) yann@1: +#else yann@1: +#undef gettext yann@1: +#define gettext(msgid) (msgid) yann@1: +#endif yann@1: + yann@1: +namespace std yann@1: +{ yann@1: + // Specializations. yann@1: + template<> yann@1: + string yann@1: + messages::do_get(catalog, int, int, const string& __dfault) const yann@1: + { yann@1: +#ifdef __UCLIBC_HAS_XLOCALE__ yann@1: + __c_locale __old = __uselocale(_M_c_locale_messages); yann@1: + const char* __msg = const_cast(gettext(__dfault.c_str())); yann@1: + __uselocale(__old); yann@1: + return string(__msg); yann@1: +#elif defined __UCLIBC_HAS_LOCALE__ yann@1: + char* __old = strdup(setlocale(LC_ALL, NULL)); yann@1: + setlocale(LC_ALL, _M_name_messages); yann@1: + const char* __msg = gettext(__dfault.c_str()); yann@1: + setlocale(LC_ALL, __old); yann@1: + free(__old); yann@1: + return string(__msg); yann@1: +#else yann@1: + const char* __msg = gettext(__dfault.c_str()); yann@1: + return string(__msg); yann@1: +#endif yann@1: + } yann@1: + yann@1: +#ifdef _GLIBCXX_USE_WCHAR_T yann@1: + template<> yann@1: + wstring yann@1: + messages::do_get(catalog, int, int, const wstring& __dfault) const yann@1: + { yann@1: +# ifdef __UCLIBC_HAS_XLOCALE__ yann@1: + __c_locale __old = __uselocale(_M_c_locale_messages); yann@1: + char* __msg = gettext(_M_convert_to_char(__dfault)); yann@1: + __uselocale(__old); yann@1: + return _M_convert_from_char(__msg); yann@1: +# elif defined __UCLIBC_HAS_LOCALE__ yann@1: + char* __old = strdup(setlocale(LC_ALL, NULL)); yann@1: + setlocale(LC_ALL, _M_name_messages); yann@1: + char* __msg = gettext(_M_convert_to_char(__dfault)); yann@1: + setlocale(LC_ALL, __old); yann@1: + free(__old); yann@1: + return _M_convert_from_char(__msg); yann@1: +# else yann@1: + char* __msg = gettext(_M_convert_to_char(__dfault)); yann@1: + return _M_convert_from_char(__msg); yann@1: +# endif yann@1: + } yann@1: +#endif yann@1: +} yann@1: diff -urN gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/messages_members.h gcc-3.4.2/libstdc++-v3/config/locale/uclibc/messages_members.h yann@1: --- gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/messages_members.h 1969-12-31 18:00:00.000000000 -0600 yann@1: +++ gcc-3.4.2/libstdc++-v3/config/locale/uclibc/messages_members.h 2004-09-10 10:47:40.000000000 -0500 yann@1: @@ -0,0 +1,118 @@ yann@1: +// std::messages implementation details, GNU version -*- C++ -*- yann@1: + yann@1: +// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc. yann@1: +// yann@1: +// This file is part of the GNU ISO C++ Library. This library is free yann@1: +// software; you can redistribute it and/or modify it under the yann@1: +// terms of the GNU General Public License as published by the yann@1: +// Free Software Foundation; either version 2, or (at your option) yann@1: +// any later version. yann@1: + yann@1: +// This library is distributed in the hope that it will be useful, yann@1: +// but WITHOUT ANY WARRANTY; without even the implied warranty of yann@1: +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the yann@1: +// GNU General Public License for more details. yann@1: + yann@1: +// You should have received a copy of the GNU General Public License along yann@1: +// with this library; see the file COPYING. If not, write to the Free yann@1: +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, yann@1: +// USA. yann@1: + yann@1: +// As a special exception, you may use this file as part of a free software yann@1: +// library without restriction. Specifically, if other files instantiate yann@1: +// templates or use macros or inline functions from this file, or you compile yann@1: +// this file and link it with other files to produce an executable, this yann@1: +// file does not by itself cause the resulting executable to be covered by yann@1: +// the GNU General Public License. This exception does not however yann@1: +// invalidate any other reasons why the executable file might be covered by yann@1: +// the GNU General Public License. yann@1: + yann@1: +// yann@1: +// ISO C++ 14882: 22.2.7.1.2 messages functions yann@1: +// yann@1: + yann@1: +// Written by Benjamin Kosnik yann@1: + yann@1: +#ifdef __UCLIBC_MJN3_ONLY__ yann@1: +#warning fix prototypes for *textdomain funcs yann@1: +#endif yann@1: +#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__ yann@1: +extern "C" char *__textdomain(const char *domainname); yann@1: +extern "C" char *__bindtextdomain(const char *domainname, yann@1: + const char *dirname); yann@1: +#else yann@1: +#undef __textdomain yann@1: +#undef __bindtextdomain yann@1: +#define __textdomain(D) ((void)0) yann@1: +#define __bindtextdomain(D,P) ((void)0) yann@1: +#endif yann@1: + yann@1: + // Non-virtual member functions. yann@1: + template yann@1: + messages<_CharT>::messages(size_t __refs) yann@1: + : facet(__refs), _M_c_locale_messages(_S_get_c_locale()), yann@1: + _M_name_messages(_S_get_c_name()) yann@1: + { } yann@1: + yann@1: + template yann@1: + messages<_CharT>::messages(__c_locale __cloc, const char* __s, yann@1: + size_t __refs) yann@1: + : facet(__refs), _M_c_locale_messages(_S_clone_c_locale(__cloc)), yann@1: + _M_name_messages(__s) yann@1: + { yann@1: + char* __tmp = new char[std::strlen(__s) + 1]; yann@1: + std::strcpy(__tmp, __s); yann@1: + _M_name_messages = __tmp; yann@1: + } yann@1: + yann@1: + template yann@1: + typename messages<_CharT>::catalog yann@1: + messages<_CharT>::open(const basic_string& __s, const locale& __loc, yann@1: + const char* __dir) const yann@1: + { yann@1: + __bindtextdomain(__s.c_str(), __dir); yann@1: + return this->do_open(__s, __loc); yann@1: + } yann@1: + yann@1: + // Virtual member functions. yann@1: + template yann@1: + messages<_CharT>::~messages() yann@1: + { yann@1: + if (_M_name_messages != _S_get_c_name()) yann@1: + delete [] _M_name_messages; yann@1: + _S_destroy_c_locale(_M_c_locale_messages); yann@1: + } yann@1: + yann@1: + template yann@1: + typename messages<_CharT>::catalog yann@1: + messages<_CharT>::do_open(const basic_string& __s, yann@1: + const locale&) const yann@1: + { yann@1: + // No error checking is done, assume the catalog exists and can yann@1: + // be used. yann@1: + __textdomain(__s.c_str()); yann@1: + return 0; yann@1: + } yann@1: + yann@1: + template yann@1: + void yann@1: + messages<_CharT>::do_close(catalog) const yann@1: + { } yann@1: + yann@1: + // messages_byname yann@1: + template yann@1: + messages_byname<_CharT>::messages_byname(const char* __s, size_t __refs) yann@1: + : messages<_CharT>(__refs) yann@1: + { yann@1: + if (this->_M_name_messages != locale::facet::_S_get_c_name()) yann@1: + delete [] this->_M_name_messages; yann@1: + char* __tmp = new char[std::strlen(__s) + 1]; yann@1: + std::strcpy(__tmp, __s); yann@1: + this->_M_name_messages = __tmp; yann@1: + yann@1: + if (std::strcmp(__s, "C") != 0 && std::strcmp(__s, "POSIX") != 0) yann@1: + { yann@1: + this->_S_destroy_c_locale(this->_M_c_locale_messages); yann@1: + this->_S_create_c_locale(this->_M_c_locale_messages, __s); yann@1: + } yann@1: + } yann@1: diff -urN gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/monetary_members.cc gcc-3.4.2/libstdc++-v3/config/locale/uclibc/monetary_members.cc yann@1: --- gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/monetary_members.cc 1969-12-31 18:00:00.000000000 -0600 yann@1: +++ gcc-3.4.2/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2004-09-10 10:47:40.000000000 -0500 yann@1: @@ -0,0 +1,698 @@ yann@1: +// std::moneypunct implementation details, GNU version -*- C++ -*- yann@1: + yann@1: +// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc. yann@1: +// yann@1: +// This file is part of the GNU ISO C++ Library. This library is free yann@1: +// software; you can redistribute it and/or modify it under the yann@1: +// terms of the GNU General Public License as published by the yann@1: +// Free Software Foundation; either version 2, or (at your option) yann@1: +// any later version. yann@1: + yann@1: +// This library is distributed in the hope that it will be useful, yann@1: +// but WITHOUT ANY WARRANTY; without even the implied warranty of yann@1: +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the yann@1: +// GNU General Public License for more details. yann@1: + yann@1: +// You should have received a copy of the GNU General Public License along yann@1: +// with this library; see the file COPYING. If not, write to the Free yann@1: +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, yann@1: +// USA. yann@1: + yann@1: +// As a special exception, you may use this file as part of a free software yann@1: +// library without restriction. Specifically, if other files instantiate yann@1: +// templates or use macros or inline functions from this file, or you compile yann@1: +// this file and link it with other files to produce an executable, this yann@1: +// file does not by itself cause the resulting executable to be covered by yann@1: +// the GNU General Public License. This exception does not however yann@1: +// invalidate any other reasons why the executable file might be covered by yann@1: +// the GNU General Public License. yann@1: + yann@1: +// yann@1: +// ISO C++ 14882: 22.2.6.3.2 moneypunct virtual functions yann@1: +// yann@1: + yann@1: +// Written by Benjamin Kosnik yann@1: + yann@1: +#define _LIBC yann@1: +#include yann@1: +#undef _LIBC yann@1: +#include yann@1: + yann@1: +#ifdef __UCLIBC_MJN3_ONLY__ yann@1: +#warning optimize this for uclibc yann@1: +#warning tailor for stub locale support yann@1: +#endif yann@1: + yann@1: +#ifndef __UCLIBC_HAS_XLOCALE__ yann@1: +#define __nl_langinfo_l(N, L) nl_langinfo((N)) yann@1: +#endif yann@1: + yann@1: +namespace std yann@1: +{ yann@1: + // Construct and return valid pattern consisting of some combination of: yann@1: + // space none symbol sign value yann@1: + money_base::pattern yann@1: + money_base::_S_construct_pattern(char __precedes, char __space, char __posn) yann@1: + { yann@1: + pattern __ret; yann@1: + yann@1: + // This insanely complicated routine attempts to construct a valid yann@1: + // pattern for use with monyepunct. A couple of invariants: yann@1: + yann@1: + // if (__precedes) symbol -> value yann@1: + // else value -> symbol yann@1: + yann@1: + // if (__space) space yann@1: + // else none yann@1: + yann@1: + // none == never first yann@1: + // space never first or last yann@1: + yann@1: + // Any elegant implementations of this are welcome. yann@1: + switch (__posn) yann@1: + { yann@1: + case 0: yann@1: + case 1: yann@1: + // 1 The sign precedes the value and symbol. yann@1: + __ret.field[0] = sign; yann@1: + if (__space) yann@1: + { yann@1: + // Pattern starts with sign. yann@1: + if (__precedes) yann@1: + { yann@1: + __ret.field[1] = symbol; yann@1: + __ret.field[3] = value; yann@1: + } yann@1: + else yann@1: + { yann@1: + __ret.field[1] = value; yann@1: + __ret.field[3] = symbol; yann@1: + } yann@1: + __ret.field[2] = space; yann@1: + } yann@1: + else yann@1: + { yann@1: + // Pattern starts with sign and ends with none. yann@1: + if (__precedes) yann@1: + { yann@1: + __ret.field[1] = symbol; yann@1: + __ret.field[2] = value; yann@1: + } yann@1: + else yann@1: + { yann@1: + __ret.field[1] = value; yann@1: + __ret.field[2] = symbol; yann@1: + } yann@1: + __ret.field[3] = none; yann@1: + } yann@1: + break; yann@1: + case 2: yann@1: + // 2 The sign follows the value and symbol. yann@1: + if (__space) yann@1: + { yann@1: + // Pattern either ends with sign. yann@1: + if (__precedes) yann@1: + { yann@1: + __ret.field[0] = symbol; yann@1: + __ret.field[2] = value; yann@1: + } yann@1: + else yann@1: + { yann@1: + __ret.field[0] = value; yann@1: + __ret.field[2] = symbol; yann@1: + } yann@1: + __ret.field[1] = space; yann@1: + __ret.field[3] = sign; yann@1: + } yann@1: + else yann@1: + { yann@1: + // Pattern ends with sign then none. yann@1: + if (__precedes) yann@1: + { yann@1: + __ret.field[0] = symbol; yann@1: + __ret.field[1] = value; yann@1: + } yann@1: + else yann@1: + { yann@1: + __ret.field[0] = value; yann@1: + __ret.field[1] = symbol; yann@1: + } yann@1: + __ret.field[2] = sign; yann@1: + __ret.field[3] = none; yann@1: + } yann@1: + break; yann@1: + case 3: yann@1: + // 3 The sign immediately precedes the symbol. yann@1: + if (__precedes) yann@1: + { yann@1: + __ret.field[0] = sign; yann@1: + __ret.field[1] = symbol; yann@1: + if (__space) yann@1: + { yann@1: + __ret.field[2] = space; yann@1: + __ret.field[3] = value; yann@1: + } yann@1: + else yann@1: + { yann@1: + __ret.field[2] = value; yann@1: + __ret.field[3] = none; yann@1: + } yann@1: + } yann@1: + else yann@1: + { yann@1: + __ret.field[0] = value; yann@1: + if (__space) yann@1: + { yann@1: + __ret.field[1] = space; yann@1: + __ret.field[2] = sign; yann@1: + __ret.field[3] = symbol; yann@1: + } yann@1: + else yann@1: + { yann@1: + __ret.field[1] = sign; yann@1: + __ret.field[2] = symbol; yann@1: + __ret.field[3] = none; yann@1: + } yann@1: + } yann@1: + break; yann@1: + case 4: yann@1: + // 4 The sign immediately follows the symbol. yann@1: + if (__precedes) yann@1: + { yann@1: + __ret.field[0] = symbol; yann@1: + __ret.field[1] = sign; yann@1: + if (__space) yann@1: + { yann@1: + __ret.field[2] = space; yann@1: + __ret.field[3] = value; yann@1: + } yann@1: + else yann@1: + { yann@1: + __ret.field[2] = value; yann@1: + __ret.field[3] = none; yann@1: + } yann@1: + } yann@1: + else yann@1: + { yann@1: + __ret.field[0] = value; yann@1: + if (__space) yann@1: + { yann@1: + __ret.field[1] = space; yann@1: + __ret.field[2] = symbol; yann@1: + __ret.field[3] = sign; yann@1: + } yann@1: + else yann@1: + { yann@1: + __ret.field[1] = symbol; yann@1: + __ret.field[2] = sign; yann@1: + __ret.field[3] = none; yann@1: + } yann@1: + } yann@1: + break; yann@1: + default: yann@1: + ; yann@1: + } yann@1: + return __ret; yann@1: + } yann@1: + yann@1: + template<> yann@1: + void yann@1: + moneypunct::_M_initialize_moneypunct(__c_locale __cloc, yann@1: + const char*) yann@1: + { yann@1: + if (!_M_data) yann@1: + _M_data = new __moneypunct_cache; yann@1: + yann@1: + if (!__cloc) yann@1: + { yann@1: + // "C" locale yann@1: + _M_data->_M_decimal_point = '.'; yann@1: + _M_data->_M_thousands_sep = ','; yann@1: + _M_data->_M_grouping = ""; yann@1: + _M_data->_M_grouping_size = 0; yann@1: + _M_data->_M_curr_symbol = ""; yann@1: + _M_data->_M_curr_symbol_size = 0; yann@1: + _M_data->_M_positive_sign = ""; yann@1: + _M_data->_M_positive_sign_size = 0; yann@1: + _M_data->_M_negative_sign = ""; yann@1: + _M_data->_M_negative_sign_size = 0; yann@1: + _M_data->_M_frac_digits = 0; yann@1: + _M_data->_M_pos_format = money_base::_S_default_pattern; yann@1: + _M_data->_M_neg_format = money_base::_S_default_pattern; yann@1: + yann@1: + for (size_t __i = 0; __i < money_base::_S_end; ++__i) yann@1: + _M_data->_M_atoms[__i] = money_base::_S_atoms[__i]; yann@1: + } yann@1: + else yann@1: + { yann@1: + // Named locale. yann@1: + _M_data->_M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT, yann@1: + __cloc)); yann@1: + _M_data->_M_thousands_sep = *(__nl_langinfo_l(__MON_THOUSANDS_SEP, yann@1: + __cloc)); yann@1: + _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc); yann@1: + _M_data->_M_grouping_size = strlen(_M_data->_M_grouping); yann@1: + _M_data->_M_positive_sign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc); yann@1: + _M_data->_M_positive_sign_size = strlen(_M_data->_M_positive_sign); yann@1: + yann@1: + char __nposn = *(__nl_langinfo_l(__INT_N_SIGN_POSN, __cloc)); yann@1: + if (!__nposn) yann@1: + _M_data->_M_negative_sign = "()"; yann@1: + else yann@1: + _M_data->_M_negative_sign = __nl_langinfo_l(__NEGATIVE_SIGN, yann@1: + __cloc); yann@1: + _M_data->_M_negative_sign_size = strlen(_M_data->_M_negative_sign); yann@1: + yann@1: + // _Intl == true yann@1: + _M_data->_M_curr_symbol = __nl_langinfo_l(__INT_CURR_SYMBOL, __cloc); yann@1: + _M_data->_M_curr_symbol_size = strlen(_M_data->_M_curr_symbol); yann@1: + _M_data->_M_frac_digits = *(__nl_langinfo_l(__INT_FRAC_DIGITS, yann@1: + __cloc)); yann@1: + char __pprecedes = *(__nl_langinfo_l(__INT_P_CS_PRECEDES, __cloc)); yann@1: + char __pspace = *(__nl_langinfo_l(__INT_P_SEP_BY_SPACE, __cloc)); yann@1: + char __pposn = *(__nl_langinfo_l(__INT_P_SIGN_POSN, __cloc)); yann@1: + _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace, yann@1: + __pposn); yann@1: + char __nprecedes = *(__nl_langinfo_l(__INT_N_CS_PRECEDES, __cloc)); yann@1: + char __nspace = *(__nl_langinfo_l(__INT_N_SEP_BY_SPACE, __cloc)); yann@1: + _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace, yann@1: + __nposn); yann@1: + } yann@1: + } yann@1: + yann@1: + template<> yann@1: + void yann@1: + moneypunct::_M_initialize_moneypunct(__c_locale __cloc, yann@1: + const char*) yann@1: + { yann@1: + if (!_M_data) yann@1: + _M_data = new __moneypunct_cache; yann@1: + yann@1: + if (!__cloc) yann@1: + { yann@1: + // "C" locale yann@1: + _M_data->_M_decimal_point = '.'; yann@1: + _M_data->_M_thousands_sep = ','; yann@1: + _M_data->_M_grouping = ""; yann@1: + _M_data->_M_grouping_size = 0; yann@1: + _M_data->_M_curr_symbol = ""; yann@1: + _M_data->_M_curr_symbol_size = 0; yann@1: + _M_data->_M_positive_sign = ""; yann@1: + _M_data->_M_positive_sign_size = 0; yann@1: + _M_data->_M_negative_sign = ""; yann@1: + _M_data->_M_negative_sign_size = 0; yann@1: + _M_data->_M_frac_digits = 0; yann@1: + _M_data->_M_pos_format = money_base::_S_default_pattern; yann@1: + _M_data->_M_neg_format = money_base::_S_default_pattern; yann@1: + yann@1: + for (size_t __i = 0; __i < money_base::_S_end; ++__i) yann@1: + _M_data->_M_atoms[__i] = money_base::_S_atoms[__i]; yann@1: + } yann@1: + else yann@1: + { yann@1: + // Named locale. yann@1: + _M_data->_M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT, yann@1: + __cloc)); yann@1: + _M_data->_M_thousands_sep = *(__nl_langinfo_l(__MON_THOUSANDS_SEP, yann@1: + __cloc)); yann@1: + _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc); yann@1: + _M_data->_M_grouping_size = strlen(_M_data->_M_grouping); yann@1: + _M_data->_M_positive_sign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc); yann@1: + _M_data->_M_positive_sign_size = strlen(_M_data->_M_positive_sign); yann@1: + yann@1: + char __nposn = *(__nl_langinfo_l(__N_SIGN_POSN, __cloc)); yann@1: + if (!__nposn) yann@1: + _M_data->_M_negative_sign = "()"; yann@1: + else yann@1: + _M_data->_M_negative_sign = __nl_langinfo_l(__NEGATIVE_SIGN, yann@1: + __cloc); yann@1: + _M_data->_M_negative_sign_size = strlen(_M_data->_M_negative_sign); yann@1: + yann@1: + // _Intl == false yann@1: + _M_data->_M_curr_symbol = __nl_langinfo_l(__CURRENCY_SYMBOL, __cloc); yann@1: + _M_data->_M_curr_symbol_size = strlen(_M_data->_M_curr_symbol); yann@1: + _M_data->_M_frac_digits = *(__nl_langinfo_l(__FRAC_DIGITS, __cloc)); yann@1: + char __pprecedes = *(__nl_langinfo_l(__P_CS_PRECEDES, __cloc)); yann@1: + char __pspace = *(__nl_langinfo_l(__P_SEP_BY_SPACE, __cloc)); yann@1: + char __pposn = *(__nl_langinfo_l(__P_SIGN_POSN, __cloc)); yann@1: + _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace, yann@1: + __pposn); yann@1: + char __nprecedes = *(__nl_langinfo_l(__N_CS_PRECEDES, __cloc)); yann@1: + char __nspace = *(__nl_langinfo_l(__N_SEP_BY_SPACE, __cloc)); yann@1: + _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace, yann@1: + __nposn); yann@1: + } yann@1: + } yann@1: + yann@1: + template<> yann@1: + moneypunct::~moneypunct() yann@1: + { delete _M_data; } yann@1: + yann@1: + template<> yann@1: + moneypunct::~moneypunct() yann@1: + { delete _M_data; } yann@1: + yann@1: +#ifdef _GLIBCXX_USE_WCHAR_T yann@1: + template<> yann@1: + void yann@1: + moneypunct::_M_initialize_moneypunct(__c_locale __cloc, yann@1: +#ifdef __UCLIBC_HAS_XLOCALE__ yann@1: + const char*) yann@1: +#else yann@1: + const char* __name) yann@1: +#endif yann@1: + { yann@1: + if (!_M_data) yann@1: + _M_data = new __moneypunct_cache; yann@1: + yann@1: + if (!__cloc) yann@1: + { yann@1: + // "C" locale yann@1: + _M_data->_M_decimal_point = L'.'; yann@1: + _M_data->_M_thousands_sep = L','; yann@1: + _M_data->_M_grouping = ""; yann@1: + _M_data->_M_grouping_size = 0; yann@1: + _M_data->_M_curr_symbol = L""; yann@1: + _M_data->_M_curr_symbol_size = 0; yann@1: + _M_data->_M_positive_sign = L""; yann@1: + _M_data->_M_positive_sign_size = 0; yann@1: + _M_data->_M_negative_sign = L""; yann@1: + _M_data->_M_negative_sign_size = 0; yann@1: + _M_data->_M_frac_digits = 0; yann@1: + _M_data->_M_pos_format = money_base::_S_default_pattern; yann@1: + _M_data->_M_neg_format = money_base::_S_default_pattern; yann@1: + yann@1: + // Use ctype::widen code without the facet... yann@1: + unsigned char uc; yann@1: + for (size_t __i = 0; __i < money_base::_S_end; ++__i) yann@1: + { yann@1: + uc = static_cast(money_base::_S_atoms[__i]); yann@1: + _M_data->_M_atoms[__i] = btowc(uc); yann@1: + } yann@1: + } yann@1: + else yann@1: + { yann@1: + // Named locale. yann@1: +#ifdef __UCLIBC_HAS_XLOCALE__ yann@1: + __c_locale __old = __uselocale(__cloc); yann@1: +#else yann@1: + // Switch to named locale so that mbsrtowcs will work. yann@1: + char* __old = strdup(setlocale(LC_ALL, NULL)); yann@1: + setlocale(LC_ALL, __name); yann@1: +#endif yann@1: + yann@1: +#ifdef __UCLIBC_MJN3_ONLY__ yann@1: +#warning fix this... should be monetary yann@1: +#endif yann@1: +#ifdef __UCLIBC__ yann@1: +# ifdef __UCLIBC_HAS_XLOCALE__ yann@1: + _M_data->_M_decimal_point = __cloc->decimal_point_wc; yann@1: + _M_data->_M_thousands_sep = __cloc->thousands_sep_wc; yann@1: +# else yann@1: + _M_data->_M_decimal_point = __global_locale->decimal_point_wc; yann@1: + _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc; yann@1: +# endif yann@1: +#else yann@1: + union __s_and_w { const char *__s; unsigned int __w; } __u; yann@1: + __u.__s = __nl_langinfo_l(_NL_MONETARY_DECIMAL_POINT_WC, __cloc); yann@1: + _M_data->_M_decimal_point = static_cast(__u.__w); yann@1: + yann@1: + __u.__s = __nl_langinfo_l(_NL_MONETARY_THOUSANDS_SEP_WC, __cloc); yann@1: + _M_data->_M_thousands_sep = static_cast(__u.__w); yann@1: +#endif yann@1: + _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc); yann@1: + _M_data->_M_grouping_size = strlen(_M_data->_M_grouping); yann@1: + yann@1: + const char* __cpossign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc); yann@1: + const char* __cnegsign = __nl_langinfo_l(__NEGATIVE_SIGN, __cloc); yann@1: + const char* __ccurr = __nl_langinfo_l(__INT_CURR_SYMBOL, __cloc); yann@1: + yann@1: + wchar_t* __wcs_ps = 0; yann@1: + wchar_t* __wcs_ns = 0; yann@1: + const char __nposn = *(__nl_langinfo_l(__INT_N_SIGN_POSN, __cloc)); yann@1: + try yann@1: + { yann@1: + mbstate_t __state; yann@1: + size_t __len = strlen(__cpossign); yann@1: + if (__len) yann@1: + { yann@1: + ++__len; yann@1: + memset(&__state, 0, sizeof(mbstate_t)); yann@1: + __wcs_ps = new wchar_t[__len]; yann@1: + mbsrtowcs(__wcs_ps, &__cpossign, __len, &__state); yann@1: + _M_data->_M_positive_sign = __wcs_ps; yann@1: + } yann@1: + else yann@1: + _M_data->_M_positive_sign = L""; yann@1: + _M_data->_M_positive_sign_size = wcslen(_M_data->_M_positive_sign); yann@1: + yann@1: + __len = strlen(__cnegsign); yann@1: + if (!__nposn) yann@1: + _M_data->_M_negative_sign = L"()"; yann@1: + else if (__len) yann@1: + { yann@1: + ++__len; yann@1: + memset(&__state, 0, sizeof(mbstate_t)); yann@1: + __wcs_ns = new wchar_t[__len]; yann@1: + mbsrtowcs(__wcs_ns, &__cnegsign, __len, &__state); yann@1: + _M_data->_M_negative_sign = __wcs_ns; yann@1: + } yann@1: + else yann@1: + _M_data->_M_negative_sign = L""; yann@1: + _M_data->_M_negative_sign_size = wcslen(_M_data->_M_negative_sign); yann@1: + yann@1: + // _Intl == true. yann@1: + __len = strlen(__ccurr); yann@1: + if (__len) yann@1: + { yann@1: + ++__len; yann@1: + memset(&__state, 0, sizeof(mbstate_t)); yann@1: + wchar_t* __wcs = new wchar_t[__len]; yann@1: + mbsrtowcs(__wcs, &__ccurr, __len, &__state); yann@1: + _M_data->_M_curr_symbol = __wcs; yann@1: + } yann@1: + else yann@1: + _M_data->_M_curr_symbol = L""; yann@1: + _M_data->_M_curr_symbol_size = wcslen(_M_data->_M_curr_symbol); yann@1: + } yann@1: + catch (...) yann@1: + { yann@1: + delete _M_data; yann@1: + _M_data = 0; yann@1: + delete __wcs_ps; yann@1: + delete __wcs_ns; yann@1: +#ifdef __UCLIBC_HAS_XLOCALE__ yann@1: + __uselocale(__old); yann@1: +#else yann@1: + setlocale(LC_ALL, __old); yann@1: + free(__old); yann@1: +#endif yann@1: + __throw_exception_again; yann@1: + } yann@1: + yann@1: + _M_data->_M_frac_digits = *(__nl_langinfo_l(__INT_FRAC_DIGITS, yann@1: + __cloc)); yann@1: + char __pprecedes = *(__nl_langinfo_l(__INT_P_CS_PRECEDES, __cloc)); yann@1: + char __pspace = *(__nl_langinfo_l(__INT_P_SEP_BY_SPACE, __cloc)); yann@1: + char __pposn = *(__nl_langinfo_l(__INT_P_SIGN_POSN, __cloc)); yann@1: + _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace, yann@1: + __pposn); yann@1: + char __nprecedes = *(__nl_langinfo_l(__INT_N_CS_PRECEDES, __cloc)); yann@1: + char __nspace = *(__nl_langinfo_l(__INT_N_SEP_BY_SPACE, __cloc)); yann@1: + _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace, yann@1: + __nposn); yann@1: + yann@1: +#ifdef __UCLIBC_HAS_XLOCALE__ yann@1: + __uselocale(__old); yann@1: +#else yann@1: + setlocale(LC_ALL, __old); yann@1: + free(__old); yann@1: +#endif yann@1: + } yann@1: + } yann@1: + yann@1: + template<> yann@1: + void yann@1: + moneypunct::_M_initialize_moneypunct(__c_locale __cloc, yann@1: +#ifdef __UCLIBC_HAS_XLOCALE__ yann@1: + const char*) yann@1: +#else yann@1: + const char* __name) yann@1: +#endif yann@1: + { yann@1: + if (!_M_data) yann@1: + _M_data = new __moneypunct_cache; yann@1: + yann@1: + if (!__cloc) yann@1: + { yann@1: + // "C" locale yann@1: + _M_data->_M_decimal_point = L'.'; yann@1: + _M_data->_M_thousands_sep = L','; yann@1: + _M_data->_M_grouping = ""; yann@1: + _M_data->_M_grouping_size = 0; yann@1: + _M_data->_M_curr_symbol = L""; yann@1: + _M_data->_M_curr_symbol_size = 0; yann@1: + _M_data->_M_positive_sign = L""; yann@1: + _M_data->_M_positive_sign_size = 0; yann@1: + _M_data->_M_negative_sign = L""; yann@1: + _M_data->_M_negative_sign_size = 0; yann@1: + _M_data->_M_frac_digits = 0; yann@1: + _M_data->_M_pos_format = money_base::_S_default_pattern; yann@1: + _M_data->_M_neg_format = money_base::_S_default_pattern; yann@1: + yann@1: + // Use ctype::widen code without the facet... yann@1: + unsigned char uc; yann@1: + for (size_t __i = 0; __i < money_base::_S_end; ++__i) yann@1: + { yann@1: + uc = static_cast(money_base::_S_atoms[__i]); yann@1: + _M_data->_M_atoms[__i] = btowc(uc); yann@1: + } yann@1: + } yann@1: + else yann@1: + { yann@1: + // Named locale. yann@1: +#ifdef __UCLIBC_HAS_XLOCALE__ yann@1: + __c_locale __old = __uselocale(__cloc); yann@1: +#else yann@1: + // Switch to named locale so that mbsrtowcs will work. yann@1: + char* __old = strdup(setlocale(LC_ALL, NULL)); yann@1: + setlocale(LC_ALL, __name); yann@1: +#endif yann@1: + yann@1: +#ifdef __UCLIBC_MJN3_ONLY__ yann@1: +#warning fix this... should be monetary yann@1: +#endif yann@1: +#ifdef __UCLIBC__ yann@1: +# ifdef __UCLIBC_HAS_XLOCALE__ yann@1: + _M_data->_M_decimal_point = __cloc->decimal_point_wc; yann@1: + _M_data->_M_thousands_sep = __cloc->thousands_sep_wc; yann@1: +# else yann@1: + _M_data->_M_decimal_point = __global_locale->decimal_point_wc; yann@1: + _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc; yann@1: +# endif yann@1: +#else yann@1: + union __s_and_w { const char *__s; unsigned int __w; } __u; yann@1: + __u.__s = __nl_langinfo_l(_NL_MONETARY_DECIMAL_POINT_WC, __cloc); yann@1: + _M_data->_M_decimal_point = static_cast(__u.__w); yann@1: + yann@1: + __u.__s = __nl_langinfo_l(_NL_MONETARY_THOUSANDS_SEP_WC, __cloc); yann@1: + _M_data->_M_thousands_sep = static_cast(__u.__w); yann@1: +#endif yann@1: + _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc); yann@1: + _M_data->_M_grouping_size = strlen(_M_data->_M_grouping); yann@1: + yann@1: + const char* __cpossign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc); yann@1: + const char* __cnegsign = __nl_langinfo_l(__NEGATIVE_SIGN, __cloc); yann@1: + const char* __ccurr = __nl_langinfo_l(__CURRENCY_SYMBOL, __cloc); yann@1: + yann@1: + wchar_t* __wcs_ps = 0; yann@1: + wchar_t* __wcs_ns = 0; yann@1: + const char __nposn = *(__nl_langinfo_l(__N_SIGN_POSN, __cloc)); yann@1: + try yann@1: + { yann@1: + mbstate_t __state; yann@1: + size_t __len; yann@1: + __len = strlen(__cpossign); yann@1: + if (__len) yann@1: + { yann@1: + ++__len; yann@1: + memset(&__state, 0, sizeof(mbstate_t)); yann@1: + __wcs_ps = new wchar_t[__len]; yann@1: + mbsrtowcs(__wcs_ps, &__cpossign, __len, &__state); yann@1: + _M_data->_M_positive_sign = __wcs_ps; yann@1: + } yann@1: + else yann@1: + _M_data->_M_positive_sign = L""; yann@1: + _M_data->_M_positive_sign_size = wcslen(_M_data->_M_positive_sign); yann@1: + yann@1: + __len = strlen(__cnegsign); yann@1: + if (!__nposn) yann@1: + _M_data->_M_negative_sign = L"()"; yann@1: + else if (__len) yann@1: + { yann@1: + ++__len; yann@1: + memset(&__state, 0, sizeof(mbstate_t)); yann@1: + __wcs_ns = new wchar_t[__len]; yann@1: + mbsrtowcs(__wcs_ns, &__cnegsign, __len, &__state); yann@1: + _M_data->_M_negative_sign = __wcs_ns; yann@1: + } yann@1: + else yann@1: + _M_data->_M_negative_sign = L""; yann@1: + _M_data->_M_negative_sign_size = wcslen(_M_data->_M_negative_sign); yann@1: + yann@1: + // _Intl == true. yann@1: + __len = strlen(__ccurr); yann@1: + if (__len) yann@1: + { yann@1: + ++__len; yann@1: + memset(&__state, 0, sizeof(mbstate_t)); yann@1: + wchar_t* __wcs = new wchar_t[__len]; yann@1: + mbsrtowcs(__wcs, &__ccurr, __len, &__state); yann@1: + _M_data->_M_curr_symbol = __wcs; yann@1: + } yann@1: + else yann@1: + _M_data->_M_curr_symbol = L""; yann@1: + _M_data->_M_curr_symbol_size = wcslen(_M_data->_M_curr_symbol); yann@1: + } yann@1: + catch (...) yann@1: + { yann@1: + delete _M_data; yann@1: + _M_data = 0; yann@1: + delete __wcs_ps; yann@1: + delete __wcs_ns; yann@1: +#ifdef __UCLIBC_HAS_XLOCALE__ yann@1: + __uselocale(__old); yann@1: +#else yann@1: + setlocale(LC_ALL, __old); yann@1: + free(__old); yann@1: +#endif yann@1: + __throw_exception_again; yann@1: + } yann@1: + yann@1: + _M_data->_M_frac_digits = *(__nl_langinfo_l(__FRAC_DIGITS, __cloc)); yann@1: + char __pprecedes = *(__nl_langinfo_l(__P_CS_PRECEDES, __cloc)); yann@1: + char __pspace = *(__nl_langinfo_l(__P_SEP_BY_SPACE, __cloc)); yann@1: + char __pposn = *(__nl_langinfo_l(__P_SIGN_POSN, __cloc)); yann@1: + _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace, yann@1: + __pposn); yann@1: + char __nprecedes = *(__nl_langinfo_l(__N_CS_PRECEDES, __cloc)); yann@1: + char __nspace = *(__nl_langinfo_l(__N_SEP_BY_SPACE, __cloc)); yann@1: + _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace, yann@1: + __nposn); yann@1: + yann@1: +#ifdef __UCLIBC_HAS_XLOCALE__ yann@1: + __uselocale(__old); yann@1: +#else yann@1: + setlocale(LC_ALL, __old); yann@1: + free(__old); yann@1: +#endif yann@1: + } yann@1: + } yann@1: + yann@1: + template<> yann@1: + moneypunct::~moneypunct() yann@1: + { yann@1: + if (_M_data->_M_positive_sign_size) yann@1: + delete [] _M_data->_M_positive_sign; yann@1: + if (_M_data->_M_negative_sign_size yann@1: + && wcscmp(_M_data->_M_negative_sign, L"()") != 0) yann@1: + delete [] _M_data->_M_negative_sign; yann@1: + if (_M_data->_M_curr_symbol_size) yann@1: + delete [] _M_data->_M_curr_symbol; yann@1: + delete _M_data; yann@1: + } yann@1: + yann@1: + template<> yann@1: + moneypunct::~moneypunct() yann@1: + { yann@1: + if (_M_data->_M_positive_sign_size) yann@1: + delete [] _M_data->_M_positive_sign; yann@1: + if (_M_data->_M_negative_sign_size yann@1: + && wcscmp(_M_data->_M_negative_sign, L"()") != 0) yann@1: + delete [] _M_data->_M_negative_sign; yann@1: + if (_M_data->_M_curr_symbol_size) yann@1: + delete [] _M_data->_M_curr_symbol; yann@1: + delete _M_data; yann@1: + } yann@1: +#endif yann@1: +} yann@1: diff -urN gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/numeric_members.cc gcc-3.4.2/libstdc++-v3/config/locale/uclibc/numeric_members.cc yann@1: --- gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/numeric_members.cc 1969-12-31 18:00:00.000000000 -0600 yann@1: +++ gcc-3.4.2/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2004-09-10 10:47:40.000000000 -0500 yann@1: @@ -0,0 +1,183 @@ yann@1: +// std::numpunct implementation details, GNU version -*- C++ -*- yann@1: + yann@1: +// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc. yann@1: +// yann@1: +// This file is part of the GNU ISO C++ Library. This library is free yann@1: +// software; you can redistribute it and/or modify it under the yann@1: +// terms of the GNU General Public License as published by the yann@1: +// Free Software Foundation; either version 2, or (at your option) yann@1: +// any later version. yann@1: + yann@1: +// This library is distributed in the hope that it will be useful, yann@1: +// but WITHOUT ANY WARRANTY; without even the implied warranty of yann@1: +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the yann@1: +// GNU General Public License for more details. yann@1: + yann@1: +// You should have received a copy of the GNU General Public License along yann@1: +// with this library; see the file COPYING. If not, write to the Free yann@1: +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, yann@1: +// USA. yann@1: + yann@1: +// As a special exception, you may use this file as part of a free software yann@1: +// library without restriction. Specifically, if other files instantiate yann@1: +// templates or use macros or inline functions from this file, or you compile yann@1: +// this file and link it with other files to produce an executable, this yann@1: +// file does not by itself cause the resulting executable to be covered by yann@1: +// the GNU General Public License. This exception does not however yann@1: +// invalidate any other reasons why the executable file might be covered by yann@1: +// the GNU General Public License. yann@1: + yann@1: +// yann@1: +// ISO C++ 14882: 22.2.3.1.2 numpunct virtual functions yann@1: +// yann@1: + yann@1: +// Written by Benjamin Kosnik yann@1: + yann@1: +#define _LIBC yann@1: +#include yann@1: +#undef _LIBC yann@1: +#include yann@1: + yann@1: +#ifdef __UCLIBC_MJN3_ONLY__ yann@1: +#warning tailor for stub locale support yann@1: +#endif yann@1: +#ifndef __UCLIBC_HAS_XLOCALE__ yann@1: +#define __nl_langinfo_l(N, L) nl_langinfo((N)) yann@1: +#endif yann@1: + yann@1: +namespace std yann@1: +{ yann@1: + template<> yann@1: + void yann@1: + numpunct::_M_initialize_numpunct(__c_locale __cloc) yann@1: + { yann@1: + if (!_M_data) yann@1: + _M_data = new __numpunct_cache; yann@1: + yann@1: + if (!__cloc) yann@1: + { yann@1: + // "C" locale yann@1: + _M_data->_M_grouping = ""; yann@1: + _M_data->_M_grouping_size = 0; yann@1: + _M_data->_M_use_grouping = false; yann@1: + yann@1: + _M_data->_M_decimal_point = '.'; yann@1: + _M_data->_M_thousands_sep = ','; yann@1: + yann@1: + for (size_t __i = 0; __i < __num_base::_S_oend; ++__i) yann@1: + _M_data->_M_atoms_out[__i] = __num_base::_S_atoms_out[__i]; yann@1: + yann@1: + for (size_t __j = 0; __j < __num_base::_S_iend; ++__j) yann@1: + _M_data->_M_atoms_in[__j] = __num_base::_S_atoms_in[__j]; yann@1: + } yann@1: + else yann@1: + { yann@1: + // Named locale. yann@1: + _M_data->_M_decimal_point = *(__nl_langinfo_l(DECIMAL_POINT, yann@1: + __cloc)); yann@1: + _M_data->_M_thousands_sep = *(__nl_langinfo_l(THOUSANDS_SEP, yann@1: + __cloc)); yann@1: + yann@1: + // Check for NULL, which implies no grouping. yann@1: + if (_M_data->_M_thousands_sep == '\0') yann@1: + _M_data->_M_grouping = ""; yann@1: + else yann@1: + _M_data->_M_grouping = __nl_langinfo_l(GROUPING, __cloc); yann@1: + _M_data->_M_grouping_size = strlen(_M_data->_M_grouping); yann@1: + } yann@1: + yann@1: + // NB: There is no way to extact this info from posix locales. yann@1: + // _M_truename = __nl_langinfo_l(YESSTR, __cloc); yann@1: + _M_data->_M_truename = "true"; yann@1: + _M_data->_M_truename_size = strlen(_M_data->_M_truename); yann@1: + // _M_falsename = __nl_langinfo_l(NOSTR, __cloc); yann@1: + _M_data->_M_falsename = "false"; yann@1: + _M_data->_M_falsename_size = strlen(_M_data->_M_falsename); yann@1: + } yann@1: + yann@1: + template<> yann@1: + numpunct::~numpunct() yann@1: + { delete _M_data; } yann@1: + yann@1: +#ifdef _GLIBCXX_USE_WCHAR_T yann@1: + template<> yann@1: + void yann@1: + numpunct::_M_initialize_numpunct(__c_locale __cloc) yann@1: + { yann@1: + if (!_M_data) yann@1: + _M_data = new __numpunct_cache; yann@1: + yann@1: + if (!__cloc) yann@1: + { yann@1: + // "C" locale yann@1: + _M_data->_M_grouping = ""; yann@1: + _M_data->_M_grouping_size = 0; yann@1: + _M_data->_M_use_grouping = false; yann@1: + yann@1: + _M_data->_M_decimal_point = L'.'; yann@1: + _M_data->_M_thousands_sep = L','; yann@1: + yann@1: +#ifdef __UCLIBC_HAS_XLOCALE__ yann@1: + __c_locale __old = __uselocale(_S_get_c_locale()); yann@1: +#endif yann@1: + // Use ctype::widen code without the facet... yann@1: + unsigned char uc; yann@1: + for (size_t __i = 0; __i < __num_base::_S_oend; ++__i) yann@1: + { yann@1: + uc = static_cast(__num_base::_S_atoms_out[__i]); yann@1: + _M_data->_M_atoms_out[__i] = btowc(uc); yann@1: + } yann@1: + yann@1: + for (size_t __j = 0; __j < __num_base::_S_iend; ++__j) yann@1: + { yann@1: + uc = static_cast(__num_base::_S_atoms_in[__j]); yann@1: + _M_data->_M_atoms_in[__j] = btowc(uc); yann@1: + } yann@1: +#ifdef __UCLIBC_HAS_XLOCALE__ yann@1: + __uselocale(__old); yann@1: +#endif yann@1: + } yann@1: + else yann@1: + { yann@1: + // Named locale. yann@1: +#ifdef __UCLIBC_MJN3_ONLY__ yann@1: +#warning fix this yann@1: +#endif yann@1: +#ifdef __UCLIBC__ yann@1: +# ifdef __UCLIBC_HAS_XLOCALE__ yann@1: + _M_data->_M_decimal_point = __cloc->decimal_point_wc; yann@1: + _M_data->_M_thousands_sep = __cloc->thousands_sep_wc; yann@1: +# else yann@1: + _M_data->_M_decimal_point = __global_locale->decimal_point_wc; yann@1: + _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc; yann@1: +# endif yann@1: +#else yann@1: + union __s_and_w { const char *__s; unsigned int __w; } __u; yann@1: + __u.__s = __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc); yann@1: + _M_data->_M_decimal_point = static_cast(__u.__w); yann@1: + yann@1: + __u.__s = __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc); yann@1: + _M_data->_M_thousands_sep = static_cast(__u.__w); yann@1: +#endif yann@1: + yann@1: + if (_M_data->_M_thousands_sep == L'\0') yann@1: + _M_data->_M_grouping = ""; yann@1: + else yann@1: + _M_data->_M_grouping = __nl_langinfo_l(GROUPING, __cloc); yann@1: + _M_data->_M_grouping_size = strlen(_M_data->_M_grouping); yann@1: + } yann@1: + yann@1: + // NB: There is no way to extact this info from posix locales. yann@1: + // _M_truename = __nl_langinfo_l(YESSTR, __cloc); yann@1: + _M_data->_M_truename = L"true"; yann@1: + _M_data->_M_truename_size = wcslen(_M_data->_M_truename); yann@1: + // _M_falsename = __nl_langinfo_l(NOSTR, __cloc); yann@1: + _M_data->_M_falsename = L"false"; yann@1: + _M_data->_M_falsename_size = wcslen(_M_data->_M_falsename); yann@1: + } yann@1: + yann@1: + template<> yann@1: + numpunct::~numpunct() yann@1: + { delete _M_data; } yann@1: + #endif yann@1: +} yann@1: diff -urN gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/time_members.cc gcc-3.4.2/libstdc++-v3/config/locale/uclibc/time_members.cc yann@1: --- gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/time_members.cc 1969-12-31 18:00:00.000000000 -0600 yann@1: +++ gcc-3.4.2/libstdc++-v3/config/locale/uclibc/time_members.cc 2004-09-10 10:48:00.000000000 -0500 yann@1: @@ -0,0 +1,356 @@ yann@1: +// std::time_get, std::time_put implementation, GNU version -*- C++ -*- yann@1: + yann@1: +// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc. yann@1: +// yann@1: +// This file is part of the GNU ISO C++ Library. This library is free yann@1: +// software; you can redistribute it and/or modify it under the yann@1: +// terms of the GNU General Public License as published by the yann@1: +// Free Software Foundation; either version 2, or (at your option) yann@1: +// any later version. yann@1: + yann@1: +// This library is distributed in the hope that it will be useful, yann@1: +// but WITHOUT ANY WARRANTY; without even the implied warranty of yann@1: +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the yann@1: +// GNU General Public License for more details. yann@1: + yann@1: +// You should have received a copy of the GNU General Public License along yann@1: +// with this library; see the file COPYING. If not, write to the Free yann@1: +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, yann@1: +// USA. yann@1: + yann@1: +// As a special exception, you may use this file as part of a free software yann@1: +// library without restriction. Specifically, if other files instantiate yann@1: +// templates or use macros or inline functions from this file, or you compile yann@1: +// this file and link it with other files to produce an executable, this yann@1: +// file does not by itself cause the resulting executable to be covered by yann@1: +// the GNU General Public License. This exception does not however yann@1: +// invalidate any other reasons why the executable file might be covered by yann@1: +// the GNU General Public License. yann@1: + yann@1: +// yann@1: +// ISO C++ 14882: 22.2.5.1.2 - time_get virtual functions yann@1: +// ISO C++ 14882: 22.2.5.3.2 - time_put virtual functions yann@1: +// yann@1: + yann@1: +// Written by Benjamin Kosnik yann@1: + yann@1: +#include yann@1: +#include yann@1: + yann@1: +#ifdef __UCLIBC_MJN3_ONLY__ yann@1: +#warning tailor for stub locale support yann@1: +#endif yann@1: +#ifndef __UCLIBC_HAS_XLOCALE__ yann@1: +#define __nl_langinfo_l(N, L) nl_langinfo((N)) yann@1: +#endif yann@1: + yann@1: +namespace std yann@1: +{ yann@1: + template<> yann@1: + void yann@1: + __timepunct:: yann@1: + _M_put(char* __s, size_t __maxlen, const char* __format, yann@1: + const tm* __tm) const yann@1: + { yann@1: +#ifdef __UCLIBC_HAS_XLOCALE__ yann@1: + const size_t __len = __strftime_l(__s, __maxlen, __format, __tm, yann@1: + _M_c_locale_timepunct); yann@1: +#else yann@1: + char* __old = strdup(setlocale(LC_ALL, NULL)); yann@1: + setlocale(LC_ALL, _M_name_timepunct); yann@1: + const size_t __len = strftime(__s, __maxlen, __format, __tm); yann@1: + setlocale(LC_ALL, __old); yann@1: + free(__old); yann@1: +#endif yann@1: + // Make sure __s is null terminated. yann@1: + if (__len == 0) yann@1: + __s[0] = '\0'; yann@1: + } yann@1: + yann@1: + template<> yann@1: + void yann@1: + __timepunct::_M_initialize_timepunct(__c_locale __cloc) yann@1: + { yann@1: + if (!_M_data) yann@1: + _M_data = new __timepunct_cache; yann@1: + yann@1: + if (!__cloc) yann@1: + { yann@1: + // "C" locale yann@1: + _M_c_locale_timepunct = _S_get_c_locale(); yann@1: + yann@1: + _M_data->_M_date_format = "%m/%d/%y"; yann@1: + _M_data->_M_date_era_format = "%m/%d/%y"; yann@1: + _M_data->_M_time_format = "%H:%M:%S"; yann@1: + _M_data->_M_time_era_format = "%H:%M:%S"; yann@1: + _M_data->_M_date_time_format = ""; yann@1: + _M_data->_M_date_time_era_format = ""; yann@1: + _M_data->_M_am = "AM"; yann@1: + _M_data->_M_pm = "PM"; yann@1: + _M_data->_M_am_pm_format = ""; yann@1: + yann@1: + // Day names, starting with "C"'s Sunday. yann@1: + _M_data->_M_day1 = "Sunday"; yann@1: + _M_data->_M_day2 = "Monday"; yann@1: + _M_data->_M_day3 = "Tuesday"; yann@1: + _M_data->_M_day4 = "Wednesday"; yann@1: + _M_data->_M_day5 = "Thursday"; yann@1: + _M_data->_M_day6 = "Friday"; yann@1: + _M_data->_M_day7 = "Saturday"; yann@1: + yann@1: + // Abbreviated day names, starting with "C"'s Sun. yann@1: + _M_data->_M_aday1 = "Sun"; yann@1: + _M_data->_M_aday2 = "Mon"; yann@1: + _M_data->_M_aday3 = "Tue"; yann@1: + _M_data->_M_aday4 = "Wed"; yann@1: + _M_data->_M_aday5 = "Thu"; yann@1: + _M_data->_M_aday6 = "Fri"; yann@1: + _M_data->_M_aday7 = "Sat"; yann@1: + yann@1: + // Month names, starting with "C"'s January. yann@1: + _M_data->_M_month01 = "January"; yann@1: + _M_data->_M_month02 = "February"; yann@1: + _M_data->_M_month03 = "March"; yann@1: + _M_data->_M_month04 = "April"; yann@1: + _M_data->_M_month05 = "May"; yann@1: + _M_data->_M_month06 = "June"; yann@1: + _M_data->_M_month07 = "July"; yann@1: + _M_data->_M_month08 = "August"; yann@1: + _M_data->_M_month09 = "September"; yann@1: + _M_data->_M_month10 = "October"; yann@1: + _M_data->_M_month11 = "November"; yann@1: + _M_data->_M_month12 = "December"; yann@1: + yann@1: + // Abbreviated month names, starting with "C"'s Jan. yann@1: + _M_data->_M_amonth01 = "Jan"; yann@1: + _M_data->_M_amonth02 = "Feb"; yann@1: + _M_data->_M_amonth03 = "Mar"; yann@1: + _M_data->_M_amonth04 = "Apr"; yann@1: + _M_data->_M_amonth05 = "May"; yann@1: + _M_data->_M_amonth06 = "Jun"; yann@1: + _M_data->_M_amonth07 = "Jul"; yann@1: + _M_data->_M_amonth08 = "Aug"; yann@1: + _M_data->_M_amonth09 = "Sep"; yann@1: + _M_data->_M_amonth10 = "Oct"; yann@1: + _M_data->_M_amonth11 = "Nov"; yann@1: + _M_data->_M_amonth12 = "Dec"; yann@1: + } yann@1: + else yann@1: + { yann@1: + _M_c_locale_timepunct = _S_clone_c_locale(__cloc); yann@1: + yann@1: + _M_data->_M_date_format = __nl_langinfo_l(D_FMT, __cloc); yann@1: + _M_data->_M_date_era_format = __nl_langinfo_l(ERA_D_FMT, __cloc); yann@1: + _M_data->_M_time_format = __nl_langinfo_l(T_FMT, __cloc); yann@1: + _M_data->_M_time_era_format = __nl_langinfo_l(ERA_T_FMT, __cloc); yann@1: + _M_data->_M_date_time_format = __nl_langinfo_l(D_T_FMT, __cloc); yann@1: + _M_data->_M_date_time_era_format = __nl_langinfo_l(ERA_D_T_FMT, __cloc); yann@1: + _M_data->_M_am = __nl_langinfo_l(AM_STR, __cloc); yann@1: + _M_data->_M_pm = __nl_langinfo_l(PM_STR, __cloc); yann@1: + _M_data->_M_am_pm_format = __nl_langinfo_l(T_FMT_AMPM, __cloc); yann@1: + yann@1: + // Day names, starting with "C"'s Sunday. yann@1: + _M_data->_M_day1 = __nl_langinfo_l(DAY_1, __cloc); yann@1: + _M_data->_M_day2 = __nl_langinfo_l(DAY_2, __cloc); yann@1: + _M_data->_M_day3 = __nl_langinfo_l(DAY_3, __cloc); yann@1: + _M_data->_M_day4 = __nl_langinfo_l(DAY_4, __cloc); yann@1: + _M_data->_M_day5 = __nl_langinfo_l(DAY_5, __cloc); yann@1: + _M_data->_M_day6 = __nl_langinfo_l(DAY_6, __cloc); yann@1: + _M_data->_M_day7 = __nl_langinfo_l(DAY_7, __cloc); yann@1: + yann@1: + // Abbreviated day names, starting with "C"'s Sun. yann@1: + _M_data->_M_aday1 = __nl_langinfo_l(ABDAY_1, __cloc); yann@1: + _M_data->_M_aday2 = __nl_langinfo_l(ABDAY_2, __cloc); yann@1: + _M_data->_M_aday3 = __nl_langinfo_l(ABDAY_3, __cloc); yann@1: + _M_data->_M_aday4 = __nl_langinfo_l(ABDAY_4, __cloc); yann@1: + _M_data->_M_aday5 = __nl_langinfo_l(ABDAY_5, __cloc); yann@1: + _M_data->_M_aday6 = __nl_langinfo_l(ABDAY_6, __cloc); yann@1: + _M_data->_M_aday7 = __nl_langinfo_l(ABDAY_7, __cloc); yann@1: + yann@1: + // Month names, starting with "C"'s January. yann@1: + _M_data->_M_month01 = __nl_langinfo_l(MON_1, __cloc); yann@1: + _M_data->_M_month02 = __nl_langinfo_l(MON_2, __cloc); yann@1: + _M_data->_M_month03 = __nl_langinfo_l(MON_3, __cloc); yann@1: + _M_data->_M_month04 = __nl_langinfo_l(MON_4, __cloc); yann@1: + _M_data->_M_month05 = __nl_langinfo_l(MON_5, __cloc); yann@1: + _M_data->_M_month06 = __nl_langinfo_l(MON_6, __cloc); yann@1: + _M_data->_M_month07 = __nl_langinfo_l(MON_7, __cloc); yann@1: + _M_data->_M_month08 = __nl_langinfo_l(MON_8, __cloc); yann@1: + _M_data->_M_month09 = __nl_langinfo_l(MON_9, __cloc); yann@1: + _M_data->_M_month10 = __nl_langinfo_l(MON_10, __cloc); yann@1: + _M_data->_M_month11 = __nl_langinfo_l(MON_11, __cloc); yann@1: + _M_data->_M_month12 = __nl_langinfo_l(MON_12, __cloc); yann@1: + yann@1: + // Abbreviated month names, starting with "C"'s Jan. yann@1: + _M_data->_M_amonth01 = __nl_langinfo_l(ABMON_1, __cloc); yann@1: + _M_data->_M_amonth02 = __nl_langinfo_l(ABMON_2, __cloc); yann@1: + _M_data->_M_amonth03 = __nl_langinfo_l(ABMON_3, __cloc); yann@1: + _M_data->_M_amonth04 = __nl_langinfo_l(ABMON_4, __cloc); yann@1: + _M_data->_M_amonth05 = __nl_langinfo_l(ABMON_5, __cloc); yann@1: + _M_data->_M_amonth06 = __nl_langinfo_l(ABMON_6, __cloc); yann@1: + _M_data->_M_amonth07 = __nl_langinfo_l(ABMON_7, __cloc); yann@1: + _M_data->_M_amonth08 = __nl_langinfo_l(ABMON_8, __cloc); yann@1: + _M_data->_M_amonth09 = __nl_langinfo_l(ABMON_9, __cloc); yann@1: + _M_data->_M_amonth10 = __nl_langinfo_l(ABMON_10, __cloc); yann@1: + _M_data->_M_amonth11 = __nl_langinfo_l(ABMON_11, __cloc); yann@1: + _M_data->_M_amonth12 = __nl_langinfo_l(ABMON_12, __cloc); yann@1: + } yann@1: + } yann@1: + yann@1: +#ifdef _GLIBCXX_USE_WCHAR_T yann@1: + template<> yann@1: + void yann@1: + __timepunct:: yann@1: + _M_put(wchar_t* __s, size_t __maxlen, const wchar_t* __format, yann@1: + const tm* __tm) const yann@1: + { yann@1: +#ifdef __UCLIBC_HAS_XLOCALE__ yann@1: + __wcsftime_l(__s, __maxlen, __format, __tm, _M_c_locale_timepunct); yann@1: + const size_t __len = __wcsftime_l(__s, __maxlen, __format, __tm, yann@1: + _M_c_locale_timepunct); yann@1: +#else yann@1: + char* __old = strdup(setlocale(LC_ALL, NULL)); yann@1: + setlocale(LC_ALL, _M_name_timepunct); yann@1: + const size_t __len = wcsftime(__s, __maxlen, __format, __tm); yann@1: + setlocale(LC_ALL, __old); yann@1: + free(__old); yann@1: +#endif yann@1: + // Make sure __s is null terminated. yann@1: + if (__len == 0) yann@1: + __s[0] = L'\0'; yann@1: + } yann@1: + yann@1: + template<> yann@1: + void yann@1: + __timepunct::_M_initialize_timepunct(__c_locale __cloc) yann@1: + { yann@1: + if (!_M_data) yann@1: + _M_data = new __timepunct_cache; yann@1: + yann@1: +#warning wide time stuff yann@1: +// if (!__cloc) yann@1: + { yann@1: + // "C" locale yann@1: + _M_c_locale_timepunct = _S_get_c_locale(); yann@1: + yann@1: + _M_data->_M_date_format = L"%m/%d/%y"; yann@1: + _M_data->_M_date_era_format = L"%m/%d/%y"; yann@1: + _M_data->_M_time_format = L"%H:%M:%S"; yann@1: + _M_data->_M_time_era_format = L"%H:%M:%S"; yann@1: + _M_data->_M_date_time_format = L""; yann@1: + _M_data->_M_date_time_era_format = L""; yann@1: + _M_data->_M_am = L"AM"; yann@1: + _M_data->_M_pm = L"PM"; yann@1: + _M_data->_M_am_pm_format = L""; yann@1: + yann@1: + // Day names, starting with "C"'s Sunday. yann@1: + _M_data->_M_day1 = L"Sunday"; yann@1: + _M_data->_M_day2 = L"Monday"; yann@1: + _M_data->_M_day3 = L"Tuesday"; yann@1: + _M_data->_M_day4 = L"Wednesday"; yann@1: + _M_data->_M_day5 = L"Thursday"; yann@1: + _M_data->_M_day6 = L"Friday"; yann@1: + _M_data->_M_day7 = L"Saturday"; yann@1: + yann@1: + // Abbreviated day names, starting with "C"'s Sun. yann@1: + _M_data->_M_aday1 = L"Sun"; yann@1: + _M_data->_M_aday2 = L"Mon"; yann@1: + _M_data->_M_aday3 = L"Tue"; yann@1: + _M_data->_M_aday4 = L"Wed"; yann@1: + _M_data->_M_aday5 = L"Thu"; yann@1: + _M_data->_M_aday6 = L"Fri"; yann@1: + _M_data->_M_aday7 = L"Sat"; yann@1: + yann@1: + // Month names, starting with "C"'s January. yann@1: + _M_data->_M_month01 = L"January"; yann@1: + _M_data->_M_month02 = L"February"; yann@1: + _M_data->_M_month03 = L"March"; yann@1: + _M_data->_M_month04 = L"April"; yann@1: + _M_data->_M_month05 = L"May"; yann@1: + _M_data->_M_month06 = L"June"; yann@1: + _M_data->_M_month07 = L"July"; yann@1: + _M_data->_M_month08 = L"August"; yann@1: + _M_data->_M_month09 = L"September"; yann@1: + _M_data->_M_month10 = L"October"; yann@1: + _M_data->_M_month11 = L"November"; yann@1: + _M_data->_M_month12 = L"December"; yann@1: + yann@1: + // Abbreviated month names, starting with "C"'s Jan. yann@1: + _M_data->_M_amonth01 = L"Jan"; yann@1: + _M_data->_M_amonth02 = L"Feb"; yann@1: + _M_data->_M_amonth03 = L"Mar"; yann@1: + _M_data->_M_amonth04 = L"Apr"; yann@1: + _M_data->_M_amonth05 = L"May"; yann@1: + _M_data->_M_amonth06 = L"Jun"; yann@1: + _M_data->_M_amonth07 = L"Jul"; yann@1: + _M_data->_M_amonth08 = L"Aug"; yann@1: + _M_data->_M_amonth09 = L"Sep"; yann@1: + _M_data->_M_amonth10 = L"Oct"; yann@1: + _M_data->_M_amonth11 = L"Nov"; yann@1: + _M_data->_M_amonth12 = L"Dec"; yann@1: + } yann@1: +#if 0 yann@1: + else yann@1: + { yann@1: + _M_c_locale_timepunct = _S_clone_c_locale(__cloc); yann@1: + yann@1: + _M_data->_M_date_format = reinterpret_cast(__nl_langinfo_l(_NL_WD_FMT, __cloc)); yann@1: + _M_data->_M_date_era_format = reinterpret_cast(__nl_langinfo_l(_NL_WERA_D_FMT, __cloc)); yann@1: + _M_data->_M_time_format = reinterpret_cast(__nl_langinfo_l(_NL_WT_FMT, __cloc)); yann@1: + _M_data->_M_time_era_format = reinterpret_cast(__nl_langinfo_l(_NL_WERA_T_FMT, __cloc)); yann@1: + _M_data->_M_date_time_format = reinterpret_cast(__nl_langinfo_l(_NL_WD_T_FMT, __cloc)); yann@1: + _M_data->_M_date_time_era_format = reinterpret_cast(__nl_langinfo_l(_NL_WERA_D_T_FMT, __cloc)); yann@1: + _M_data->_M_am = reinterpret_cast(__nl_langinfo_l(_NL_WAM_STR, __cloc)); yann@1: + _M_data->_M_pm = reinterpret_cast(__nl_langinfo_l(_NL_WPM_STR, __cloc)); yann@1: + _M_data->_M_am_pm_format = reinterpret_cast(__nl_langinfo_l(_NL_WT_FMT_AMPM, __cloc)); yann@1: + yann@1: + // Day names, starting with "C"'s Sunday. yann@1: + _M_data->_M_day1 = reinterpret_cast(__nl_langinfo_l(_NL_WDAY_1, __cloc)); yann@1: + _M_data->_M_day2 = reinterpret_cast(__nl_langinfo_l(_NL_WDAY_2, __cloc)); yann@1: + _M_data->_M_day3 = reinterpret_cast(__nl_langinfo_l(_NL_WDAY_3, __cloc)); yann@1: + _M_data->_M_day4 = reinterpret_cast(__nl_langinfo_l(_NL_WDAY_4, __cloc)); yann@1: + _M_data->_M_day5 = reinterpret_cast(__nl_langinfo_l(_NL_WDAY_5, __cloc)); yann@1: + _M_data->_M_day6 = reinterpret_cast(__nl_langinfo_l(_NL_WDAY_6, __cloc)); yann@1: + _M_data->_M_day7 = reinterpret_cast(__nl_langinfo_l(_NL_WDAY_7, __cloc)); yann@1: + yann@1: + // Abbreviated day names, starting with "C"'s Sun. yann@1: + _M_data->_M_aday1 = reinterpret_cast(__nl_langinfo_l(_NL_WABDAY_1, __cloc)); yann@1: + _M_data->_M_aday2 = reinterpret_cast(__nl_langinfo_l(_NL_WABDAY_2, __cloc)); yann@1: + _M_data->_M_aday3 = reinterpret_cast(__nl_langinfo_l(_NL_WABDAY_3, __cloc)); yann@1: + _M_data->_M_aday4 = reinterpret_cast(__nl_langinfo_l(_NL_WABDAY_4, __cloc)); yann@1: + _M_data->_M_aday5 = reinterpret_cast(__nl_langinfo_l(_NL_WABDAY_5, __cloc)); yann@1: + _M_data->_M_aday6 = reinterpret_cast(__nl_langinfo_l(_NL_WABDAY_6, __cloc)); yann@1: + _M_data->_M_aday7 = reinterpret_cast(__nl_langinfo_l(_NL_WABDAY_7, __cloc)); yann@1: + yann@1: + // Month names, starting with "C"'s January. yann@1: + _M_data->_M_month01 = reinterpret_cast(__nl_langinfo_l(_NL_WMON_1, __cloc)); yann@1: + _M_data->_M_month02 = reinterpret_cast(__nl_langinfo_l(_NL_WMON_2, __cloc)); yann@1: + _M_data->_M_month03 = reinterpret_cast(__nl_langinfo_l(_NL_WMON_3, __cloc)); yann@1: + _M_data->_M_month04 = reinterpret_cast(__nl_langinfo_l(_NL_WMON_4, __cloc)); yann@1: + _M_data->_M_month05 = reinterpret_cast(__nl_langinfo_l(_NL_WMON_5, __cloc)); yann@1: + _M_data->_M_month06 = reinterpret_cast(__nl_langinfo_l(_NL_WMON_6, __cloc)); yann@1: + _M_data->_M_month07 = reinterpret_cast(__nl_langinfo_l(_NL_WMON_7, __cloc)); yann@1: + _M_data->_M_month08 = reinterpret_cast(__nl_langinfo_l(_NL_WMON_8, __cloc)); yann@1: + _M_data->_M_month09 = reinterpret_cast(__nl_langinfo_l(_NL_WMON_9, __cloc)); yann@1: + _M_data->_M_month10 = reinterpret_cast(__nl_langinfo_l(_NL_WMON_10, __cloc)); yann@1: + _M_data->_M_month11 = reinterpret_cast(__nl_langinfo_l(_NL_WMON_11, __cloc)); yann@1: + _M_data->_M_month12 = reinterpret_cast(__nl_langinfo_l(_NL_WMON_12, __cloc)); yann@1: + yann@1: + // Abbreviated month names, starting with "C"'s Jan. yann@1: + _M_data->_M_amonth01 = reinterpret_cast(__nl_langinfo_l(_NL_WABMON_1, __cloc)); yann@1: + _M_data->_M_amonth02 = reinterpret_cast(__nl_langinfo_l(_NL_WABMON_2, __cloc)); yann@1: + _M_data->_M_amonth03 = reinterpret_cast(__nl_langinfo_l(_NL_WABMON_3, __cloc)); yann@1: + _M_data->_M_amonth04 = reinterpret_cast(__nl_langinfo_l(_NL_WABMON_4, __cloc)); yann@1: + _M_data->_M_amonth05 = reinterpret_cast(__nl_langinfo_l(_NL_WABMON_5, __cloc)); yann@1: + _M_data->_M_amonth06 = reinterpret_cast(__nl_langinfo_l(_NL_WABMON_6, __cloc)); yann@1: + _M_data->_M_amonth07 = reinterpret_cast(__nl_langinfo_l(_NL_WABMON_7, __cloc)); yann@1: + _M_data->_M_amonth08 = reinterpret_cast(__nl_langinfo_l(_NL_WABMON_8, __cloc)); yann@1: + _M_data->_M_amonth09 = reinterpret_cast(__nl_langinfo_l(_NL_WABMON_9, __cloc)); yann@1: + _M_data->_M_amonth10 = reinterpret_cast(__nl_langinfo_l(_NL_WABMON_10, __cloc)); yann@1: + _M_data->_M_amonth11 = reinterpret_cast(__nl_langinfo_l(_NL_WABMON_11, __cloc)); yann@1: + _M_data->_M_amonth12 = reinterpret_cast(__nl_langinfo_l(_NL_WABMON_12, __cloc)); yann@1: + } yann@1: +#endif // 0 yann@1: + } yann@1: +#endif yann@1: +} yann@1: diff -urN gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/time_members.h gcc-3.4.2/libstdc++-v3/config/locale/uclibc/time_members.h yann@1: --- gcc-3.4.2-dist/libstdc++-v3/config/locale/uclibc/time_members.h 1969-12-31 18:00:00.000000000 -0600 yann@1: +++ gcc-3.4.2/libstdc++-v3/config/locale/uclibc/time_members.h 2004-09-10 10:47:40.000000000 -0500 yann@1: @@ -0,0 +1,68 @@ yann@1: +// std::time_get, std::time_put implementation, GNU version -*- C++ -*- yann@1: + yann@1: +// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc. yann@1: +// yann@1: +// This file is part of the GNU ISO C++ Library. This library is free yann@1: +// software; you can redistribute it and/or modify it under the yann@1: +// terms of the GNU General Public License as published by the yann@1: +// Free Software Foundation; either version 2, or (at your option) yann@1: +// any later version. yann@1: + yann@1: +// This library is distributed in the hope that it will be useful, yann@1: +// but WITHOUT ANY WARRANTY; without even the implied warranty of yann@1: +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the yann@1: +// GNU General Public License for more details. yann@1: + yann@1: +// You should have received a copy of the GNU General Public License along yann@1: +// with this library; see the file COPYING. If not, write to the Free yann@1: +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, yann@1: +// USA. yann@1: + yann@1: +// As a special exception, you may use this file as part of a free software yann@1: +// library without restriction. Specifically, if other files instantiate yann@1: +// templates or use macros or inline functions from this file, or you compile yann@1: +// this file and link it with other files to produce an executable, this yann@1: +// file does not by itself cause the resulting executable to be covered by yann@1: +// the GNU General Public License. This exception does not however yann@1: +// invalidate any other reasons why the executable file might be covered by yann@1: +// the GNU General Public License. yann@1: + yann@1: +// yann@1: +// ISO C++ 14882: 22.2.5.1.2 - time_get functions yann@1: +// ISO C++ 14882: 22.2.5.3.2 - time_put functions yann@1: +// yann@1: + yann@1: +// Written by Benjamin Kosnik yann@1: + yann@1: + template yann@1: + __timepunct<_CharT>::__timepunct(size_t __refs) yann@1: + : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL), yann@1: + _M_name_timepunct(_S_get_c_name()) yann@1: + { _M_initialize_timepunct(); } yann@1: + yann@1: + template yann@1: + __timepunct<_CharT>::__timepunct(__cache_type* __cache, size_t __refs) yann@1: + : facet(__refs), _M_data(__cache), _M_c_locale_timepunct(NULL), yann@1: + _M_name_timepunct(_S_get_c_name()) yann@1: + { _M_initialize_timepunct(); } yann@1: + yann@1: + template yann@1: + __timepunct<_CharT>::__timepunct(__c_locale __cloc, const char* __s, yann@1: + size_t __refs) yann@1: + : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL), yann@1: + _M_name_timepunct(__s) yann@1: + { yann@1: + char* __tmp = new char[std::strlen(__s) + 1]; yann@1: + std::strcpy(__tmp, __s); yann@1: + _M_name_timepunct = __tmp; yann@1: + _M_initialize_timepunct(__cloc); yann@1: + } yann@1: + yann@1: + template yann@1: + __timepunct<_CharT>::~__timepunct() yann@1: + { yann@1: + if (_M_name_timepunct != _S_get_c_name()) yann@1: + delete [] _M_name_timepunct; yann@1: + delete _M_data; yann@1: + _S_destroy_c_locale(_M_c_locale_timepunct); yann@1: + } yann@1: diff -urN gcc-3.4.2-dist/libstdc++-v3/config/os/uclibc/ctype_base.h gcc-3.4.2/libstdc++-v3/config/os/uclibc/ctype_base.h yann@1: --- gcc-3.4.2-dist/libstdc++-v3/config/os/uclibc/ctype_base.h 1969-12-31 18:00:00.000000000 -0600 yann@1: +++ gcc-3.4.2/libstdc++-v3/config/os/uclibc/ctype_base.h 2004-09-10 10:47:40.000000000 -0500 yann@1: @@ -0,0 +1,58 @@ yann@1: +// Locale support -*- C++ -*- yann@1: + yann@1: +// Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003 yann@1: +// Free Software Foundation, Inc. yann@1: +// yann@1: +// This file is part of the GNU ISO C++ Library. This library is free yann@1: +// software; you can redistribute it and/or modify it under the yann@1: +// terms of the GNU General Public License as published by the yann@1: +// Free Software Foundation; either version 2, or (at your option) yann@1: +// any later version. yann@1: + yann@1: +// This library is distributed in the hope that it will be useful, yann@1: +// but WITHOUT ANY WARRANTY; without even the implied warranty of yann@1: +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the yann@1: +// GNU General Public License for more details. yann@1: + yann@1: +// You should have received a copy of the GNU General Public License along yann@1: +// with this library; see the file COPYING. If not, write to the Free yann@1: +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, yann@1: +// USA. yann@1: + yann@1: +// As a special exception, you may use this file as part of a free software yann@1: +// library without restriction. Specifically, if other files instantiate yann@1: +// templates or use macros or inline functions from this file, or you compile yann@1: +// this file and link it with other files to produce an executable, this yann@1: +// file does not by itself cause the resulting executable to be covered by yann@1: +// the GNU General Public License. This exception does not however yann@1: +// invalidate any other reasons why the executable file might be covered by yann@1: +// the GNU General Public License. yann@1: + yann@1: +// yann@1: +// ISO C++ 14882: 22.1 Locales yann@1: +// yann@1: + yann@1: +// Information as gleaned from /usr/include/ctype.h yann@1: + yann@1: + struct ctype_base yann@1: + { yann@1: + // Note: In uClibc, the following two types depend on configuration. yann@1: + yann@1: + // Non-standard typedefs. yann@1: + typedef const __ctype_touplow_t* __to_type; yann@1: + yann@1: + // NB: Offsets into ctype::_M_table force a particular size yann@1: + // on the mask type. Because of this, we don't use an enum. yann@1: + typedef __ctype_mask_t mask; yann@1: + static const mask upper = _ISupper; yann@1: + static const mask lower = _ISlower; yann@1: + static const mask alpha = _ISalpha; yann@1: + static const mask digit = _ISdigit; yann@1: + static const mask xdigit = _ISxdigit; yann@1: + static const mask space = _ISspace; yann@1: + static const mask print = _ISprint; yann@1: + static const mask graph = _ISalpha | _ISdigit | _ISpunct; yann@1: + static const mask cntrl = _IScntrl; yann@1: + static const mask punct = _ISpunct; yann@1: + static const mask alnum = _ISalpha | _ISdigit; yann@1: + }; yann@1: diff -urN gcc-3.4.2-dist/libstdc++-v3/config/os/uclibc/ctype_inline.h gcc-3.4.2/libstdc++-v3/config/os/uclibc/ctype_inline.h yann@1: --- gcc-3.4.2-dist/libstdc++-v3/config/os/uclibc/ctype_inline.h 1969-12-31 18:00:00.000000000 -0600 yann@1: +++ gcc-3.4.2/libstdc++-v3/config/os/uclibc/ctype_inline.h 2004-09-10 10:47:40.000000000 -0500 yann@1: @@ -0,0 +1,69 @@ yann@1: +// Locale support -*- C++ -*- yann@1: + yann@1: +// Copyright (C) 2000, 2002 Free Software Foundation, Inc. yann@1: +// yann@1: +// This file is part of the GNU ISO C++ Library. This library is free yann@1: +// software; you can redistribute it and/or modify it under the yann@1: +// terms of the GNU General Public License as published by the yann@1: +// Free Software Foundation; either version 2, or (at your option) yann@1: +// any later version. yann@1: + yann@1: +// This library is distributed in the hope that it will be useful, yann@1: +// but WITHOUT ANY WARRANTY; without even the implied warranty of yann@1: +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the yann@1: +// GNU General Public License for more details. yann@1: + yann@1: +// You should have received a copy of the GNU General Public License along yann@1: +// with this library; see the file COPYING. If not, write to the Free yann@1: +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, yann@1: +// USA. yann@1: + yann@1: +// As a special exception, you may use this file as part of a free software yann@1: +// library without restriction. Specifically, if other files instantiate yann@1: +// templates or use macros or inline functions from this file, or you compile yann@1: +// this file and link it with other files to produce an executable, this yann@1: +// file does not by itself cause the resulting executable to be covered by yann@1: +// the GNU General Public License. This exception does not however yann@1: +// invalidate any other reasons why the executable file might be covered by yann@1: +// the GNU General Public License. yann@1: + yann@1: +// yann@1: +// ISO C++ 14882: 22.1 Locales yann@1: +// yann@1: + yann@1: +// ctype bits to be inlined go here. Non-inlinable (ie virtual do_*) yann@1: +// functions go in ctype.cc yann@1: + yann@1: + bool yann@1: + ctype:: yann@1: + is(mask __m, char __c) const yann@1: + { return _M_table[static_cast(__c)] & __m; } yann@1: + yann@1: + const char* yann@1: + ctype:: yann@1: + is(const char* __low, const char* __high, mask* __vec) const yann@1: + { yann@1: + while (__low < __high) yann@1: + *__vec++ = _M_table[static_cast(*__low++)]; yann@1: + return __high; yann@1: + } yann@1: + yann@1: + const char* yann@1: + ctype:: yann@1: + scan_is(mask __m, const char* __low, const char* __high) const yann@1: + { yann@1: + while (__low < __high yann@1: + && !(_M_table[static_cast(*__low)] & __m)) yann@1: + ++__low; yann@1: + return __low; yann@1: + } yann@1: + yann@1: + const char* yann@1: + ctype:: yann@1: + scan_not(mask __m, const char* __low, const char* __high) const yann@1: + { yann@1: + while (__low < __high yann@1: + && (_M_table[static_cast(*__low)] & __m) != 0) yann@1: + ++__low; yann@1: + return __low; yann@1: + } yann@1: diff -urN gcc-3.4.2-dist/libstdc++-v3/config/os/uclibc/ctype_noninline.h gcc-3.4.2/libstdc++-v3/config/os/uclibc/ctype_noninline.h yann@1: --- gcc-3.4.2-dist/libstdc++-v3/config/os/uclibc/ctype_noninline.h 1969-12-31 18:00:00.000000000 -0600 yann@1: +++ gcc-3.4.2/libstdc++-v3/config/os/uclibc/ctype_noninline.h 2004-09-10 10:47:40.000000000 -0500 yann@1: @@ -0,0 +1,92 @@ yann@1: +// Locale support -*- C++ -*- yann@1: + yann@1: +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2004 yann@1: +// Free Software Foundation, Inc. yann@1: +// yann@1: +// This file is part of the GNU ISO C++ Library. This library is free yann@1: +// software; you can redistribute it and/or modify it under the yann@1: +// terms of the GNU General Public License as published by the yann@1: +// Free Software Foundation; either version 2, or (at your option) yann@1: +// any later version. yann@1: + yann@1: +// This library is distributed in the hope that it will be useful, yann@1: +// but WITHOUT ANY WARRANTY; without even the implied warranty of yann@1: +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the yann@1: +// GNU General Public License for more details. yann@1: + yann@1: +// You should have received a copy of the GNU General Public License along yann@1: +// with this library; see the file COPYING. If not, write to the Free yann@1: +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, yann@1: +// USA. yann@1: + yann@1: +// As a special exception, you may use this file as part of a free software yann@1: +// library without restriction. Specifically, if other files instantiate yann@1: +// templates or use macros or inline functions from this file, or you compile yann@1: +// this file and link it with other files to produce an executable, this yann@1: +// file does not by itself cause the resulting executable to be covered by yann@1: +// the GNU General Public License. This exception does not however yann@1: +// invalidate any other reasons why the executable file might be covered by yann@1: +// the GNU General Public License. yann@1: + yann@1: +// yann@1: +// ISO C++ 14882: 22.1 Locales yann@1: +// yann@1: + yann@1: +// Information as gleaned from /usr/include/ctype.h yann@1: + yann@1: + const ctype_base::mask* yann@1: + ctype::classic_table() throw() yann@1: + { return __C_ctype_b; } yann@1: + yann@1: + ctype::ctype(__c_locale, const mask* __table, bool __del, yann@1: + size_t __refs) yann@1: + : facet(__refs), _M_c_locale_ctype(_S_get_c_locale()), yann@1: + _M_del(__table != 0 && __del), _M_widen_ok(0), _M_narrow_ok(0) yann@1: + { yann@1: + _M_toupper = __C_ctype_toupper; yann@1: + _M_tolower = __C_ctype_tolower; yann@1: + _M_table = __table ? __table : __C_ctype_b; yann@1: + memset(_M_widen, 0, sizeof(_M_widen)); yann@1: + memset(_M_narrow, 0, sizeof(_M_narrow)); yann@1: + } yann@1: + yann@1: + ctype::ctype(const mask* __table, bool __del, size_t __refs) yann@1: + : facet(__refs), _M_c_locale_ctype(_S_get_c_locale()), yann@1: + _M_del(__table != 0 && __del), _M_widen_ok(0), _M_narrow_ok(0) yann@1: + { yann@1: + _M_toupper = __C_ctype_toupper; yann@1: + _M_tolower = __C_ctype_tolower; yann@1: + _M_table = __table ? __table : __C_ctype_b; yann@1: + memset(_M_widen, 0, sizeof(_M_widen)); yann@1: + memset(_M_narrow, 0, sizeof(_M_narrow)); yann@1: + } yann@1: + yann@1: + char yann@1: + ctype::do_toupper(char __c) const yann@1: + { return _M_toupper[static_cast(__c)]; } yann@1: + yann@1: + const char* yann@1: + ctype::do_toupper(char* __low, const char* __high) const yann@1: + { yann@1: + while (__low < __high) yann@1: + { yann@1: + *__low = _M_toupper[static_cast(*__low)]; yann@1: + ++__low; yann@1: + } yann@1: + return __high; yann@1: + } yann@1: + yann@1: + char yann@1: + ctype::do_tolower(char __c) const yann@1: + { return _M_tolower[static_cast(__c)]; } yann@1: + yann@1: + const char* yann@1: + ctype::do_tolower(char* __low, const char* __high) const yann@1: + { yann@1: + while (__low < __high) yann@1: + { yann@1: + *__low = _M_tolower[static_cast(*__low)]; yann@1: + ++__low; yann@1: + } yann@1: + return __high; yann@1: + } yann@1: diff -urN gcc-3.4.2-dist/libstdc++-v3/config/os/uclibc/os_defines.h gcc-3.4.2/libstdc++-v3/config/os/uclibc/os_defines.h yann@1: --- gcc-3.4.2-dist/libstdc++-v3/config/os/uclibc/os_defines.h 1969-12-31 18:00:00.000000000 -0600 yann@1: +++ gcc-3.4.2/libstdc++-v3/config/os/uclibc/os_defines.h 2004-09-10 10:47:40.000000000 -0500 yann@1: @@ -0,0 +1,44 @@ yann@1: +// Specific definitions for GNU/Linux -*- C++ -*- yann@1: + yann@1: +// Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc. yann@1: +// yann@1: +// This file is part of the GNU ISO C++ Library. This library is free yann@1: +// software; you can redistribute it and/or modify it under the yann@1: +// terms of the GNU General Public License as published by the yann@1: +// Free Software Foundation; either version 2, or (at your option) yann@1: +// any later version. yann@1: + yann@1: +// This library is distributed in the hope that it will be useful, yann@1: +// but WITHOUT ANY WARRANTY; without even the implied warranty of yann@1: +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the yann@1: +// GNU General Public License for more details. yann@1: + yann@1: +// You should have received a copy of the GNU General Public License along yann@1: +// with this library; see the file COPYING. If not, write to the Free yann@1: +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, yann@1: +// USA. yann@1: + yann@1: +// As a special exception, you may use this file as part of a free software yann@1: +// library without restriction. Specifically, if other files instantiate yann@1: +// templates or use macros or inline functions from this file, or you compile yann@1: +// this file and link it with other files to produce an executable, this yann@1: +// file does not by itself cause the resulting executable to be covered by yann@1: +// the GNU General Public License. This exception does not however yann@1: +// invalidate any other reasons why the executable file might be covered by yann@1: +// the GNU General Public License. yann@1: + yann@1: +#ifndef _GLIBCXX_OS_DEFINES yann@1: +#define _GLIBCXX_OS_DEFINES 1 yann@1: + yann@1: +// System-specific #define, typedefs, corrections, etc, go here. This yann@1: +// file will come before all others. yann@1: + yann@1: +// This keeps isanum, et al from being propagated as macros. yann@1: +#define __NO_CTYPE 1 yann@1: + yann@1: +#include yann@1: + yann@1: +// We must not see the optimized string functions GNU libc defines. yann@1: +#define __NO_STRING_INLINES yann@1: + yann@1: +#endif yann@1: diff -urN gcc-3.4.2-dist/libstdc++-v3/configure gcc-3.4.2/libstdc++-v3/configure yann@1: --- gcc-3.4.2-dist/libstdc++-v3/configure 2004-08-13 15:44:04.000000000 -0500 yann@1: +++ gcc-3.4.2/libstdc++-v3/configure 2004-09-10 10:47:40.000000000 -0500 yann@1: @@ -3878,6 +3878,11 @@ yann@1: lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` yann@1: ;; yann@1: yann@1: +linux-uclibc*) yann@1: + lt_cv_deplibs_check_method=pass_all yann@1: + lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so` yann@1: + ;; yann@1: + yann@1: netbsd*) yann@1: if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then yann@1: lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$' yann@1: @@ -5479,7 +5479,7 @@ yann@1: enableval="$enable_clocale" yann@1: yann@1: case "$enableval" in yann@1: - generic|gnu|ieee_1003.1-2001|yes|no|auto) ;; yann@1: + generic|gnu|ieee_1003.1-2001|uclibc|yes|no|auto) ;; yann@1: *) { { echo "$as_me:$LINENO: error: Unknown argument to enable/disable clocale" >&5 yann@1: echo "$as_me: error: Unknown argument to enable/disable clocale" >&2;} yann@1: { (exit 1); exit 1; }; } ;; yann@1: @@ -5545,6 +5550,9 @@ yann@1: # Default to "generic". yann@1: if test $enable_clocale_flag = auto; then yann@1: case x${target_os} in yann@1: + xlinux-uclibc*) yann@1: + enable_clocale_flag=uclibc yann@1: + ;; yann@1: xlinux* | xgnu* | xkfreebsd*-gnu | xknetbsd*-gnu) yann@1: cat >conftest.$ac_ext <<_ACEOF yann@1: #line $LINENO "configure" yann@1: @@ -5759,6 +5767,77 @@ yann@1: CTIME_CC=config/locale/generic/time_members.cc yann@1: CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h yann@1: ;; yann@1: + uclibc) yann@1: + echo "$as_me:$LINENO: result: uclibc" >&5 yann@1: +echo "${ECHO_T}uclibc" >&6 yann@1: + yann@1: + # Declare intention to use gettext, and add support for specific yann@1: + # languages. yann@1: + # For some reason, ALL_LINGUAS has to be before AM-GNU-GETTEXT yann@1: + ALL_LINGUAS="de fr" yann@1: + yann@1: + # Don't call AM-GNU-GETTEXT here. Instead, assume glibc. yann@1: + # Extract the first word of "msgfmt", so it can be a program name with args. yann@1: +set dummy msgfmt; ac_word=$2 yann@1: +echo "$as_me:$LINENO: checking for $ac_word" >&5 yann@1: +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 yann@1: +if test "${ac_cv_prog_check_msgfmt+set}" = set; then yann@1: + echo $ECHO_N "(cached) $ECHO_C" >&6 yann@1: +else yann@1: + if test -n "$check_msgfmt"; then yann@1: + ac_cv_prog_check_msgfmt="$check_msgfmt" # Let the user override the test. yann@1: +else yann@1: +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR yann@1: +for as_dir in $PATH yann@1: +do yann@1: + IFS=$as_save_IFS yann@1: + test -z "$as_dir" && as_dir=. yann@1: + for ac_exec_ext in '' $ac_executable_extensions; do yann@1: + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then yann@1: + ac_cv_prog_check_msgfmt="yes" yann@1: + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 yann@1: + break 2 yann@1: + fi yann@1: +done yann@1: +done yann@1: + yann@1: + test -z "$ac_cv_prog_check_msgfmt" && ac_cv_prog_check_msgfmt="no" yann@1: +fi yann@1: +fi yann@1: +check_msgfmt=$ac_cv_prog_check_msgfmt yann@1: +if test -n "$check_msgfmt"; then yann@1: + echo "$as_me:$LINENO: result: $check_msgfmt" >&5 yann@1: +echo "${ECHO_T}$check_msgfmt" >&6 yann@1: +else yann@1: + echo "$as_me:$LINENO: result: no" >&5 yann@1: +echo "${ECHO_T}no" >&6 yann@1: +fi yann@1: + yann@1: + if test x"$check_msgfmt" = x"yes" && test x"$enable_nls" = x"yes"; then yann@1: + USE_NLS=yes yann@1: + fi yann@1: + # Export the build objects. yann@1: + for ling in $ALL_LINGUAS; do \ yann@1: + glibcxx_MOFILES="$glibcxx_MOFILES $ling.mo"; \ yann@1: + glibcxx_POFILES="$glibcxx_POFILES $ling.po"; \ yann@1: + done yann@1: + yann@1: + yann@1: + yann@1: + CLOCALE_H=config/locale/uclibc/c_locale.h yann@1: + CLOCALE_CC=config/locale/uclibc/c_locale.cc yann@1: + CCODECVT_H=config/locale/ieee_1003.1-2001/codecvt_specializations.h yann@1: + CCODECVT_CC=config/locale/uclibc/codecvt_members.cc yann@1: + CCOLLATE_CC=config/locale/uclibc/collate_members.cc yann@1: + CCTYPE_CC=config/locale/uclibc/ctype_members.cc yann@1: + CMESSAGES_H=config/locale/uclibc/messages_members.h yann@1: + CMESSAGES_CC=config/locale/uclibc/messages_members.cc yann@1: + CMONEY_CC=config/locale/uclibc/monetary_members.cc yann@1: + CNUMERIC_CC=config/locale/uclibc/numeric_members.cc yann@1: + CTIME_H=config/locale/uclibc/time_members.h yann@1: + CTIME_CC=config/locale/uclibc/time_members.cc yann@1: + CLOCALE_INTERNAL_H=config/locale/uclibc/c++locale_internal.h yann@1: + ;; yann@1: esac yann@1: yann@1: # This is where the testsuite looks for locale catalogs, using the yann@1: diff -urN gcc-3.4.2-dist/libstdc++-v3/configure.host gcc-3.4.2/libstdc++-v3/configure.host yann@1: --- gcc-3.4.2-dist/libstdc++-v3/configure.host 2004-08-27 14:52:30.000000000 -0500 yann@1: +++ gcc-3.4.2/libstdc++-v3/configure.host 2004-09-10 10:47:40.000000000 -0500 yann@1: @@ -217,6 +217,12 @@ yann@1: ;; yann@1: esac yann@1: yann@1: +# Override for uClibc since linux-uclibc gets mishandled above. yann@1: +case "${host_os}" in yann@1: + *-uclibc*) yann@1: + os_include_dir="os/uclibc" yann@1: + ;; yann@1: +esac yann@1: yann@1: # Set any OS-dependent and CPU-dependent bits. yann@1: # THIS TABLE IS SORTED. KEEP IT THAT WAY. yann@1: diff -urN gcc-3.4.2-dist/libstdc++-v3/crossconfig.m4 gcc-3.4.2/libstdc++-v3/crossconfig.m4 yann@1: --- gcc-3.4.2-dist/libstdc++-v3/crossconfig.m4 2004-07-06 20:23:49.000000000 -0500 yann@1: +++ gcc-3.4.2/libstdc++-v3/crossconfig.m4 2004-09-10 10:47:40.000000000 -0500 yann@1: @@ -138,6 +138,99 @@ yann@1: ;; yann@1: esac yann@1: ;; yann@1: + *-uclibc*) yann@1: +# Temporary hack until we implement the float versions of the libm funcs yann@1: + AC_CHECK_HEADERS([nan.h ieeefp.h endian.h sys/isa_defs.h \ yann@1: + machine/endian.h machine/param.h sys/machine.h sys/types.h \ yann@1: + fp.h float.h endian.h inttypes.h locale.h float.h stdint.h]) yann@1: + SECTION_FLAGS='-ffunction-sections -fdata-sections' yann@1: + AC_SUBST(SECTION_FLAGS) yann@1: + GLIBCXX_CHECK_LINKER_FEATURES yann@1: + GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT yann@1: + GLIBCXX_CHECK_WCHAR_T_SUPPORT yann@1: + yann@1: + # For LFS. yann@1: + AC_DEFINE(HAVE_INT64_T) yann@1: + case "$target" in yann@1: + *-uclinux*) yann@1: + # Don't enable LFS with uClinux yann@1: + ;; yann@1: + *) yann@1: + AC_DEFINE(_GLIBCXX_USE_LFS) yann@1: + esac yann@1: + yann@1: + # For showmanyc_helper(). yann@1: + AC_CHECK_HEADERS(sys/ioctl.h sys/filio.h) yann@1: + GLIBCXX_CHECK_POLL yann@1: + GLIBCXX_CHECK_S_ISREG_OR_S_IFREG yann@1: + yann@1: + # For xsputn_2(). yann@1: + AC_CHECK_HEADERS(sys/uio.h) yann@1: + GLIBCXX_CHECK_WRITEV yann@1: + yann@1: +# AC_DEFINE(HAVE_ACOSF) yann@1: +# AC_DEFINE(HAVE_ASINF) yann@1: +# AC_DEFINE(HAVE_ATANF) yann@1: +# AC_DEFINE(HAVE_ATAN2F) yann@1: + AC_DEFINE(HAVE_CEILF) yann@1: + AC_DEFINE(HAVE_COPYSIGN) yann@1: +# AC_DEFINE(HAVE_COPYSIGNF) yann@1: +# AC_DEFINE(HAVE_COSF) yann@1: +# AC_DEFINE(HAVE_COSHF) yann@1: +# AC_DEFINE(HAVE_EXPF) yann@1: +# AC_DEFINE(HAVE_FABSF) yann@1: + AC_DEFINE(HAVE_FINITE) yann@1: + AC_DEFINE(HAVE_FINITEF) yann@1: + AC_DEFINE(HAVE_FLOORF) yann@1: +# AC_DEFINE(HAVE_FMODF) yann@1: +# AC_DEFINE(HAVE_FREXPF) yann@1: + AC_DEFINE(HAVE_HYPOT) yann@1: +# AC_DEFINE(HAVE_HYPOTF) yann@1: + AC_DEFINE(HAVE_ISINF) yann@1: + AC_DEFINE(HAVE_ISINFF) yann@1: + AC_DEFINE(HAVE_ISNAN) yann@1: + AC_DEFINE(HAVE_ISNANF) yann@1: +# AC_DEFINE(HAVE_LOGF) yann@1: +# AC_DEFINE(HAVE_LOG10F) yann@1: +# AC_DEFINE(HAVE_MODFF) yann@1: +# AC_DEFINE(HAVE_SINF) yann@1: +# AC_DEFINE(HAVE_SINHF) yann@1: +# AC_DEFINE(HAVE_SINCOS) yann@1: +# AC_DEFINE(HAVE_SINCOSF) yann@1: + AC_DEFINE(HAVE_SQRTF) yann@1: +# AC_DEFINE(HAVE_TANF) yann@1: +# AC_DEFINE(HAVE_TANHF) yann@1: + if test x"long_double_math_on_this_cpu" = x"yes"; then yann@1: + AC_MSG_ERROR([long_double_math_on_this_cpu is yes!]) yann@1: +# AC_DEFINE(HAVE_ACOSL) yann@1: +# AC_DEFINE(HAVE_ASINL) yann@1: +# AC_DEFINE(HAVE_ATANL) yann@1: +# AC_DEFINE(HAVE_ATAN2L) yann@1: +# AC_DEFINE(HAVE_CEILL) yann@1: +# AC_DEFINE(HAVE_COPYSIGNL) yann@1: +# AC_DEFINE(HAVE_COSL) yann@1: +# AC_DEFINE(HAVE_COSHL) yann@1: +# AC_DEFINE(HAVE_EXPL) yann@1: +# AC_DEFINE(HAVE_FABSL) yann@1: +# AC_DEFINE(HAVE_FINITEL) yann@1: +# AC_DEFINE(HAVE_FLOORL) yann@1: +# AC_DEFINE(HAVE_FMODL) yann@1: +# AC_DEFINE(HAVE_FREXPL) yann@1: +# AC_DEFINE(HAVE_HYPOTL) yann@1: +# AC_DEFINE(HAVE_ISINFL) yann@1: +# AC_DEFINE(HAVE_ISNANL) yann@1: +# AC_DEFINE(HAVE_LOGL) yann@1: +# AC_DEFINE(HAVE_LOG10L) yann@1: +# AC_DEFINE(HAVE_MODFL) yann@1: +# AC_DEFINE(HAVE_POWL) yann@1: +# AC_DEFINE(HAVE_SINL) yann@1: +# AC_DEFINE(HAVE_SINHL) yann@1: +# AC_DEFINE(HAVE_SINCOSL) yann@1: +# AC_DEFINE(HAVE_SQRTL) yann@1: +# AC_DEFINE(HAVE_TANL) yann@1: +# AC_DEFINE(HAVE_TANHL) yann@1: + fi yann@1: + ;; yann@1: *-linux* | *-uclinux* | *-gnu* | *-kfreebsd*-gnu | *-knetbsd*-gnu) yann@1: AC_CHECK_HEADERS([nan.h ieeefp.h endian.h sys/isa_defs.h \ yann@1: machine/endian.h machine/param.h sys/machine.h sys/types.h \ yann@1: @@ -152,7 +245,7 @@ yann@1: AC_DEFINE(HAVE_INT64_T) yann@1: case "$target" in yann@1: *-uclinux*) yann@1: - # Don't enable LFS with uClibc yann@1: + # Don't enable LFS with uClinux yann@1: ;; yann@1: *) yann@1: AC_DEFINE(_GLIBCXX_USE_LFS) yann@1: diff -urN gcc-3.4.2-dist/libstdc++-v3/include/c_compatibility/wchar.h gcc-3.4.2/libstdc++-v3/include/c_compatibility/wchar.h yann@1: --- gcc-3.4.2-dist/libstdc++-v3/include/c_compatibility/wchar.h 2003-12-08 21:51:45.000000000 -0600 yann@1: +++ gcc-3.4.2/libstdc++-v3/include/c_compatibility/wchar.h 2004-09-10 10:47:40.000000000 -0500 yann@1: @@ -101,7 +101,9 @@ yann@1: using std::wmemcpy; yann@1: using std::wmemmove; yann@1: using std::wmemset; yann@1: +#if _GLIBCXX_HAVE_WCSFTIME yann@1: using std::wcsftime; yann@1: +#endif yann@1: yann@1: #if _GLIBCXX_USE_C99 yann@1: using std::wcstold; yann@1: diff -urN gcc-3.4.2-dist/libstdc++-v3/include/c_std/std_cwchar.h gcc-3.4.2/libstdc++-v3/include/c_std/std_cwchar.h yann@1: --- gcc-3.4.2-dist/libstdc++-v3/include/c_std/std_cwchar.h 2004-07-20 03:52:12.000000000 -0500 yann@1: +++ gcc-3.4.2/libstdc++-v3/include/c_std/std_cwchar.h 2004-09-10 10:47:40.000000000 -0500 yann@1: @@ -179,7 +179,9 @@ yann@1: using ::wcscoll; yann@1: using ::wcscpy; yann@1: using ::wcscspn; yann@1: +#if _GLIBCXX_HAVE_WCSFTIME yann@1: using ::wcsftime; yann@1: +#endif yann@1: using ::wcslen; yann@1: using ::wcsncat; yann@1: using ::wcsncmp;