Merge GDB 7.5.1

gdb/testsuite/gdb.cp/fpointer.exp

Index: gdb/testsuite/gdb.cp/fpointer.exp
diff --git a/gdb/testsuite/gdb.cp/fpointer.exp b/gdb/testsuite/gdb.cp/fpointer.exp
index 48e6aadf0e3e6fa19fedbbddedab36eaca5fd4fc..6f8c09f831569df620d63bc6a3f6f1bb78fb2818 100644
--- a/gdb/testsuite/gdb.cp/fpointer.exp
+++ b/gdb/testsuite/gdb.cp/fpointer.exp
@@ -16,8 +16,8 @@
 # This tests for evaluation of functions in the form of
 # complex expressions.
 
-set testfile fpointer
-set srcfile ${testfile}.cc
+standard_testfile .cc
+
 if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug c++}] } {
      return -1
 }