diff options
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/infrun.c | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 08575ff..58df0ca 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2015-02-10 Pedro Alves <palves@redhat.com> + + * infrun.c (displaced_step_fixup): Switch to the event thread + before calling gdbarch_displaced_step_fixup. + 2015-02-10 Antoine Tremblay <antoine.tremblay@ericsson.com> * MAINTAINERS (Write After Approval): Add Antoine Tremblay. diff --git a/gdb/infrun.c b/gdb/infrun.c index 11dcc0e..5770d77 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -1784,6 +1784,10 @@ displaced_step_fixup (ptid_t event_ptid, enum gdb_signal signal) /* Did the instruction complete successfully? */ if (signal == GDB_SIGNAL_TRAP) { + /* Fixup may need to read memory/registers. Switch to the + thread that we're fixing up. */ + switch_to_thread (event_ptid); + /* Fix up the resulting state. */ gdbarch_displaced_step_fixup (displaced->step_gdbarch, displaced->step_closure, |