diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e5064a33dc967e4b3d69a3901446cc7c6d8207b5..06b1a9d4862a1efa1a568806c98e8ed0a1d1e14b 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,19 @@
+2010-01-01 Paolo Carlini <paolo.carlini@oracle.com>
+
+ * testsuite/21_strings/basic_string/requirements/exception/
+ propagation_consistent.cc: Remove, cannot instantiate basic_string
+ for non-PODs (21/1).
+ * testsuite/21_strings/basic_string/requirements/exception/
+ basic.cc: Likewise.
+ * testsuite/21_strings/basic_string/requirements/exception/
+ generation_prohibited.cc: Likewise.
+ * testsuite/ext/vstring/requirements/exception/
+ propagation_consistent.cc: Likewise.
+ * testsuite/ext/vstring/requirements/exception/basic.cc:
+ Likewise.
+ * testsuite/ext/vstring/requirements/exception/
+ generation_prohibited.cc: Likewise.
+
2009-12-31 Benjamin Kosnik <bkoz@redhat.com>
PR libstdc++/21772 part 3
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/requirements/exception/basic.cc b/libstdc++-v3/testsuite/21_strings/basic_string/requirements/exception/basic.cc
deleted file mode 100644
index 1f6b970d2bfcc44beec5a85a493bb3d1fecd72e2..0000000000000000000000000000000000000000
--- a/libstdc++-v3/testsuite/21_strings/basic_string/requirements/exception/basic.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-// { dg-options "-std=gnu++0x" }
-// { dg-require-cstdint "" }
-
-// 2009-11-10 Benjamin Kosnik <benjamin@redhat.com>
-
-// Copyright (C) 2009 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library. This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 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 <string>
-#include <exception/safety.h>
-
-void
-value()
-{
- typedef __gnu_cxx::throw_value_limit value_type;
- typedef __gnu_cxx::throw_allocator_limit<value_type> allocator_type;
- typedef std::char_traits<value_type> traits_type;
- typedef std::basic_string<value_type, traits_type, allocator_type> test_type;
- __gnu_test::basic_safety<test_type> test;
-}
-
-// Container requirement testing, exceptional behavior
-int main()
-{
- value();
- return 0;
-}
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/requirements/exception/generation_prohibited.cc b/libstdc++-v3/testsuite/21_strings/basic_string/requirements/exception/generation_prohibited.cc
deleted file mode 100644
index 211d7c21d89ede630472cd990d23e0f2d6b5d8b5..0000000000000000000000000000000000000000
--- a/libstdc++-v3/testsuite/21_strings/basic_string/requirements/exception/generation_prohibited.cc
+++ /dev/null
@@ -1,54 +0,0 @@
-// { dg-options "-std=gnu++0x" }
-// { dg-require-cstdint "" }
-
-// 2009-09-14 Benjamin Kosnik <benjamin@redhat.com>
-
-// Copyright (C) 2009 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library. This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 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 <string>
-#include <exception/safety.h>
-
-void
-char_allocator()
-{
- typedef char value_type;
- typedef __gnu_cxx::throw_allocator_random<value_type> allocator_type;
- typedef std::char_traits<value_type> traits_type;
- typedef std::basic_string<value_type, traits_type, allocator_type> test_type;
- __gnu_test::generation_prohibited<test_type> test;
-}
-
-void
-wchar_allocator()
-{
- typedef wchar_t value_type;
- typedef __gnu_cxx::throw_allocator_random<value_type> allocator_type;
- typedef std::char_traits<value_type> traits_type;
- typedef std::basic_string<value_type, traits_type, allocator_type> test_type;
- __gnu_test::generation_prohibited<test_type> test;
-}
-
-// Container requirement testing, exceptional behavior
-int main()
-{
- // throw_allocator
- char_allocator();
- wchar_allocator();
-
- return 0;
-}
diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/requirements/exception/propagation_consistent.cc b/libstdc++-v3/testsuite/21_strings/basic_string/requirements/exception/propagation_consistent.cc
deleted file mode 100644
index 8e27a919ce136d513a6e86a7df1af5bf769c8207..0000000000000000000000000000000000000000
--- a/libstdc++-v3/testsuite/21_strings/basic_string/requirements/exception/propagation_consistent.cc
+++ /dev/null
@@ -1,42 +0,0 @@
-// { dg-options "-std=gnu++0x" }
-// { dg-require-cstdint "" }
-// { dg-do run { xfail *-*-* } }
-
-// 2009-09-14 Benjamin Kosnik <benjamin@redhat.com>
-
-// Copyright (C) 2009 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library. This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 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 <string>
-#include <exception/safety.h>
-
-void
-value()
-{
- typedef __gnu_cxx::throw_value_limit value_type;
- typedef __gnu_cxx::throw_allocator_limit<value_type> allocator_type;
- typedef std::char_traits<value_type> traits_type;
- typedef std::basic_string<value_type, traits_type, allocator_type> test_type;
- __gnu_test::propagation_consistent<test_type> test;
-}
-
-// Container requirement testing, exceptional behavior
-int main()
-{
- value();
- return 0;
-}
diff --git a/libstdc++-v3/testsuite/ext/vstring/requirements/exception/basic.cc b/libstdc++-v3/testsuite/ext/vstring/requirements/exception/basic.cc
deleted file mode 100644
index a0042d488265e34ce828349fb630c45231000c69..0000000000000000000000000000000000000000
--- a/libstdc++-v3/testsuite/ext/vstring/requirements/exception/basic.cc
+++ /dev/null
@@ -1,55 +0,0 @@
-// { dg-options "-std=gnu++0x" }
-// { dg-require-cstdint "" }
-
-// 2009-11-10 Benjamin Kosnik <benjamin@redhat.com>
-
-// Copyright (C) 2009 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library. This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 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/vstring.h>
-#include <exception/safety.h>
-
-void
-value()
-{
-#if 1
- typedef char value_type;
-#else
- // XXX
- // __gnu_cxx::__rc_string_base<>::_Rep::_M_align’ with constructor
- // not allowed in union
- // typedef __gnu_cxx::throw_value_limit value_type;
-#endif
- typedef __gnu_cxx::throw_allocator_limit<value_type> allocator_type;
- typedef std::char_traits<value_type> traits_type;
-
- typedef __gnu_cxx::__versa_string<value_type, traits_type,
- allocator_type, __gnu_cxx::__rc_string_base> test_type_rc;
-
- typedef __gnu_cxx::__versa_string<value_type, traits_type,
- allocator_type, __gnu_cxx::__sso_string_base> test_type_sso;
-
- __gnu_test::basic_safety<test_type_rc> test_rc;
- __gnu_test::basic_safety<test_type_sso> test_sso;
-}
-
-// Container requirement testing, exceptional behavior
-int main()
-{
- value();
- return 0;
-}
diff --git a/libstdc++-v3/testsuite/ext/vstring/requirements/exception/generation_prohibited.cc b/libstdc++-v3/testsuite/ext/vstring/requirements/exception/generation_prohibited.cc
deleted file mode 100644
index 4ffe0df3bc4a32b8809934f6a0167aa4d33f9cd7..0000000000000000000000000000000000000000
--- a/libstdc++-v3/testsuite/ext/vstring/requirements/exception/generation_prohibited.cc
+++ /dev/null
@@ -1,52 +0,0 @@
-// { dg-options "-std=gnu++0x" }
-// { dg-require-cstdint "" }
-
-// 2009-09-14 Benjamin Kosnik <benjamin@redhat.com>
-
-// Copyright (C) 2009 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library. This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 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/vstring.h>
-#include <exception/safety.h>
-
-void
-char_instance()
-{
- typedef char value_type;
- typedef __gnu_cxx::throw_allocator_random<value_type> allocator_type;
- typedef std::char_traits<value_type> traits_type;
- typedef __gnu_cxx::__versa_string<value_type, traits_type, allocator_type> test_type;
- __gnu_test::generation_prohibited<test_type> test;
-}
-
-void
-wchar_instance()
-{
- typedef wchar_t value_type;
- typedef __gnu_cxx::throw_allocator_random<value_type> allocator_type;
- typedef std::char_traits<value_type> traits_type;
- typedef __gnu_cxx::__versa_string<value_type, traits_type, allocator_type> test_type;
- __gnu_test::generation_prohibited<test_type> test;
-}
-
-// Container requirement testing, exceptional behavior
-int main()
-{
- char_instance();
- wchar_instance();
- return 0;
-}
diff --git a/libstdc++-v3/testsuite/ext/vstring/requirements/exception/propagation_consistent.cc b/libstdc++-v3/testsuite/ext/vstring/requirements/exception/propagation_consistent.cc
deleted file mode 100644
index 09d8618ab80cc291baa924779cb1a3805871fad4..0000000000000000000000000000000000000000
--- a/libstdc++-v3/testsuite/ext/vstring/requirements/exception/propagation_consistent.cc
+++ /dev/null
@@ -1,55 +0,0 @@
-// { dg-options "-std=gnu++0x" }
-// { dg-require-cstdint "" }
-
-// 2009-09-14 Benjamin Kosnik <benjamin@redhat.com>
-
-// Copyright (C) 2009 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library. This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 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/vstring.h>
-#include <exception/safety.h>
-
-void
-value()
-{
-#if 1
- typedef char value_type;
-#else
- // XXX
- // __gnu_cxx::__rc_string_base<>::_Rep::_M_align’ with constructor
- // not allowed in union
- // typedef __gnu_cxx::throw_value_limit value_type;
-#endif
- typedef __gnu_cxx::throw_allocator_limit<value_type> allocator_type;
- typedef std::char_traits<value_type> traits_type;
-
- typedef __gnu_cxx::__versa_string<value_type, traits_type,
- allocator_type, __gnu_cxx::__rc_string_base> test_type_rc;
-
- typedef __gnu_cxx::__versa_string<value_type, traits_type,
- allocator_type, __gnu_cxx::__sso_string_base> test_type_sso;
-
- __gnu_test::propagation_consistent<test_type_rc> test_rc;
- __gnu_test::propagation_consistent<test_type_sso> test_sso;
-}
-
-// Container requirement testing, exceptional behavior
-int main()
-{
- value();
- return 0;
-}