aboutsummaryrefslogtreecommitdiff
path: root/gdb/infrun.c
diff options
context:
space:
mode:
authorPedro Alves <palves@redhat.com>2012-01-05 13:11:31 +0000
committerPedro Alves <palves@redhat.com>2012-01-05 13:11:31 +0000
commit2ca0b532fd230a6d5b2465105010e51baa51f44b (patch)
treef69f1f2a43a24157770bbcec491914ab6a5af536 /gdb/infrun.c
parent50aeff07f4ff130053310127b1522b3c7f15a230 (diff)
downloadgdb-2ca0b532fd230a6d5b2465105010e51baa51f44b.zip
gdb-2ca0b532fd230a6d5b2465105010e51baa51f44b.tar.gz
gdb-2ca0b532fd230a6d5b2465105010e51baa51f44b.tar.bz2
2012-01-05 Khoo Yit Phang <khooyp@cs.umd.edu>
* infrun.c (normal_stop): Don't skip calling the normal_stop observers if the thread was doing a multi-step, but stopped for some reason other than stepping. gdb/testsuite/ 2012-01-05 Pedro Alves <alves.ped@gmail.com> * gdb.mi/mi-stepn.c, gdb.mi/mi-stepn.exp: New files. * gdb.python/py-events.c (first): Add bits for new "step N" test. * gdb.python/py-events.exp: Test that "step N" tripping on a breakpoint emits a breakpoint event.
Diffstat (limited to 'gdb/infrun.c')
-rw-r--r--gdb/infrun.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/gdb/infrun.c b/gdb/infrun.c
index a6e1af7..29db420 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -6068,7 +6068,8 @@ done:
|| last.kind == TARGET_WAITKIND_SIGNALLED
|| last.kind == TARGET_WAITKIND_EXITED
|| last.kind == TARGET_WAITKIND_NO_RESUMED
- || (!inferior_thread ()->step_multi
+ || (!(inferior_thread ()->step_multi
+ && inferior_thread ()->control.stop_step)
&& !(inferior_thread ()->control.stop_bpstat
&& inferior_thread ()->control.proceed_to_finish)
&& !inferior_thread ()->control.in_infcall))