Merge GDB 7.5.1

gdb/testsuite/gdb.dwarf2/dw2-filename.exp

Index: gdb/testsuite/gdb.dwarf2/dw2-filename.exp
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-filename.exp b/gdb/testsuite/gdb.dwarf2/dw2-filename.exp
index 992a06cd15840cba05ca1b0c62ee068f8bf26a37..5cc2534390265a4c2decd9dafbfc4154ca3dd3f1 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-filename.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-filename.exp
@@ -21,15 +21,13 @@ if {![dwarf2_support]} {
     return 0
 }
 
-set testfile "dw2-filename"
-set srcfile ${testfile}.S
-set binfile ${objdir}/${subdir}/${testfile}.x
+standard_testfile .S
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" object {nodebug}] != "" } {
     return -1
 }
 
-clean_restart ${testfile}.x
+clean_restart ${testfile}
 
 # Verify that -file-list-exec-source-files returns a list where
 # the "file" is "file1.txt" (file base name), and "fullname" is