re PR libstdc++/29095 (cxxabi.h __cxa_cdtor_type not declared when included from "C")

2006-10-09  Benjamin Kosnik  <bkoz@redhat.com>

	PR libstdc++/29095
	* libsupc++/cxxabi.h (__cxa_cdtor_type): Explicit "C" linkage.
	* config/cpu/arm/cxxabi_tweaks.h: Same.
	* config/cpu/generic/cxxabi_tweaks.h: Same.
	* testsuite/abi: Add.
	* testsuite/abi/header_cxxabi.cc: New.
	* testsuite/demangle: Move...
	* testsuite/abi/demangle: ...here.
	* testsuite/libstdc++-dg/conformance.exp: Adjust testsuite file
	calculation.
	* scripts/create_testsuite_files: Same.
	* testsuite/lib/libstdc++.exp (v3_target_compile_as_c): New.
	(libstdc++-dg-test): Use it.

From-SVN: r117589

33 files changed, 0 insertions, 1484 deletions

diff --git a/libstdc++-v3/testsuite/demangle/regression/3111-1.cc b/libstdc++-v3/testsuite/demangle/regression/3111-1.cc
deleted file mode 100644
index f21aed0..0000000
--- a/libstdc++-v3/testsuite/demangle/regression/3111-1.cc
+++ /dev/null
@@ -1,33 +0,0 @@
-// 2003-02-26 Benjamin Kosnik <bkoz@redhat.com>
-
-// Copyright (C) 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// USA.
-
-// IA 64 C++ ABI - 5.1 External Names (a.k.a. Mangling)
-
-#include <testsuite_hooks.h>
-
-// c++/3111
-int main()
-{
-  using namespace __gnu_test;
-
-  verify_demangle("_Z1fKPFiiE", "f(int (* const)(int))");
-
-  return 0;
-}
diff --git a/libstdc++-v3/testsuite/demangle/regression/3111-2.cc b/libstdc++-v3/testsuite/demangle/regression/3111-2.cc
deleted file mode 100644
index 725cc55..0000000
--- a/libstdc++-v3/testsuite/demangle/regression/3111-2.cc
+++ /dev/null
@@ -1,38 +0,0 @@
-// 2003-02-26  Carlo Wood  <carlo@alinoe.com>
-
-// Copyright (C) 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// USA.
-
-// IA 64 C++ ABI - 5.1 External Names (a.k.a. Mangling)
-
-#include <testsuite_hooks.h>
-
-// c++/3111
-int main()
-{
-  using namespace __gnu_test;
-
-  // cplus-dem FAIL
-  // icc FAIL
-  // verify_demangle("_Z1fAszL_ZZNK1N1A1fEvE3foo_0E_i", 
-  //       "f(int[sizeof(N::A::f() const::foo())])");
-  verify_demangle("_Z1fAszL_ZZNK1N1A1fEvE3foo_0E_i", 
-		  "f(int [sizeof (N::A::f() const::foo)])");
-
-  return 0;
-}
diff --git a/libstdc++-v3/testsuite/demangle/regression/7986-01.cc b/libstdc++-v3/testsuite/demangle/regression/7986-01.cc
deleted file mode 100644
index 67eeb67..0000000
--- a/libstdc++-v3/testsuite/demangle/regression/7986-01.cc
+++ /dev/null
@@ -1,33 +0,0 @@
-// 2003-02-26 Benjamin Kosnik <bkoz@redhat.com>
-
-// Copyright (C) 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// USA.
-
-// IA 64 C++ ABI - 5.1 External Names (a.k.a. Mangling)
-
-#include <testsuite_hooks.h>
-
-// libstdc++/7986
-int main()
-{
-  using namespace __gnu_test;
-  // cplus-dem FAIL
-  verify_demangle("_Z1fA37_iPS_", "f(int [37], int (*) [37])");
-
-  return 0;
-}
diff --git a/libstdc++-v3/testsuite/demangle/regression/7986-02.cc b/libstdc++-v3/testsuite/demangle/regression/7986-02.cc
deleted file mode 100644
index 4d9e3ad..0000000
--- a/libstdc++-v3/testsuite/demangle/regression/7986-02.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-// 2003-02-26 Benjamin Kosnik <bkoz@redhat.com>
-
-// Copyright (C) 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// USA.
-
-// IA 64 C++ ABI - 5.1 External Names (a.k.a. Mangling)
-
-#include <testsuite_hooks.h>
-
-// libstdc++/7986
-int main()
-{
-  using namespace __gnu_test;
-
-  // Equivalent, but formatting difference in void argument.
-  //  verify_demangle("_Z1fM1AFivEPS0_", "f(int (A::*)(void), int (*)(void))");
-  verify_demangle("_Z1fM1AFivEPS0_", "f(int (A::*)(), int (*)())");
-
-  return 0;
-}
diff --git a/libstdc++-v3/testsuite/demangle/regression/7986-03.cc b/libstdc++-v3/testsuite/demangle/regression/7986-03.cc
deleted file mode 100644
index c4da14d..0000000
--- a/libstdc++-v3/testsuite/demangle/regression/7986-03.cc
+++ /dev/null
@@ -1,34 +0,0 @@
-// 2003-02-26 Benjamin Kosnik <bkoz@redhat.com>
-
-// Copyright (C) 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// USA.
-
-// IA 64 C++ ABI - 5.1 External Names (a.k.a. Mangling)
-
-#include <testsuite_hooks.h>
-
-// libstdc++/7986
-int main()
-{
-  using namespace __gnu_test;
-
-  // cplus-dem FAIL
-  verify_demangle("_Z1fPFPA1_ivE", "f(int (*(*)()) [1])");
-
-  return 0;
-}
diff --git a/libstdc++-v3/testsuite/demangle/regression/7986-04.cc b/libstdc++-v3/testsuite/demangle/regression/7986-04.cc
deleted file mode 100644
index 4650794..0000000
--- a/libstdc++-v3/testsuite/demangle/regression/7986-04.cc
+++ /dev/null
@@ -1,34 +0,0 @@
-// 2003-02-26 Benjamin Kosnik <bkoz@redhat.com>
-
-// Copyright (C) 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// USA.
-
-// IA 64 C++ ABI - 5.1 External Names (a.k.a. Mangling)
-
-#include <testsuite_hooks.h>
-
-// libstdc++/7986
-int main()
-{
-  using namespace __gnu_test;
-
-  // cplus-dem FAIL
-  verify_demangle("_Z1fPKM1AFivE", "f(int (A::* const*)())");
-
-  return 0;
-}
diff --git a/libstdc++-v3/testsuite/demangle/regression/7986-05.cc b/libstdc++-v3/testsuite/demangle/regression/7986-05.cc
deleted file mode 100644
index 4ca3eb4..0000000
--- a/libstdc++-v3/testsuite/demangle/regression/7986-05.cc
+++ /dev/null
@@ -1,34 +0,0 @@
-// 2003-02-26 Benjamin Kosnik <bkoz@redhat.com>
-
-// Copyright (C) 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// USA.
-
-// IA 64 C++ ABI - 5.1 External Names (a.k.a. Mangling)
-
-#include <testsuite_hooks.h>
-
-// libstdc++/7986
-int main()
-{
-  using namespace __gnu_test;
-
-  // cplus-dem FAIL  
-  verify_demangle("_Z1jM1AFivEPS1_", "j(int (A::*)(), int (A::**)())");
-
-  return 0;
-}
diff --git a/libstdc++-v3/testsuite/demangle/regression/7986-06.cc b/libstdc++-v3/testsuite/demangle/regression/7986-06.cc
deleted file mode 100644
index 04881eb..0000000
--- a/libstdc++-v3/testsuite/demangle/regression/7986-06.cc
+++ /dev/null
@@ -1,34 +0,0 @@
-// 2003-02-26 Benjamin Kosnik <bkoz@redhat.com>
-
-// Copyright (C) 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// USA.
-
-// IA 64 C++ ABI - 5.1 External Names (a.k.a. Mangling)
-
-#include <testsuite_hooks.h>
-
-// libstdc++/7986
-int main()
-{
-  using namespace __gnu_test;
-
-  // cplus-dem FAIL
-  verify_demangle("_Z1sPA37_iPS0_", "s(int (*) [37], int (**) [37])");
-
-  return 0;
-}
diff --git a/libstdc++-v3/testsuite/demangle/regression/7986-07.cc b/libstdc++-v3/testsuite/demangle/regression/7986-07.cc
deleted file mode 100644
index 45ebff7..0000000
--- a/libstdc++-v3/testsuite/demangle/regression/7986-07.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-// 2003-02-26 Benjamin Kosnik <bkoz@redhat.com>
-
-// Copyright (C) 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// USA.
-
-// IA 64 C++ ABI - 5.1 External Names (a.k.a. Mangling)
-
-#include <testsuite_hooks.h>
-
-// libstdc++/7986
-int main()
-{
-  using namespace __gnu_test;
-
- // cplus-dem FAIL
-  verify_demangle("_Z3fooA30_A_i", "foo(int [30][])");
-
-
-  return 0;
-}
diff --git a/libstdc++-v3/testsuite/demangle/regression/7986-08.cc b/libstdc++-v3/testsuite/demangle/regression/7986-08.cc
deleted file mode 100644
index 148add2d..0000000
--- a/libstdc++-v3/testsuite/demangle/regression/7986-08.cc
+++ /dev/null
@@ -1,34 +0,0 @@
-// 2003-02-26 Benjamin Kosnik <bkoz@redhat.com>
-
-// Copyright (C) 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// USA.
-
-// IA 64 C++ ABI - 5.1 External Names (a.k.a. Mangling)
-
-#include <testsuite_hooks.h>
-
-// libstdc++/7986
-int main()
-{
-  using namespace __gnu_test;
-
-  // cplus-dem FAIL
-  verify_demangle("_Z3kooPA28_A30_i", "koo(int (*) [28][30])");
-
-  return 0;
-}
diff --git a/libstdc++-v3/testsuite/demangle/regression/7986-09.cc b/libstdc++-v3/testsuite/demangle/regression/7986-09.cc
deleted file mode 100644
index 7ac3ac0..0000000
--- a/libstdc++-v3/testsuite/demangle/regression/7986-09.cc
+++ /dev/null
@@ -1,40 +0,0 @@
-// 2003-02-26 Benjamin Kosnik <bkoz@redhat.com>
-
-// Copyright (C) 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// USA.
-
-// IA 64 C++ ABI - 5.1 External Names (a.k.a. Mangling)
-
-#include <testsuite_hooks.h>
-
-// libstdc++/7986
-int main()
-{
-  using namespace __gnu_test;
-
- // cplus-dem FAIL
-  // Equivalent as considered order-insensitive?
-  // standard text, icc FAIL
-  //  verify_demangle("_ZlsRKU3fooU4bart1XS0_", 
-  //     "operator<<(X const foo bart&, X const foo bart)");
-  // new __cxa_demangle
-  verify_demangle("_ZlsRKU3fooU4bart1XS0_", 
-		  "operator<<(X bart foo const&, X bart)");
-
-  return 0;
-}
diff --git a/libstdc++-v3/testsuite/demangle/regression/7986-10.cc b/libstdc++-v3/testsuite/demangle/regression/7986-10.cc
deleted file mode 100644
index 592a9fd..0000000
--- a/libstdc++-v3/testsuite/demangle/regression/7986-10.cc
+++ /dev/null
@@ -1,34 +0,0 @@
-// 2003-02-26 Benjamin Kosnik <bkoz@redhat.com>
-
-// Copyright (C) 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// USA.
-
-// IA 64 C++ ABI - 5.1 External Names (a.k.a. Mangling)
-
-#include <testsuite_hooks.h>
-
-// libstdc++/7986
-int main()
-{
-  using namespace __gnu_test;
-
-  verify_demangle("_ZlsRKU3fooU4bart1XS2_", 
-		  "operator<<(X bart foo const&, X bart foo const)");
-
-  return 0;
-}
diff --git a/libstdc++-v3/testsuite/demangle/regression/7986-11.cc b/libstdc++-v3/testsuite/demangle/regression/7986-11.cc
deleted file mode 100644
index 34bc883..0000000
--- a/libstdc++-v3/testsuite/demangle/regression/7986-11.cc
+++ /dev/null
@@ -1,34 +0,0 @@
-// 2003-02-26 Benjamin Kosnik <bkoz@redhat.com>
-
-// Copyright (C) 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// USA.
-
-// IA 64 C++ ABI - 5.1 External Names (a.k.a. Mangling)
-
-#include <testsuite_hooks.h>
-
-// libstdc++/7986
-int main()
-{
-  using namespace __gnu_test;
-
-  // cplus-dem FAIL
-  verify_demangle("_Z1fM1AKFivE", "f(int (A::*)() const)");
-
-  return 0;
-}
diff --git a/libstdc++-v3/testsuite/demangle/regression/7986-12.cc b/libstdc++-v3/testsuite/demangle/regression/7986-12.cc
deleted file mode 100644
index 819a915..0000000
--- a/libstdc++-v3/testsuite/demangle/regression/7986-12.cc
+++ /dev/null
@@ -1,47 +0,0 @@
-// 2003-02-26 Benjamin Kosnik <bkoz@redhat.com>
-
-// Copyright (C) 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// USA.
-
-// IA 64 C++ ABI - 5.1 External Names (a.k.a. Mangling)
-
-#include <testsuite_hooks.h>
-
-// libstdc++/7986
-int main()
-{
-  using namespace __gnu_test;
-
-  // ICE on figmative float template parameters?
-  /*
-  demangle("_Z3absILd1c1f1496f8a44219EEvv", "void abs<3.14159e-173>()");
-  demangle("_Z3absILd40092acd9e83e426EEvv", "void abs<3.1459>()");
-  demangl("_Z3absILe08042191a6cc56a2fe117becEEvv", "void abs<1.234e-2345l>()");
-  demangle("_Z3absILf4016147bEEvv", "void abs<2.345f>()");
-  demangle("_Z3absILfc1800000EEvv", " void abs<-16f>()");
-  demangle("_Z3absILe804bfff8000000000000000EEvv", "void abs<-1l>()");
-  */
-
-  // template<int D> void abs(void) { };
-  // template void abs<11>(void);
-  // Equivalent, but formatting difference in void argument.
-  // verify_demangle("_Z3absILi11EEvv", "void abs<(int)11>()");
-  verify_demangle("_Z3absILi11EEvv", "void abs<11>()");
-
-  return 0;
-}
diff --git a/libstdc++-v3/testsuite/demangle/regression/7986.cc b/libstdc++-v3/testsuite/demangle/regression/7986.cc
deleted file mode 100644
index 7cea896..0000000
--- a/libstdc++-v3/testsuite/demangle/regression/7986.cc
+++ /dev/null
@@ -1,32 +0,0 @@
-// 2003-02-26  Carlo Wood  <carlo@alinoe.com>
-
-// Copyright (C) 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// USA.
-
-// IA 64 C++ ABI - 5.1 External Names (a.k.a. Mangling)
-
-#include <testsuite_hooks.h>
-
-// libcwd tests
-int main()
-{
-  using namespace __gnu_test;
-
-
-  return 0;
-}
diff --git a/libstdc++-v3/testsuite/demangle/regression/8897.cc b/libstdc++-v3/testsuite/demangle/regression/8897.cc
deleted file mode 100644
index 1a7e545..0000000
--- a/libstdc++-v3/testsuite/demangle/regression/8897.cc
+++ /dev/null
@@ -1,61 +0,0 @@
-// 2003-02-26  Martin v. Loewis  <martin@v.loewis.de>
-
-// Copyright (C) 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// USA.
-
-// IA 64 C++ ABI - 5.1 External Names (a.k.a. Mangling)
-
-#include <testsuite_hooks.h>
-
-// c++/8897
-int main()
-{
-  using namespace __gnu_test;
-
-  /*
-    template<typename T1>
-      struct A 
-      {
-        template<typename T2>
-	  operator T2();
-      };
-    
-    A<float> a;
-    (int)a;		<-- that function.
-  */
-  /*  
-      Using "operator int()" is ambigious because that
-      could be either:
-    
-      operator int();
-      
-      or
-      
-      template<typename T>
-      operator T();      
-      with T = int.
-
-      - Carlo Wood
-  */
-  // cplus-dem FAIL  
-  // icc FAIL
-  // new __cxa_demangle FAIL
-  verify_demangle("_ZN1AIfEcvT_IiEEv", "A<float>::operator int<int>()");
-
-  return 0;
-}
diff --git a/libstdc++-v3/testsuite/demangle/regression/cw-01.cc b/libstdc++-v3/testsuite/demangle/regression/cw-01.cc
deleted file mode 100644
index 920c14d..0000000
--- a/libstdc++-v3/testsuite/demangle/regression/cw-01.cc
+++ /dev/null
@@ -1,54 +0,0 @@
-// 2003-02-26  Carlo Wood  <carlo@alinoe.com>
-
-// Copyright (C) 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// USA.
-
-// IA 64 C++ ABI - 5.1 External Names (a.k.a. Mangling)
-
-#include <testsuite_hooks.h>
-
-// libcwd tests
-int main()
-{
-  using namespace __gnu_test;
-
-  /*
-class libcw_app_ct {
-public:
-  void dummy(char const*) { }
-  template<typename T>
-    static void add_option(void (T::*)(char const*), char const*, char, 
-                           char const*, char const*);
-};
-
-template<typename T>
-  void libcw_app_ct::add_option(void (T::*)(char const*), char const*, char, 
-                                char const*, char const*)
-{ }
-
-void fn(void)
-{
-  // Instantiation.
-  libcw_app_ct::add_option(&libcw_app_ct::dummy, "", '\0', "", "");
-}
-*/
-verify_demangle("_ZN12libcw_app_ct10add_optionIS_EEvMT_FvPKcES3_cS3_S3_",
-       "void libcw_app_ct::add_option<libcw_app_ct>(void (libcw_app_ct::*)(char const*), char const*, char, char const*, char const*)");
-
-  return 0;
-}
diff --git a/libstdc++-v3/testsuite/demangle/regression/cw-02.cc b/libstdc++-v3/testsuite/demangle/regression/cw-02.cc
deleted file mode 100644
index b38c323..0000000
--- a/libstdc++-v3/testsuite/demangle/regression/cw-02.cc
+++ /dev/null
@@ -1,59 +0,0 @@
-// 2003-02-26  Carlo Wood  <carlo@alinoe.com>
-
-// Copyright (C) 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// USA.
-
-// IA 64 C++ ABI - 5.1 External Names (a.k.a. Mangling)
-
-#include <testsuite_hooks.h>
-
-// libcwd tests
-int main()
-{
-  using namespace __gnu_test;
-
-/*
-namespace libcw {
-  namespace debug {
-    class memblk_types_manipulator_data_ct { };
-  }
-  template<typename T>
-    class omanip_id_tct { };
-  namespace {
-    template<typename T>
-      class compiler_bug_workaround {
-      public:
-	static std::vector<int> ids;
-      };
-    template<typename T>
-      std::vector<int> compiler_bug_workaround<T>::ids;
-    typedef std::vector<libcw::omanip_id_tct<libcw::debug::memblk_types_manipulator_data_ct> > vector_t;
-    compiler_bug_workaround<vector_t> dummy;
-  }
-}
-
-void g(void)
-{
-  // Instantiation.
-  libcw::dummy.ids.size();
-}
-*/
-  verify_demangle("_ZGVN5libcw24_GLOBAL__N_cbll.cc0ZhUKa23compiler_bug_workaroundISt6vectorINS_13omanip_id_tctINS_5debug32memblk_types_manipulator_data_ctEEESaIS6_EEE3idsE", "guard variable for libcw::(anonymous namespace)::compiler_bug_workaround<std::vector<libcw::omanip_id_tct<libcw::debug::memblk_types_manipulator_data_ct>, std::allocator<libcw::omanip_id_tct<libcw::debug::memblk_types_manipulator_data_ct> > > >::ids");
-
-  return 0;
-}
diff --git a/libstdc++-v3/testsuite/demangle/regression/cw-03.cc b/libstdc++-v3/testsuite/demangle/regression/cw-03.cc
deleted file mode 100644
index 710dea6..0000000
--- a/libstdc++-v3/testsuite/demangle/regression/cw-03.cc
+++ /dev/null
@@ -1,54 +0,0 @@
-// 2003-02-26  Carlo Wood  <carlo@alinoe.com>
-
-// Copyright (C) 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// USA.
-
-// IA 64 C++ ABI - 5.1 External Names (a.k.a. Mangling)
-
-#include <testsuite_hooks.h>
-
-// libcwd tests
-int main()
-{
-  using namespace __gnu_test;
-
-/*
-namespace libcw {
-  namespace _private_ {
-    class GlobalObject { public: void dummy(std::ostream&) const; };
-  }
-  namespace debug {
-    template<typename T>
-      class cwprint_using_tct { };
-    template<typename T>
-      cwprint_using_tct<T> cwprint_using(T const&, void (T::*)(std::ostream&) const);
-  }
-}
-
-void h(void)
-{
-  // Instantiation.
-  libcw::_private_::GlobalObject dummy;
-  (void)libcw::debug::cwprint_using(dummy, &libcw::_private_::GlobalObject::dummy);
-}
-*/
-  // cplus-dem CORE
-  verify_demangle("_ZN5libcw5debug13cwprint_usingINS_9_private_12GlobalObjectEEENS0_17cwprint_using_tctIT_EERKS5_MS5_KFvRSt7ostreamE", "libcw::debug::cwprint_using_tct<libcw::_private_::GlobalObject> libcw::debug::cwprint_using<libcw::_private_::GlobalObject>(libcw::_private_::GlobalObject const&, void (libcw::_private_::GlobalObject::*)(std::ostream&) const)");
-
-  return 0;
-}
diff --git a/libstdc++-v3/testsuite/demangle/regression/cw-04.cc b/libstdc++-v3/testsuite/demangle/regression/cw-04.cc
deleted file mode 100644
index 8a524f3..0000000
--- a/libstdc++-v3/testsuite/demangle/regression/cw-04.cc
+++ /dev/null
@@ -1,45 +0,0 @@
-// 2003-02-26  Carlo Wood  <carlo@alinoe.com>
-
-// Copyright (C) 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// USA.
-
-// IA 64 C++ ABI - 5.1 External Names (a.k.a. Mangling)
-
-#include <testsuite_hooks.h>
-
-// libcwd tests
-int main()
-{
-  using namespace __gnu_test;
-
-
-/*
-class timer_event_request_base_ct { };
-struct timer_greater { };
-
-void i(void)
-{
-  // Instantiation.
-  std::priority_queue<timer_event_request_base_ct*, std::deque<timer_event_request_base_ct*>, timer_greater> dummy;
-  dummy.top();
-}
-*/
-  verify_demangle("_ZNKSt14priority_queueIP27timer_event_request_base_ctSt5dequeIS1_SaIS1_EE13timer_greaterE3topEv", "std::priority_queue<timer_event_request_base_ct*, std::deque<timer_event_request_base_ct*, std::allocator<timer_event_request_base_ct*> >, timer_greater>::top() const");
-
-  return 0;
-}
diff --git a/libstdc++-v3/testsuite/demangle/regression/cw-05.cc b/libstdc++-v3/testsuite/demangle/regression/cw-05.cc
deleted file mode 100644
index 2b77685..0000000
--- a/libstdc++-v3/testsuite/demangle/regression/cw-05.cc
+++ /dev/null
@@ -1,51 +0,0 @@
-// 2003-02-26  Carlo Wood  <carlo@alinoe.com>
-
-// Copyright (C) 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// USA.
-
-// IA 64 C++ ABI - 5.1 External Names (a.k.a. Mangling)
-
-#include <testsuite_hooks.h>
-
-// libcwd tests
-int main()
-{
-  using namespace __gnu_test;
-
-/*
-struct memory_block_st { };
-namespace std {
-  template<typename T, typename R = T const&, typename P = T const*>
-    class _Deque_iterator {
-    public:
-      void operator==(_Deque_iterator const&) const { }
-    };
-}
-
-void j(void)
-{
-  // Instantiation.
-  std::_Deque_iterator<memory_block_st*> dummy;
-  dummy.operator==(dummy);
-}
-*/
-  verify_demangle("_ZNKSt15_Deque_iteratorIP15memory_block_stRKS1_PS2_EeqERKS5_",
-       "std::_Deque_iterator<memory_block_st*, memory_block_st* const&, memory_block_st* const*>::operator==(std::_Deque_iterator<memory_block_st*, memory_block_st* const&, memory_block_st* const*> const&) const");
-
-  return 0;
-}
diff --git a/libstdc++-v3/testsuite/demangle/regression/cw-06.cc b/libstdc++-v3/testsuite/demangle/regression/cw-06.cc
deleted file mode 100644
index a131d4c..0000000
--- a/libstdc++-v3/testsuite/demangle/regression/cw-06.cc
+++ /dev/null
@@ -1,51 +0,0 @@
-// 2003-02-26  Carlo Wood  <carlo@alinoe.com>
-
-// Copyright (C) 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// USA.
-
-// IA 64 C++ ABI - 5.1 External Names (a.k.a. Mangling)
-
-#include <testsuite_hooks.h>
-
-// libcwd tests
-int main()
-{
-  using namespace __gnu_test;
-
-/*
-struct option { };
-namespace std {
-  template<typename T1, typename T2>
-    class __normal_iterator {
-    public:
-      void operator-(__normal_iterator const&) const { }
-    };
-}
-
-void k(void)
-{
-  // Instantiation.
-  std::__normal_iterator<option const*, std::vector<option> > dummy;
-  dummy.operator-(dummy);
-}
-*/
-  verify_demangle("_ZNKSt17__normal_iteratorIPK6optionSt6vectorIS0_SaIS0_EEEmiERKS6_",
-       "std::__normal_iterator<option const*, std::vector<option, std::allocator<option> > >::operator-(std::__normal_iterator<option const*, std::vector<option, std::allocator<option> > > const&) const");
-
-  return 0;
-}
diff --git a/libstdc++-v3/testsuite/demangle/regression/cw-07.cc b/libstdc++-v3/testsuite/demangle/regression/cw-07.cc
deleted file mode 100644
index da278ac..0000000
--- a/libstdc++-v3/testsuite/demangle/regression/cw-07.cc
+++ /dev/null
@@ -1,62 +0,0 @@
-// 2003-02-26  Carlo Wood  <carlo@alinoe.com>
-
-// Copyright (C) 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// USA.
-
-// IA 64 C++ ABI - 5.1 External Names (a.k.a. Mangling)
-
-#include <testsuite_hooks.h>
-
-// libcwd tests
-int main()
-{
-  using namespace __gnu_test;
-
-
-/*
-
-namespace libcw {
-  namespace debug {
-    class no_alloc_checking_allocator { };
-  }
-}
-namespace std {
-  template<typename T>
-    class char_traits { };
-  template<typename T, class _Traits, class _Alloc>
-    class basic_string {
-    public:
-      template<typename T2>
-	char* _S_construct(T2, T2, _Alloc const&) { return (char*)0; }
-    };
-}
-
-void l(void)
-{
-  // Instantiation.
-  std::basic_string<char, std::char_traits<char>, 
-                    libcw::debug::no_alloc_checking_allocator> dummy;
-  char* cp;
-  libcw::debug::no_alloc_checking_allocator alloc;
-  dummy._S_construct(cp, cp, alloc);
-}
-*/
-  verify_demangle("_ZNSbIcSt11char_traitsIcEN5libcw5debug27no_alloc_checking_allocatorEE12_S_constructIPcEES6_T_S7_RKS3_", "char* std::basic_string<char, std::char_traits<char>, libcw::debug::no_alloc_checking_allocator>::_S_construct<char*>(char*, char*, libcw::debug::no_alloc_checking_allocator const&)");
-
-  return 0;
-}
diff --git a/libstdc++-v3/testsuite/demangle/regression/cw-08.cc b/libstdc++-v3/testsuite/demangle/regression/cw-08.cc
deleted file mode 100644
index 01a29c0..0000000
--- a/libstdc++-v3/testsuite/demangle/regression/cw-08.cc
+++ /dev/null
@@ -1,54 +0,0 @@
-// 2003-02-26  Carlo Wood  <carlo@alinoe.com>
-
-// Copyright (C) 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// USA.
-
-// IA 64 C++ ABI - 5.1 External Names (a.k.a. Mangling)
-
-#include <testsuite_hooks.h>
-
-// libcwd tests
-int main()
-{
-  using namespace __gnu_test;
-
-/*
-class A { };
-typedef A const* a4_t[4];
-typedef a4_t* ap4_t;
-class C {
-public:
-  ap4_t c;
-};
-template<typename T1, typename T2, typename T3>
-  void f(T1, T2, T3, ap4_t, ap4_t (C::*)) { }
-
-void m(void)
-{
-  // Instantiation.
-  A a;
-  a4_t a4;
-  f(a, &a, static_cast<A const*>(&a), &a4, &C::c);
-}
-*/
-  // Equivalent, spacing differences with icc.
-  // cplus-dem FAIL
-  verify_demangle("_Z1fI1APS0_PKS0_EvT_T0_T1_PA4_S3_M1CS8_", "void f<A, A*, A const*>(A, A*, A const*, A const* (*) [4], A const* (* C::*) [4])");
-
-  return 0;
-}
diff --git a/libstdc++-v3/testsuite/demangle/regression/cw-09.cc b/libstdc++-v3/testsuite/demangle/regression/cw-09.cc
deleted file mode 100644
index 2e48a63..0000000
--- a/libstdc++-v3/testsuite/demangle/regression/cw-09.cc
+++ /dev/null
@@ -1,62 +0,0 @@
-// 2003-02-26  Carlo Wood  <carlo@alinoe.com>
-
-// Copyright (C) 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// USA.
-
-// IA 64 C++ ABI - 5.1 External Names (a.k.a. Mangling)
-
-#include <testsuite_hooks.h>
-
-// libcwd tests
-int main()
-{
-  using namespace __gnu_test;
-
-
-/*
-
-void foo(int, int*, int**, int***, int****, int*****, int******, int*******, int********, int*********, int**********, int***********, int************, int*************, int**************, int***************)
-{
-}
-
-void n(void)
-{
-  int i0;
-  int* i1;
-  int** i2;
-  int*** i3;
-  int**** i4;
-  int***** i5;
-  int****** i6;
-  int******* i7;
-  int******** i8;
-  int********* i9;
-  int********** i10;
-  int*********** i11;
-  int************ i12;
-  int************* i13;
-  int************** i14;
-  int*************** i15;
-  foo(i0, i1, i2, i3, i4, i5, i6, i7, i8, i9, i10, i11, i12, i13, i14, i15);
-}
-*/
-  // cplus-dem FAIL  
-   verify_demangle("_Z3fooiPiPS_PS0_PS1_PS2_PS3_PS4_PS5_PS6_PS7_PS8_PS9_PSA_PSB_PSC_", "foo(int, int*, int**, int***, int****, int*****, int******, int*******, int********, int*********, int**********, int***********, int************, int*************, int**************, int***************)");
-
-  return 0;
-}
diff --git a/libstdc++-v3/testsuite/demangle/regression/cw-10.cc b/libstdc++-v3/testsuite/demangle/regression/cw-10.cc
deleted file mode 100644
index 61fe7c9..0000000
--- a/libstdc++-v3/testsuite/demangle/regression/cw-10.cc
+++ /dev/null
@@ -1,52 +0,0 @@
-// 2003-02-26  Carlo Wood  <carlo@alinoe.com>
-
-// Copyright (C) 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// USA.
-
-// IA 64 C++ ABI - 5.1 External Names (a.k.a. Mangling)
-
-#include <testsuite_hooks.h>
-
-// libcwd tests
-int main()
-{
-  using namespace __gnu_test;
-
-
-/*
-
-namespace std {
-  template<typename T1, typename T2, typename T3>
-    class D { };
-  D<A*, A*&, A**> d;
-  template<typename T1, typename T2, typename T3>
-    D<T3, T3&, T3*> B(T1, T1, T2, T3*) { return d; }
-}
-
-void o(void)
-{
-  std::D<A*, A* const&, A* const*> dummy1;
-  std::D<A*, A*&, A**> dummy2;
-  A* dummy3;
-  std::B(dummy1, dummy1, dummy2, &dummy3);
-}
-*/
-
-    verify_demangle("_ZSt1BISt1DIP1ARKS2_PS3_ES0_IS2_RS2_PS2_ES2_ET0_T_SB_SA_PT1_", "std::D<A*, A*&, A**> std::B<std::D<A*, A* const&, A* const*>, std::D<A*, A*&, A**>, A*>(std::D<A*, A* const&, A* const*>, std::D<A*, A* const&, A* const*>, std::D<A*, A*&, A**>, A**)");
-    return 0;
-}
diff --git a/libstdc++-v3/testsuite/demangle/regression/cw-11.cc b/libstdc++-v3/testsuite/demangle/regression/cw-11.cc
deleted file mode 100644
index fbb869e..0000000
--- a/libstdc++-v3/testsuite/demangle/regression/cw-11.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-// 2003-02-26  Carlo Wood  <carlo@alinoe.com>
-
-// Copyright (C) 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// USA.
-
-// IA 64 C++ ABI - 5.1 External Names (a.k.a. Mangling)
-
-#include <testsuite_hooks.h>
-
-// libcwd tests
-int main()
-{
-  using namespace __gnu_test;
-
-  // cplus-dem CORE
-  verify_demangle("_X11TransParseAddress",
-		  "error code = -2: invalid mangled name");
-
-  return 0;
-}
diff --git a/libstdc++-v3/testsuite/demangle/regression/cw-12.cc b/libstdc++-v3/testsuite/demangle/regression/cw-12.cc
deleted file mode 100644
index 8466715..0000000
--- a/libstdc++-v3/testsuite/demangle/regression/cw-12.cc
+++ /dev/null
@@ -1,88 +0,0 @@
-// 2003-02-26  Carlo Wood  <carlo@alinoe.com>
-
-// Copyright (C) 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// USA.
-
-// IA 64 C++ ABI - 5.1 External Names (a.k.a. Mangling)
-
-#include <testsuite_hooks.h>
-
-// libcwd tests
-int main()
-{
-  using namespace __gnu_test;
-
-/*
-namespace std {
-  template<bool b, int i>
-    class __default_alloc_template { };
-
-  template<typename CHAR>
-    class string_char_traits { };
-
-  template<class BASIC_STRING, class ADAPTOR>
-    struct _Alloc_traits {
-      static char _S_instanceless;
-    };
-  template<class BASIC_STRING, class ADAPTOR>
-    char _Alloc_traits<BASIC_STRING, ADAPTOR>::_S_instanceless;
-}
-namespace libcw {
-  namespace debug {
-    namespace _private_ {
-      template<typename CHAR, class ALLOCATOR, bool b>
-	class allocator_adaptor { };
-    }
-  }
-}
-
-char x;
-void q(void)
-{
-  std::_Alloc_traits<
-    std::basic_string<
-      char,
-      std::string_char_traits<char>,
-      libcw::debug::_private_::allocator_adaptor<
-	char,
-        std::__default_alloc_template<false, 327664>,
-	true
-      >
-    >,
-    libcw::debug::_private_::allocator_adaptor<
-      std::basic_string<
-	char,
-        std::string_char_traits<char>,
-	libcw::debug::_private_::allocator_adaptor<
-	  char,
-	  std::__default_alloc_template<false, 327664>,
-	  true
-	>
-      >,
-      std::__default_alloc_template<false, 327664>,
-      true
-    >
-  > dummy1;
-  x = dummy1._S_instanceless;
-}
-*/
-    // cplus-dem FAIL 
-    verify_demangle("_ZNSt13_Alloc_traitsISbIcSt18string_char_traitsIcEN5libcw5debug9_private_17allocator_adaptorIcSt24__default_alloc_templateILb0ELi327664EELb1EEEENS5_IS9_S7_Lb1EEEE15_S_instancelessE","std::_Alloc_traits<std::basic_string<char, std::string_char_traits<char>, libcw::debug::_private_::allocator_adaptor<char, std::__default_alloc_template<false, 327664>, true> >, libcw::debug::_private_::allocator_adaptor<std::basic_string<char, std::string_char_traits<char>, libcw::debug::_private_::allocator_adaptor<char, std::__default_alloc_template<false, 327664>, true> >, std::__default_alloc_template<false, 327664>, true> >::_S_instanceless");
-
-  return 0;
-}
diff --git a/libstdc++-v3/testsuite/demangle/regression/cw-13.cc b/libstdc++-v3/testsuite/demangle/regression/cw-13.cc
deleted file mode 100644
index ae621f0..0000000
--- a/libstdc++-v3/testsuite/demangle/regression/cw-13.cc
+++ /dev/null
@@ -1,34 +0,0 @@
-// 2003-02-26  Carlo Wood  <carlo@alinoe.com>
-
-// Copyright (C) 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// USA.
-
-// IA 64 C++ ABI - 5.1 External Names (a.k.a. Mangling)
-
-#include <testsuite_hooks.h>
-
-// libcwd tests
-int main()
-{
-  using namespace __gnu_test;
-
-  // cplus-dem CORE
-  verify_demangle("_GLOBAL__I__Z2fnv", "global constructors keyed to _Z2fnv");
-
-  return 0;
-}
diff --git a/libstdc++-v3/testsuite/demangle/regression/cw-14.cc b/libstdc++-v3/testsuite/demangle/regression/cw-14.cc
deleted file mode 100644
index aa250f0..0000000
--- a/libstdc++-v3/testsuite/demangle/regression/cw-14.cc
+++ /dev/null
@@ -1,72 +0,0 @@
-// 2003-02-26  Carlo Wood  <carlo@alinoe.com>
-
-// Copyright (C) 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// USA.
-
-// IA 64 C++ ABI - 5.1 External Names (a.k.a. Mangling)
-
-#include <testsuite_hooks.h>
-
-// libcwd tests
-int main()
-{
-  using namespace __gnu_test;
-
-/*
-struct G {
-  int m(void) const { return 0; }
-  int n(void) { return 0; }
-};
-
-struct H {
-  int m(void) const { return 0; }
-  int n(void) { return 0; }
-};
-
-template<typename T>
-  class what
-  {
-  };
-
-template<typename T>
-  class what2
-  {
-  };
-
-void r(int (G::*)(void),
-       int (G::*)(void) const,
-       G, // S_ 
-       int (H::*)(void), // M1HS0_
-       int (G::*)(void), // S1_
-       what<G const>, // what<S2_>
-  what2<G const>, // what2<S8_>
-    int (G::*)(void) const // S3_ 
-{
-  G g;
-  what<G const> y;
-  what2<G const> y2;
-  r(&G::n, &G::m, g, &H::n, &G::n, y, y2, &G::m);
-}
-*/
-
-  // cplus-dem CORE
-verify_demangle("_Z1rM1GFivEMS_KFivES_M1HFivES1_4whatIKS_E5what2IS8_ES3_",
-		"r(int (G::*)(), int (G::*)() const, G, int (H::*)(), int (G::*)(), what<G const>, what2<G const>, int (G::*)() const)");
-
-  return 0;
-}
diff --git a/libstdc++-v3/testsuite/demangle/regression/cw-15.cc b/libstdc++-v3/testsuite/demangle/regression/cw-15.cc
deleted file mode 100644
index cca8e96..0000000
--- a/libstdc++-v3/testsuite/demangle/regression/cw-15.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-// 2003-10-14  Carlo Wood  <carlo@alinoe.com>
-
-// Copyright (C) 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// USA.
-
-// IA 64 C++ ABI - 5.1 External Names (a.k.a. Mangling)
-
-#include <testsuite_hooks.h>
-
-// libcwd tests
-int main()
-{
-  using namespace __gnu_test;
-
-  // cplus-dem CORE
-verify_demangle("_Z1xINiEE",
-		"error code = -2: invalid mangled name");
-
-  return 0;
-}
diff --git a/libstdc++-v3/testsuite/demangle/regression/cw-16.cc b/libstdc++-v3/testsuite/demangle/regression/cw-16.cc
deleted file mode 100644
index 0c8c29f..0000000
--- a/libstdc++-v3/testsuite/demangle/regression/cw-16.cc
+++ /dev/null
@@ -1,53 +0,0 @@
-// 2003-11-07  Carlo Wood  <carlo@alinoe.com>
-
-// Copyright (C) 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// USA.
-
-// IA 64 C++ ABI - 5.1 External Names (a.k.a. Mangling)
-
-#include <testsuite_hooks.h>
-
-// Torturing by Carlo Wood.
-int main()
-{
-  using namespace __gnu_test;
-
-// 2003/11/07, libstdc++/12736
-verify_demangle("_Z3fooIA6_KiEvA9_KT_rVPrS4_",
-		"void foo<int const [6]>(int const [9][6], int restrict const (* volatile restrict) [9][6])");
-// 2003/11/12, libstdc++/12947
-verify_demangle("_Z1fILi5E1AEvN1CIXqugtT_Li0ELi1ELi2EEE1qE",
-                "void f<5, A>(C<(((5) > (0))) ? (1) : (2)>::q)");
-verify_demangle("_Z1fILi5EEvN1AIXcvimlT_Li22EEE1qE",
-                "void f<5>(A<(int)((5) * (22))>::q)");
-verify_demangle("_Z1fPFYPFiiEiE",
-                "f(int (*(*)(int))(int))");
-verify_demangle("_Z1fI1XENT_1tES2_",
-                "X::t f<X>(X::t)");
-verify_demangle("_Z1fILi5E1AEvN1CIXstN1T1tEEXszsrS2_1tEE1qE",
-                "void f<5, A>(C<sizeof (T::t), sizeof (T::t)>::q)");
-// 2003/12/03, libstdc++/13045
-verify_demangle("_Z1fILi1ELc120EEv1AIXplT_cviLd4028ae147ae147aeEEE",
-                "void f<1, (char)120>(A<(1) + ((int)((double)[4028ae147ae147ae]))>)");
-verify_demangle("_Z1fILi1ELc120EEv1AIXplT_cviLf3f800000EEE",
-                "void f<1, (char)120>(A<(1) + ((int)((float)[3f800000]))>)");
-verify_demangle("_Z9hairyfuncM1YKFPVPFrPA2_PM1XKFKPA3_ilEPcEiE",
-                "hairyfunc(int (* const (X::** (* restrict (* volatile* (Y::*)(int) const)(char*)) [2])(long) const) [3])");
-
-  return 0;
-}
diff --git a/libstdc++-v3/testsuite/demangle/regression/old.cc b/libstdc++-v3/testsuite/demangle/regression/old.cc
deleted file mode 100644
index 736ede7..0000000
--- a/libstdc++-v3/testsuite/demangle/regression/old.cc
+++ /dev/null
@@ -1,31 +0,0 @@
-// 2003-02-26 Benjamin Kosnik <bkoz@redhat.com>
-
-// Copyright (C) 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-// USA.
-
-// IA 64 C++ ABI - 5.1 External Names (a.k.a. Mangling)
-
-#include <testsuite_hooks.h>
-
-// old libiberty tests for gnu-v3
-int main()
-{
-  using namespace __gnu_test;
-  verify_demangle("St9bad_alloc", "std::bad_alloc");
-  return 0;
-}