diff options
| -rw-r--r-- | gdb/gdbserver/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/gdbserver/linux-low.c | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index d0fbbb5..4cdabef 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,8 @@ +2010-09-06 Yao Qi <yao@codesourcery.com> + + * linux-low.c (maybe_move_out_of_jump_pad): Restore current_inferior + on return. + 2010-09-06 Jan Kratochvil <jan.kratochvil@redhat.com> * target.c (mywait) <TARGET_WAITKIND_EXITED>: Fix to use INTEGER. diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c index f2177ff..76a4df1 100644 --- a/gdb/gdbserver/linux-low.c +++ b/gdb/gdbserver/linux-low.c @@ -1244,6 +1244,7 @@ Checking whether LWP %ld needs to move out of the jump pad.\n", fprintf (stderr, "\ Checking whether LWP %ld needs to move out of the jump pad...it does\n", lwpid_of (lwp)); + current_inferior = saved_inferior; return 1; } @@ -1314,6 +1315,8 @@ Checking whether LWP %ld needs to move out of the jump pad...it does\n", fprintf (stderr, "\ Checking whether LWP %ld needs to move out of the jump pad...no\n", lwpid_of (lwp)); + + current_inferior = saved_inferior; return 0; } |