Merge GDB 7.5.1

gdb/testsuite/gdb.cp/cmpd-minsyms.exp

Index: gdb/testsuite/gdb.cp/cmpd-minsyms.exp
diff --git a/gdb/testsuite/gdb.cp/cmpd-minsyms.exp b/gdb/testsuite/gdb.cp/cmpd-minsyms.exp
index 0186c0c24f5b2457c8e8364a60d24f56e0f8c0e5..fae1ac948acc3851bfae6c812190d42ced37aa9f 100644
--- a/gdb/testsuite/gdb.cp/cmpd-minsyms.exp
+++ b/gdb/testsuite/gdb.cp/cmpd-minsyms.exp
@@ -20,9 +20,10 @@
 if {[skip_cplus_tests]} { continue }
 
 # Tests for c++/12273, breakpoint/12803
-set testfile "cmpd-minsyms"
+standard_testfile .cc
+
 # Do NOT compile with debug flag.
-if {[prepare_for_testing $testfile $testfile $testfile.cc {c++}]} {
+if {[prepare_for_testing $testfile $testfile $srcfile {c++}]} {
     return -1
 }