obtained gcc-4.6.4.tar.bz2 from upstream website;upstream

verified gcc-4.6.4.tar.bz2.sig;
imported gcc-4.6.4 source tree from verified upstream tarball.

downloading a git-generated archive based on the 'upstream' tag
should provide you with a source tree that is binary identical
to the one extracted from the above tarball.

if you have obtained the source via the command 'git clone',
however, do note that line-endings of files in your working
directory might differ from line-endings of the respective
files in the upstream repository.

23 files changed, 2221 insertions, 0 deletions

diff --git a/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/1.cc
new file mode 100644
index 000000000..0c6f450cb
--- /dev/null
+++ b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/1.cc
@@ -0,0 +1,153 @@
+// { dg-require-namedlocale "de_DE" }
+
+// 2001-11-21 Benjamin Kosnik  <bkoz@redhat.com>
+
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010
+// Free Software Foundation
+//
+// 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 3, 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 COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// 22.2.2.1.1  num_get members
+
+#include <locale>
+#include <sstream>
+#include <testsuite_hooks.h>
+
+void test01()
+{
+  using namespace std;
+  typedef istreambuf_iterator<wchar_t> iterator_type;
+
+  bool test __attribute__((unused)) = true;
+
+  // basic construction
+  locale loc_c = locale::classic();
+  locale loc_de = locale("de_DE");
+  VERIFY( loc_c != loc_de );
+
+  // sanity check the data is correct.
+  const wstring empty;
+
+  bool b1 = true;
+  bool b0 = false;
+  unsigned long ul1 = 1294967294;
+  unsigned long ul;
+  double d1 =  1.02345e+308;
+  double d2 = 3.15e-308;
+  double d;
+  long double ld1 = 6.630025e+4;
+  long double ld;
+  void* v = 0;
+
+  // cache the num_get facet
+  wistringstream iss;
+  iss.imbue(loc_de);
+  const num_get<wchar_t>& ng = use_facet<num_get<wchar_t> >(iss.getloc()); 
+  const ios_base::iostate goodbit = ios_base::goodbit;
+  const ios_base::iostate eofbit = ios_base::eofbit;
+  ios_base::iostate err = ios_base::goodbit;
+
+  // bool, simple
+  iss.str(L"1");
+  iterator_type os_it00 = iss.rdbuf();
+  ng.get(os_it00, 0, iss, err, b1);
+  VERIFY( b1 == true );
+  VERIFY( err & ios_base::eofbit );
+
+  iss.str(L"0");
+  err = goodbit;
+  ng.get(iss.rdbuf(), 0, iss, err, b0);
+  VERIFY( b0 == false );
+  VERIFY( err & eofbit );
+
+  // ... and one that does
+  iss.str(L"1.294.967.294+++++++");
+  iss.clear();
+  iss.width(20);
+  iss.setf(ios_base::left, ios_base::adjustfield);
+  err = goodbit;
+  ng.get(iss.rdbuf(), 0, iss, err, ul);
+  VERIFY( ul == ul1 );
+  VERIFY( err == goodbit );
+
+  iss.str(L"+1,02345e+308");
+  iss.clear();
+  iss.width(20);
+  iss.setf(ios_base::right, ios_base::adjustfield);
+  iss.setf(ios_base::scientific, ios_base::floatfield);
+  err = goodbit;
+  ng.get(iss.rdbuf(), 0, iss, err, d);
+  VERIFY( d == d1 );
+  VERIFY( err == eofbit );
+
+  iss.str(L"3,15E-308 ");
+  iss.clear();
+  iss.width(20);
+  iss.precision(10);
+  iss.setf(ios_base::right, ios_base::adjustfield);
+  iss.setf(ios_base::scientific, ios_base::floatfield);
+  iss.setf(ios_base::uppercase);
+  err = goodbit;
+  ng.get(iss.rdbuf(), 0, iss, err, d);
+  VERIFY( d == d2 );
+  VERIFY( err == goodbit );
+
+  // long double
+  iss.str(L"6,630025e+4");
+  iss.clear();
+  err = goodbit;
+  ng.get(iss.rdbuf(), 0, iss, err, ld);
+  VERIFY( ld == ld1 );
+  VERIFY( err == eofbit );
+
+  iss.str(L"0 ");
+  iss.clear();
+  iss.precision(0);
+  iss.setf(ios_base::fixed, ios_base::floatfield);
+  err = goodbit;
+  ng.get(iss.rdbuf(), 0, iss, err, ld);
+  VERIFY( ld == 0 );
+  VERIFY( err == goodbit );
+
+  // void*
+  iss.str(L"0xbffff74c,");
+  iss.clear();
+  err = goodbit;
+  ng.get(iss.rdbuf(), 0, iss, err, v);
+  VERIFY( v != 0 );
+  VERIFY( err == goodbit );
+
+#ifdef _GLIBCXX_USE_LONG_LONG
+  long long ll1 = 9223372036854775807LL;
+  long long ll;
+
+  iss.str(L"9.223.372.036.854.775.807");
+  iss.clear();
+  err = goodbit;
+  ng.get(iss.rdbuf(), 0, iss, err, ll);
+  VERIFY( ll == ll1 );
+  VERIFY( err == eofbit );
+#endif
+}
+
+int main()
+{
+  test01();
+  return 0;
+}
+
+
+// Kathleen Hannah, humanitarian, woman, art-thief
diff --git a/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/10.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/10.cc
new file mode 100644
index 000000000..2411fdff9
--- /dev/null
+++ b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/10.cc
@@ -0,0 +1,74 @@
+// 2003-12-19  Paolo Carlini  <pcarlini@suse.de>
+
+// Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009
+// Free Software Foundation
+//
+// 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 3, 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 COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// 22.2.2.1.1  num_get members
+
+#include <locale>
+#include <sstream>
+#include <testsuite_hooks.h>
+
+void test01()
+{
+  using namespace std;
+  typedef istreambuf_iterator<wchar_t> iterator_type;
+  
+  bool test __attribute__((unused)) = true;
+
+  wistringstream iss;
+  const num_get<wchar_t>& ng = use_facet<num_get<wchar_t> >(iss.getloc()); 
+  ios_base::iostate err = ios_base::goodbit;
+  iterator_type end;
+  float f = 1.0f;
+  double d = 1.0;
+  long double ld = 1.0l;
+  
+  iss.str(L"1e.");
+  err = ios_base::goodbit;
+  end = ng.get(iss.rdbuf(), 0, iss, err, f);
+  VERIFY( err == ios_base::failbit );
+  VERIFY( *end == L'.' );
+  VERIFY( f == 0.0f );
+
+  iss.str(L"3e+");
+  iss.clear();
+  err = ios_base::goodbit;
+  end = ng.get(iss.rdbuf(), 0, iss, err, d);
+  VERIFY( err == (ios_base::failbit | ios_base::eofbit) );
+  VERIFY( d == 0.0 );
+
+  iss.str(L"6e ");
+  iss.clear();
+  err = ios_base::goodbit;
+  end = ng.get(iss.rdbuf(), 0, iss, err, ld);
+  VERIFY( *end == L' ' );
+
+  // libstdc++/37624.  We can't always obtain the required behavior
+  // when sscanf is involved, because of, e.g., glibc/1765.
+#if defined(_GLIBCXX_HAVE_STRTOLD) && !defined(_GLIBCXX_HAVE_BROKEN_STRTOLD)
+  VERIFY( err == ios_base::failbit );
+  VERIFY( ld == 0.0l );
+#endif
+}
+
+int main()
+{
+  test01();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/11.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/11.cc
new file mode 100644
index 000000000..0725b3713
--- /dev/null
+++ b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/11.cc
@@ -0,0 +1,107 @@
+// Copyright (C) 2003, 2009 Free Software Foundation
+//
+// 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 3, 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 COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// 22.2.2.1.1  num_get members
+
+#include <locale>
+#include <sstream>
+#include <testsuite_hooks.h>
+
+struct Punct1: std::numpunct<wchar_t>
+{
+  std::string do_grouping() const { return "\1"; }
+  wchar_t do_thousands_sep() const { return L'2'; }
+  wchar_t do_decimal_point() const { return L'4'; }
+};
+
+struct Punct2: std::numpunct<wchar_t>
+{
+  std::string do_grouping() const { return "\1"; }
+  wchar_t do_thousands_sep() const { return L'2'; }
+  wchar_t do_decimal_point() const { return L'2'; }
+};
+
+// http://gcc.gnu.org/ml/libstdc++/2003-12/msg00201.html
+void test01()
+{
+  using namespace std;
+  typedef istreambuf_iterator<wchar_t> iterator_type;
+  
+  bool test __attribute__((unused)) = true;
+
+  wistringstream iss1, iss2;
+  iss1.imbue(locale(iss1.getloc(), new Punct1));
+  iss2.imbue(locale(iss2.getloc(), new Punct2));
+  const num_get<wchar_t>& ng1 = use_facet<num_get<wchar_t> >(iss1.getloc()); 
+  const num_get<wchar_t>& ng2 = use_facet<num_get<wchar_t> >(iss2.getloc()); 
+
+  ios_base::iostate err = ios_base::goodbit;
+  iterator_type end;
+  double d = 0.0;
+  double d1 = 13.0;
+  double d2 = 1.0;
+  double d3 = 30.0;
+  long l = 0l;
+  long l1 = 13l;
+  long l2 = 10l;
+  
+  iss1.str(L"1234");
+  err = ios_base::goodbit;
+  end = ng1.get(iss1.rdbuf(), 0, iss1, err, d);
+  VERIFY( err == ios_base::eofbit );
+  VERIFY( d == d1 );
+
+  iss1.str(L"142");
+  iss1.clear();
+  err = ios_base::goodbit;
+  end = ng1.get(iss1.rdbuf(), 0, iss1, err, d);
+  VERIFY( err == ios_base::goodbit );
+  VERIFY( d == d2 );
+
+  iss1.str(L"3e14");
+  iss1.clear();
+  err = ios_base::goodbit;
+  end = ng1.get(iss1.rdbuf(), 0, iss1, err, d);
+  VERIFY( err == ios_base::goodbit );
+  VERIFY( d == d3 );
+
+  iss1.str(L"1234");
+  iss1.clear();
+  err = ios_base::goodbit;
+  end = ng1.get(iss1.rdbuf(), 0, iss1, err, l);
+  VERIFY( err == ios_base::goodbit );
+  VERIFY( l == l1 );
+
+  iss2.str(L"123");
+  err = ios_base::goodbit;
+  end = ng2.get(iss2.rdbuf(), 0, iss2, err, d);
+  VERIFY( err == ios_base::eofbit );
+  VERIFY( d == d1 );
+
+  iss2.str(L"120");
+  iss2.clear();
+  err = ios_base::goodbit;
+  end = ng2.get(iss2.rdbuf(), 0, iss2, err, l);
+  VERIFY( err == ios_base::eofbit );
+  VERIFY( l == l2 );
+}
+
+int main()
+{
+  test01();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/12.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/12.cc
new file mode 100644
index 000000000..aaea6f42e
--- /dev/null
+++ b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/12.cc
@@ -0,0 +1,161 @@
+// 2003-12-22  Paolo Carlini  <pcarlini@suse.de>
+
+// Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009
+// Free Software Foundation
+//
+// 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 3, 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 COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// 22.2.2.1.1  num_get members
+
+#include <locale>
+#include <sstream>
+#include <testsuite_hooks.h>
+
+struct Punct1: std::numpunct<wchar_t>
+{
+  std::string do_grouping() const { return "\1"; }
+  wchar_t do_thousands_sep() const { return L'+'; }
+  wchar_t do_decimal_point() const { return L'x'; }
+};
+
+struct Punct2: std::numpunct<wchar_t>
+{
+  std::string do_grouping() const { return "\1"; }
+  wchar_t do_thousands_sep() const { return L'X'; }
+  wchar_t do_decimal_point() const { return L'-'; }
+};
+
+// http://gcc.gnu.org/ml/libstdc++/2003-12/msg00201.html
+void test01()
+{
+  using namespace std;
+  typedef istreambuf_iterator<wchar_t> iterator_type;
+  
+  bool test __attribute__((unused)) = true;
+
+  wistringstream iss1, iss2;
+  iss1.imbue(locale(iss1.getloc(), new Punct1));
+  iss2.imbue(locale(iss2.getloc(), new Punct2));
+  const num_get<wchar_t>& ng1 = use_facet<num_get<wchar_t> >(iss1.getloc()); 
+  const num_get<wchar_t>& ng2 = use_facet<num_get<wchar_t> >(iss2.getloc()); 
+
+  ios_base::iostate err = ios_base::goodbit;
+  iterator_type end;
+  long l = 1l;
+  long l1 = 0l;
+  long l2 = 10l;
+  long l3 = 1l;
+  long l4 = 63l;
+  double d = 0.0;
+  double d1 = .4;
+  double d2 = 0.0;
+  double d3 = .1;
+
+  iss1.str(L"+3");
+  err = ios_base::goodbit;
+  end = ng1.get(iss1.rdbuf(), 0, iss1, err, l);
+  VERIFY( err == ios_base::failbit );
+  VERIFY( *end == L'+' );
+
+  iss1.str(L"0x1");
+  iss1.clear();
+  err = ios_base::goodbit;
+  end = ng1.get(iss1.rdbuf(), 0, iss1, err, l);
+  VERIFY( err == ios_base::goodbit );
+  VERIFY( *end == L'x' );
+  VERIFY( l == l1 );
+
+  iss1.str(L"0Xa");
+  iss1.clear();
+  iss1.unsetf(ios::basefield);
+  err = ios_base::goodbit;
+  end = ng1.get(iss1.rdbuf(), 0, iss1, err, l);
+  VERIFY( err == ios_base::eofbit );
+  VERIFY( l == l2 );
+
+  iss1.str(L"0xa");
+  iss1.clear();
+  err = ios_base::goodbit;
+  end = ng1.get(iss1.rdbuf(), 0, iss1, err, l);
+  VERIFY( err == ios_base::goodbit );
+  VERIFY( *end == L'x' );
+  VERIFY( l == l1 );  
+
+  iss1.str(L"+5");
+  iss1.clear();
+  err = ios_base::goodbit;
+  end = ng1.get(iss1.rdbuf(), 0, iss1, err, d);
+  VERIFY( err == ios_base::failbit );
+  VERIFY( *end == L'+' );
+
+  iss1.str(L"x4");
+  iss1.clear();
+  err = ios_base::goodbit;
+  end = ng1.get(iss1.rdbuf(), 0, iss1, err, d);
+  VERIFY( err == ios_base::eofbit );
+  VERIFY( d == d1 );
+
+  iss2.str(L"0001-");
+  err = ios_base::goodbit;
+  end = ng2.get(iss2.rdbuf(), 0, iss2, err, l);
+  VERIFY( err == ios_base::goodbit );
+  VERIFY( *end == L'-' );
+  VERIFY( l == l3 );
+
+  iss2.str(L"-2");
+  iss2.clear();
+  err = ios_base::goodbit;
+  end = ng2.get(iss2.rdbuf(), 0, iss2, err, l);
+  VERIFY( err == ios_base::failbit );
+  VERIFY( *end == L'-' );
+
+  iss2.str(L"0X1");
+  iss2.clear();
+  iss2.unsetf(ios::basefield);
+  err = ios_base::goodbit;
+  end = ng2.get(iss2.rdbuf(), 0, iss2, err, l);
+  VERIFY( err == ios_base::failbit );
+  VERIFY( *end == L'X' );
+  VERIFY( l == 0 );
+
+  iss2.str(L"000778");
+  iss2.clear();
+  err = ios_base::goodbit;
+  end = ng2.get(iss2.rdbuf(), 0, iss2, err, l);
+  VERIFY( err == ios_base::goodbit );
+  VERIFY( *end == L'8' );
+  VERIFY( l == l4 );
+
+  iss2.str(L"00X");
+  iss2.clear();
+  err = ios_base::goodbit;
+  end = ng2.get(iss2.rdbuf(), 0, iss2, err, d);
+  VERIFY( err == (ios_base::eofbit | ios_base::failbit) );
+  VERIFY( d == d2 );
+
+  iss2.str(L"-1");
+  iss2.clear();
+  err = ios_base::goodbit;
+  end = ng2.get(iss2.rdbuf(), 0, iss2, err, d);
+  VERIFY( err == ios_base::eofbit );
+  VERIFY( d == d3 );  
+}
+
+int main()
+{
+  test01();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/13.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/13.cc
new file mode 100644
index 000000000..ceb4df920
--- /dev/null
+++ b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/13.cc
@@ -0,0 +1,78 @@
+// 2003-12-30  Paolo Carlini  <pcarlini@suse.de>
+
+// Copyright (C) 2003, 2009 Free Software Foundation
+//
+// 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 3, 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 COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// 22.2.2.1.1  num_get members
+
+#include <locale>
+#include <sstream>
+#include <testsuite_hooks.h>
+
+struct Punct1: std::numpunct<wchar_t>
+{ std::string do_grouping() const { return "\003\002\001"; } };
+
+struct Punct2: std::numpunct<wchar_t>
+{ std::string do_grouping() const { return "\001\003"; } };
+
+// libstdc++/13369
+void test01()
+{
+  using namespace std;
+  typedef istreambuf_iterator<wchar_t> iterator_type;
+  
+  bool test __attribute__((unused)) = true;
+
+  wistringstream iss1, iss2;
+  iss1.imbue(locale(iss1.getloc(), new Punct1));
+  iss2.imbue(locale(iss2.getloc(), new Punct2));
+  const num_get<wchar_t>& ng1 = use_facet<num_get<wchar_t> >(iss1.getloc()); 
+  const num_get<wchar_t>& ng2 = use_facet<num_get<wchar_t> >(iss2.getloc()); 
+
+  ios_base::iostate err = ios_base::goodbit;
+  iterator_type end;
+  long l = 0l;
+  long l1 = 12345678l;
+  double d = 0.0;
+  double d1 = 1234567.0;
+  double d2 = 123456.0;
+
+  iss1.str(L"1,2,3,45,678");
+  err = ios_base::goodbit;
+  end = ng1.get(iss1.rdbuf(), 0, iss1, err, l);
+  VERIFY( err == ios_base::eofbit );
+  VERIFY( l == l1 );
+
+  iss2.str(L"123,456,7.0");
+  err = ios_base::goodbit;
+  end = ng2.get(iss2.rdbuf(), 0, iss2, err, d);
+  VERIFY( err == ios_base::eofbit );
+  VERIFY( d == d1 );
+
+  iss2.str(L"12,345,6.0");
+  iss2.clear();
+  err = ios_base::goodbit;
+  end = ng2.get(iss2.rdbuf(), 0, iss2, err, d);
+  VERIFY( err == ios_base::eofbit );
+  VERIFY( d == d2 );
+}
+
+int main()
+{
+  test01();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/14.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/14.cc
new file mode 100644
index 000000000..b8076dc50
--- /dev/null
+++ b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/14.cc
@@ -0,0 +1,58 @@
+// 2004-02-28  Paolo Carlini  <pcarlini@suse.de>
+
+// Copyright (C) 2004, 2009 Free Software Foundation
+//
+// 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 3, 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 COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// 22.2.2.1.1  num_get members
+
+#include <locale>
+#include <sstream>
+#include <testsuite_hooks.h>
+
+struct Punct: std::numpunct<wchar_t>
+{
+  std::string do_grouping() const { return "\1"; }
+};
+
+void test01()
+{
+  using namespace std;
+  typedef istreambuf_iterator<wchar_t> iterator_type;
+  
+  bool test __attribute__((unused)) = true;
+
+  wistringstream iss;
+  iss.imbue(locale(iss.getloc(), new Punct));
+  const num_get<wchar_t>& ng = use_facet<num_get<wchar_t> >(iss.getloc()); 
+
+  ios_base::iostate err = ios_base::goodbit;
+  iterator_type end;
+  double d = 0.0;
+  double d1 = 1000.0;
+  
+  iss.str(L"1,0e2");
+  err = ios_base::goodbit;
+  end = ng.get(iss.rdbuf(), 0, iss, err, d);
+  VERIFY( err == ios_base::eofbit );
+  VERIFY( d == d1 );
+}
+
+int main()
+{
+  test01();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/15.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/15.cc
new file mode 100644
index 000000000..1b9ba137b
--- /dev/null
+++ b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/15.cc
@@ -0,0 +1,75 @@
+// 2004-03-01  Paolo Carlini  <pcarlini@suse.de>
+
+// Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
+//
+// 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 3, 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 COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// 22.2.2.1.1  num_get members
+
+#include <locale>
+#include <sstream>
+#include <testsuite_hooks.h>
+
+struct Punct1: std::numpunct<wchar_t>
+{
+  std::string do_grouping() const { return "\1"; }
+  wchar_t do_thousands_sep() const { return L'+'; }
+};
+
+struct Punct2: std::numpunct<wchar_t>
+{
+  wchar_t do_decimal_point() const { return L'-'; }
+};
+
+// http://gcc.gnu.org/ml/libstdc++/2003-12/msg00201.html
+void test01()
+{
+  using namespace std;
+  typedef istreambuf_iterator<wchar_t> iterator_type;
+  
+  bool test __attribute__((unused)) = true;
+
+  wistringstream iss1, iss2;
+  iss1.imbue(locale(iss1.getloc(), new Punct1));
+  iss2.imbue(locale(iss2.getloc(), new Punct2));
+  const num_get<wchar_t>& ng1 = use_facet<num_get<wchar_t> >(iss1.getloc()); 
+  const num_get<wchar_t>& ng2 = use_facet<num_get<wchar_t> >(iss2.getloc()); 
+
+  ios_base::iostate err = ios_base::goodbit;
+  iterator_type end;
+  double d = 1.0;
+  
+  iss1.str(L"1e+2");
+  err = ios_base::goodbit;
+  end = ng1.get(iss1.rdbuf(), 0, iss1, err, d);
+  VERIFY( err == ios_base::failbit );
+  VERIFY( *end == L'+' );
+  VERIFY( d == 0.0 );
+
+  iss2.str(L"3e-1");
+  err = ios_base::goodbit;
+  d = 1.0;
+  end = ng2.get(iss2.rdbuf(), 0, iss2, err, d);
+  VERIFY( err == ios_base::failbit );
+  VERIFY( *end == L'-' );
+  VERIFY( d == 0.0 );
+}
+
+int main()
+{
+  test01();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/16.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/16.cc
new file mode 100644
index 000000000..cb33d0fad
--- /dev/null
+++ b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/16.cc
@@ -0,0 +1,201 @@
+// 2005-04-26  Paolo Carlini  <pcarlini@suse.de>
+
+// Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation
+//
+// 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 3, 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 COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// 22.2.2.1.1  num_get members
+
+#include <locale>
+#include <sstream>
+#include <limits>
+#include <testsuite_hooks.h>
+
+void test01()
+{
+  using namespace std;
+  typedef istreambuf_iterator<wchar_t> iterator_type;
+  
+  bool test __attribute__((unused)) = true;
+
+  wstringstream ss;
+  const num_get<wchar_t>& ng = use_facet<num_get<wchar_t> >(ss.getloc()); 
+  ios_base::iostate err;
+  iterator_type end;
+
+  unsigned short us0, us1 = numeric_limits<unsigned short>::max();
+  unsigned int ui0, ui1 = numeric_limits<unsigned int>::max();
+  unsigned long ul0, ul1 = numeric_limits<unsigned long>::max();
+  long l01, l1 = numeric_limits<long>::max();
+  long l02, l2 = numeric_limits<long>::min();
+#ifdef _GLIBCXX_USE_LONG_LONG
+  unsigned long long ull0, ull1 = numeric_limits<unsigned long long>::max();
+  long long ll01, ll1 = numeric_limits<long long>::max();
+  long long ll02, ll2 = numeric_limits<long long>::min();
+#endif
+
+  const wstring empty;
+
+  us0 = 0;
+  ss << us1;
+  err = ios_base::goodbit;
+  end = ng.get(ss.rdbuf(), 0, ss, err, us0);
+  VERIFY( err == ios_base::eofbit );
+  VERIFY( us0 == us1 );
+
+  us0 = 0;
+  ss.clear();
+  ss.str(empty);
+  ss << us1 << L'0';
+  err = ios_base::goodbit;
+  end = ng.get(ss.rdbuf(), 0, ss, err, us0);
+  VERIFY( err == (ios_base::failbit | ios_base::eofbit) );
+  VERIFY( us0 == numeric_limits<unsigned short>::max() );
+
+  ui0 = 0U;
+  ss.clear();
+  ss.str(empty);
+  ss << ui1 << ' ';
+  err = ios_base::goodbit;
+  end = ng.get(ss.rdbuf(), 0, ss, err, ui0);
+  VERIFY( err == ios_base::goodbit );
+  VERIFY( ui0 == ui1 );
+
+  ui0 = 0U;
+  ss.clear();
+  ss.str(empty);
+  ss << ui1 << L'1';
+  err = ios_base::goodbit;
+  end = ng.get(ss.rdbuf(), 0, ss, err, ui0);
+  VERIFY( err == (ios_base::failbit | ios_base::eofbit) );
+  VERIFY( ui0 == numeric_limits<unsigned int>::max() );
+
+  ul0 = 0UL;
+  ss.clear();
+  ss.str(empty);
+  ss << ul1;
+  err = ios_base::goodbit;
+  end = ng.get(ss.rdbuf(), 0, ss, err, ul0);
+  VERIFY( err == ios_base::eofbit );
+  VERIFY( ul0 == ul1 );
+
+  ul0 = 0UL;
+  ss.clear();
+  ss.str(empty);
+  ss << ul1 << L'2';
+  err = ios_base::goodbit;
+  end = ng.get(ss.rdbuf(), 0, ss, err, ul0);
+  VERIFY( err == (ios_base::failbit | ios_base::eofbit) );
+  VERIFY( ul0 == numeric_limits<unsigned long>::max() );
+
+  l01 = 0L;
+  ss.clear();
+  ss.str(empty);
+  ss << l1 << L' ';
+  err = ios_base::goodbit;
+  end = ng.get(ss.rdbuf(), 0, ss, err, l01);
+  VERIFY( err == ios_base::goodbit );
+  VERIFY( l01 == l1 );
+
+  l01 = 0L;
+  ss.clear();
+  ss.str(empty);
+  ss << l1 << L'3';
+  err = ios_base::goodbit;
+  end = ng.get(ss.rdbuf(), 0, ss, err, l01);
+  VERIFY( err == (ios_base::failbit | ios_base::eofbit) );
+  VERIFY( l01 == numeric_limits<long>::max() );
+
+  l02 = 0L;
+  ss.clear();
+  ss.str(empty);
+  ss << l2;
+  err = ios_base::goodbit;
+  end = ng.get(ss.rdbuf(), 0, ss, err, l02);
+  VERIFY( err == ios_base::eofbit );
+  VERIFY( l02 == l2 );
+
+  l02 = 0L;
+  ss.clear();
+  ss.str(empty);
+  ss << l2 << L'4';
+  err = ios_base::goodbit;
+  end = ng.get(ss.rdbuf(), 0, ss, err, l02);
+  VERIFY( err == (ios_base::failbit | ios_base::eofbit) );
+  VERIFY( l02 == numeric_limits<long>::min() );
+
+#ifdef _GLIBCXX_USE_LONG_LONG
+  ull0 = 0ULL;
+  ss.clear();
+  ss.str(empty);
+  ss << ull1 << L' ';
+  err = ios_base::goodbit;
+  end = ng.get(ss.rdbuf(), 0, ss, err, ull0);
+  VERIFY( err == ios_base::goodbit );
+  VERIFY( ull0 == ull1 );
+
+  ull0 = 0ULL;
+  ss.clear();
+  ss.str(empty);
+  ss << ull1 << L'5';
+  err = ios_base::goodbit;
+  end = ng.get(ss.rdbuf(), 0, ss, err, ull0);
+  VERIFY( err == (ios_base::failbit | ios_base::eofbit) );
+  VERIFY( ull0 == numeric_limits<unsigned long long>::max() );
+
+  ll01 = 0LL;
+  ss.clear();
+  ss.str(empty);
+  ss << ll1;
+  err = ios_base::goodbit;
+  end = ng.get(ss.rdbuf(), 0, ss, err, ll01);
+  VERIFY( err == ios_base::eofbit );
+  VERIFY( ll01 == ll1 );
+
+  ll01 = 0LL;
+  ss.clear();
+  ss.str(empty);
+  ss << ll1 << L'6';
+  err = ios_base::goodbit;
+  end = ng.get(ss.rdbuf(), 0, ss, err, ll01);
+  VERIFY( err == (ios_base::failbit | ios_base::eofbit) );
+  VERIFY( ll01 == numeric_limits<long long>::max() );
+
+  ll02 = 0LL;
+  ss.clear();
+  ss.str(empty);
+  ss << ll2 << L' ';
+  err = ios_base::goodbit;
+  end = ng.get(ss.rdbuf(), 0, ss, err, ll02);
+  VERIFY( err == ios_base::goodbit );
+  VERIFY( ll02 == ll2 );
+
+  ll02 = 0LL;
+  ss.clear();
+  ss.str(empty);
+  ss << ll2 << L'7';
+  err = ios_base::goodbit;
+  end = ng.get(ss.rdbuf(), 0, ss, err, ll02);
+  VERIFY( err == (ios_base::failbit | ios_base::eofbit) );
+  VERIFY( ll02 == numeric_limits<long long>::min() );
+#endif
+}
+
+int main()
+{
+  test01();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/2.cc
new file mode 100644
index 000000000..4aa6e48bf
--- /dev/null
+++ b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/2.cc
@@ -0,0 +1,120 @@
+// 2001-11-21 Benjamin Kosnik  <bkoz@redhat.com>
+
+// Copyright (C) 2001, 2002, 2003, 2004, 2009 Free Software Foundation
+//
+// 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 3, 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 COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// 22.2.2.1.1  num_get members
+
+// { dg-do run { xfail lax_strtofp } }
+
+#include <locale>
+#include <sstream>
+#include <testsuite_hooks.h>
+
+void test02()
+{
+  using namespace std;
+  typedef istreambuf_iterator<wchar_t> iterator_type;
+
+  bool test __attribute__((unused)) = true;
+
+  // basic construction
+  locale loc_c = locale::classic();
+
+  // sanity check the data is correct.
+  const wstring empty;
+
+  bool b1 = true;
+  bool b0 = false;
+  unsigned long ul1 = 1294967294;
+  unsigned long ul2 = 0;
+  unsigned long ul;
+  double d1 =  1.02345e+308;
+  double d2 = 3.15e-308;
+  double d;
+
+  // cache the num_get facet
+  wistringstream iss;
+  iss.imbue(loc_c);
+  const num_get<wchar_t>& ng = use_facet<num_get<wchar_t> >(iss.getloc()); 
+  const ios_base::iostate goodbit = ios_base::goodbit;
+  const ios_base::iostate eofbit = ios_base::eofbit;
+  ios_base::iostate err = ios_base::goodbit;
+
+  // C
+  // bool, more twisted examples
+  iss.str(L"true ");
+  iss.clear();
+  iss.setf(ios_base::boolalpha);
+  err = goodbit;
+  ng.get(iss.rdbuf(), 0, iss, err, b0);
+  VERIFY( b0 == true );
+  VERIFY( err == goodbit );
+
+  iss.str(L"false ");
+  iss.clear();
+  iss.setf(ios_base::boolalpha);
+  err = goodbit;
+  ng.get(iss.rdbuf(), 0, iss, err, b1);
+  VERIFY( b1 == false );
+  VERIFY( err == goodbit );
+
+  // unsigned long, in a locale that does not group
+  iss.imbue(loc_c);
+  iss.str(L"1294967294");
+  iss.clear();
+  err = goodbit;
+  ng.get(iss.rdbuf(), 0, iss, err, ul);
+  VERIFY( ul == ul1);
+  VERIFY( err == eofbit );
+
+  iss.str(L"0+++++++++++++++++++");
+  iss.clear();
+  err = goodbit;
+  ng.get(iss.rdbuf(), 0, iss, err, ul);
+  VERIFY( ul == ul2);
+  VERIFY( err == goodbit );
+
+  // double
+  iss.imbue(loc_c);
+  iss.str(L"1.02345e+308++++++++");
+  iss.clear();
+  iss.width(20);
+  iss.setf(ios_base::left, ios_base::adjustfield);
+  err = goodbit;
+  ng.get(iss.rdbuf(), 0, iss, err, d);
+  VERIFY( d == d1 );
+  VERIFY( err == goodbit );
+
+  iss.str(L"+3.15e-308");
+  iss.clear();
+  iss.width(20);
+  iss.setf(ios_base::right, ios_base::adjustfield);
+  err = goodbit;
+  ng.get(iss.rdbuf(), 0, iss, err, d);
+  VERIFY( d == d2 );
+  VERIFY( err == eofbit );
+}
+
+int main()
+{
+  test02();
+  return 0;
+}
+
+
+// Kathleen Hannah, humanitarian, woman, art-thief
diff --git a/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/22131.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/22131.cc
new file mode 100644
index 000000000..fa172edfd
--- /dev/null
+++ b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/22131.cc
@@ -0,0 +1,125 @@
+// 2005-06-28  Paolo Carlini  <pcarlini@suse.de>
+
+// Copyright (C) 2005, 2009 Free Software Foundation
+//
+// 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 3, 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 COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// 22.2.2.1.1  num_get members
+
+#include <locale>
+#include <sstream>
+#include <testsuite_hooks.h>
+
+struct Punct: std::numpunct<wchar_t>
+{
+  std::string do_grouping() const { return "\1"; }
+  wchar_t do_thousands_sep() const { return L'#'; }
+};
+
+// libstdc++/22131
+void test01()
+{
+  using namespace std;
+  typedef istreambuf_iterator<wchar_t> iterator_type;
+  
+  bool test __attribute__((unused)) = true;
+
+  wistringstream iss1, iss2;
+  iss1.imbue(locale(iss1.getloc(), new Punct));
+  const num_get<wchar_t>& ng1 = use_facet<num_get<wchar_t> >(iss1.getloc());
+
+  ios_base::iostate err = ios_base::goodbit;
+  iterator_type end;
+  long l = 0l;
+  long l1 = 1l;
+  long l2 = 2l;
+  long l3 = 3l;
+  double d = 0.0;
+  double d1 = 1.0;
+  double d2 = 2.0;
+
+  iss1.str(L"00#0#1");
+  err = ios_base::goodbit;
+  end = ng1.get(iss1.rdbuf(), 0, iss1, err, l);
+  VERIFY( err == (ios_base::eofbit | ios_base::failbit) );
+  VERIFY( l == l1 );
+
+  iss1.str(L"000##2");
+  iss1.clear();
+  err = ios_base::goodbit;
+  end = ng1.get(iss1.rdbuf(), 0, iss1, err, l);
+  VERIFY( err == ios_base::failbit );
+  VERIFY( *end == L'#' );
+  VERIFY( l == 0 );
+
+  iss1.str(L"0#0#0#2");
+  iss1.clear();
+  err = ios_base::goodbit;
+  end = ng1.get(iss1.rdbuf(), 0, iss1, err, l);
+  VERIFY( err == ios_base::eofbit );
+  VERIFY( l == l2 );
+
+  iss1.str(L"00#0#1");
+  iss1.clear();
+  err = ios_base::goodbit;
+  end = ng1.get(iss1.rdbuf(), 0, iss1, err, d);
+  VERIFY( err == (ios_base::eofbit | ios_base::failbit) );
+  VERIFY( d == d1 );
+
+  iss1.str(L"000##2");
+  iss1.clear();
+  err = ios_base::goodbit;
+  end = ng1.get(iss1.rdbuf(), 0, iss1, err, d);
+  VERIFY( err == ios_base::failbit );
+  VERIFY( *end == L'#' );
+  VERIFY( d == 0.0 );
+
+  iss1.str(L"0#0#0#2");
+  iss1.clear();
+  err = ios_base::goodbit;
+  end = ng1.get(iss1.rdbuf(), 0, iss1, err, d);
+  VERIFY( err == ios_base::eofbit );
+  VERIFY( d == d2 );
+
+  iss1.str(L"0#0");
+  iss1.clear();
+  iss1.unsetf(ios::basefield);
+  err = ios_base::goodbit;
+  end = ng1.get(iss1.rdbuf(), 0, iss1, err, l);
+  VERIFY( err == ios_base::failbit );
+  VERIFY( *end == L'#' );
+  VERIFY( l == 0 );
+
+  iss1.str(L"00#0#3");
+  iss1.clear();
+  err = ios_base::goodbit;
+  end = ng1.get(iss1.rdbuf(), 0, iss1, err, l);
+  VERIFY( err == ios_base::eofbit );
+  VERIFY( l == l3 );
+
+  iss1.str(L"00#02");
+  iss1.clear();
+  err = ios_base::goodbit;
+  end = ng1.get(iss1.rdbuf(), 0, iss1, err, l);
+  VERIFY( err == (ios_base::eofbit | ios_base::failbit) );
+  VERIFY( l == l2 );
+}
+
+int main()
+{
+  test01();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/23953.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/23953.cc
new file mode 100644
index 000000000..5b1376679
--- /dev/null
+++ b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/23953.cc
@@ -0,0 +1,82 @@
+// 2005-09-30  Paolo Carlini  <pcarlini@suse.de>
+
+// Copyright (C) 2005, 2009 Free Software Foundation
+//
+// 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 3, 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 COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// 22.2.2.1.1  num_get members
+
+#include <locale>
+#include <sstream>
+#include <testsuite_hooks.h>
+
+using namespace std;
+
+struct Punct1: numpunct<wchar_t>
+{ string do_grouping() const { return string(1, char(-1)); } };
+
+struct Punct2: numpunct<wchar_t>
+{ string do_grouping() const { return string("\002") + char(-1); } };
+
+struct Punct3: numpunct<wchar_t>
+{ string do_grouping() const { return string("\001\002") + char(-1); } };
+
+// libstdc++/23953
+void test01()
+{
+  bool test __attribute__((unused)) = true;
+  typedef istreambuf_iterator<wchar_t> iterator_type;
+  
+  wistringstream iss1, iss2, iss3;
+  iss1.imbue(locale(iss1.getloc(), new Punct1));
+  iss2.imbue(locale(iss2.getloc(), new Punct2));
+  iss3.imbue(locale(iss3.getloc(), new Punct3));
+  const num_get<wchar_t>& ng1 = use_facet<num_get<wchar_t> >(iss1.getloc());
+  const num_get<wchar_t>& ng2 = use_facet<num_get<wchar_t> >(iss2.getloc());
+  const num_get<wchar_t>& ng3 = use_facet<num_get<wchar_t> >(iss3.getloc());
+
+  ios_base::iostate err = ios_base::goodbit;
+  iterator_type end;
+  long l = 0l;
+  long l1 = 12345l;
+  long l2 = 12345678l;
+  double d = 0.0;
+  double d1 = 1234567.0;
+
+  iss1.str(L"12345");
+  err = ios_base::goodbit;
+  end = ng1.get(iss1.rdbuf(), 0, iss1, err, l);
+  VERIFY( err == ios_base::eofbit );
+  VERIFY( l == l1 );
+
+  iss2.str(L"123456,78");
+  err = ios_base::goodbit;
+  end = ng2.get(iss2.rdbuf(), 0, iss2, err, l);
+  VERIFY( err == ios_base::eofbit );
+  VERIFY( l == l2 );
+
+  iss3.str(L"1234,56,7.0");
+  err = ios_base::goodbit;
+  end = ng3.get(iss3.rdbuf(), 0, iss3, err, d);
+  VERIFY( err == ios_base::eofbit );
+  VERIFY( d == d1 );
+}
+
+int main()
+{
+  test01();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/3.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/3.cc
new file mode 100644
index 000000000..387e31e86
--- /dev/null
+++ b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/3.cc
@@ -0,0 +1,78 @@
+// { dg-require-namedlocale "en_HK" }
+
+// 2001-11-21 Benjamin Kosnik  <bkoz@redhat.com>
+
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2009 Free Software Foundation
+//
+// 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 3, 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 COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// 22.2.2.1.1  num_get members
+
+#include <locale>
+#include <sstream>
+#include <testsuite_hooks.h>
+
+void test03()
+{
+  using namespace std;
+  typedef istreambuf_iterator<wchar_t> iterator_type;
+
+  bool test __attribute__((unused)) = true;
+
+  // basic construction
+  locale loc_c = locale::classic();
+  locale loc_hk = locale("en_HK");
+  VERIFY( loc_c != loc_hk );
+
+  // sanity check the data is correct.
+  const wstring empty;
+
+  long l1 = 2147483647;
+  long l2 = -2147483647;
+  long l;
+
+  // cache the num_get facet
+  wistringstream iss;
+  iss.imbue(loc_hk);
+  const num_get<wchar_t>& ng = use_facet<num_get<wchar_t> >(iss.getloc()); 
+  const ios_base::iostate goodbit = ios_base::goodbit;
+  ios_base::iostate err = ios_base::goodbit;
+
+  // HK
+  // long, in a locale that expects grouping
+  iss.str(L"2,147,483,647 ");
+  iss.clear();
+  err = goodbit;
+  ng.get(iss.rdbuf(), 0, iss, err, l);
+  VERIFY( l == l1 );
+  VERIFY( err == goodbit );
+
+  iss.str(L"-2,147,483,647++++++");
+  iss.clear();
+  err = goodbit;
+  ng.get(iss.rdbuf(), 0, iss, err, l);
+  VERIFY( l == l2 );
+  VERIFY( err == goodbit );
+}
+
+int main()
+{
+  test03();
+  return 0;
+}
+
+
+// Kathleen Hannah, humanitarian, woman, art-thief
diff --git a/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/37958.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/37958.cc
new file mode 100644
index 000000000..1ea82f1e7
--- /dev/null
+++ b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/37958.cc
@@ -0,0 +1,196 @@
+// 2008-10-31  Paolo Carlini  <paolo.carlini@oracle.com>
+
+// Copyright (C) 2008, 2009 Free Software Foundation
+//
+// 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 3, 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 COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// 22.2.2.1.1  num_get members
+
+#include <locale>
+#include <sstream>
+#include <testsuite_hooks.h>
+
+struct Punct1: std::numpunct<wchar_t>
+{
+  std::wstring do_truename() const { return L"a"; }
+  std::wstring do_falsename() const { return L"abb"; }
+};
+
+struct Punct2: std::numpunct<wchar_t>
+{
+  std::wstring do_truename() const { return L"1"; }
+  std::wstring do_falsename() const { return L"0"; }
+};
+
+struct Punct3: std::numpunct<wchar_t>
+{
+  std::wstring do_truename() const { return L""; }
+  std::wstring do_falsename() const { return L""; }
+};
+
+struct Punct4: std::numpunct<wchar_t>
+{
+  std::wstring do_truename() const { return L"one"; }
+  std::wstring do_falsename() const { return L"two"; }
+};
+
+// libstdc++/37958
+void test01()
+{
+  using namespace std;
+  typedef istreambuf_iterator<wchar_t> iterator_type;
+  
+  bool test __attribute__((unused)) = true;
+
+  wistringstream iss0, iss1, iss2, iss3, iss4;
+  iss1.imbue(locale(iss1.getloc(), new Punct1));
+  iss2.imbue(locale(iss2.getloc(), new Punct2));
+  iss3.imbue(locale(iss3.getloc(), new Punct3));
+  iss4.imbue(locale(iss4.getloc(), new Punct4));
+  const num_get<wchar_t>& ng0 = use_facet<num_get<wchar_t> >(iss0.getloc());
+  const num_get<wchar_t>& ng1 = use_facet<num_get<wchar_t> >(iss1.getloc());
+  const num_get<wchar_t>& ng2 = use_facet<num_get<wchar_t> >(iss2.getloc());
+  const num_get<wchar_t>& ng3 = use_facet<num_get<wchar_t> >(iss3.getloc());
+  const num_get<wchar_t>& ng4 = use_facet<num_get<wchar_t> >(iss4.getloc());
+
+  ios_base::iostate err = ios_base::goodbit;
+  iterator_type end;
+  bool b0 = false;
+  bool b1 = false;
+  bool b2 = false;
+  bool b3 = true;
+  bool b4 = false;
+
+  iss0.str(L"true");
+  iss0.setf(ios_base::boolalpha);
+  err = ios_base::goodbit;
+  end = ng0.get(iss0.rdbuf(), 0, iss0, err, b0);
+  VERIFY( err == ios_base::goodbit );
+  VERIFY( b0 == true );
+
+  iss0.str(L"false");
+  iss0.clear();
+  err = ios_base::goodbit;
+  end = ng0.get(iss0.rdbuf(), 0, iss0, err, b0);
+  VERIFY( err == ios_base::goodbit );
+  VERIFY( b0 == false );
+
+  iss1.str(L"a");
+  iss1.setf(ios_base::boolalpha);
+  err = ios_base::goodbit;
+  end = ng1.get(iss1.rdbuf(), 0, iss1, err, b1);
+  VERIFY( err == ios_base::eofbit );
+  VERIFY( b1 == true );
+
+  iss1.str(L"abb");
+  iss1.clear();
+  err = ios_base::goodbit;
+  end = ng1.get(iss1.rdbuf(), 0, iss1, err, b1);
+  VERIFY( err == ios_base::goodbit );
+  VERIFY( b1 == false );
+
+  iss1.str(L"abc");
+  iss1.clear();
+  err = ios_base::goodbit;
+  end = ng1.get(iss1.rdbuf(), 0, iss1, err, b1);
+  VERIFY( err == ios_base::failbit );
+  VERIFY( b1 == false );
+  VERIFY( *end == L'c' );
+
+  iss1.str(L"ab");
+  iss1.clear();
+  b1 = true;
+  err = ios_base::goodbit;
+  end = ng1.get(iss1.rdbuf(), 0, iss1, err, b1);
+  VERIFY( err == (ios_base::failbit | ios_base::eofbit) );
+  VERIFY( b1 == false );
+
+  iss2.str(L"1");
+  iss2.setf(ios_base::boolalpha);
+  err = ios_base::goodbit;
+  end = ng2.get(iss2.rdbuf(), 0, iss2, err, b2);
+  VERIFY( err == ios_base::goodbit );
+  VERIFY( b2 == true );
+
+  iss2.str(L"0");
+  iss2.clear();
+  err = ios_base::goodbit;
+  end = ng2.get(iss2.rdbuf(), 0, iss2, err, b2);
+  VERIFY( err == ios_base::goodbit );
+  VERIFY( b2 == false );
+
+  iss2.str(L"2");
+  iss2.clear();
+  b2 = true;
+  err = ios_base::goodbit;
+  end = ng2.get(iss2.rdbuf(), 0, iss2, err, b2);
+  VERIFY( err == ios_base::failbit );
+  VERIFY( b2 == false );
+  VERIFY( *end == L'2' );
+
+  iss3.str(L"blah");
+  iss3.setf(ios_base::boolalpha);
+  err = ios_base::goodbit;
+  end = ng3.get(iss3.rdbuf(), 0, iss3, err, b3);
+  VERIFY( err == ios_base::failbit );
+  VERIFY( b3 == false );
+  VERIFY( *end == L'b' );
+
+  iss3.str(L"");
+  iss3.clear();
+  b3 = true;
+  err = ios_base::goodbit;
+  end = ng3.get(iss3.rdbuf(), 0, iss3, err, b3);
+  VERIFY( err == ios_base::failbit );
+  VERIFY( b3 == false );
+
+  iss4.str(L"one");
+  iss4.setf(ios_base::boolalpha);
+  err = ios_base::goodbit;
+  end = ng4.get(iss4.rdbuf(), 0, iss4, err, b4);
+  VERIFY( err == ios_base::goodbit );
+  VERIFY( b4 == true );
+
+  iss4.str(L"two");
+  iss4.clear();
+  err = ios_base::goodbit;
+  end = ng4.get(iss4.rdbuf(), 0, iss4, err, b4);
+  VERIFY( err == ios_base::goodbit );
+  VERIFY( b4 == false );
+
+  iss4.str(L"three");
+  iss4.clear();
+  b4 = true;
+  err = ios_base::goodbit;
+  end = ng4.get(iss4.rdbuf(), 0, iss4, err, b4);
+  VERIFY( err == ios_base::failbit );
+  VERIFY( b4 == false );
+  VERIFY( *end == L'h' );
+
+  iss4.str(L"on");
+  iss4.clear();
+  b4 = true;
+  err = ios_base::goodbit;
+  end = ng4.get(iss4.rdbuf(), 0, iss4, err, b4);
+  VERIFY( err == (ios_base::failbit | ios_base::eofbit) );
+  VERIFY( b4 == false );
+}
+
+int main()
+{
+  test01();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/39168.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/39168.cc
new file mode 100644
index 000000000..a50658dcc
--- /dev/null
+++ b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/39168.cc
@@ -0,0 +1,56 @@
+// Copyright (C) 2009 Free Software Foundation
+//
+// 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 3, 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 COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// 22.2.2.1.1  num_get members
+
+#include <sstream>
+#include <locale>
+#include <climits>
+#include <testsuite_hooks.h>
+
+class my_numpunct: public std::numpunct<wchar_t>
+{
+protected:
+  std::string do_grouping() const { return std::string(1, CHAR_MAX); }
+};
+
+// libstdc++/39168
+void test01()
+{
+  bool test __attribute__((unused)) = true;
+  using namespace std;
+  typedef istreambuf_iterator<wchar_t> iterator_type;
+
+  wistringstream iss;
+  iss.imbue(locale(iss.getloc(), new my_numpunct));
+  const num_get<wchar_t>& ng = use_facet<num_get<wchar_t> >(iss.getloc());
+
+  long double l = -1;
+  ios_base::iostate err = ios_base::goodbit;
+
+  iss.str(L"123,456");
+  iterator_type end = ng.get(iss.rdbuf(), 0, iss, err, l);
+  VERIFY( err == ios_base::goodbit );
+  VERIFY( l == 123 );
+  VERIFY( *end == L',' );
+}
+
+int main()
+{
+  test01();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/39802.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/39802.cc
new file mode 100644
index 000000000..67138d1da
--- /dev/null
+++ b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/39802.cc
@@ -0,0 +1,77 @@
+// Copyright (C) 2009 Free Software Foundation
+//
+// 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 3, 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 COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// 22.2.2.1.1  num_get members
+
+#include <locale>
+#include <sstream>
+#include <limits>
+#include <testsuite_hooks.h>
+
+// libstdc++/39802
+void test01()
+{
+  using namespace std;
+  typedef istreambuf_iterator<wchar_t> iterator_type;
+  
+  bool test __attribute__((unused)) = true;
+
+  wstringstream ss;
+  const num_get<wchar_t>& ng = use_facet<num_get<wchar_t> >(ss.getloc()); 
+  ios_base::iostate err;
+  iterator_type end;
+  const wstring empty;
+
+  unsigned long ul0 = 1;
+  const unsigned long ul1 = numeric_limits<unsigned long>::max();
+
+  ss << L"-0";
+  err = ios_base::goodbit;
+  end = ng.get(ss.rdbuf(), 0, ss, err, ul0);
+  VERIFY( err == ios_base::eofbit );
+  VERIFY( ul0 == 0 );
+
+  ss.clear();
+  ss.str(empty);
+  ss << L"-1";
+  err = ios_base::goodbit;
+  end = ng.get(ss.rdbuf(), 0, ss, err, ul0);
+  VERIFY( err == ios_base::eofbit );
+  VERIFY( ul0 == ul1 );
+
+  ss.clear();
+  ss.str(empty);
+  ss << L'-' << ul1;
+  err = ios_base::goodbit;
+  end = ng.get(ss.rdbuf(), 0, ss, err, ul0);
+  VERIFY( err == ios_base::eofbit );
+  VERIFY( ul0 == 1 );
+
+  ss.clear();
+  ss.str(empty);
+  ss << L'-' << ul1 << L'0';
+  err = ios_base::goodbit;
+  end = ng.get(ss.rdbuf(), 0, ss, err, ul0);
+  VERIFY( err == (ios_base::eofbit | ios_base::failbit) );
+  VERIFY( ul0 == ul1 );
+}
+
+int main()
+{
+  test01();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/4.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/4.cc
new file mode 100644
index 000000000..7fcc3f943
--- /dev/null
+++ b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/4.cc
@@ -0,0 +1,110 @@
+// 2001-11-21 Benjamin Kosnik  <bkoz@redhat.com>
+
+// Copyright (C) 2001, 2002, 2003, 2009 Free Software Foundation
+//
+// 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 3, 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 COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// 22.2.2.1.1  num_get members
+
+#include <locale>
+#include <sstream>
+#include <testsuite_hooks.h>
+
+// 2002-01-10  David Seymour  <seymour_dj@yahoo.com>
+// libstdc++/5331
+void test04()
+{
+  using namespace std;
+  bool test __attribute__((unused)) = true;
+
+  // Check num_get works with other iterators besides streambuf
+  // output iterators. (As long as output_iterator requirements are met.)
+  typedef wstring::const_iterator iter_type;
+  typedef num_get<wchar_t, iter_type> num_get_type;
+  const ios_base::iostate goodbit = ios_base::goodbit;
+  ios_base::iostate err = ios_base::goodbit;
+  const locale loc_c = locale::classic();
+  const wstring str(L"20000106 Elizabeth Durack");
+  const wstring str2(L"0 true 0xbffff74c Durack");
+
+  wistringstream iss; // need an ios, add my num_get facet
+  iss.imbue(locale(loc_c, new num_get_type));
+
+  // Iterator advanced, state, output.
+  const num_get_type& ng = use_facet<num_get_type>(iss.getloc());
+
+  // 01 get(long)
+  // 02 get(long double)
+  // 03 get(bool)
+  // 04 get(void*)
+
+  // 01 get(long)
+  long i = 0;
+  err = goodbit;
+  iter_type end1 = ng.get(str.begin(), str.end(), iss, err, i);
+  wstring rem1(end1, str.end());
+  VERIFY( err == goodbit );
+  VERIFY( i == 20000106);
+  VERIFY( rem1 == L" Elizabeth Durack" );
+
+  // 02 get(long double)
+  long double ld = 0.0;
+  err = goodbit;
+  iter_type end2 = ng.get(str.begin(), str.end(), iss, err, ld);
+  wstring rem2(end2, str.end());
+  VERIFY( err == goodbit );
+  VERIFY( ld == 20000106);
+  VERIFY( rem2 == L" Elizabeth Durack" );
+
+  // 03 get(bool)
+  bool b = 1;
+  iss.clear();
+  err = goodbit;
+  iter_type end3 = ng.get(str2.begin(), str2.end(), iss, err, b);
+  wstring rem3(end3, str2.end());
+  VERIFY( err == goodbit );
+  VERIFY( b == 0 );
+  VERIFY( rem3 == L" true 0xbffff74c Durack" );
+
+  iss.clear();
+  err = goodbit;
+  iss.setf(ios_base::boolalpha);
+  iter_type end4 = ng.get(++end3, str2.end(), iss, err, b);
+  wstring rem4(end4, str2.end());
+  VERIFY( err == goodbit );
+  VERIFY( b == true );
+  VERIFY( rem4 == L" 0xbffff74c Durack" );
+
+  // 04 get(void*)
+  void* v;
+  iss.clear();
+  err = goodbit;
+  iss.setf(ios_base::fixed, ios_base::floatfield);
+  iter_type end5 = ng.get(++end4, str2.end(), iss, err, v);
+  wstring rem5(end5, str2.end());
+  VERIFY( err == goodbit );
+  VERIFY( b == true );
+  VERIFY( rem5 == L" Durack" );
+}
+
+int main()
+{
+  test04();
+  return 0;
+}
+
+
+// Kathleen Hannah, humanitarian, woman, art-thief
diff --git a/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/5.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/5.cc
new file mode 100644
index 000000000..dd3a876e1
--- /dev/null
+++ b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/5.cc
@@ -0,0 +1,93 @@
+// { dg-require-namedlocale "de_DE" }
+
+// 2001-11-21 Benjamin Kosnik  <bkoz@redhat.com>
+
+// Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation
+//
+// 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 3, 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 COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// 22.2.2.1.1  num_get members
+
+#include <locale>
+#include <sstream>
+#include <testsuite_hooks.h>
+
+// Testing the correct parsing of grouped hexadecimals and octals.
+void test05()
+{
+  using namespace std;
+
+  bool test __attribute__((unused)) = true;
+ 
+  unsigned long ul;
+
+  wistringstream iss;
+
+  // A locale that expects grouping  
+  locale loc_de = locale("de_DE");
+  iss.imbue(loc_de);
+
+  const num_get<wchar_t>& ng = use_facet<num_get<wchar_t> >(iss.getloc()); 
+  const ios_base::iostate goodbit = ios_base::goodbit;
+  ios_base::iostate err = ios_base::goodbit;
+
+  iss.setf(ios::hex, ios::basefield);
+  iss.str(L"0xbf.fff.74c ");
+  err = goodbit;
+  ng.get(iss.rdbuf(), 0, iss, err, ul);
+  VERIFY( err == goodbit );
+  VERIFY( ul == 0xbffff74c );
+
+  iss.str(L"0Xf.fff ");
+  err = goodbit;
+  ng.get(iss.rdbuf(), 0, iss, err, ul);
+  VERIFY( err == goodbit );
+  VERIFY( ul == 0xffff );
+
+  iss.str(L"ffe ");
+  err = goodbit;
+  ng.get(iss.rdbuf(), 0, iss, err, ul);
+  VERIFY( err == goodbit );
+  VERIFY( ul == 0xffe );
+
+  iss.setf(ios::oct, ios::basefield);
+  iss.str(L"07.654.321 ");
+  err = goodbit;
+  ng.get(iss.rdbuf(), 0, iss, err, ul);
+  VERIFY( err == goodbit );
+  VERIFY( ul == 07654321 );
+
+  iss.str(L"07.777 ");
+  err = goodbit;
+  ng.get(iss.rdbuf(), 0, iss, err, ul);
+  VERIFY( err == goodbit );
+  VERIFY( ul == 07777 );
+
+  iss.str(L"776 ");
+  err = goodbit;
+  ng.get(iss.rdbuf(), 0, iss, err, ul);
+  VERIFY( err == goodbit );
+  VERIFY( ul == 0776 );
+}
+
+int main()
+{
+  test05();
+  return 0;
+}
+
+
+// Kathleen Hannah, humanitarian, woman, art-thief
diff --git a/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/6.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/6.cc
new file mode 100644
index 000000000..e134f7ec4
--- /dev/null
+++ b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/6.cc
@@ -0,0 +1,58 @@
+// { dg-require-namedlocale "de_DE" }
+
+// 2001-11-21 Benjamin Kosnik  <bkoz@redhat.com>
+
+// Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation
+//
+// 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 3, 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 COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// 22.2.2.1.1  num_get members
+
+#include <locale>
+#include <sstream>
+#include <testsuite_hooks.h>
+
+// libstdc++/5816
+void test06()
+{
+  using namespace std;
+  bool test __attribute__((unused)) = true;
+
+  double d = 0.0;
+
+  wistringstream iss;
+  locale loc_de = locale("de_DE");
+  iss.imbue(loc_de);
+
+  const num_get<wchar_t>& ng = use_facet<num_get<wchar_t> >(iss.getloc()); 
+  const ios_base::iostate goodbit = ios_base::goodbit;
+  ios_base::iostate err = ios_base::goodbit;
+
+  iss.str(L"1234,5 ");
+  err = goodbit;
+  ng.get(iss.rdbuf(), 0, iss, err, d);
+  VERIFY( err == goodbit );
+  VERIFY( d == 1234.5 );
+}
+
+int main()
+{
+  test06();
+  return 0;
+}
+
+
+// Kathleen Hannah, humanitarian, woman, art-thief
diff --git a/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/7.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/7.cc
new file mode 100644
index 000000000..36c2cef71
--- /dev/null
+++ b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/7.cc
@@ -0,0 +1,57 @@
+// 2003-10-25  Paolo Carlini  <pcarlini@suse.de>
+
+// Copyright (C) 2003, 2009 Free Software Foundation
+//
+// 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 3, 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 COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// 22.2.2.1.1  num_get members
+
+#include <locale>
+#include <sstream>
+#include <testsuite_hooks.h>
+
+void test01()
+{
+  using namespace std;
+  typedef istreambuf_iterator<wchar_t> iterator_type;
+  
+  bool test __attribute__((unused)) = true;
+
+  // cache the num_get facet
+  wistringstream iss;
+  const num_get<wchar_t>& ng = use_facet<num_get<wchar_t> >(iss.getloc()); 
+  ios_base::iostate err = ios_base::goodbit;
+  iterator_type end;
+  double d;
+
+  iss.str(L"+e3");
+  end = ng.get(iss.rdbuf(), 0, iss, err, d);
+  VERIFY( err == ios_base::failbit );
+  VERIFY( *end == L'e' );
+
+  iss.str(L".e+1");
+  iss.clear();
+  err = ios_base::goodbit;
+  end = ng.get(iss.rdbuf(), 0, iss, err, d);
+  VERIFY( err == ios_base::failbit );
+  VERIFY( *end == L'e' );
+}
+
+int main()
+{
+  test01();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/8.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/8.cc
new file mode 100644
index 000000000..e68b1b207
--- /dev/null
+++ b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/8.cc
@@ -0,0 +1,69 @@
+// 2003-12-15  Paolo Carlini  <pcarlini@suse.de>
+
+// Copyright (C) 2003, 2009 Free Software Foundation
+//
+// 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 3, 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 COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// 22.2.2.1.1  num_get members
+
+#include <locale>
+#include <sstream>
+#include <testsuite_hooks.h>
+
+void test01()
+{
+  using namespace std;
+  typedef istreambuf_iterator<wchar_t> iterator_type;
+
+  bool test __attribute__((unused)) = true;
+
+  bool b;
+
+  // cache the num_get facet
+  wistringstream iss;
+  const num_get<wchar_t>& ng = use_facet<num_get<wchar_t> >(iss.getloc()); 
+  const ios_base::iostate goodbit = ios_base::goodbit;
+  const ios_base::iostate failbit = ios_base::failbit;
+  ios_base::iostate err;
+  iterator_type end;
+
+  iss.setf(ios_base::boolalpha);
+  iss.str(L"faLse");
+  err = goodbit;
+  end = ng.get(iss.rdbuf(), 0, iss, err, b);
+  VERIFY( *end == L'L' );
+  VERIFY( err == failbit );
+
+  iss.str(L"falsr");
+  iss.clear();  
+  err = goodbit;
+  end = ng.get(iss.rdbuf(), 0, iss, err, b);
+  VERIFY( *end == L'r' );
+  VERIFY( err == failbit );
+
+  iss.str(L"trus");
+  iss.clear();
+  err = goodbit;
+  end = ng.get(iss.rdbuf(), 0, iss, err, b);
+  VERIFY( *end == L's' );
+  VERIFY( err == failbit );
+}
+
+int main()
+{
+  test01();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/9.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/9.cc
new file mode 100644
index 000000000..134349f01
--- /dev/null
+++ b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/9.cc
@@ -0,0 +1,66 @@
+// { dg-require-namedlocale "de_DE" }
+
+// 2003-12-19  Paolo Carlini  <pcarlini@suse.de>
+
+// Copyright (C) 2003, 2005, 2009 Free Software Foundation
+//
+// 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 3, 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 COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// 22.2.2.1.1  num_get members
+
+#include <locale>
+#include <sstream>
+#include <testsuite_hooks.h>
+
+void test01()
+{
+  using namespace std;
+  typedef istreambuf_iterator<wchar_t> iterator_type;
+  
+  bool test __attribute__((unused)) = true;
+
+  // A locale that expects grouping  
+  locale loc_de = locale("de_DE");
+  wistringstream iss;
+  iss.imbue(loc_de);
+
+  const num_get<wchar_t>& ng = use_facet<num_get<wchar_t> >(iss.getloc()); 
+  ios_base::iostate err = ios_base::goodbit;
+  iterator_type end;
+  double d = 0.0;
+  double d1 = 1e1;
+  double d2 = 3e1;
+  
+  iss.str(L"1e1,");
+  end = ng.get(iss.rdbuf(), 0, iss, err, d);
+  VERIFY( err == ios_base::goodbit );
+  VERIFY( *end == L',' );
+  VERIFY( d == d1 );
+
+  iss.str(L"3e1.");
+  iss.clear();
+  err = ios_base::goodbit;
+  end = ng.get(iss.rdbuf(), 0, iss, err, d);
+  VERIFY( err == ios_base::goodbit );
+  VERIFY( *end == L'.' );
+  VERIFY( d == d2 );
+}
+
+int main()
+{
+  test01();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/wrapped_env.cc
new file mode 100644
index 000000000..b8776a328
--- /dev/null
+++ b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/wrapped_env.cc
@@ -0,0 +1,63 @@
+// { dg-require-namedlocale "de_DE" }
+// { dg-require-namedlocale "en_HK" }
+
+// 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
+
+// Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation
+//
+// 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 3, 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 COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// 22.2.4.1.1 collate members
+
+#include <testsuite_hooks.h>
+
+#define main discard_main_1
+#include "1.cc"
+#undef main 
+
+#define main discard_main_2
+#include "2.cc"
+#undef main 
+
+#define main discard_main_3
+#include "3.cc"
+#undef main 
+
+#define main discard_main_4
+#include "4.cc"
+#undef main 
+
+#define main discard_main_5
+#include "5.cc"
+#undef main 
+
+#define main discard_main_6
+#include "6.cc"
+#undef main 
+
+int main()
+{
+  using namespace __gnu_test;
+  func_callback two;
+  two.push_back(&test01);
+  two.push_back(&test02);
+  two.push_back(&test03);
+  two.push_back(&test04);
+  two.push_back(&test05);
+  two.push_back(&test06);
+  run_tests_wrapped_env("de_DE", "LANG", two);
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/wrapped_locale.cc
new file mode 100644
index 000000000..6f937a972
--- /dev/null
+++ b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/wrapped_locale.cc
@@ -0,0 +1,64 @@
+// { dg-require-namedlocale "ja_JP.eucjp" }
+// { dg-require-namedlocale "de_DE" }
+// { dg-require-namedlocale "en_HK" }
+
+// 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
+
+// Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation
+//
+// 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 3, 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 COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// 22.2.4.1.1 collate members
+
+#include <testsuite_hooks.h>
+
+#define main discard_main_1
+#include "1.cc"
+#undef main 
+
+#define main discard_main_2
+#include "2.cc"
+#undef main 
+
+#define main discard_main_3
+#include "3.cc"
+#undef main 
+
+#define main discard_main_4
+#include "4.cc"
+#undef main 
+
+#define main discard_main_5
+#include "5.cc"
+#undef main 
+
+#define main discard_main_6
+#include "6.cc"
+#undef main 
+
+int main()
+{
+  using namespace __gnu_test;
+  func_callback two;
+  two.push_back(&test01);
+  two.push_back(&test02);
+  two.push_back(&test03);
+  two.push_back(&test04);
+  two.push_back(&test05);
+  two.push_back(&test06);
+  run_tests_wrapped_locale("ja_JP.eucjp", two);
+  return 0;
+}