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.

13 files changed, 659 insertions, 0 deletions

diff --git a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/1.cc b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/1.cc
new file mode 100644
index 000000000..47b337213
--- /dev/null
+++ b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/1.cc
@@ -0,0 +1,66 @@
+// 2003-05-01 Petur Runolfsson <peturr02@ru.is>
+
+// Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 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/>.
+
+// { dg-require-fileio "" }
+
+#include <ext/stdio_sync_filebuf.h>
+#include <cstring>
+#include <testsuite_hooks.h>
+
+void test01()
+{
+  using namespace std;
+
+  bool test __attribute__((unused)) = true;
+  const char* c_lit = "black pearl jasmine tea";
+  unsigned size = strlen(c_lit);
+  const char* name = "stdiobuf-1.txt";
+
+  FILE* fout = fopen(name, "w");
+  VERIFY( fwrite(c_lit, 1, size, fout) == size );
+  fclose(fout);
+
+  FILE* fin = fopen(name, "r");
+  __gnu_cxx::stdio_sync_filebuf<char> sbuf(fin);
+
+  VERIFY( sbuf.sgetc() == c_lit[0] );
+  VERIFY( getc(fin) == c_lit[0] );
+  VERIFY( sbuf.sgetc() == c_lit[1] );
+  VERIFY( sbuf.sbumpc() == c_lit[1] );
+  VERIFY( ungetc('Z', fin) == 'Z' );
+  VERIFY( sbuf.sbumpc() == 'Z' );
+  VERIFY( getc(fin) == c_lit[2] );
+  VERIFY( sbuf.sputbackc('X') == 'X' );
+  VERIFY( getc(fin) == 'X' );
+
+  char buf[5];
+  memset(buf, 'x', 5);
+  VERIFY( sbuf.sgetn(buf, 5) == 5 );
+  VERIFY( !memcmp(buf, c_lit + 3, 5) );
+  VERIFY( getc(fin) == c_lit[8] );
+
+  fclose(fin);
+}
+
+int main ()
+{
+  test01();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-1.cc b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-1.cc
new file mode 100644
index 000000000..521575fca
--- /dev/null
+++ b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-1.cc
@@ -0,0 +1,47 @@
+// 2003-05-01 Petur Runolfsson <peturr02@ru.is>
+
+// 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/>.
+
+// { dg-require-fileio "" }
+
+#include <ext/stdio_sync_filebuf.h>
+#include <testsuite_hooks.h>
+
+// libstdc++/12048
+void test02()
+{
+  bool test __attribute__((unused)) = true;
+  const char* name = "cin_unget-1.txt";
+
+  std::FILE* file = std::fopen(name, "r");
+  __gnu_cxx::stdio_sync_filebuf<char> sbuf(file);
+  int c1 = sbuf.sbumpc();
+  VERIFY( c1 != EOF );
+  int c2 = sbuf.sungetc();
+  VERIFY( c2 != EOF );
+  int c3 = sbuf.sbumpc();
+  VERIFY( c3 == c1 );
+
+  std::fclose(file);
+}
+
+int main ()
+{
+  test02();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-2.cc b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-2.cc
new file mode 100644
index 000000000..f7c4eeef3
--- /dev/null
+++ b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-2.cc
@@ -0,0 +1,47 @@
+// 2003-05-01 Petur Runolfsson <peturr02@ru.is>
+
+// 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/>.
+
+// { dg-require-fileio "" }
+
+#include <ext/stdio_sync_filebuf.h>
+#include <testsuite_hooks.h>
+
+// libstdc++/12048
+void test03()
+{
+  bool test __attribute__((unused)) = true;
+  const char* name = "cin_unget-1.txt";
+
+  std::FILE* file = std::fopen(name, "r");
+  __gnu_cxx::stdio_sync_filebuf<char> sbuf(file);
+  int c1 = sbuf.sbumpc();
+  VERIFY( c1 != EOF );
+  int c2 = sbuf.sungetc();
+  VERIFY( c2 != EOF );
+  int c3 = std::fgetc(file);
+  VERIFY( c3 == c1 );
+
+  std::fclose(file);
+}
+
+int main ()
+{
+  test03();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-3.cc b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-3.cc
new file mode 100644
index 000000000..9070e80f6
--- /dev/null
+++ b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-3.cc
@@ -0,0 +1,47 @@
+// 2003-05-01 Petur Runolfsson <peturr02@ru.is>
+
+// 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/>.
+
+// { dg-require-fileio "" }
+
+#include <ext/stdio_sync_filebuf.h>
+#include <testsuite_hooks.h>
+
+// libstdc++/12048
+void test04()
+{
+  bool test __attribute__((unused)) = true;
+  const char* name = "cin_unget-1.txt";
+
+  std::FILE* file = std::fopen(name, "r");
+  __gnu_cxx::stdio_sync_filebuf<char> sbuf(file);
+  char buf[2];
+  VERIFY( sbuf.sgetn(buf, 2) == 2 );
+  int c2 = sbuf.sungetc();
+  VERIFY( c2 != EOF );
+  int c3 = sbuf.sbumpc();
+  VERIFY( c3 == std::char_traits<char>::to_int_type(buf[1]) );
+
+  std::fclose(file);
+}
+
+int main ()
+{
+  test04();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-4.cc b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-4.cc
new file mode 100644
index 000000000..ab41acab3
--- /dev/null
+++ b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-4.cc
@@ -0,0 +1,47 @@
+// 2003-05-01 Petur Runolfsson <peturr02@ru.is>
+
+// 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/>.
+
+// { dg-require-fileio "" }
+
+#include <ext/stdio_sync_filebuf.h>
+#include <testsuite_hooks.h>
+
+// libstdc++/12048
+void test05()
+{
+  bool test __attribute__((unused)) = true;
+  const char* name = "cin_unget-1.txt";
+
+  std::FILE* file = std::fopen(name, "r");
+  __gnu_cxx::stdio_sync_filebuf<char> sbuf(file);
+  char buf[2];
+  VERIFY( sbuf.sgetn(buf, 2) == 2 );
+  int c2 = sbuf.sungetc();
+  VERIFY( c2 != EOF );
+  int c3 = std::fgetc(file);
+  VERIFY( c3 == std::char_traits<char>::to_int_type(buf[1]) );
+
+  std::fclose(file);
+}
+
+int main ()
+{
+  test05();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/35209.cc b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/35209.cc
new file mode 100644
index 000000000..b199b58f7
--- /dev/null
+++ b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/35209.cc
@@ -0,0 +1,39 @@
+// 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/>.
+
+// { dg-do link }
+
+#include <ext/stdio_sync_filebuf.h>
+
+struct my_ssf
+: __gnu_cxx::stdio_sync_filebuf<char>
+{
+  my_ssf(std::__c_file* __f)
+  : __gnu_cxx::stdio_sync_filebuf<char>(__f) { }
+};
+
+// libstdc++/35209
+void test01()
+{
+  my_ssf ss1(0);
+}
+
+int main()
+{
+  test01();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/1.cc b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/1.cc
new file mode 100644
index 000000000..2629ecb43
--- /dev/null
+++ b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/1.cc
@@ -0,0 +1,66 @@
+// 2003-05-01 Petur Runolfsson <peturr02@ru.is>
+
+// Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 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/>.
+
+#include <ext/stdio_sync_filebuf.h>
+#include <cstring>
+#include <testsuite_hooks.h>
+
+void test01()
+{
+  using namespace std;
+  typedef char_traits<wchar_t> traits_type;
+
+  bool test __attribute__((unused)) = true;
+  const char* c_lit = "black pearl jasmine tea";
+  const wchar_t* w_lit = L"black pearl jasmine tea";
+  unsigned size = strlen(c_lit);
+  const char* name = "stdiobuf-1.txt";
+
+  FILE* fout = fopen(name, "w");
+  VERIFY( fwrite(c_lit, 1, size, fout) == size );
+  fclose(fout);
+
+  FILE* fin = fopen(name, "r");
+  __gnu_cxx::stdio_sync_filebuf<wchar_t> wsbuf(fin);
+
+  VERIFY( traits_type::to_char_type(wsbuf.sgetc()) == w_lit[0] );
+  VERIFY( traits_type::to_char_type(getwc(fin)) == w_lit[0] );
+  VERIFY( traits_type::to_char_type(wsbuf.sgetc()) == w_lit[1] );
+  VERIFY( traits_type::to_char_type(wsbuf.sbumpc()) == w_lit[1] );
+  VERIFY( ungetwc(L'Z', fin) == L'Z' );
+  VERIFY( wsbuf.sbumpc() == L'Z' );
+  VERIFY( traits_type::to_char_type(getwc(fin)) == w_lit[2] );
+  VERIFY( wsbuf.sputbackc(L'X') == L'X' );
+  VERIFY( getwc(fin) == L'X' );
+
+  wchar_t buf[5];
+  wmemset(buf, static_cast<wchar_t>(0xdeadbeef), 5);
+  VERIFY( wsbuf.sgetn(buf, 5) == 5 );
+  VERIFY( !wmemcmp(buf, w_lit + 3, 5) );
+  VERIFY( traits_type::to_char_type(getwc(fin)) == w_lit[8] );
+
+  fclose(fin);
+}
+
+int main ()
+{
+  test01();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12077.cc b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12077.cc
new file mode 100644
index 000000000..7e4795f68
--- /dev/null
+++ b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12077.cc
@@ -0,0 +1,81 @@
+// { dg-require-namedlocale "is_IS.UTF-8" }
+
+// 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/>.
+
+#include <iostream>
+#include <locale>
+#include <cstdio>
+#include <testsuite_hooks.h>
+
+// libstdc++/12077
+void test01()
+{
+  using namespace std;
+  bool test __attribute__((unused)) = true;
+
+  const char* name = "tmp_12077";
+
+  locale loc = locale("is_IS.UTF-8");
+  locale::global(loc);
+  wcin.imbue(loc);
+
+  const char* str =
+    "\x1\x2\x3\x4\x5\x6\x7\x8\x9\xa\xb\xc\xd\xe\xf\x10\x11\x12\x13"
+    "\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f\x20!\"#$%&"
+    "'()*+,-./0123456789:;<=>?@}~\x7f\xc2\x80\xc2\x81\xc2\x82\xc2"
+    "\x83\xc2\x84\xc2\x85\xc2\x86\xc2\x87\xc2\x88\xc2\x89\xc2\x8a"
+    "\xc2\x8b\xc2\x8c\xc2\x8d\xc2\x8e\xc2\x8f\xc2\x90\xc2\x91\xc2"
+    "\x92\xc2\x93\xc2\x94\xc2\x95\xc2\x96\xc2\x97\xc2\x98\xc2\x99"
+    "\xc2\x9a\xc2\x9b\xc2\x9c\xc3\xba\xc3\xbb\xc3\xbc\xc3\xbd\xc3"
+    "\xbe\xc3\xbf\xc4\x80\xc4\x81\xc4\x82\xc4\x83\xc4\x84\xc4\x85"
+    "\xc4\x86\xc4\x87\xc4\x88\xc4\x89\xc4\x8a\xc4\x8b\xc4\x8c\xc4"
+    "\x8d\xc4\x8e\xc4\x8f\xc4\x90\xc4\x91\xc4\x92\xc4\x93\xc4\x94"
+    "\xc4\x95\xc4\x96\xc4\x97\xc4\x98\xc4\x99\xdf\xb8\xdf\xb9\xdf"
+    "\xba\xdf\xbb\xdf\xbc\xdf\xbd\xdf\xbe\xdf\xbf\xe0\xa0\x80\xe0"
+    "\xa0\x81\xe0\xa0\x82\xe0\xa0\x83\xe0\xa0\x84\xe0\xa0\x85\xe0"
+    "\xa0\x86\xe0\xa0\x87\xe0\xa0\x88\xe0\xa0\x89\xe0\xa0\x8a\xe0"
+    "\xa0\x8b\xe0\xa0\x8c\xe0\xa0\x8d\xe0\xa0\x8e\xe0\xa0\x8f\xe0"
+    "\xa0\x90\xe0\xa0\x91\xe0\xa0\x92\xe0\xa0\x93\xe0\xa0\x94\xe0"
+    "\xa0\x95\xe0\xa0\x96\xe0\xa0\x97\x1\x2\x4\x8\x10\x20@\xc2\x80"
+    "\xc4\x80\xc8\x80\xd0\x80\xe0\xa0\x80\xe1\x80\x80\xe2\x80\x80"
+    "\xe4\x80\x80\xe8\x80\x80\xf0\x90\x80\x80\xf0\xa0\x80\x80\xf1"
+    "\x80\x80\x80\xf2\x80\x80\x80\xf4\x80\x80\x80\xf8\x88\x80\x80"
+    "\x80\xf8\x90\x80\x80\x80\xf8\xa0\x80\x80\x80\xf9\x80\x80\x80"
+    "\x80\xfa\x80\x80\x80\x80\xfc\x84\x80\x80\x80\x80\xfc\x88\x80"
+    "\x80\x80\x80\xfc\x90\x80\x80\x80\x80\xfc\xa0\x80\x80\x80\x80"
+    "\xfd\x80\x80\x80\x80\x80";
+
+  FILE* file = fopen(name, "w");
+  fputs(str, file);
+  fclose(file);
+  
+  VERIFY( freopen(name, "r", stdin) );
+  
+  streamsize n = wcin.rdbuf()->in_avail();
+  while (n--)
+    {
+      wint_t c = wcin.rdbuf()->sbumpc();
+      VERIFY( c != WEOF );
+    }
+}
+
+int main()
+{
+  test01();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-1.cc b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-1.cc
new file mode 100644
index 000000000..c3d35046c
--- /dev/null
+++ b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-1.cc
@@ -0,0 +1,45 @@
+// 2003-05-01 Petur Runolfsson <peturr02@ru.is>
+
+// 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/>.
+
+#include <ext/stdio_sync_filebuf.h>
+#include <testsuite_hooks.h>
+
+// libstdc++/12048
+void test02()
+{
+  bool test __attribute__((unused)) = true;
+  const char* name = "cin_unget-1.txt";
+
+  std::FILE* file = std::fopen(name, "r");
+  __gnu_cxx::stdio_sync_filebuf<wchar_t> sbuf(file);
+  std::wint_t c1 = sbuf.sbumpc();
+  VERIFY( c1 != WEOF );
+  std::wint_t c2 = sbuf.sungetc();
+  VERIFY( c2 != WEOF );
+  std::wint_t c3 = sbuf.sbumpc();
+  VERIFY( c3 == c1 );
+
+  std::fclose(file);
+}
+
+int main ()
+{
+  test02();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-2.cc b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-2.cc
new file mode 100644
index 000000000..1756e3070
--- /dev/null
+++ b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-2.cc
@@ -0,0 +1,45 @@
+// 2003-05-01 Petur Runolfsson <peturr02@ru.is>
+
+// 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/>.
+
+#include <ext/stdio_sync_filebuf.h>
+#include <testsuite_hooks.h>
+
+// libstdc++/12048
+void test03()
+{
+  bool test __attribute__((unused)) = true;
+  const char* name = "cin_unget-1.txt";
+
+  std::FILE* file = std::fopen(name, "r");
+  __gnu_cxx::stdio_sync_filebuf<wchar_t> sbuf(file);
+  std::wint_t c1 = sbuf.sbumpc();
+  VERIFY( c1 != WEOF );
+  std::wint_t c2 = sbuf.sungetc();
+  VERIFY( c2 != WEOF );
+  std::wint_t c3 = std::fgetwc(file);
+  VERIFY( c3 == c1 );
+
+  std::fclose(file);
+}
+
+int main ()
+{
+  test03();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-3.cc b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-3.cc
new file mode 100644
index 000000000..29cdea7bb
--- /dev/null
+++ b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-3.cc
@@ -0,0 +1,45 @@
+// 2003-05-01 Petur Runolfsson <peturr02@ru.is>
+
+// 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/>.
+
+#include <ext/stdio_sync_filebuf.h>
+#include <testsuite_hooks.h>
+
+// libstdc++/12048
+void test04()
+{
+  bool test __attribute__((unused)) = true;
+  const char* name = "cin_unget-1.txt";
+
+  std::FILE* file = std::fopen(name, "r");
+  __gnu_cxx::stdio_sync_filebuf<wchar_t> sbuf(file);
+  wchar_t buf[2];
+  VERIFY( sbuf.sgetn(buf, 2) == 2 );
+  std::wint_t c2 = sbuf.sungetc();
+  VERIFY( c2 != WEOF );
+  std::wint_t c3 = sbuf.sbumpc();
+  VERIFY( c3 == std::char_traits<wchar_t>::to_int_type(buf[1]) );
+
+  std::fclose(file);
+}
+
+int main ()
+{
+  test04();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-4.cc b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-4.cc
new file mode 100644
index 000000000..a0e83551c
--- /dev/null
+++ b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-4.cc
@@ -0,0 +1,45 @@
+// 2003-05-01 Petur Runolfsson <peturr02@ru.is>
+
+// 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/>.
+
+#include <ext/stdio_sync_filebuf.h>
+#include <testsuite_hooks.h>
+
+// libstdc++/12048
+void test05()
+{
+  bool test __attribute__((unused)) = true;
+  const char* name = "cin_unget-1.txt";
+
+  std::FILE* file = std::fopen(name, "r");
+  __gnu_cxx::stdio_sync_filebuf<wchar_t> sbuf(file);
+  wchar_t buf[2];
+  VERIFY( sbuf.sgetn(buf, 2) == 2 );
+  std::wint_t c2 = sbuf.sungetc();
+  VERIFY( c2 != WEOF );
+  std::wint_t c3 = std::fgetwc(file);
+  VERIFY( c3 == std::char_traits<wchar_t>::to_int_type(buf[1]) );
+
+  std::fclose(file);
+}
+
+int main ()
+{
+  test05();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/35209.cc b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/35209.cc
new file mode 100644
index 000000000..0f25a392e
--- /dev/null
+++ b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/35209.cc
@@ -0,0 +1,39 @@
+// 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/>.
+
+// { dg-do link }
+
+#include <ext/stdio_sync_filebuf.h>
+
+struct my_ssf
+: __gnu_cxx::stdio_sync_filebuf<wchar_t>
+{
+  my_ssf(std::__c_file* __f)
+  : __gnu_cxx::stdio_sync_filebuf<wchar_t>(__f) { }
+};
+
+// libstdc++/35209
+void test01()
+{
+  my_ssf ss1(0);
+}
+
+int main()
+{
+  test01();
+  return 0;
+}