From 0cccb68320342940fa2903f9458a6b61ba88302a Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Mon, 6 Sep 2010 15:10:15 +0000 Subject: [PATCH] 2010-09-06 Yao Qi * linux-low.c (maybe_move_out_of_jump_pad): Restore current_inferior on return. --- gdb/gdbserver/ChangeLog | 5 +++++ gdb/gdbserver/linux-low.c | 3 +++ 2 files changed, 8 insertions(+) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index d0fbbb535b..4cdabefb69 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,8 @@ +2010-09-06 Yao Qi + + * linux-low.c (maybe_move_out_of_jump_pad): Restore current_inferior + on return. + 2010-09-06 Jan Kratochvil * target.c (mywait) : Fix to use INTEGER. diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c index f2177ff354..76a4df1733 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; } -- 2.34.1