79 files changed, 13 insertions, 4 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 865793576ac..c32a6a5863c 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2003-08-22  Michael Chastain  <mec@shout.net>
+
+	* gdb.cp: New directory.
+	* gdb.cp/*: Copy from gdb.c++/*.
+	* gdb.c++/*: Remove.
+	* Makefile.in: Change gdb.c++ to gdb.cp.
+	* configure.in:  Ditto.
+	* configure: Regnerate.
+
 2003-08-18  Mark Kettenis  <kettenis@gnu.org>
 
 	* gdb.arch/i386-prologue.exp: Add testcase for PR backtrace/1338.
diff --git a/gdb/testsuite/Makefile.in b/gdb/testsuite/Makefile.in
index 898e6ed28b4..3f3b7ad2bb9 100644
--- a/gdb/testsuite/Makefile.in
+++ b/gdb/testsuite/Makefile.in
@@ -35,7 +35,7 @@ SHELL = @SHELL@
 EXEEXT = @EXEEXT@
 SUBDIRS = @subdirs@
 RPATH_ENVVAR = @RPATH_ENVVAR@
-ALL_SUBDIRS = gdb.arch gdb.asm gdb.base gdb.c++ gdb.disasm gdb.java gdb.mi \
+ALL_SUBDIRS = gdb.arch gdb.asm gdb.base gdb.cp gdb.disasm gdb.java gdb.mi \
 	gdb.objc gdb.threads gdb.trace $(SUBDIRS)
 
 EXPECT = `if [ -f $${rootme}/../../expect/expect ] ; then \
diff --git a/gdb/testsuite/configure b/gdb/testsuite/configure
index eb505fe52cd..f5cb0895a2b 100755
--- a/gdb/testsuite/configure
+++ b/gdb/testsuite/configure
@@ -1050,7 +1050,7 @@ done
 ac_given_srcdir=$srcdir
 
 trap 'rm -fr `echo "Makefile gdb.arch/Makefile gdb.asm/Makefile gdb.base/Makefile \
-  gdb.c++/Makefile gdb.disasm/Makefile gdb.java/Makefile gdb.mi/Makefile \
+  gdb.cp/Makefile gdb.disasm/Makefile gdb.java/Makefile gdb.mi/Makefile \
   gdb.objc/Makefile gdb.threads/Makefile gdb.trace/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
@@ -1144,7 +1144,7 @@ EOF
 cat >> $CONFIG_STATUS <<EOF
 
 CONFIG_FILES=\${CONFIG_FILES-"Makefile gdb.arch/Makefile gdb.asm/Makefile gdb.base/Makefile \
-  gdb.c++/Makefile gdb.disasm/Makefile gdb.java/Makefile gdb.mi/Makefile \
+  gdb.cp/Makefile gdb.disasm/Makefile gdb.java/Makefile gdb.mi/Makefile \
   gdb.objc/Makefile gdb.threads/Makefile gdb.trace/Makefile"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
diff --git a/gdb/testsuite/configure.in b/gdb/testsuite/configure.in
index 14300ec0944..c60cf576a4d 100644
--- a/gdb/testsuite/configure.in
+++ b/gdb/testsuite/configure.in
@@ -113,5 +113,5 @@ AC_EXEEXT
 
 AC_CONFIG_SUBDIRS($configdirs)
 AC_OUTPUT([Makefile gdb.arch/Makefile gdb.asm/Makefile gdb.base/Makefile \
-  gdb.c++/Makefile gdb.disasm/Makefile gdb.java/Makefile gdb.mi/Makefile \
+  gdb.cp/Makefile gdb.disasm/Makefile gdb.java/Makefile gdb.mi/Makefile \
   gdb.objc/Makefile gdb.threads/Makefile gdb.trace/Makefile])
diff --git a/gdb/testsuite/gdb.c++/Makefile.in b/gdb/testsuite/gdb.cp/Makefile.in
index 8f4a90e2bb2..8f4a90e2bb2 100644
--- a/gdb/testsuite/gdb.c++/Makefile.in
+++ b/gdb/testsuite/gdb.cp/Makefile.in
diff --git a/gdb/testsuite/gdb.c++/ambiguous.cc b/gdb/testsuite/gdb.cp/ambiguous.cc
index 6ee7bc18ea9..6ee7bc18ea9 100644
--- a/gdb/testsuite/gdb.c++/ambiguous.cc
+++ b/gdb/testsuite/gdb.cp/ambiguous.cc
diff --git a/gdb/testsuite/gdb.c++/ambiguous.exp b/gdb/testsuite/gdb.cp/ambiguous.exp
index 4224b2d79fd..4224b2d79fd 100644
--- a/gdb/testsuite/gdb.c++/ambiguous.exp
+++ b/gdb/testsuite/gdb.cp/ambiguous.exp
diff --git a/gdb/testsuite/gdb.c++/annota2.cc b/gdb/testsuite/gdb.cp/annota2.cc
index 234752e49af..234752e49af 100644
--- a/gdb/testsuite/gdb.c++/annota2.cc
+++ b/gdb/testsuite/gdb.cp/annota2.cc
diff --git a/gdb/testsuite/gdb.c++/annota2.exp b/gdb/testsuite/gdb.cp/annota2.exp
index 0446eb3b63f..0446eb3b63f 100644
--- a/gdb/testsuite/gdb.c++/annota2.exp
+++ b/gdb/testsuite/gdb.cp/annota2.exp
diff --git a/gdb/testsuite/gdb.c++/annota3.cc b/gdb/testsuite/gdb.cp/annota3.cc
index 234752e49af..234752e49af 100644
--- a/gdb/testsuite/gdb.c++/annota3.cc
+++ b/gdb/testsuite/gdb.cp/annota3.cc
diff --git a/gdb/testsuite/gdb.c++/annota3.exp b/gdb/testsuite/gdb.cp/annota3.exp
index 431ed4f07bc..431ed4f07bc 100644
--- a/gdb/testsuite/gdb.c++/annota3.exp
+++ b/gdb/testsuite/gdb.cp/annota3.exp
diff --git a/gdb/testsuite/gdb.c++/anon-union.cc b/gdb/testsuite/gdb.cp/anon-union.cc
index 0b3fd130aeb..0b3fd130aeb 100644
--- a/gdb/testsuite/gdb.c++/anon-union.cc
+++ b/gdb/testsuite/gdb.cp/anon-union.cc
diff --git a/gdb/testsuite/gdb.c++/anon-union.exp b/gdb/testsuite/gdb.cp/anon-union.exp
index 0d5c7777319..0d5c7777319 100644
--- a/gdb/testsuite/gdb.c++/anon-union.exp
+++ b/gdb/testsuite/gdb.cp/anon-union.exp
diff --git a/gdb/testsuite/gdb.c++/casts.cc b/gdb/testsuite/gdb.cp/casts.cc
index 831add94418..831add94418 100644
--- a/gdb/testsuite/gdb.c++/casts.cc
+++ b/gdb/testsuite/gdb.cp/casts.cc
diff --git a/gdb/testsuite/gdb.c++/casts.exp b/gdb/testsuite/gdb.cp/casts.exp
index 5b6cabe34fa..5b6cabe34fa 100644
--- a/gdb/testsuite/gdb.c++/casts.exp
+++ b/gdb/testsuite/gdb.cp/casts.exp
diff --git a/gdb/testsuite/gdb.c++/classes.exp b/gdb/testsuite/gdb.cp/classes.exp
index 3f398acc5ec..3f398acc5ec 100644
--- a/gdb/testsuite/gdb.c++/classes.exp
+++ b/gdb/testsuite/gdb.cp/classes.exp
diff --git a/gdb/testsuite/gdb.c++/cplusfuncs.cc b/gdb/testsuite/gdb.cp/cplusfuncs.cc
index 7f033d6d90c..7f033d6d90c 100644
--- a/gdb/testsuite/gdb.c++/cplusfuncs.cc
+++ b/gdb/testsuite/gdb.cp/cplusfuncs.cc
diff --git a/gdb/testsuite/gdb.c++/cplusfuncs.exp b/gdb/testsuite/gdb.cp/cplusfuncs.exp
index 0a5e1b3f0a1..0a5e1b3f0a1 100644
--- a/gdb/testsuite/gdb.c++/cplusfuncs.exp
+++ b/gdb/testsuite/gdb.cp/cplusfuncs.exp
diff --git a/gdb/testsuite/gdb.c++/ctti.exp b/gdb/testsuite/gdb.cp/ctti.exp
index 96e9fcff81a..96e9fcff81a 100644
--- a/gdb/testsuite/gdb.c++/ctti.exp
+++ b/gdb/testsuite/gdb.cp/ctti.exp
diff --git a/gdb/testsuite/gdb.c++/cttiadd.cc b/gdb/testsuite/gdb.cp/cttiadd.cc
index 1f50fae24c1..1f50fae24c1 100644
--- a/gdb/testsuite/gdb.c++/cttiadd.cc
+++ b/gdb/testsuite/gdb.cp/cttiadd.cc
diff --git a/gdb/testsuite/gdb.c++/cttiadd1.cc b/gdb/testsuite/gdb.cp/cttiadd1.cc
index 7113ecea421..7113ecea421 100644
--- a/gdb/testsuite/gdb.c++/cttiadd1.cc
+++ b/gdb/testsuite/gdb.cp/cttiadd1.cc
diff --git a/gdb/testsuite/gdb.c++/cttiadd2.cc b/gdb/testsuite/gdb.cp/cttiadd2.cc
index d0d9891fb2f..d0d9891fb2f 100644
--- a/gdb/testsuite/gdb.c++/cttiadd2.cc
+++ b/gdb/testsuite/gdb.cp/cttiadd2.cc
diff --git a/gdb/testsuite/gdb.c++/cttiadd3.cc b/gdb/testsuite/gdb.cp/cttiadd3.cc
index 7ba1b019f16..7ba1b019f16 100644
--- a/gdb/testsuite/gdb.c++/cttiadd3.cc
+++ b/gdb/testsuite/gdb.cp/cttiadd3.cc
diff --git a/gdb/testsuite/gdb.c++/demangle.exp b/gdb/testsuite/gdb.cp/demangle.exp
index 7bd9fc54d00..7bd9fc54d00 100644
--- a/gdb/testsuite/gdb.c++/demangle.exp
+++ b/gdb/testsuite/gdb.cp/demangle.exp
diff --git a/gdb/testsuite/gdb.c++/derivation.cc b/gdb/testsuite/gdb.cp/derivation.cc
index f6d42e7d1de..f6d42e7d1de 100644
--- a/gdb/testsuite/gdb.c++/derivation.cc
+++ b/gdb/testsuite/gdb.cp/derivation.cc
diff --git a/gdb/testsuite/gdb.c++/derivation.exp b/gdb/testsuite/gdb.cp/derivation.exp
index 38a46a2beaa..38a46a2beaa 100644
--- a/gdb/testsuite/gdb.c++/derivation.exp
+++ b/gdb/testsuite/gdb.cp/derivation.exp
diff --git a/gdb/testsuite/gdb.c++/hang.H b/gdb/testsuite/gdb.cp/hang.H
index 26fec8792ad..26fec8792ad 100644
--- a/gdb/testsuite/gdb.c++/hang.H
+++ b/gdb/testsuite/gdb.cp/hang.H
diff --git a/gdb/testsuite/gdb.c++/hang.exp b/gdb/testsuite/gdb.cp/hang.exp
index 4c117a10744..4c117a10744 100644
--- a/gdb/testsuite/gdb.c++/hang.exp
+++ b/gdb/testsuite/gdb.cp/hang.exp
diff --git a/gdb/testsuite/gdb.c++/hang1.C b/gdb/testsuite/gdb.cp/hang1.C
index 4b04d77e68c..4b04d77e68c 100644
--- a/gdb/testsuite/gdb.c++/hang1.C
+++ b/gdb/testsuite/gdb.cp/hang1.C
diff --git a/gdb/testsuite/gdb.c++/hang2.C b/gdb/testsuite/gdb.cp/hang2.C
index 59732f87d63..59732f87d63 100644
--- a/gdb/testsuite/gdb.c++/hang2.C
+++ b/gdb/testsuite/gdb.cp/hang2.C
diff --git a/gdb/testsuite/gdb.c++/hang3.C b/gdb/testsuite/gdb.cp/hang3.C
index 92c82fa2441..92c82fa2441 100644
--- a/gdb/testsuite/gdb.c++/hang3.C
+++ b/gdb/testsuite/gdb.cp/hang3.C
diff --git a/gdb/testsuite/gdb.c++/inherit.exp b/gdb/testsuite/gdb.cp/inherit.exp
index 993bfb159cb..993bfb159cb 100644
--- a/gdb/testsuite/gdb.c++/inherit.exp
+++ b/gdb/testsuite/gdb.cp/inherit.exp
diff --git a/gdb/testsuite/gdb.c++/local.cc b/gdb/testsuite/gdb.cp/local.cc
index 85fd6e14a87..85fd6e14a87 100644
--- a/gdb/testsuite/gdb.c++/local.cc
+++ b/gdb/testsuite/gdb.cp/local.cc
diff --git a/gdb/testsuite/gdb.c++/local.exp b/gdb/testsuite/gdb.cp/local.exp
index 21ceb7ae3db..21ceb7ae3db 100644
--- a/gdb/testsuite/gdb.c++/local.exp
+++ b/gdb/testsuite/gdb.cp/local.exp
diff --git a/gdb/testsuite/gdb.c++/m-data.cc b/gdb/testsuite/gdb.cp/m-data.cc
index c97e7195f77..c97e7195f77 100644
--- a/gdb/testsuite/gdb.c++/m-data.cc
+++ b/gdb/testsuite/gdb.cp/m-data.cc
diff --git a/gdb/testsuite/gdb.c++/m-data.exp b/gdb/testsuite/gdb.cp/m-data.exp
index 85adb5e5200..85adb5e5200 100644
--- a/gdb/testsuite/gdb.c++/m-data.exp
+++ b/gdb/testsuite/gdb.cp/m-data.exp
diff --git a/gdb/testsuite/gdb.c++/m-static.cc b/gdb/testsuite/gdb.cp/m-static.cc
index 6d08cb063ea..6d08cb063ea 100644
--- a/gdb/testsuite/gdb.c++/m-static.cc
+++ b/gdb/testsuite/gdb.cp/m-static.cc
diff --git a/gdb/testsuite/gdb.c++/m-static.exp b/gdb/testsuite/gdb.cp/m-static.exp
index d291135fb06..d291135fb06 100644
--- a/gdb/testsuite/gdb.c++/m-static.exp
+++ b/gdb/testsuite/gdb.cp/m-static.exp
diff --git a/gdb/testsuite/gdb.c++/m-static.h b/gdb/testsuite/gdb.cp/m-static.h
index 137d3b75c50..137d3b75c50 100644
--- a/gdb/testsuite/gdb.c++/m-static.h
+++ b/gdb/testsuite/gdb.cp/m-static.h
diff --git a/gdb/testsuite/gdb.c++/m-static1.cc b/gdb/testsuite/gdb.cp/m-static1.cc
index 302a5ada254..302a5ada254 100644
--- a/gdb/testsuite/gdb.c++/m-static1.cc
+++ b/gdb/testsuite/gdb.cp/m-static1.cc
diff --git a/gdb/testsuite/gdb.c++/maint.exp b/gdb/testsuite/gdb.cp/maint.exp
index 1042c913ceb..1042c913ceb 100644
--- a/gdb/testsuite/gdb.c++/maint.exp
+++ b/gdb/testsuite/gdb.cp/maint.exp
diff --git a/gdb/testsuite/gdb.c++/member-ptr.cc b/gdb/testsuite/gdb.cp/member-ptr.cc
index 4beb92616d4..4beb92616d4 100644
--- a/gdb/testsuite/gdb.c++/member-ptr.cc
+++ b/gdb/testsuite/gdb.cp/member-ptr.cc
diff --git a/gdb/testsuite/gdb.c++/member-ptr.exp b/gdb/testsuite/gdb.cp/member-ptr.exp
index f21cd1506e7..f21cd1506e7 100644
--- a/gdb/testsuite/gdb.c++/member-ptr.exp
+++ b/gdb/testsuite/gdb.cp/member-ptr.exp
diff --git a/gdb/testsuite/gdb.c++/method.cc b/gdb/testsuite/gdb.cp/method.cc
index 949b027a02e..949b027a02e 100644
--- a/gdb/testsuite/gdb.c++/method.cc
+++ b/gdb/testsuite/gdb.cp/method.cc
diff --git a/gdb/testsuite/gdb.c++/method.exp b/gdb/testsuite/gdb.cp/method.exp
index a085b14cdcc..a085b14cdcc 100644
--- a/gdb/testsuite/gdb.c++/method.exp
+++ b/gdb/testsuite/gdb.cp/method.exp
diff --git a/gdb/testsuite/gdb.c++/misc.cc b/gdb/testsuite/gdb.cp/misc.cc
index 286c02bc6df..286c02bc6df 100644
--- a/gdb/testsuite/gdb.c++/misc.cc
+++ b/gdb/testsuite/gdb.cp/misc.cc
diff --git a/gdb/testsuite/gdb.c++/misc.exp b/gdb/testsuite/gdb.cp/misc.exp
index a2d122fc69e..a2d122fc69e 100644
--- a/gdb/testsuite/gdb.c++/misc.exp
+++ b/gdb/testsuite/gdb.cp/misc.exp
diff --git a/gdb/testsuite/gdb.c++/namespace.cc b/gdb/testsuite/gdb.cp/namespace.cc
index 7b9a173d819..7b9a173d819 100644
--- a/gdb/testsuite/gdb.c++/namespace.cc
+++ b/gdb/testsuite/gdb.cp/namespace.cc
diff --git a/gdb/testsuite/gdb.c++/namespace.exp b/gdb/testsuite/gdb.cp/namespace.exp
index f4efaf64d23..f4efaf64d23 100644
--- a/gdb/testsuite/gdb.c++/namespace.exp
+++ b/gdb/testsuite/gdb.cp/namespace.exp
diff --git a/gdb/testsuite/gdb.c++/namespace1.cc b/gdb/testsuite/gdb.cp/namespace1.cc
index 4a5900a8b3d..4a5900a8b3d 100644
--- a/gdb/testsuite/gdb.c++/namespace1.cc
+++ b/gdb/testsuite/gdb.cp/namespace1.cc
diff --git a/gdb/testsuite/gdb.c++/overload.cc b/gdb/testsuite/gdb.cp/overload.cc
index 56afc96884e..56afc96884e 100644
--- a/gdb/testsuite/gdb.c++/overload.cc
+++ b/gdb/testsuite/gdb.cp/overload.cc
diff --git a/gdb/testsuite/gdb.c++/overload.exp b/gdb/testsuite/gdb.cp/overload.exp
index 3e14678e4c2..3e14678e4c2 100644
--- a/gdb/testsuite/gdb.c++/overload.exp
+++ b/gdb/testsuite/gdb.cp/overload.exp
diff --git a/gdb/testsuite/gdb.c++/ovldbreak.cc b/gdb/testsuite/gdb.cp/ovldbreak.cc
index 9a5b5cbf7c7..9a5b5cbf7c7 100644
--- a/gdb/testsuite/gdb.c++/ovldbreak.cc
+++ b/gdb/testsuite/gdb.cp/ovldbreak.cc
diff --git a/gdb/testsuite/gdb.c++/ovldbreak.exp b/gdb/testsuite/gdb.cp/ovldbreak.exp
index 043243d23ff..043243d23ff 100644
--- a/gdb/testsuite/gdb.c++/ovldbreak.exp
+++ b/gdb/testsuite/gdb.cp/ovldbreak.exp
diff --git a/gdb/testsuite/gdb.c++/pr-1023.cc b/gdb/testsuite/gdb.cp/pr-1023.cc
index 758308481dc..758308481dc 100644
--- a/gdb/testsuite/gdb.c++/pr-1023.cc
+++ b/gdb/testsuite/gdb.cp/pr-1023.cc
diff --git a/gdb/testsuite/gdb.c++/pr-1023.exp b/gdb/testsuite/gdb.cp/pr-1023.exp
index c8c98027471..c8c98027471 100644
--- a/gdb/testsuite/gdb.c++/pr-1023.exp
+++ b/gdb/testsuite/gdb.cp/pr-1023.exp
diff --git a/gdb/testsuite/gdb.c++/pr-1210.cc b/gdb/testsuite/gdb.cp/pr-1210.cc
index 5747e5da58d..5747e5da58d 100644
--- a/gdb/testsuite/gdb.c++/pr-1210.cc
+++ b/gdb/testsuite/gdb.cp/pr-1210.cc
diff --git a/gdb/testsuite/gdb.c++/pr-1210.exp b/gdb/testsuite/gdb.cp/pr-1210.exp
index 3ff850d121c..3ff850d121c 100644
--- a/gdb/testsuite/gdb.c++/pr-1210.exp
+++ b/gdb/testsuite/gdb.cp/pr-1210.exp
diff --git a/gdb/testsuite/gdb.c++/pr-574.cc b/gdb/testsuite/gdb.cp/pr-574.cc
index eb06b61b7ae..eb06b61b7ae 100644
--- a/gdb/testsuite/gdb.c++/pr-574.cc
+++ b/gdb/testsuite/gdb.cp/pr-574.cc
diff --git a/gdb/testsuite/gdb.c++/pr-574.exp b/gdb/testsuite/gdb.cp/pr-574.exp
index 5beacd10fee..5beacd10fee 100644
--- a/gdb/testsuite/gdb.c++/pr-574.exp
+++ b/gdb/testsuite/gdb.cp/pr-574.exp
diff --git a/gdb/testsuite/gdb.c++/printmethod.cc b/gdb/testsuite/gdb.cp/printmethod.cc
index d32e1b1d1c4..d32e1b1d1c4 100644
--- a/gdb/testsuite/gdb.c++/printmethod.cc
+++ b/gdb/testsuite/gdb.cp/printmethod.cc
diff --git a/gdb/testsuite/gdb.c++/printmethod.exp b/gdb/testsuite/gdb.cp/printmethod.exp
index a45393f34d9..a45393f34d9 100644
--- a/gdb/testsuite/gdb.c++/printmethod.exp
+++ b/gdb/testsuite/gdb.cp/printmethod.exp
diff --git a/gdb/testsuite/gdb.c++/psmang.exp b/gdb/testsuite/gdb.cp/psmang.exp
index 31dd34643f0..31dd34643f0 100644
--- a/gdb/testsuite/gdb.c++/psmang.exp
+++ b/gdb/testsuite/gdb.cp/psmang.exp
diff --git a/gdb/testsuite/gdb.c++/psmang1.cc b/gdb/testsuite/gdb.cp/psmang1.cc
index 19a9283bbb4..19a9283bbb4 100644
--- a/gdb/testsuite/gdb.c++/psmang1.cc
+++ b/gdb/testsuite/gdb.cp/psmang1.cc
diff --git a/gdb/testsuite/gdb.c++/psmang2.cc b/gdb/testsuite/gdb.cp/psmang2.cc
index b9b1bb55b15..b9b1bb55b15 100644
--- a/gdb/testsuite/gdb.c++/psmang2.cc
+++ b/gdb/testsuite/gdb.cp/psmang2.cc
diff --git a/gdb/testsuite/gdb.c++/ref-types.cc b/gdb/testsuite/gdb.cp/ref-types.cc
index 23cc51095e3..23cc51095e3 100644
--- a/gdb/testsuite/gdb.c++/ref-types.cc
+++ b/gdb/testsuite/gdb.cp/ref-types.cc
diff --git a/gdb/testsuite/gdb.c++/ref-types.exp b/gdb/testsuite/gdb.cp/ref-types.exp
index dd06f027111..dd06f027111 100644
--- a/gdb/testsuite/gdb.c++/ref-types.exp
+++ b/gdb/testsuite/gdb.cp/ref-types.exp
diff --git a/gdb/testsuite/gdb.c++/rtti.exp b/gdb/testsuite/gdb.cp/rtti.exp
index f99637a28a9..f99637a28a9 100644
--- a/gdb/testsuite/gdb.c++/rtti.exp
+++ b/gdb/testsuite/gdb.cp/rtti.exp
diff --git a/gdb/testsuite/gdb.c++/rtti.h b/gdb/testsuite/gdb.cp/rtti.h
index 879896d0dc8..879896d0dc8 100644
--- a/gdb/testsuite/gdb.c++/rtti.h
+++ b/gdb/testsuite/gdb.cp/rtti.h
diff --git a/gdb/testsuite/gdb.c++/rtti1.cc b/gdb/testsuite/gdb.cp/rtti1.cc
index 6e9d862bb13..6e9d862bb13 100644
--- a/gdb/testsuite/gdb.c++/rtti1.cc
+++ b/gdb/testsuite/gdb.cp/rtti1.cc
diff --git a/gdb/testsuite/gdb.c++/rtti2.cc b/gdb/testsuite/gdb.cp/rtti2.cc
index 8bb1ed6c99f..8bb1ed6c99f 100644
--- a/gdb/testsuite/gdb.c++/rtti2.cc
+++ b/gdb/testsuite/gdb.cp/rtti2.cc
diff --git a/gdb/testsuite/gdb.c++/templates.cc b/gdb/testsuite/gdb.cp/templates.cc
index c13f18b643f..c13f18b643f 100644
--- a/gdb/testsuite/gdb.c++/templates.cc
+++ b/gdb/testsuite/gdb.cp/templates.cc
diff --git a/gdb/testsuite/gdb.c++/templates.exp b/gdb/testsuite/gdb.cp/templates.exp
index 0ae878865fe..0ae878865fe 100644
--- a/gdb/testsuite/gdb.c++/templates.exp
+++ b/gdb/testsuite/gdb.cp/templates.exp
diff --git a/gdb/testsuite/gdb.c++/try_catch.cc b/gdb/testsuite/gdb.cp/try_catch.cc
index e13dd641b49..e13dd641b49 100644
--- a/gdb/testsuite/gdb.c++/try_catch.cc
+++ b/gdb/testsuite/gdb.cp/try_catch.cc
diff --git a/gdb/testsuite/gdb.c++/try_catch.exp b/gdb/testsuite/gdb.cp/try_catch.exp
index 1473e20c5f1..1473e20c5f1 100644
--- a/gdb/testsuite/gdb.c++/try_catch.exp
+++ b/gdb/testsuite/gdb.cp/try_catch.exp
diff --git a/gdb/testsuite/gdb.c++/userdef.cc b/gdb/testsuite/gdb.cp/userdef.cc
index 0bb88a2d166..0bb88a2d166 100644
--- a/gdb/testsuite/gdb.c++/userdef.cc
+++ b/gdb/testsuite/gdb.cp/userdef.cc
diff --git a/gdb/testsuite/gdb.c++/userdef.exp b/gdb/testsuite/gdb.cp/userdef.exp
index 4575249ce5a..4575249ce5a 100644
--- a/gdb/testsuite/gdb.c++/userdef.exp
+++ b/gdb/testsuite/gdb.cp/userdef.exp
diff --git a/gdb/testsuite/gdb.c++/virtfunc.cc b/gdb/testsuite/gdb.cp/virtfunc.cc
index 005de9d0ea6..005de9d0ea6 100644
--- a/gdb/testsuite/gdb.c++/virtfunc.cc
+++ b/gdb/testsuite/gdb.cp/virtfunc.cc
diff --git a/gdb/testsuite/gdb.c++/virtfunc.exp b/gdb/testsuite/gdb.cp/virtfunc.exp
index dbd575cfb32..dbd575cfb32 100644
--- a/gdb/testsuite/gdb.c++/virtfunc.exp
+++ b/gdb/testsuite/gdb.cp/virtfunc.exp