Merge GDB 7.5.1

gdb/testsuite/gdb.mi/mi-solib.exp

Index: gdb/testsuite/gdb.mi/mi-solib.exp
diff --git a/gdb/testsuite/gdb.mi/mi-solib.exp b/gdb/testsuite/gdb.mi/mi-solib.exp
index 8e99f909c13a83e86bce473e5d5d5750c9e35623..cec4b84fdb29d9dfad3cc1298082ba4682719d93 100644
--- a/gdb/testsuite/gdb.mi/mi-solib.exp
+++ b/gdb/testsuite/gdb.mi/mi-solib.exp
@@ -26,22 +26,22 @@ if [mi_gdb_start] {
     continue
 }
 
+standard_testfile solib-main.c solib-lib.c
+
 set libname "solib-lib"
-set srcfile_lib ${srcdir}/${subdir}/${libname}.c
-set binfile_lib ${objdir}/${subdir}/${libname}.so
+set srcfile_lib ${srcdir}/${subdir}/$srcfile2
+set binfile_lib [standard_output_file ${libname}.so]
 set lib_flags [list debug]
 
-set testfile "solib-main"
-set srcfile ${srcdir}/${subdir}/${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+set srcfile_main ${srcdir}/${subdir}/$srcfile
 set bin_flags [list debug shlib=${binfile_lib}]
 
-if [get_compiler_info ${binfile}] {
+if [get_compiler_info] {
     return -1
 }
 
 if { [gdb_compile_shlib ${srcfile_lib} ${binfile_lib} $lib_flags] != ""
-     || [gdb_compile ${srcfile} ${binfile} executable $bin_flags] != "" } {
+     || [gdb_compile ${srcfile_main} ${binfile} executable $bin_flags] != "" } {
   untested "Could not compile $binfile_lib or $binfile."
   return -1
 }
@@ -59,4 +59,9 @@ mi_gdb_test "777-gdb-set stop-on-solib-events 1" "777\\^done" \
 # We use "run" rather than "-exec-run" here in order to test that CLI
 # commands still cause the correct MI output to be generated.
 mi_run_with_cli
+
+global async
+if { $async } {
+    setup_kfail gdb/13860 *-*-*
+}
 mi_expect_stop solib-event .* .* .* .* .* "check for solib event"