aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alves <palves@redhat.com>2011-05-17 11:43:07 +0000
committerPedro Alves <palves@redhat.com>2011-05-17 11:43:07 +0000
commitcd3da28e23c6fe0f229cd09975b28c6b3b1d8779 (patch)
tree36bae1c2f1617c7d2c2442885372b6e08b89f635
parent4c83e80569a4e9a47cfd0ac99c671d6756aaa713 (diff)
downloadgdb-cd3da28e23c6fe0f229cd09975b28c6b3b1d8779.zip
gdb-cd3da28e23c6fe0f229cd09975b28c6b3b1d8779.tar.gz
gdb-cd3da28e23c6fe0f229cd09975b28c6b3b1d8779.tar.bz2
2011-05-17 Tomas Martinec <fyzmat@gmail.com>
gdb/ * infrun.c (handle_inferior_event) <handling deferred step>: Clear trap_expected.
-rw-r--r--gdb/ChangeLog5
-rw-r--r--gdb/infrun.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 677970d..4b8a05f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-17 Tomas Martinec <fyzmat@gmail.com>
+
+ * infrun.c (handle_inferior_event) <handling deferred step>: Clear
+ trap_expected.
+
2011-05-16 Doug Evans <dje@google.com>
* python/py-auto-load.c (source_section_scripts): Mention objfile
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 3b779de..0a15ea3 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -3646,6 +3646,8 @@ handle_inferior_event (struct execution_control_state *ecs)
singlestep_breakpoints_inserted_p = 0;
}
+ ecs->event_thread->control.trap_expected = 0;
+
/* Note: We do not call context_switch at this point, as the
context is already set up for stepping the original thread. */
switch_to_thread (deferred_step_ptid);