Merge GDB 7.5.1

gdb/testsuite/gdb.dwarf2/dw2-inline-param.exp

Index: gdb/testsuite/gdb.dwarf2/dw2-inline-param.exp
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inline-param.exp b/gdb/testsuite/gdb.dwarf2/dw2-inline-param.exp
index 0db3f0f54047c03aeb1a485edfda2c5f54ba04a7..30cfdc2692fa38af3ed88f5b88024c8b5bef7bcd 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-inline-param.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-inline-param.exp
@@ -19,14 +19,13 @@ if {![dwarf2_support]} {
     return 0  
 }
 
-set testfile dw2-inline-param
-set binfile ${objdir}/${subdir}/${testfile}
-if { [build_executable ${testfile}.exp "${testfile}" [list ${testfile}-main.c ${testfile}.S] {nodebug}] } {
+standard_testfile .S dw2-inline-param-main.c
+
+if { [prepare_for_testing ${testfile}.exp "${testfile}" \
+	  [list $srcfile2 $srcfile] {nodebug}] } {
     return -1
 }
 
-clean_restart ${testfile}
-
 set break_at ""
 set test "info addr break_at"
 gdb_test_multiple $test $test {
@@ -41,7 +40,9 @@ gdb_unload
 # Strip out any labels there as they could corrupt the `main' name.
 
 set objcopy_program [transform objcopy]
-set result [catch "exec $objcopy_program -N block_start -N block_end -N break_at ${binfile}" output]
+set command "$objcopy_program -N block_start -N block_end -N break_at ${binfile}"
+verbose -log "Executing: $command"
+set result [catch "exec $command" output]
 verbose "result is $result"
 verbose "output is $output"
 if {$result != 0} {
@@ -49,9 +50,6 @@ if {$result != 0} {
 }
 
 gdb_load ${binfile}
-if [target_info exists gdb_stub] {
-    gdb_step_for_stub;
-}    
 
 if ![runto "*${break_at}"] {
     return -1