2001-08-27 Benjamin Kosnik <bkoz@redhat.com>

	* config/locale/c_locale_gnu.cc: Move facet info to separate files...
	* config/locale/c_locale_generic.cc: Same.
	* config/locale/moneypunct_members_gnu.cc: New file.
	* config/locale/moneypunct_members_generic.cc: New file.
	* config/locale/numpunct_members_gnu.cc: New file.
	* config/locale/numpunct_members_generic.cc: New file.
	* acinclude.m4 (GLIBCPP_ENABLE_CLOCALE): Add moneypunct, numpunct
	options.
	* aclocal.m4: Regenerate.
	* configure: Regenerate.
	* src/Makefile.am (sources): And here.
	* src/Makefile.in: Regenerate.

	Rename for consistency with rest of testsuite.
	* testsuite/22_locale/codecvt.cc: New file.
	* testsuite/22_locale/money_put.cc: New file.
	* testsuite/22_locale/money_put_members_char.cc: New file.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@45224 138bc75d-0d04-0410-961f-82ee72b054a4

8 files changed, 390 insertions, 245 deletions

diff --git a/libstdc++-v3/config/locale/c_locale_generic.cc b/libstdc++-v3/config/locale/c_locale_generic.cc
index 493ac014208..fa943180411 100644
--- a/libstdc++-v3/config/locale/c_locale_generic.cc
+++ b/libstdc++-v3/config/locale/c_locale_generic.cc
@@ -48,65 +48,4 @@ namespace std
   __c_locale
   locale::facet::_S_clone_c_locale(__c_locale&)
   { return __c_locale(); }
-
-  template<> 
-    void
-    numpunct<char>::_M_initialize_numpunct(__c_locale)
-    {
-      // "C" locale
-      _M_decimal_point = '.';
-      _M_thousands_sep = ',';
-      _M_grouping = "";
-      _M_truename = "true";
-      _M_falsename = "false";
-    }
-      
-#ifdef _GLIBCPP_USE_WCHAR_T
-  template<> 
-    void
-    numpunct<wchar_t>::_M_initialize_numpunct(__c_locale)
-    {
-      // "C" locale
-      _M_decimal_point = L'.';
-      _M_thousands_sep = L',';
-      _M_grouping = "";
-      _M_truename = L"true";
-      _M_falsename = L"false";
-    }
-#endif
-
-  template<> 
-    void
-    moneypunct<char>::_M_initialize_moneypunct(__c_locale)
-    {
-      // "C" locale
-      _M_decimal_point = '.';
-      _M_thousands_sep = ',';
-      _M_grouping = "";
-      _M_curr_symbol = string_type();
-      _M_positive_sign = string_type();
-      _M_negative_sign = string_type();
-      _M_frac_digits = 0;
-      _M_pos_format = money_base::_S_default_pattern;
-      _M_neg_format = money_base::_S_default_pattern;
-    }
-
-#ifdef _GLIBCPP_USE_WCHAR_T
-  template<> 
-    void
-    moneypunct<wchar_t>::_M_initialize_moneypunct(__c_locale)
-    {
-      // "C" locale
-      _M_decimal_point = L'.';
-      _M_thousands_sep = L',';
-      _M_grouping = "";
-      _M_curr_symbol = string_type();
-      _M_positive_sign = string_type();
-      _M_negative_sign = string_type();
-      _M_frac_digits = 0;
-      _M_pos_format = money_base::_S_default_pattern;
-      _M_neg_format = money_base::_S_default_pattern;
-    }
-#endif
 }  // namespace std
-
diff --git a/libstdc++-v3/config/locale/c_locale_gnu.cc b/libstdc++-v3/config/locale/c_locale_gnu.cc
index 57c69e59951..3e583e0eea3 100644
--- a/libstdc++-v3/config/locale/c_locale_gnu.cc
+++ b/libstdc++-v3/config/locale/c_locale_gnu.cc
@@ -64,188 +64,4 @@ namespace std
   __c_locale
   locale::facet::_S_clone_c_locale(__c_locale& __cloc)
   { return __duplocale(__cloc); }
-
-  template<> 
-    void
-    numpunct<char>::_M_initialize_numpunct(__c_locale __cloc)
-    {
-      if (!__cloc)
-	{
-	  // "C" locale
-	  _M_decimal_point = '.';
-	  _M_thousands_sep = ',';
-	  _M_grouping = "";
-	}
-      else
-	{
-	  // Named locale.
-	  _M_decimal_point = *(__nl_langinfo_l(RADIXCHAR, __cloc));
-	  _M_thousands_sep = *(__nl_langinfo_l(THOUSEP, __cloc));
-	  _M_grouping = __nl_langinfo_l(GROUPING, __cloc);
-	}
-      // NB: There is no way to extact this info from posix locales.
-      // _M_truename = __nl_langinfo_l(YESSTR, __cloc);
-      _M_truename = "true";
-      // _M_falsename = __nl_langinfo_l(NOSTR, __cloc);
-      _M_falsename = "false";
-    }
-      
-#ifdef _GLIBCPP_USE_WCHAR_T
-  template<> 
-    void
-    numpunct<wchar_t>::_M_initialize_numpunct(__c_locale __cloc)
-    {
-      if (!__cloc)
-	{
-	  // "C" locale
-	  _M_decimal_point = L'.';
-	  _M_thousands_sep = L',';
-	  _M_grouping = "";
-	}
-      else
-	{
-	  // Named locale.
-	  _M_decimal_point = reinterpret_cast<wchar_t>(__nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc));
-	  _M_thousands_sep = reinterpret_cast<wchar_t>(__nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC,__cloc));
-	  _M_grouping = __nl_langinfo_l(GROUPING, __cloc);
-	}
-      // NB: There is no way to extact this info from posix locales.
-      // _M_truename = __nl_langinfo_l(YESSTR, __cloc);
-      _M_truename = L"true";
-      // _M_falsename = __nl_langinfo_l(NOSTR, __cloc);
-      _M_falsename = L"false";
-    }
-#endif
-
-  template<> 
-    void
-    moneypunct<char>::_M_initialize_moneypunct(__c_locale __cloc)
-    {
-      if (!__cloc)
-	{
-	  // "C" locale
-	  _M_decimal_point = '.';
-	  _M_thousands_sep = ',';
-	  _M_grouping = "";
-	  _M_curr_symbol = string_type();
-	  _M_positive_sign = string_type();
-	  _M_negative_sign = string_type();
-	  _M_frac_digits = 0;
-	  _M_pos_format = money_base::_S_default_pattern;
-	  _M_neg_format = money_base::_S_default_pattern;
-	}
-      else
-	{
-	  // Named locale.
-	  _M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT, __cloc));
-	  _M_thousands_sep = *(__nl_langinfo_l(__MON_THOUSANDS_SEP, __cloc));
-	  _M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
-	  _M_positive_sign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
-	  _M_negative_sign = __nl_langinfo_l(__NEGATIVE_SIGN, __cloc);
-	  if (intl)
-	    {
-	      _M_curr_symbol = __nl_langinfo_l(__INT_CURR_SYMBOL, __cloc);
-	      _M_frac_digits = *(__nl_langinfo_l(__INT_FRAC_DIGITS, __cloc));
-	      char __ppreceeds = *(__nl_langinfo_l(__INT_P_CS_PRECEDES, 
-						   __cloc));
-	      char __pspace = *(__nl_langinfo_l(__INT_P_SEP_BY_SPACE, __cloc));
-	      char __pposn = *(__nl_langinfo_l(__INT_P_SIGN_POSN, __cloc));
-	      _M_pos_format = _S_construct_pattern(__ppreceeds, __pspace, 
-						   __pposn);
-	      char __npreceeds = *(__nl_langinfo_l(__INT_N_CS_PRECEDES, 
-						   __cloc));
-	      char __nspace = *(__nl_langinfo_l(__INT_N_SEP_BY_SPACE, __cloc));
-	      char __nposn = *(__nl_langinfo_l(__INT_N_SIGN_POSN, __cloc));
-	      _M_neg_format = _S_construct_pattern(__npreceeds, __nspace, 
-						   __nposn);
-	    }
-	  else
-	    {
-	      _M_curr_symbol = __nl_langinfo_l(__CURRENCY_SYMBOL, __cloc);
-	      _M_frac_digits = *(__nl_langinfo_l(__FRAC_DIGITS, __cloc));
-	      char __ppreceeds = *(__nl_langinfo_l(__P_CS_PRECEDES, __cloc));
-	      char __pspace = *(__nl_langinfo_l(__P_SEP_BY_SPACE, __cloc));
-	      char __pposn = *(__nl_langinfo_l(__P_SIGN_POSN, __cloc));
-	      _M_pos_format = _S_construct_pattern(__ppreceeds, __pspace, 
-						   __pposn);
-	      char __npreceeds = *(__nl_langinfo_l(__N_CS_PRECEDES, __cloc));
-	      char __nspace = *(__nl_langinfo_l(__N_SEP_BY_SPACE, __cloc));
-	      char __nposn = *(__nl_langinfo_l(__N_SIGN_POSN, __cloc));
-	      _M_neg_format = _S_construct_pattern(__npreceeds, __nspace, 
-						   __nposn);
-	    }
-	}
-    }
-
-#ifdef _GLIBCPP_USE_WCHAR_T
-  template<> 
-    void
-    moneypunct<wchar_t>::_M_initialize_moneypunct(__c_locale __cloc)
-    {
-      if (!__cloc)
-	{
-	  // "C" locale
-	  _M_decimal_point = L'.';
-	  _M_thousands_sep = L',';
-	  _M_grouping = "";
-	  _M_curr_symbol = string_type();
-	  _M_positive_sign = string_type();
-	  _M_negative_sign = string_type();
-	  _M_frac_digits = 0;
-	  _M_pos_format = money_base::_S_default_pattern;
-	  _M_neg_format = money_base::_S_default_pattern;
-	}
-      else
-	{
-	  // Named locale.
-	  _M_decimal_point = reinterpret_cast<wchar_t>(__nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc));
-	  _M_thousands_sep = reinterpret_cast<wchar_t>(__nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC,__cloc));
-	  _M_grouping = __nl_langinfo_l(GROUPING, __cloc);
-	  _M_positive_sign = reinterpret_cast<wchar_t*>(__nl_langinfo_l(__POSITIVE_SIGN, __cloc));
-	  _M_negative_sign = reinterpret_cast<wchar_t*>(__nl_langinfo_l(__NEGATIVE_SIGN, __cloc));
-	  if (intl)
-	    {
-	      _M_curr_symbol = reinterpret_cast<wchar_t*>(__nl_langinfo_l(__INT_CURR_SYMBOL, __cloc));
-	      _M_frac_digits = *(__nl_langinfo_l(__INT_FRAC_DIGITS, __cloc));
-	      char __ppreceeds = *(__nl_langinfo_l(__INT_P_CS_PRECEDES, 
-						   __cloc));
-	      char __pspace = *(__nl_langinfo_l(__INT_P_SEP_BY_SPACE, __cloc));
-	      char __pposn = *(__nl_langinfo_l(__INT_P_SIGN_POSN, __cloc));
-	      _M_pos_format = _S_construct_pattern(__ppreceeds, __pspace, 
-						   __pposn);
-	      char __npreceeds = *(__nl_langinfo_l(__INT_N_CS_PRECEDES, 
-						   __cloc));
-	      char __nspace = *(__nl_langinfo_l(__INT_N_SEP_BY_SPACE, __cloc));
-	      char __nposn = *(__nl_langinfo_l(__INT_N_SIGN_POSN, __cloc));
-	      _M_neg_format = _S_construct_pattern(__npreceeds, __nspace, 
-						   __nposn);
-	    }
-	  else
-	    {
-	      _M_curr_symbol = reinterpret_cast<wchar_t*>(__nl_langinfo_l(__CURRENCY_SYMBOL, __cloc));
-	      _M_frac_digits = *(__nl_langinfo_l(__FRAC_DIGITS, __cloc));
-	      char __ppreceeds = *(__nl_langinfo_l(__P_CS_PRECEDES, __cloc));
-	      char __pspace = *(__nl_langinfo_l(__P_SEP_BY_SPACE, __cloc));
-	      char __pposn = *(__nl_langinfo_l(__P_SIGN_POSN, __cloc));
-	      _M_pos_format = _S_construct_pattern(__ppreceeds, __pspace, 
-						   __pposn);
-	      char __npreceeds = *(__nl_langinfo_l(__N_CS_PRECEDES, __cloc));
-	      char __nspace = *(__nl_langinfo_l(__N_SEP_BY_SPACE, __cloc));
-	      char __nposn = *(__nl_langinfo_l(__N_SIGN_POSN, __cloc));
-	      _M_neg_format = _S_construct_pattern(__npreceeds, __nspace, 
-						   __nposn);
-	    }
-	}
-    }
-#endif
 }  // namespace std
-
-
-
-
-
-
-
-
-
-
diff --git a/libstdc++-v3/config/locale/collate_specializations_generic.cc b/libstdc++-v3/config/locale/collate_members_generic.cc
index 0abd784378a..0abd784378a 100644
--- a/libstdc++-v3/config/locale/collate_specializations_generic.cc
+++ b/libstdc++-v3/config/locale/collate_members_generic.cc
diff --git a/libstdc++-v3/config/locale/collate_specializations_gnu.cc b/libstdc++-v3/config/locale/collate_members_gnu.cc
index a77adbf3518..a77adbf3518 100644
--- a/libstdc++-v3/config/locale/collate_specializations_gnu.cc
+++ b/libstdc++-v3/config/locale/collate_members_gnu.cc
diff --git a/libstdc++-v3/config/locale/moneypunct_members_generic.cc b/libstdc++-v3/config/locale/moneypunct_members_generic.cc
new file mode 100644
index 00000000000..8c068718739
--- /dev/null
+++ b/libstdc++-v3/config/locale/moneypunct_members_generic.cc
@@ -0,0 +1,73 @@
+// std::moneypunct implementation details, generic version -*- C++ -*-
+
+// Copyright (C) 2001 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+// As a special exception, you may use this file as part of a free software
+// library without restriction.  Specifically, if other files instantiate
+// templates or use macros or inline functions from this file, or you compile
+// this file and link it with other files to produce an executable, this
+// file does not by itself cause the resulting executable to be covered by
+// the GNU General Public License.  This exception does not however
+// invalidate any other reasons why the executable file might be covered by
+// the GNU General Public License.
+
+//
+// ISO C++ 14882: 22.2.6.3.2  moneypunct virtual functions
+//
+
+// Written by Benjamin Kosnik <bkoz@redhat.com>
+
+#include <locale>
+
+namespace std
+{
+  template<> 
+    void
+    moneypunct<char>::_M_initialize_moneypunct(__c_locale)
+    {
+      // "C" locale
+      _M_decimal_point = '.';
+      _M_thousands_sep = ',';
+      _M_grouping = "";
+      _M_curr_symbol = string_type();
+      _M_positive_sign = string_type();
+      _M_negative_sign = string_type();
+      _M_frac_digits = 0;
+      _M_pos_format = money_base::_S_default_pattern;
+      _M_neg_format = money_base::_S_default_pattern;
+    }
+
+#ifdef _GLIBCPP_USE_WCHAR_T
+  template<> 
+    void
+    moneypunct<wchar_t>::_M_initialize_moneypunct(__c_locale)
+    {
+      // "C" locale
+      _M_decimal_point = L'.';
+      _M_thousands_sep = L',';
+      _M_grouping = "";
+      _M_curr_symbol = string_type();
+      _M_positive_sign = string_type();
+      _M_negative_sign = string_type();
+      _M_frac_digits = 0;
+      _M_pos_format = money_base::_S_default_pattern;
+      _M_neg_format = money_base::_S_default_pattern;
+    }
+#endif
+}
diff --git a/libstdc++-v3/config/locale/moneypunct_members_gnu.cc b/libstdc++-v3/config/locale/moneypunct_members_gnu.cc
new file mode 100644
index 00000000000..d31c84a5386
--- /dev/null
+++ b/libstdc++-v3/config/locale/moneypunct_members_gnu.cc
@@ -0,0 +1,161 @@
+// std::moneypunct implementation details, GNU version -*- C++ -*-
+
+// Copyright (C) 2001 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+// As a special exception, you may use this file as part of a free software
+// library without restriction.  Specifically, if other files instantiate
+// templates or use macros or inline functions from this file, or you compile
+// this file and link it with other files to produce an executable, this
+// file does not by itself cause the resulting executable to be covered by
+// the GNU General Public License.  This exception does not however
+// invalidate any other reasons why the executable file might be covered by
+// the GNU General Public License.
+
+//
+// ISO C++ 14882: 22.2.6.3.2  moneypunct virtual functions
+//
+
+// Written by Benjamin Kosnik <bkoz@redhat.com>
+
+#include <locale>
+
+namespace std
+{
+  template<> 
+    void
+    moneypunct<char>::_M_initialize_moneypunct(__c_locale __cloc)
+    {
+      if (!__cloc)
+	{
+	  // "C" locale
+	  _M_decimal_point = '.';
+	  _M_thousands_sep = ',';
+	  _M_grouping = "";
+	  _M_curr_symbol = string_type();
+	  _M_positive_sign = string_type();
+	  _M_negative_sign = string_type();
+	  _M_frac_digits = 0;
+	  _M_pos_format = money_base::_S_default_pattern;
+	  _M_neg_format = money_base::_S_default_pattern;
+	}
+      else
+	{
+	  // Named locale.
+	  _M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT, __cloc));
+	  _M_thousands_sep = *(__nl_langinfo_l(__MON_THOUSANDS_SEP, __cloc));
+	  _M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
+	  _M_positive_sign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
+	  _M_negative_sign = __nl_langinfo_l(__NEGATIVE_SIGN, __cloc);
+	  if (intl)
+	    {
+	      _M_curr_symbol = __nl_langinfo_l(__INT_CURR_SYMBOL, __cloc);
+	      _M_frac_digits = *(__nl_langinfo_l(__INT_FRAC_DIGITS, __cloc));
+	      char __ppreceeds = *(__nl_langinfo_l(__INT_P_CS_PRECEDES, 
+						   __cloc));
+	      char __pspace = *(__nl_langinfo_l(__INT_P_SEP_BY_SPACE, __cloc));
+	      char __pposn = *(__nl_langinfo_l(__INT_P_SIGN_POSN, __cloc));
+	      _M_pos_format = _S_construct_pattern(__ppreceeds, __pspace, 
+						   __pposn);
+	      char __npreceeds = *(__nl_langinfo_l(__INT_N_CS_PRECEDES, 
+						   __cloc));
+	      char __nspace = *(__nl_langinfo_l(__INT_N_SEP_BY_SPACE, __cloc));
+	      char __nposn = *(__nl_langinfo_l(__INT_N_SIGN_POSN, __cloc));
+	      _M_neg_format = _S_construct_pattern(__npreceeds, __nspace, 
+						   __nposn);
+	    }
+	  else
+	    {
+	      _M_curr_symbol = __nl_langinfo_l(__CURRENCY_SYMBOL, __cloc);
+	      _M_frac_digits = *(__nl_langinfo_l(__FRAC_DIGITS, __cloc));
+	      char __ppreceeds = *(__nl_langinfo_l(__P_CS_PRECEDES, __cloc));
+	      char __pspace = *(__nl_langinfo_l(__P_SEP_BY_SPACE, __cloc));
+	      char __pposn = *(__nl_langinfo_l(__P_SIGN_POSN, __cloc));
+	      _M_pos_format = _S_construct_pattern(__ppreceeds, __pspace, 
+						   __pposn);
+	      char __npreceeds = *(__nl_langinfo_l(__N_CS_PRECEDES, __cloc));
+	      char __nspace = *(__nl_langinfo_l(__N_SEP_BY_SPACE, __cloc));
+	      char __nposn = *(__nl_langinfo_l(__N_SIGN_POSN, __cloc));
+	      _M_neg_format = _S_construct_pattern(__npreceeds, __nspace, 
+						   __nposn);
+	    }
+	}
+    }
+
+#ifdef _GLIBCPP_USE_WCHAR_T
+  template<> 
+    void
+    moneypunct<wchar_t>::_M_initialize_moneypunct(__c_locale __cloc)
+    {
+      if (!__cloc)
+	{
+	  // "C" locale
+	  _M_decimal_point = L'.';
+	  _M_thousands_sep = L',';
+	  _M_grouping = "";
+	  _M_curr_symbol = string_type();
+	  _M_positive_sign = string_type();
+	  _M_negative_sign = string_type();
+	  _M_frac_digits = 0;
+	  _M_pos_format = money_base::_S_default_pattern;
+	  _M_neg_format = money_base::_S_default_pattern;
+	}
+      else
+	{
+	  // Named locale.
+	  _M_decimal_point = reinterpret_cast<wchar_t>(__nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc));
+	  _M_thousands_sep = reinterpret_cast<wchar_t>(__nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC,__cloc));
+	  _M_grouping = __nl_langinfo_l(GROUPING, __cloc);
+	  _M_positive_sign = reinterpret_cast<wchar_t*>(__nl_langinfo_l(__POSITIVE_SIGN, __cloc));
+	  _M_negative_sign = reinterpret_cast<wchar_t*>(__nl_langinfo_l(__NEGATIVE_SIGN, __cloc));
+	  if (intl)
+	    {
+	      _M_curr_symbol = reinterpret_cast<wchar_t*>(__nl_langinfo_l(__INT_CURR_SYMBOL, __cloc));
+	      _M_frac_digits = *(__nl_langinfo_l(__INT_FRAC_DIGITS, __cloc));
+	      char __ppreceeds = *(__nl_langinfo_l(__INT_P_CS_PRECEDES, 
+						   __cloc));
+	      char __pspace = *(__nl_langinfo_l(__INT_P_SEP_BY_SPACE, __cloc));
+	      char __pposn = *(__nl_langinfo_l(__INT_P_SIGN_POSN, __cloc));
+	      _M_pos_format = _S_construct_pattern(__ppreceeds, __pspace, 
+						   __pposn);
+	      char __npreceeds = *(__nl_langinfo_l(__INT_N_CS_PRECEDES, 
+						   __cloc));
+	      char __nspace = *(__nl_langinfo_l(__INT_N_SEP_BY_SPACE, __cloc));
+	      char __nposn = *(__nl_langinfo_l(__INT_N_SIGN_POSN, __cloc));
+	      _M_neg_format = _S_construct_pattern(__npreceeds, __nspace, 
+						   __nposn);
+	    }
+	  else
+	    {
+	      _M_curr_symbol = reinterpret_cast<wchar_t*>(__nl_langinfo_l(__CURRENCY_SYMBOL, __cloc));
+	      _M_frac_digits = *(__nl_langinfo_l(__FRAC_DIGITS, __cloc));
+	      char __ppreceeds = *(__nl_langinfo_l(__P_CS_PRECEDES, __cloc));
+	      char __pspace = *(__nl_langinfo_l(__P_SEP_BY_SPACE, __cloc));
+	      char __pposn = *(__nl_langinfo_l(__P_SIGN_POSN, __cloc));
+	      _M_pos_format = _S_construct_pattern(__ppreceeds, __pspace, 
+						   __pposn);
+	      char __npreceeds = *(__nl_langinfo_l(__N_CS_PRECEDES, __cloc));
+	      char __nspace = *(__nl_langinfo_l(__N_SEP_BY_SPACE, __cloc));
+	      char __nposn = *(__nl_langinfo_l(__N_SIGN_POSN, __cloc));
+	      _M_neg_format = _S_construct_pattern(__npreceeds, __nspace, 
+						   __nposn);
+	    }
+	}
+    }
+#endif
+}
diff --git a/libstdc++-v3/config/locale/numpunct_members_generic.cc b/libstdc++-v3/config/locale/numpunct_members_generic.cc
new file mode 100644
index 00000000000..23acb769388
--- /dev/null
+++ b/libstdc++-v3/config/locale/numpunct_members_generic.cc
@@ -0,0 +1,65 @@
+// std::numpunct implementation details, generic version -*- C++ -*-
+
+// Copyright (C) 2001 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+// As a special exception, you may use this file as part of a free software
+// library without restriction.  Specifically, if other files instantiate
+// templates or use macros or inline functions from this file, or you compile
+// this file and link it with other files to produce an executable, this
+// file does not by itself cause the resulting executable to be covered by
+// the GNU General Public License.  This exception does not however
+// invalidate any other reasons why the executable file might be covered by
+// the GNU General Public License.
+
+//
+// ISO C++ 14882: 22.2.3.1.2  numpunct virtual functions
+//
+
+// Written by Benjamin Kosnik <bkoz@redhat.com>
+
+#include <locale>
+
+namespace std
+{
+  template<> 
+    void
+    numpunct<char>::_M_initialize_numpunct(__c_locale)
+    {
+      // "C" locale
+      _M_decimal_point = '.';
+      _M_thousands_sep = ',';
+      _M_grouping = "";
+      _M_truename = "true";
+      _M_falsename = "false";
+    }
+      
+#ifdef _GLIBCPP_USE_WCHAR_T
+  template<> 
+    void
+    numpunct<wchar_t>::_M_initialize_numpunct(__c_locale)
+    {
+      // "C" locale
+      _M_decimal_point = L'.';
+      _M_thousands_sep = L',';
+      _M_grouping = "";
+      _M_truename = L"true";
+      _M_falsename = L"false";
+    }
+#endif
+}
diff --git a/libstdc++-v3/config/locale/numpunct_members_gnu.cc b/libstdc++-v3/config/locale/numpunct_members_gnu.cc
new file mode 100644
index 00000000000..1ebad42cdc8
--- /dev/null
+++ b/libstdc++-v3/config/locale/numpunct_members_gnu.cc
@@ -0,0 +1,91 @@
+// std::numpunct implementation details, GNU version -*- C++ -*-
+
+// Copyright (C) 2001 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+// As a special exception, you may use this file as part of a free software
+// library without restriction.  Specifically, if other files instantiate
+// templates or use macros or inline functions from this file, or you compile
+// this file and link it with other files to produce an executable, this
+// file does not by itself cause the resulting executable to be covered by
+// the GNU General Public License.  This exception does not however
+// invalidate any other reasons why the executable file might be covered by
+// the GNU General Public License.
+
+//
+// ISO C++ 14882: 22.2.3.1.2  numpunct virtual functions
+//
+
+// Written by Benjamin Kosnik <bkoz@redhat.com>
+
+#include <locale>
+
+namespace std
+{
+  template<> 
+    void
+    numpunct<char>::_M_initialize_numpunct(__c_locale __cloc)
+    {
+      if (!__cloc)
+	{
+	  // "C" locale
+	  _M_decimal_point = '.';
+	  _M_thousands_sep = ',';
+	  _M_grouping = "";
+	}
+      else
+	{
+	  // Named locale.
+	  _M_decimal_point = *(__nl_langinfo_l(RADIXCHAR, __cloc));
+	  _M_thousands_sep = *(__nl_langinfo_l(THOUSEP, __cloc));
+	  _M_grouping = __nl_langinfo_l(GROUPING, __cloc);
+	}
+      // NB: There is no way to extact this info from posix locales.
+      // _M_truename = __nl_langinfo_l(YESSTR, __cloc);
+      _M_truename = "true";
+      // _M_falsename = __nl_langinfo_l(NOSTR, __cloc);
+      _M_falsename = "false";
+    }
+      
+#ifdef _GLIBCPP_USE_WCHAR_T
+  template<> 
+    void
+    numpunct<wchar_t>::_M_initialize_numpunct(__c_locale __cloc)
+    {
+      if (!__cloc)
+	{
+	  // "C" locale
+	  _M_decimal_point = L'.';
+	  _M_thousands_sep = L',';
+	  _M_grouping = "";
+	}
+      else
+	{
+	  // Named locale.
+	  _M_decimal_point = reinterpret_cast<wchar_t>(__nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc));
+	  _M_thousands_sep = reinterpret_cast<wchar_t>(__nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC,__cloc));
+	  _M_grouping = __nl_langinfo_l(GROUPING, __cloc);
+	}
+      // NB: There is no way to extact this info from posix locales.
+      // _M_truename = __nl_langinfo_l(YESSTR, __cloc);
+      _M_truename = L"true";
+      // _M_falsename = __nl_langinfo_l(NOSTR, __cloc);
+      _M_falsename = L"false";
+    }
+#endif
+}