2007-01-29 Benjamin Kosnik <bkoz@redhat.com>

	* include/ext/enc_filebuf.h: Resurrect, update.
	* include/ext/codecvt_specializations.h: Remove
        _GLIBCXX_USE_ICONV, _GLIBCXX_USE_ENCODING_STATE.
	* include/bits/localefwd.h: Remove declaration for __enc_traits.
	* docs/html/22_locale/codecvt.html: Change __enc_traits to
	encoding_state.
	* scripts/testsuite_flags.in: Remove ICONV.

	* configure.ac: Remove GLIBCXX_CHECK_ICONV_SUPPORT.
	* acinclude.m4 (GLIBCXX_CHECK_ICONV_SUPPORT): Remove.
	* crossconfig.m4: Remove use of GLIBCXX_CHECK_ICONV_SUPPORT.
	* config.h.in: Remove HAVE_ICONV_CLOSE, HAVE_ICONV_OPEN,
	HAVE_NL_LANGINFO, _GLIBCXX_USE_ICONV.
	* include/Makefile.am: Uglify ICONV_CONST.
	* configure: Regenerate.
	* aclocal.m4: Regenerate.
	* Makefile.in: Regenerate.
	* src/Makefile.in: Regenerate.
	* po/Makefile.in: Regenerate.
	* libmath/Makefile.in: Regenerate.
	* include/Makefile.in: Regenerate.
	* libsupc++/Makefile.in: Regenerate.
	* testsuite/Makefile.in: Regenerate.

	* testsuite/ext/enc_filebuf/wchar_t/13189.cc: Use
	dg-require-iconv, fix up for encoding_state changes.
	* testsuite/ext/enc_filebuf/char/13189.cc: Same.
	* testsuite/ext/enc_filebuf/char/13598.cc: Same.
	* testsuite/22_locale/codecvt/unicode: Move...
	* testsuite/22_locale/codecvt/unicode/char.cc: Move...
	* testsuite/22_locale/codecvt/unicode/1.cc: Move...
	* testsuite/22_locale/codecvt/unicode/wchar_t.cc: Move...
	* testsuite/ext/codecvt: New.
	* testsuite/ext/codecvt/char-1.cc: ...here. Also, use dg-require-iconv.
	* testsuite/ext/codecvt/char-2.cc: ...here. Same.
	* testsuite/ext/codecvt/1.cc: ...here. Same.
	* testsuite/ext/codecvt/wchar_t.cc: ...here. Same.
	* testsuite/22_locale/locale/cons/unicode: Delete directory.
	* testsuite/22_locale/locale/cons/unicode/1.cc: Move...
	* testsuite/22_locale/locale/cons/unicode.cc: ...here.



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

12 files changed, 450 insertions, 690 deletions

diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/unicode/1.cc b/libstdc++-v3/testsuite/22_locale/codecvt/unicode/1.cc
deleted file mode 100644
index 3bd27dd61b4..00000000000
--- a/libstdc++-v3/testsuite/22_locale/codecvt/unicode/1.cc
+++ /dev/null
@@ -1,147 +0,0 @@
-// 2003-02-06  Petur Runolfsson  <peturr02@ru.is>
-
-// Copyright (C) 2003 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 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// USA.
-
-// 22.2.1.5 - Template class codecvt [lib.locale.codecvt]
-
-#include <locale>
-#include <testsuite_hooks.h>
-
-
-
-#ifdef _GLIBCXX_USE___ENC_TRAITS
-
-// Need some char_traits specializations for this to work.
-typedef unsigned short			unicode_t;
-
-namespace std
-{
-  template<>
-    struct char_traits<unicode_t>
-    {
-      typedef unicode_t 	char_type;
-      // Unsigned as wint_t is unsigned.
-      typedef unsigned long  	int_type;
-      typedef streampos 	pos_type;
-      typedef streamoff 	off_type;
-      typedef mbstate_t 	state_type;
-      
-      static void 
-      assign(char_type& __c1, const char_type& __c2);
-
-      static bool 
-      eq(const char_type& __c1, const char_type& __c2);
-
-      static bool 
-      lt(const char_type& __c1, const char_type& __c2);
-
-      static int 
-      compare(const char_type* __s1, const char_type* __s2, size_t __n)
-      { return memcmp(__s1, __s2, __n); }
-
-      static size_t
-      length(const char_type* __s);
-
-      static const char_type* 
-      find(const char_type* __s, size_t __n, const char_type& __a);
-
-      static char_type* 
-      move(char_type* __s1, const char_type* __s2, size_t __n);
-
-      static char_type* 
-      copy(char_type* __s1, const char_type* __s2, size_t __n)
-      {  return static_cast<char_type*>(memcpy(__s1, __s2, __n)); }
-
-      static char_type* 
-      assign(char_type* __s, size_t __n, char_type __a);
-
-      static char_type 
-      to_char_type(const int_type& __c);
-
-      static int_type 
-      to_int_type(const char_type& __c);
-
-      static bool 
-      eq_int_type(const int_type& __c1, const int_type& __c2);
-
-      static int_type 
-      eof(); 
-
-      static int_type 
-      not_eof(const int_type& __c);
-    };
-}
-
-void
-initialize_state(std::__enc_traits& state)
-{ state._M_init(); }
-
-bool length_called = false;
-
-class length_codecvt : public std::codecvt<unicode_t, char, std::__enc_traits>
-{
-  typedef std::codecvt<unicode_t, char, std::__enc_traits> unicode_codecvt;
-
-public:
-  // DR75: type of first argument of do_length is state_type&
-  virtual int do_length(state_type& state, const extern_type* from,
-                        const extern_type* end, std::size_t max) const
-  {
-    length_called = true;
-    return unicode_codecvt::do_length(state, from, end, max);
-  }
-};
-
-// Partial specialization using __enc_traits.
-// codecvt<unicode_t, char, __enc_traits>
-// UNICODE - UCS2 (big endian)
-void test01()
-{
-  using namespace std;
-  typedef unicode_t				int_type;
-  typedef char					ext_type;
-  typedef __enc_traits				enc_type;
-  typedef codecvt<int_type, ext_type, enc_type>	unicode_codecvt;
-
-  bool test __attribute__((unused)) = true;
-  const ext_type* 	e_lit = "black pearl jasmine tea";
-  int 			size = strlen(e_lit);
-
-  // construct a locale object with the specialized facet.
-  locale 		loc(locale::classic(), new length_codecvt);
-  // sanity check the constructed locale has the specialized facet.
-  VERIFY( has_facet<unicode_codecvt>(loc) );
-  const unicode_codecvt&	cvt = use_facet<unicode_codecvt>(loc); 
-
-  unicode_codecvt::state_type state04("UCS-2BE", "ISO-8859-15", 0xfeff, 0);
-  initialize_state(state04);
-  length_called = false;
-  cvt.length(state04, e_lit, e_lit + size, 5);
-  VERIFY( length_called );
-}
-#endif // _GLIBCXX_USE___ENC_TRAITS
-
-int main ()
-{
-#if _GLIBCXX_USE___ENC_TRAITS
-  test01();
-#endif 
-
-  return 0;
-}
diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/unicode/char.cc b/libstdc++-v3/testsuite/22_locale/codecvt/unicode/char.cc
deleted file mode 100644
index e6e4f336eef..00000000000
--- a/libstdc++-v3/testsuite/22_locale/codecvt/unicode/char.cc
+++ /dev/null
@@ -1,300 +0,0 @@
-// 2000-08-22 Benjamin Kosnik <bkoz@cygnus.com>
-
-// Copyright (C) 2000, 2001, 2002, 2003 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 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// USA.
-
-// 22.2.1.5 - Template class codecvt [lib.locale.codecvt]
-#include <locale>
-#include <testsuite_hooks.h>
-
-#ifdef _GLIBCXX_USE___ENC_TRAITS
-
-// Need some char_traits specializations for this to work.
-typedef unsigned short			unicode_t;
-
-namespace std
-{
-  template<>
-    struct char_traits<unicode_t>
-    {
-      typedef unicode_t 	char_type;
-      // Unsigned as wint_t is unsigned.
-      typedef unsigned long  	int_type;
-      typedef streampos 	pos_type;
-      typedef streamoff 	off_type;
-      typedef mbstate_t 	state_type;
-      
-      static void 
-      assign(char_type& __c1, const char_type& __c2);
-
-      static bool 
-      eq(const char_type& __c1, const char_type& __c2);
-
-      static bool 
-      lt(const char_type& __c1, const char_type& __c2);
-
-      static int 
-      compare(const char_type* __s1, const char_type* __s2, size_t __n)
-      { return memcmp(__s1, __s2, __n); }
-
-      static size_t
-      length(const char_type* __s);
-
-      static const char_type* 
-      find(const char_type* __s, size_t __n, const char_type& __a);
-
-      static char_type* 
-      move(char_type* __s1, const char_type* __s2, size_t __n);
-
-      static char_type* 
-      copy(char_type* __s1, const char_type* __s2, size_t __n)
-      {  return static_cast<char_type*>(memcpy(__s1, __s2, __n)); }
-
-      static char_type* 
-      assign(char_type* __s, size_t __n, char_type __a);
-
-      static char_type 
-      to_char_type(const int_type& __c);
-
-      static int_type 
-      to_int_type(const char_type& __c);
-
-      static bool 
-      eq_int_type(const int_type& __c1, const int_type& __c2);
-
-      static int_type 
-      eof(); 
-
-      static int_type 
-      not_eof(const int_type& __c);
-    };
-}
-
-/*
-> how do I check that these conversions are correct? 
-Very easy.  Since all the characters are from ASCII you simply
-zero-extend the values.
-
-drepper$ echo 'black pearl jasmine tea' | od -t x1
-0000000 62 6c 61 63 6b 20 70 65 61 72 6c 20 6a 61 73 6d
-0000020 69 6e 65 20 74 65 61 0a
-
-So the UCS-2 string is
-
-0x0062, 0x006c, 0x0061, ...
-
-You get the idea.  With iconv() you have to take care of the
-byte-order, though.  UCS-2 can mean little- or big endian.  Looking at
-your result
-
-> $9 = 25856
-
-it shows that the other byte-order is used (25856 == 0x6500).
-*/
-
-
-void
-initialize_state(std::__enc_traits& state)
-{ state._M_init(); }
-
-// Partial specialization using __enc_traits.
-// codecvt<unicode_t, char, __enc_traits>
-// UNICODE - UCS2 (big endian)
-void test01()
-{
-  using namespace std;
-  typedef codecvt_base::result			result;
-  typedef unicode_t				int_type;
-  typedef char					ext_type;
-  typedef __enc_traits				enc_type;
-  typedef codecvt<int_type, ext_type, enc_type>	unicode_codecvt;
-  typedef char_traits<int_type>			int_traits;
-  typedef char_traits<ext_type>			ext_traits;
-
-  bool test __attribute__((unused)) = true;
-  const ext_type* 	e_lit = "black pearl jasmine tea";
-  int 			size = strlen(e_lit);
-
-  char  i_lit_base[50] __attribute__((aligned(__alignof__(int_type)))) = 
-  { 
-    0x00, 0x62, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x63, 0x00, 0x6b, 0x00, 0x20,
-    0x00, 0x70, 0x00, 0x65, 0x00, 0x61, 0x00, 0x72, 0x00, 0x6c, 0x00, 0x20,
-    0x00, 0x6a, 0x00, 0x61, 0x00, 0x73, 0x00, 0x6d, 0x00, 0x69, 0x00, 0x6e,
-    0x00, 0x65, 0x00, 0x20, 0x00, 0x74, 0x00, 0x65, 0x00, 0x61, 0x00, 0xa0
-  };
-  const int_type* 	i_lit = reinterpret_cast<int_type*>(i_lit_base);
-
-  const ext_type*       efrom_next;
-  const int_type*       ifrom_next;
-  ext_type* 		e_arr = new ext_type[size + 1];
-  ext_type*		eto_next;
-  int_type* 		i_arr = new int_type[size + 1];
-  int_type*		ito_next;
-
-  // construct a locale object with the specialized facet.
-  locale 		loc(locale::classic(), new unicode_codecvt);
-  // sanity check the constructed locale has the specialized facet.
-  VERIFY( has_facet<unicode_codecvt>(loc) );
-  const unicode_codecvt&	cvt = use_facet<unicode_codecvt>(loc); 
-
-  // in
-  //  unicode_codecvt::state_type state01("UCS-2BE", "ISO-8859-15", 0xfeff, 0);
-  unicode_codecvt::state_type state01("UCS-2BE", "ISO-8859-15", 0, 0);
-  initialize_state(state01);
-  // internal encoding is bigger because of bom
-  result r1 = cvt.in(state01, e_lit, e_lit + size, efrom_next, 
-		     i_arr, i_arr + size + 1, ito_next);
-  VERIFY( r1 == codecvt_base::ok );
-  VERIFY( !int_traits::compare(i_arr, i_lit, size) ); 
-  VERIFY( efrom_next == e_lit + size );
-  VERIFY( ito_next == i_arr + size );
-
-  // out
-  unicode_codecvt::state_type state02("UCS-2BE", "ISO-8859-15", 0, 0);
-  initialize_state(state02);  
-  result r2 = cvt.out(state02, i_lit, i_lit + size, ifrom_next, 
-		       e_arr, e_arr + size, eto_next);
-  VERIFY( r2 == codecvt_base::ok );
-  VERIFY( !ext_traits::compare(e_arr, e_lit, size) ); 
-  VERIFY( ifrom_next == i_lit + size );
-  VERIFY( eto_next == e_arr + size );
-
-  // unshift
-  ext_traits::copy(e_arr, e_lit, size);
-  unicode_codecvt::state_type state03("UCS-2BE", "ISO-8859-15", 0, 0);
-  initialize_state(state03);
-  result r3 = cvt.unshift(state03, e_arr, e_arr + size, eto_next);
-  VERIFY( r3 == codecvt_base::noconv );
-  VERIFY( !ext_traits::compare(e_arr, e_lit, size) ); 
-  VERIFY( eto_next == e_arr );
-
-  int i = cvt.encoding();
-  VERIFY( i == 2 ); // Target-dependent.
-
-  VERIFY( !cvt.always_noconv() );
-
-  unicode_codecvt::state_type state04("UCS-2BE", "ISO-8859-15", 0, 0);
-  initialize_state(state04);
-  int j = cvt.length(state03, e_lit, e_lit + size, 5);
-  VERIFY( j == 5 );
-
-  int k = cvt.max_length();
-  VERIFY( k == 1 );
-
-  delete [] e_arr;
-  delete [] i_arr;
-}
-
-// Partial specialization using __enc_traits.
-// codecvt<unicode_t, char, __enc_traits>
-// UNICODE - UCS2 (little endian)
-void test02()
-{
-  using namespace std;
-  typedef codecvt_base::result			result;
-  typedef unsigned short			unicode_t;
-  typedef unicode_t				int_type;
-  typedef char					ext_type;
-  typedef __enc_traits				enc_type;
-  typedef codecvt<int_type, ext_type, enc_type>	unicode_codecvt;
-  typedef char_traits<int_type>			int_traits;
-  typedef char_traits<ext_type>			ext_traits;
-
-  bool test __attribute__((unused)) = true;
-  const ext_type* 	e_lit = "black pearl jasmine tea";
-  int 			size = strlen(e_lit);
-
-  char  i_lit_base[50] __attribute__((aligned(__alignof__(int_type)))) = 
-  { 
-    0x62, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x63, 0x00, 0x6b, 0x00, 0x20, 0x00,
-    0x70, 0x00, 0x65, 0x00, 0x61, 0x00, 0x72, 0x00, 0x6c, 0x00, 0x20, 0x00,
-    0x6a, 0x00, 0x61, 0x00, 0x73, 0x00, 0x6d, 0x00, 0x69, 0x00, 0x6e, 0x00,
-    0x65, 0x00, 0x20, 0x00, 0x74, 0x00, 0x65, 0x00, 0x61, 0x00, 0xa0, 0x00
-  };
-  const int_type* 	i_lit = reinterpret_cast<int_type*>(i_lit_base);
-
-  const ext_type*       efrom_next;
-  const int_type*       ifrom_next;
-  ext_type* 		e_arr = new ext_type[size + 1];
-  ext_type*		eto_next;
-  int_type* 		i_arr = new int_type[size + 1];
-  int_type*		ito_next;
-
-  // construct a locale object with the specialized facet.
-  locale 		loc(locale::classic(), new unicode_codecvt);
-  // sanity check the constructed locale has the specialized facet.
-  VERIFY( has_facet<unicode_codecvt>(loc) );
-  const unicode_codecvt&	cvt = use_facet<unicode_codecvt>(loc); 
-
-  // in
-  unicode_codecvt::state_type state01("UCS-2LE", "ISO-8859-15", 0, 0);
-  initialize_state(state01);
-  // internal encoding is bigger because of bom
-  result r1 = cvt.in(state01, e_lit, e_lit + size, efrom_next, 
-		     i_arr, i_arr + size + 1, ito_next);
-  VERIFY( r1 == codecvt_base::ok );
-  VERIFY( !int_traits::compare(i_arr, i_lit, size) ); 
-  VERIFY( efrom_next == e_lit + size );
-  VERIFY( ito_next == i_arr + size );
-
-  // out
-  unicode_codecvt::state_type state02("UCS-2LE", "ISO-8859-15", 0, 0);
-  initialize_state(state02);  
-  result r2 = cvt.out(state02, i_lit, i_lit + size, ifrom_next, 
-		       e_arr, e_arr + size, eto_next);
-  VERIFY( r2 == codecvt_base::ok );
-  VERIFY( !ext_traits::compare(e_arr, e_lit, size) ); 
-  VERIFY( ifrom_next == i_lit + size );
-  VERIFY( eto_next == e_arr + size );
-
-  // unshift
-  ext_traits::copy(e_arr, e_lit, size);
-  unicode_codecvt::state_type state03("UCS-2LE", "ISO-8859-15", 0, 0);
-  initialize_state(state03);
-  result r3 = cvt.unshift(state03, e_arr, e_arr + size, eto_next);
-  VERIFY( r3 == codecvt_base::noconv );
-  VERIFY( !ext_traits::compare(e_arr, e_lit, size) ); 
-  VERIFY( eto_next == e_arr );
-
-  int i = cvt.encoding();
-  VERIFY( i == 2 ); // Target-dependent.
-
-  VERIFY( !cvt.always_noconv() );
-
-  unicode_codecvt::state_type state04("UCS-2LE", "ISO-8859-15", 0, 0);
-  initialize_state(state04);
-  int j = cvt.length(state03, e_lit, e_lit + size, 5);
-  VERIFY( j == 5 );
-
-  int k = cvt.max_length();
-  VERIFY( k == 1 );
-
-  delete [] e_arr;
-  delete [] i_arr;
-}
-
-#endif // _GLIBCXX_USE___ENC_TRAITS
-
-int main ()
-{
-#if _GLIBCXX_USE___ENC_TRAITS
-  test01();
-  test02();
-#endif 
-  return 0;
-}
diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/unicode.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/unicode.cc
new file mode 100644
index 00000000000..95f1f9d176d
--- /dev/null
+++ b/libstdc++-v3/testsuite/22_locale/locale/cons/unicode.cc
@@ -0,0 +1,81 @@
+// { dg-require-iconv "ISO-8859-1" }
+
+// Copyright (C) 2006, 2007 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 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// USA.
+
+// 22.1.1.2 locale constructors and destructors [lib.locale.cons]
+
+#include <cwchar> // for mbstate_t
+#include <locale>
+#include <stdexcept>
+#include <testsuite_hooks.h>
+#include <ext/codecvt_specializations.h>
+
+typedef std::codecvt<char, char, std::mbstate_t> 	      c_codecvt;
+
+#ifdef _GLIBCXX_USE_WCHAR_T
+typedef std::codecvt<wchar_t, char, std::mbstate_t>	      w_codecvt;
+#endif
+
+class gnu_facet: public std::locale::facet
+{
+public:
+  static std::locale::id id;
+};
+
+std::locale::id gnu_facet::id;
+
+void test01()
+{
+  using namespace std;
+  typedef unsigned short       				int_type;
+  typedef char						ext_type;
+  typedef __gnu_cxx::encoding_state	       		state_type;
+  typedef codecvt<int_type, ext_type, state_type>	unicode_codecvt;
+
+  bool test __attribute__((unused)) = true;
+
+  // unicode_codecvt
+  locale loc01(locale::classic());
+  locale loc13(locale::classic(), new unicode_codecvt);  
+  VERIFY( loc01 != loc13 );
+  VERIFY( loc13.name() == "*" );
+  try 
+    {
+      VERIFY( has_facet<c_codecvt>(loc13) );
+#ifdef _GLIBCXX_USE_WCHAR_T
+      VERIFY( has_facet<w_codecvt>(loc13) );
+#endif
+      VERIFY( has_facet<unicode_codecvt>(loc13) );
+    }
+  catch(...)
+    { VERIFY( false ); }
+
+  try 
+    { use_facet<gnu_facet>(loc13); }
+  catch(bad_cast& obj)
+    { VERIFY( true ); }
+  catch(...)
+    { VERIFY( false ); }
+}
+
+int main()
+{
+  test01();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/unicode/1.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/unicode/1.cc
deleted file mode 100644
index 02ef036a282..00000000000
--- a/libstdc++-v3/testsuite/22_locale/locale/cons/unicode/1.cc
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright (C) 2006 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 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// USA.
-
-// 22.1.1.2 locale constructors and destructors [lib.locale.cons]
-
-#include <cwchar> // for mbstate_t
-#include <locale>
-#include <stdexcept>
-#include <testsuite_hooks.h>
-
-#if _GLIBCXX_USE___ENC_TRAITS
-typedef std::codecvt<char, char, std::mbstate_t> 	      c_codecvt;
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-typedef std::codecvt<wchar_t, char, std::mbstate_t>	      w_codecvt;
-#endif
-
-class gnu_facet: public std::locale::facet
-{
-public:
-  static std::locale::id id;
-};
-
-std::locale::id gnu_facet::id;
-
-// Need some char_traits specializations for this to work.
-typedef unsigned short			unicode_t;
-
-namespace std
-{
-  template<>
-    struct char_traits<unicode_t>
-    {
-      typedef unicode_t 	char_type;
-      // Unsigned as wint_t is unsigned.
-      typedef unsigned long  	int_type;
-      typedef streampos 	pos_type;
-      typedef streamoff 	off_type;
-      typedef mbstate_t 	state_type;
-      
-      static void 
-      assign(char_type& __c1, const char_type& __c2);
-
-      static bool 
-      eq(const char_type& __c1, const char_type& __c2);
-
-      static bool 
-      lt(const char_type& __c1, const char_type& __c2);
-
-      static int 
-      compare(const char_type* __s1, const char_type* __s2, size_t __n)
-      { return memcmp(__s1, __s2, __n); }
-
-      static size_t
-      length(const char_type* __s);
-
-      static const char_type* 
-      find(const char_type* __s, size_t __n, const char_type& __a);
-
-      static char_type* 
-      move(char_type* __s1, const char_type* __s2, size_t __n);
-
-      static char_type* 
-      copy(char_type* __s1, const char_type* __s2, size_t __n)
-      { return static_cast<char_type*>(memcpy(__s1, __s2, __n)); }
-
-      static char_type* 
-      assign(char_type* __s, size_t __n, char_type __a);
-
-      static char_type 
-      to_char_type(const int_type& __c);
-
-      static int_type 
-      to_int_type(const char_type& __c);
-
-      static bool 
-      eq_int_type(const int_type& __c1, const int_type& __c2);
-
-      static int_type 
-      eof(); 
-
-      static int_type 
-      not_eof(const int_type& __c);
-    };
-}
-
-void test01()
-{
-  using namespace std;
-  typedef unicode_t				int_type;
-  typedef char					ext_type;
-  typedef __enc_traits				enc_type;
-  typedef codecvt<int_type, ext_type, enc_type>	unicode_codecvt;
-
-  bool test __attribute__((unused)) = true;
-
-  // unicode_codecvt
-  locale loc13(locale::classic(), new unicode_codecvt);  
-  VERIFY( loc01 != loc13 );
-  VERIFY( loc13.name() == "*" );
-  try 
-    {
-      VERIFY( has_facet<c_codecvt>(loc13) );
-#ifdef _GLIBCXX_USE_WCHAR_T
-      VERIFY( has_facet<w_codecvt>(loc13) );
-#endif
-      VERIFY( has_facet<unicode_codecvt>(loc13) );
-    }
-  catch(...)
-    { VERIFY( false ); }
-
-  try 
-    { use_facet<gnu_facet>(loc13); }
-  catch(bad_cast& obj)
-    { VERIFY( true ); }
-  catch(...)
-    { VERIFY( false ); }
-}
-#endif // _GLIBCXX_USE___ENC_TRAITS
-
-int main()
-{
-#if _GLIBCXX_USE___ENC_TRAITS
-  test01();
-#endif 
-  return 0;
-}
diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in
index 6f443ec1745..c71e43d22e2 100644
--- a/libstdc++-v3/testsuite/Makefile.in
+++ b/libstdc++-v3/testsuite/Makefile.in
@@ -41,7 +41,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 subdir = testsuite
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../config/enable.m4 \
+	$(top_srcdir)/../config/iconv.m4 \
 	$(top_srcdir)/../config/lead-dot.m4 \
+	$(top_srcdir)/../config/lib-ld.m4 \
+	$(top_srcdir)/../config/lib-link.m4 \
+	$(top_srcdir)/../config/lib-prefix.m4 \
 	$(top_srcdir)/../config/multi.m4 \
 	$(top_srcdir)/../config/no-executables.m4 \
 	$(top_srcdir)/../config/unwind_ipinfo.m4 \
@@ -143,6 +147,7 @@ LIBS = @LIBS@
 LIBSUPCXX_PICFLAGS = @LIBSUPCXX_PICFLAGS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
diff --git a/libstdc++-v3/testsuite/ext/codecvt/1.cc b/libstdc++-v3/testsuite/ext/codecvt/1.cc
new file mode 100644
index 00000000000..2e3fb746bef
--- /dev/null
+++ b/libstdc++-v3/testsuite/ext/codecvt/1.cc
@@ -0,0 +1,58 @@
+// { dg-require-iconv "UCS-2BE" }
+// { dg-require-iconv "ISO-8859-15" }
+// 2003-02-06  Petur Runolfsson  <peturr02@ru.is>
+
+// Copyright (C) 2003, 2007 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 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// USA.
+
+// 22.2.1.5 - Template class codecvt [lib.locale.codecvt]
+
+#include <locale>
+#include <testsuite_hooks.h>
+#include <ext/codecvt_specializations.h>
+
+// Partial specialization using encoding_state
+// codecvt<unicode_t, char, encoding_state>
+// UNICODE - UCS2 (big endian)
+void test01()
+{
+  using namespace std;
+  typedef unsigned short       		      		int_type;
+  typedef char						ext_type;
+  typedef __gnu_cxx::encoding_state    			state_type;
+  typedef codecvt<int_type, ext_type, state_type>	unicode_codecvt;
+
+  bool test __attribute__((unused)) = true;
+  const ext_type* 	e_lit = "black pearl jasmine tea";
+  int 			size = strlen(e_lit);
+
+  // construct a locale object with the specialized facet.
+  locale 		loc(locale::classic(), new unicode_codecvt);
+  // sanity check the constructed locale has the specialized facet.
+  VERIFY( has_facet<unicode_codecvt>(loc) );
+  const unicode_codecvt& cvt = use_facet<unicode_codecvt>(loc); 
+
+  unicode_codecvt::state_type state04("UCS-2BE", "ISO-8859-15", 0xfeff, 0);
+  cvt.length(state04, e_lit, e_lit + size, 5);
+}
+
+int main ()
+{
+  test01();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/ext/codecvt/char-1.cc b/libstdc++-v3/testsuite/ext/codecvt/char-1.cc
new file mode 100644
index 00000000000..507d7136ee7
--- /dev/null
+++ b/libstdc++-v3/testsuite/ext/codecvt/char-1.cc
@@ -0,0 +1,140 @@
+// { dg-require-iconv "UCS-2BE" }
+// { dg-require-iconv "ISO-8859-15" }
+
+// 2000-08-22 Benjamin Kosnik <bkoz@cygnus.com>
+
+// Copyright (C) 2000, 2001, 2002, 2003, 2007 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 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// USA.
+
+// 22.2.1.5 - Template class codecvt [lib.locale.codecvt]
+#include <locale>
+#include <testsuite_hooks.h>
+#include <ext/codecvt_specializations.h>
+
+/*
+> how do I check that these conversions are correct? 
+Very easy.  Since all the characters are from ASCII you simply
+zero-extend the values.
+
+drepper$ echo 'black pearl jasmine tea' | od -t x1
+0000000 62 6c 61 63 6b 20 70 65 61 72 6c 20 6a 61 73 6d
+0000020 69 6e 65 20 74 65 61 0a
+
+So the UCS-2 string is
+
+0x0062, 0x006c, 0x0061, ...
+
+You get the idea.  With iconv() you have to take care of the
+byte-order, though.  UCS-2 can mean little- or big endian.  Looking at
+your result
+
+> $9 = 25856
+
+it shows that the other byte-order is used (25856 == 0x6500).
+*/
+
+// Partial specialization using encoding_state.
+// codecvt<unicode_t, char, encoding_state>
+// UNICODE - UCS2 (big endian)
+void test01()
+{
+  using namespace std;
+  typedef codecvt_base::result			result;
+  typedef unsigned short	       		int_type;
+  typedef char					ext_type;
+  typedef __gnu_cxx::encoding_state	       		state_type;
+  typedef codecvt<int_type, ext_type, state_type>	unicode_codecvt;
+  typedef char_traits<int_type>			int_traits;
+  typedef char_traits<ext_type>			ext_traits;
+
+  bool test __attribute__((unused)) = true;
+  const ext_type* 	e_lit = "black pearl jasmine tea";
+  int 			size = strlen(e_lit);
+
+  char  i_lit_base[50] __attribute__((aligned(__alignof__(int_type)))) = 
+  { 
+    0x00, 0x62, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x63, 0x00, 0x6b, 0x00, 0x20,
+    0x00, 0x70, 0x00, 0x65, 0x00, 0x61, 0x00, 0x72, 0x00, 0x6c, 0x00, 0x20,
+    0x00, 0x6a, 0x00, 0x61, 0x00, 0x73, 0x00, 0x6d, 0x00, 0x69, 0x00, 0x6e,
+    0x00, 0x65, 0x00, 0x20, 0x00, 0x74, 0x00, 0x65, 0x00, 0x61, 0x00, 0xa0
+  };
+  const int_type* 	i_lit = reinterpret_cast<int_type*>(i_lit_base);
+
+  const ext_type*       efrom_next;
+  const int_type*       ifrom_next;
+  ext_type* 		e_arr = new ext_type[size + 1];
+  ext_type*		eto_next;
+  int_type* 		i_arr = new int_type[size + 1];
+  int_type*		ito_next;
+
+  // construct a locale object with the specialized facet.
+  locale 		loc(locale::classic(), new unicode_codecvt);
+  // sanity check the constructed locale has the specialized facet.
+  VERIFY( has_facet<unicode_codecvt>(loc) );
+  const unicode_codecvt& cvt = use_facet<unicode_codecvt>(loc); 
+
+  // in
+  //  unicode_codecvt::state_type state01("UCS-2BE", "ISO-8859-15", 0xfeff, 0);
+  unicode_codecvt::state_type state01("UCS-2BE", "ISO-8859-15", 0, 0);
+
+  // internal encoding is bigger because of bom
+  result r1 = cvt.in(state01, e_lit, e_lit + size, efrom_next, 
+		     i_arr, i_arr + size + 1, ito_next);
+  VERIFY( r1 == codecvt_base::ok );
+  VERIFY( !int_traits::compare(i_arr, i_lit, size) ); 
+  VERIFY( efrom_next == e_lit + size );
+  VERIFY( ito_next == i_arr + size );
+
+  // out
+  unicode_codecvt::state_type state02("UCS-2BE", "ISO-8859-15", 0, 0);
+  result r2 = cvt.out(state02, i_lit, i_lit + size, ifrom_next, 
+		       e_arr, e_arr + size, eto_next);
+  VERIFY( r2 == codecvt_base::ok );
+  VERIFY( !ext_traits::compare(e_arr, e_lit, size) ); 
+  VERIFY( ifrom_next == i_lit + size );
+  VERIFY( eto_next == e_arr + size );
+
+  // unshift
+  ext_traits::copy(e_arr, e_lit, size);
+  unicode_codecvt::state_type state03("UCS-2BE", "ISO-8859-15", 0, 0);
+  result r3 = cvt.unshift(state03, e_arr, e_arr + size, eto_next);
+  VERIFY( r3 == codecvt_base::noconv );
+  VERIFY( !ext_traits::compare(e_arr, e_lit, size) ); 
+  VERIFY( eto_next == e_arr );
+
+  int i = cvt.encoding();
+  VERIFY( i == 2 ); // Target-dependent.
+
+  VERIFY( !cvt.always_noconv() );
+
+  unicode_codecvt::state_type state04("UCS-2BE", "ISO-8859-15", 0, 0);
+  int j = cvt.length(state03, e_lit, e_lit + size, 5);
+  VERIFY( j == 5 );
+
+  int k = cvt.max_length();
+  VERIFY( k == 1 );
+
+  delete [] e_arr;
+  delete [] i_arr;
+}
+
+int main ()
+{
+  test01();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/ext/codecvt/char-2.cc b/libstdc++-v3/testsuite/ext/codecvt/char-2.cc
new file mode 100644
index 00000000000..19e28aa024b
--- /dev/null
+++ b/libstdc++-v3/testsuite/ext/codecvt/char-2.cc
@@ -0,0 +1,138 @@
+// { dg-require-iconv "UCS-2LE" }
+// { dg-require-iconv "ISO-8859-15" }
+
+// 2000-08-22 Benjamin Kosnik <bkoz@cygnus.com>
+
+// Copyright (C) 2000, 2001, 2002, 2003, 2007 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 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// USA.
+
+// 22.2.1.5 - Template class codecvt [lib.locale.codecvt]
+#include <locale>
+#include <testsuite_hooks.h>
+#include <ext/codecvt_specializations.h>
+
+/*
+> how do I check that these conversions are correct? 
+Very easy.  Since all the characters are from ASCII you simply
+zero-extend the values.
+
+drepper$ echo 'black pearl jasmine tea' | od -t x1
+0000000 62 6c 61 63 6b 20 70 65 61 72 6c 20 6a 61 73 6d
+0000020 69 6e 65 20 74 65 61 0a
+
+So the UCS-2 string is
+
+0x0062, 0x006c, 0x0061, ...
+
+You get the idea.  With iconv() you have to take care of the
+byte-order, though.  UCS-2 can mean little- or big endian.  Looking at
+your result
+
+> $9 = 25856
+
+it shows that the other byte-order is used (25856 == 0x6500).
+*/
+
+// Partial specialization using encoding_state.
+// codecvt<unicode_t, char, encoding_state>
+// UNICODE - UCS2 (little endian)
+void test02()
+{
+  using namespace std;
+  typedef codecvt_base::result			result;
+  typedef unsigned short			int_type;
+  typedef char					ext_type;
+  typedef __gnu_cxx::encoding_state	       		state_type;
+  typedef codecvt<int_type, ext_type, state_type>	unicode_codecvt;
+  typedef char_traits<int_type>			int_traits;
+  typedef char_traits<ext_type>			ext_traits;
+
+  bool test __attribute__((unused)) = true;
+  const ext_type* 	e_lit = "black pearl jasmine tea";
+  int 			size = strlen(e_lit);
+
+  char  i_lit_base[50] __attribute__((aligned(__alignof__(int_type)))) = 
+  { 
+    0x62, 0x00, 0x6c, 0x00, 0x61, 0x00, 0x63, 0x00, 0x6b, 0x00, 0x20, 0x00,
+    0x70, 0x00, 0x65, 0x00, 0x61, 0x00, 0x72, 0x00, 0x6c, 0x00, 0x20, 0x00,
+    0x6a, 0x00, 0x61, 0x00, 0x73, 0x00, 0x6d, 0x00, 0x69, 0x00, 0x6e, 0x00,
+    0x65, 0x00, 0x20, 0x00, 0x74, 0x00, 0x65, 0x00, 0x61, 0x00, 0xa0, 0x00
+  };
+  const int_type* 	i_lit = reinterpret_cast<int_type*>(i_lit_base);
+
+  const ext_type*       efrom_next;
+  const int_type*       ifrom_next;
+  ext_type* 		e_arr = new ext_type[size + 1];
+  ext_type*		eto_next;
+  int_type* 		i_arr = new int_type[size + 1];
+  int_type*		ito_next;
+
+  // construct a locale object with the specialized facet.
+  locale 		loc(locale::classic(), new unicode_codecvt);
+  // sanity check the constructed locale has the specialized facet.
+  VERIFY( has_facet<unicode_codecvt>(loc) );
+  const unicode_codecvt& cvt = use_facet<unicode_codecvt>(loc); 
+
+  // in
+  unicode_codecvt::state_type state01("UCS-2LE", "ISO-8859-15", 0, 0);
+  // internal encoding is bigger because of bom
+  result r1 = cvt.in(state01, e_lit, e_lit + size, efrom_next, 
+		     i_arr, i_arr + size + 1, ito_next);
+  VERIFY( r1 == codecvt_base::ok );
+  VERIFY( !int_traits::compare(i_arr, i_lit, size) ); 
+  VERIFY( efrom_next == e_lit + size );
+  VERIFY( ito_next == i_arr + size );
+
+  // out
+  unicode_codecvt::state_type state02("UCS-2LE", "ISO-8859-15", 0, 0);
+  result r2 = cvt.out(state02, i_lit, i_lit + size, ifrom_next, 
+		       e_arr, e_arr + size, eto_next);
+  VERIFY( r2 == codecvt_base::ok );
+  VERIFY( !ext_traits::compare(e_arr, e_lit, size) ); 
+  VERIFY( ifrom_next == i_lit + size );
+  VERIFY( eto_next == e_arr + size );
+
+  // unshift
+  ext_traits::copy(e_arr, e_lit, size);
+  unicode_codecvt::state_type state03("UCS-2LE", "ISO-8859-15", 0, 0);
+  result r3 = cvt.unshift(state03, e_arr, e_arr + size, eto_next);
+  VERIFY( r3 == codecvt_base::noconv );
+  VERIFY( !ext_traits::compare(e_arr, e_lit, size) ); 
+  VERIFY( eto_next == e_arr );
+
+  int i = cvt.encoding();
+  VERIFY( i == 2 ); // Target-dependent.
+
+  VERIFY( !cvt.always_noconv() );
+
+  unicode_codecvt::state_type state04("UCS-2LE", "ISO-8859-15", 0, 0);
+  int j = cvt.length(state03, e_lit, e_lit + size, 5);
+  VERIFY( j == 5 );
+
+  int k = cvt.max_length();
+  VERIFY( k == 1 );
+
+  delete [] e_arr;
+  delete [] i_arr;
+}
+
+int main ()
+{
+  test02();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/unicode/wchar_t.cc b/libstdc++-v3/testsuite/ext/codecvt/wchar_t.cc
index 6a318362e1c..fcc3d0220f0 100644
--- a/libstdc++-v3/testsuite/22_locale/codecvt/unicode/wchar_t.cc
+++ b/libstdc++-v3/testsuite/ext/codecvt/wchar_t.cc
@@ -1,6 +1,9 @@
+// { dg-require-iconv "UCS-2BE" }
+// { dg-require-iconv "UCS-4BE" }
+
 // 2000-08-23 Benjamin Kosnik <bkoz@cygnus.com>
 
-// Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation
+// Copyright (C) 2000, 2001, 2002, 2003, 2007 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
@@ -22,84 +25,18 @@
 
 #include <locale>
 #include <testsuite_hooks.h>
+#include <ext/codecvt_specializations.h>
 
-#ifdef _GLIBCXX_USE___ENC_TRAITS
-
-// Need some char_traits specializations for this to work.
-typedef unsigned short			unicode_t;
-
-namespace std
-{
-  template<>
-    struct char_traits<unicode_t>
-    {
-      typedef unicode_t 	char_type;
-      // Unsigned as wint_t is unsigned.
-      typedef unsigned long  	int_type;
-      typedef streampos 	pos_type;
-      typedef streamoff 	off_type;
-      typedef mbstate_t 	state_type;
-      
-      static void 
-      assign(char_type& __c1, const char_type& __c2);
-
-      static bool 
-      eq(const char_type& __c1, const char_type& __c2);
-
-      static bool 
-      lt(const char_type& __c1, const char_type& __c2);
-
-      static int 
-      compare(const char_type* __s1, const char_type* __s2, size_t __n)
-      { return memcmp(__s1, __s2, __n); }
-
-      static size_t
-      length(const char_type* __s);
-
-      static const char_type* 
-      find(const char_type* __s, size_t __n, const char_type& __a);
-
-      static char_type* 
-      move(char_type* __s1, const char_type* __s2, size_t __n);
-
-      static char_type* 
-      copy(char_type* __s1, const char_type* __s2, size_t __n)
-      {  return static_cast<char_type*>(memcpy(__s1, __s2, __n)); }
-
-      static char_type* 
-      assign(char_type* __s, size_t __n, char_type __a);
-
-      static char_type 
-      to_char_type(const int_type& __c);
-
-      static int_type 
-      to_int_type(const char_type& __c);
-
-      static bool 
-      eq_int_type(const int_type& __c1, const int_type& __c2);
-
-      static int_type 
-      eof(); 
-
-      static int_type 
-      not_eof(const int_type& __c);
-    };
-}
-
-void
-initialize_state(std::__enc_traits& state)
-{ state._M_init(); }
-
-// Partial specialization using __enc_traits.
-// codecvt<unicode_t, wchar_t, __enc_traits>
+// Partial specialization using encoding_state.
+// codecvt<unicode_t, wchar_t, encoding_state>
 void test01()
 {
   using namespace std;
   typedef codecvt_base::result			result;
-  typedef unicode_t				int_type;
+  typedef unsigned short       			int_type;
   typedef wchar_t				ext_type;
-  typedef __enc_traits				enc_type;
-  typedef codecvt<int_type, ext_type, enc_type>	unicode_codecvt;
+  typedef __gnu_cxx::encoding_state	       		state_type;
+  typedef codecvt<int_type, ext_type, state_type>	unicode_codecvt;
   typedef char_traits<int_type>			int_traits;
   typedef char_traits<ext_type>			ext_traits;
 
@@ -138,12 +75,11 @@ void test01()
   locale 		loc(locale::classic(), new unicode_codecvt);
   // sanity check the constructed locale has the specialized facet.
   VERIFY( has_facet<unicode_codecvt>(loc) );
-  const unicode_codecvt&	cvt = use_facet<unicode_codecvt>(loc); 
+  const unicode_codecvt& cvt = use_facet<unicode_codecvt>(loc); 
 
   // in
   //  unicode_codecvt::state_type state01("UCS-2BE", "UCS-4BE", 0xfeff, 0);
   unicode_codecvt::state_type state01("UCS-2BE", "UCS-4BE", 0, 0);
-  initialize_state(state01);
   result r1 = cvt.in(state01, e_lit, e_lit + size, efrom_next, 
 		     i_arr, i_arr + size + 1, ito_next);
   VERIFY( r1 == codecvt_base::ok );
@@ -153,7 +89,6 @@ void test01()
 
   // out
   unicode_codecvt::state_type state02("UCS-2BE", "UCS-4BE", 0, 0);
-  initialize_state(state02);  
   result r2 = cvt.out(state02, i_lit, i_lit + size, ifrom_next, 
 		       e_arr, e_arr + size, eto_next);   
   VERIFY( r2 == codecvt_base::ok ); // XXX?
@@ -164,7 +99,6 @@ void test01()
   // unshift
   ext_traits::copy(e_arr, e_lit, size);
   unicode_codecvt::state_type state03("UCS-2BE", "UCS-4BE", 0, 0);
-  initialize_state(state03);
   result r3 = cvt.unshift(state03, e_arr, e_arr + size, eto_next);
   VERIFY( r3 == codecvt_base::noconv );
   VERIFY( !ext_traits::compare(e_arr, e_lit, size) ); 
@@ -176,7 +110,6 @@ void test01()
   VERIFY( !cvt.always_noconv() );
 
   unicode_codecvt::state_type state04("UCS-2BE", "UCS-4BE", 0, 0);
-  initialize_state(state04);
   int j = cvt.length(state03, e_lit, e_lit + size, 5);
   VERIFY( j == 5 );
 
@@ -186,13 +119,10 @@ void test01()
   delete [] e_arr;
   delete [] i_arr;
 }
-#endif // _GLIBCXX_USE___ENC_TRAITS
 
 int main ()
 {
-#ifdef _GLIBCXX_USE___ENC_TRAITS
   test01();
-#endif 
   return 0;
 }
 
diff --git a/libstdc++-v3/testsuite/ext/enc_filebuf/char/13189.cc b/libstdc++-v3/testsuite/ext/enc_filebuf/char/13189.cc
index 2807d469ee6..461bdf9ee87 100644
--- a/libstdc++-v3/testsuite/ext/enc_filebuf/char/13189.cc
+++ b/libstdc++-v3/testsuite/ext/enc_filebuf/char/13189.cc
@@ -1,4 +1,6 @@
-// Copyright (C) 2003, 2004, 2005 Free Software Foundation
+// { dg-require-iconv "ISO-8859-1" }
+
+// Copyright (C) 2003, 2004, 2005, 2007 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
@@ -17,17 +19,14 @@
 // USA.
 
 #include <testsuite_hooks.h>
-#ifdef _GLIBCXX_USE___ENC_TRAITS
 #include <ext/enc_filebuf.h>
-#endif
 
 void test01()
 {
-#ifdef _GLIBCXX_USE___ENC_TRAITS
   using namespace std;
-  typedef __enc_traits state_type;
   typedef char char_type;
   typedef __gnu_cxx::enc_filebuf<char_type> filebuf_type;
+  typedef filebuf_type::state_type state_type;
   typedef codecvt<char_type, char, state_type> enc_codecvt;
 
   bool test __attribute__((unused)) = true;
@@ -47,7 +46,6 @@ void test01()
   catch(...)
     {
     }
-#endif
 }
 
 int main() 
diff --git a/libstdc++-v3/testsuite/ext/enc_filebuf/char/13598.cc b/libstdc++-v3/testsuite/ext/enc_filebuf/char/13598.cc
index f7cd9b540b3..3aa7de8cd82 100644
--- a/libstdc++-v3/testsuite/ext/enc_filebuf/char/13598.cc
+++ b/libstdc++-v3/testsuite/ext/enc_filebuf/char/13598.cc
@@ -1,4 +1,6 @@
-// Copyright (C) 2004 Free Software Foundation
+// { dg-require-iconv "ISO-8859-1" }
+
+// Copyright (C) 2004, 2007 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
@@ -19,20 +21,20 @@
 #include <locale>
 #include <cstring>
 #include <testsuite_hooks.h>
-#ifdef _GLIBCXX_USE___ENC_TRAITS
 #include <ext/enc_filebuf.h>
-#endif
 
 int main()
 {
-#ifdef _GLIBCXX_USE___ENC_TRAITS
   bool test __attribute__((unused)) = true;
+  typedef char char_type;
+  typedef __gnu_cxx::enc_filebuf<char_type> filebuf_type;
+  typedef filebuf_type::state_type state_type;
 
   const char* str = "Hello, world!\n";
   std::locale loc(std::locale::classic(),
-		  new std::codecvt<char, char, std::__enc_traits>());
-  std::__enc_traits st("ISO-8859-1", "ISO-8859-1");
-  __gnu_cxx::enc_filebuf<char> fb(st);
+		  new std::codecvt<char, char, __gnu_cxx::encoding_state>());
+  state_type st("ISO-8859-1", "ISO-8859-1");
+  filebuf_type fb(st);
   fb.pubimbue(loc);
 
   fb.open("tmp_13598", std::ios_base::out);
@@ -42,7 +44,6 @@ int main()
   
   VERIFY( n == std::strlen(str) );
   VERIFY( s == 0 );
-#endif
   
   return 0;
 }
diff --git a/libstdc++-v3/testsuite/ext/enc_filebuf/wchar_t/13189.cc b/libstdc++-v3/testsuite/ext/enc_filebuf/wchar_t/13189.cc
index a74c846b189..9dc4152692f 100644
--- a/libstdc++-v3/testsuite/ext/enc_filebuf/wchar_t/13189.cc
+++ b/libstdc++-v3/testsuite/ext/enc_filebuf/wchar_t/13189.cc
@@ -1,4 +1,6 @@
-// Copyright (C) 2003, 2004, 2005 Free Software Foundation
+// { dg-require-iconv "ISO-8859-1" }
+
+// Copyright (C) 2003, 2004, 2005, 2007 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
@@ -17,17 +19,14 @@
 // USA.
 
 #include <testsuite_hooks.h>
-#ifdef _GLIBCXX_USE___ENC_TRAITS
 #include <ext/enc_filebuf.h>
-#endif
 
 void test01()
 {
-#ifdef _GLIBCXX_USE___ENC_TRAITS
   using namespace std;
-  typedef __enc_traits state_type;
   typedef wchar_t char_type;
   typedef __gnu_cxx::enc_filebuf<char_type> filebuf_type;
+  typedef filebuf_type::state_type state_type;
   typedef codecvt<char_type, char, state_type> enc_codecvt;
 
   bool test __attribute__((unused)) = true;
@@ -47,7 +46,6 @@ void test01()
   catch(...)
     {
     }
-#endif
 }
 
 int main()