diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index ff2cbbb4f1b..8232f0b6cf2 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-30  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* gdb.cp/hang.exp: Use .cc instead of .C.
+	* gdb.cp/hang1.cc, gdb.cp/hang2.cc, gdb.cp/hang3.cc: Renamed from ...
+	* gdb.cp/hang1.C, gdb.cp/hang2.C, gdb.cp/hang3.C: ... here.
+
 2008-04-30  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* gdb.base/gdb1250.exp: Remove perror.
diff --git a/gdb/testsuite/gdb.cp/hang.exp b/gdb/testsuite/gdb.cp/hang.exp
index 86305e03b33..61bcf41b8f0 100644
--- a/gdb/testsuite/gdb.cp/hang.exp
+++ b/gdb/testsuite/gdb.cp/hang.exp
@@ -26,7 +26,7 @@ set testfile hang
 set binfile ${objdir}/${subdir}/${testfile}
 
 foreach file {hang1 hang2 hang3} {
-    if {[gdb_compile "${srcdir}/${subdir}/${file}.C" "${file}.o" object {c++ debug}] != ""} {
+    if {[gdb_compile "${srcdir}/${subdir}/${file}.cc" "${file}.o" object {c++ debug}] != ""} {
         untested hang.exp
         return -1
     }
diff --git a/gdb/testsuite/gdb.cp/hang1.C b/gdb/testsuite/gdb.cp/hang1.cc
similarity index 100%
rename from gdb/testsuite/gdb.cp/hang1.C
rename to gdb/testsuite/gdb.cp/hang1.cc
diff --git a/gdb/testsuite/gdb.cp/hang2.C b/gdb/testsuite/gdb.cp/hang2.cc
similarity index 100%
rename from gdb/testsuite/gdb.cp/hang2.C
rename to gdb/testsuite/gdb.cp/hang2.cc
diff --git a/gdb/testsuite/gdb.cp/hang3.C b/gdb/testsuite/gdb.cp/hang3.cc
similarity index 100%
rename from gdb/testsuite/gdb.cp/hang3.C
rename to gdb/testsuite/gdb.cp/hang3.cc