* gdb.threads/attach-stopped.exp (corefunc): Add $srcfile to the
	linespec.
+2011-10-14  Tom Tromey  <tromey@redhat.com>
+
+       * gdb.threads/attachstop-mt.exp: Add $srcfile to the linespecs.
+       * gdb.threads/attach-stopped.exp (corefunc): Add $srcfile to the
+       linespec.
+
 2011-10-13  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
        Fix internal error regression.
 
        gdb_test "bt" ".*sleep.*main.*" "$threadtype: attach2 to stopped bt"
     }
     # This breakpoint is there for old/non-x86 kernels not restarting syscalls.
-    gdb_breakpoint [gdb_get_line_number "Second sleep"]
+    gdb_breakpoint $srcfile:[gdb_get_line_number "Second sleep"]
     set test "$threadtype: attach2 continue"
     gdb_test_multiple "continue" "continue ($test)" {
        -re "Continuing" {
 
 gdb_test "bt" ".*sleep.*(func|main).*" "attach4 to stopped bt"
 
 # RHEL3U8 kernel-2.4.21-47.EL will not return SIGINT but only shorten the sleep.
-gdb_breakpoint [gdb_get_line_number "Ridiculous time"]
-gdb_breakpoint [gdb_get_line_number "cut the sleep time"]
+gdb_breakpoint $srcfile:[gdb_get_line_number "Ridiculous time"]
+gdb_breakpoint $srcfile:[gdb_get_line_number "cut the sleep time"]
 set test "attach4 continue"
 gdb_test_multiple "continue" "continue ($test)" {
     -re "Continuing" {