From 32fcada3227c58a33c3c295d88a42e507ff8c8a8 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Mon, 6 Sep 2010 15:15:50 +0000 Subject: [PATCH] 2010-09-06 Yao Qi * linux-low.c (linux_kill): Remove unused variable. (linux_stabilize_threads): Likewise. * server.c (start_inferior): Likewise. (queue_stop_reply_callback): Likewise. * tracepoint.c (do_action_at_tracepoint): Likewise. --- gdb/gdbserver/ChangeLog | 8 ++++++++ gdb/gdbserver/linux-low.c | 5 +---- gdb/gdbserver/server.c | 8 +------- gdb/gdbserver/tracepoint.c | 3 --- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 4cdabef..f2db7c6 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,5 +1,13 @@ 2010-09-06 Yao Qi + * linux-low.c (linux_kill): Remove unused variable. + (linux_stabilize_threads): Likewise. + * server.c (start_inferior): Likewise. + (queue_stop_reply_callback): Likewise. + * tracepoint.c (do_action_at_tracepoint): Likewise. + +2010-09-06 Yao Qi + * linux-low.c (maybe_move_out_of_jump_pad): Restore current_inferior on return. diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c index 76a4df1..b798c16 100644 --- a/gdb/gdbserver/linux-low.c +++ b/gdb/gdbserver/linux-low.c @@ -775,7 +775,6 @@ linux_kill (int pid) { struct process_info *process; struct lwp_info *lwp; - struct thread_info *thread; int wstat; int lwpid; @@ -792,7 +791,6 @@ linux_kill (int pid) /* See the comment in linux_kill_one_lwp. We did not kill the first thread in the list, so do so now. */ lwp = find_lwp_pid (pid_to_ptid (pid)); - thread = get_lwp_thread (lwp); if (debug_threads) fprintf (stderr, "lk_1: killing lwp %ld, for pid: %d\n", @@ -1935,13 +1933,12 @@ linux_stabilize_threads (void) { struct target_waitstatus ourstatus; struct lwp_info *lwp; - ptid_t ptid; int wstat; /* Note that we go through the full wait even loop. While moving threads out of jump pad, we need to be able to step over internal breakpoints and such. */ - ptid = linux_wait_1 (minus_one_ptid, &ourstatus, 0); + linux_wait_1 (minus_one_ptid, &ourstatus, 0); if (ourstatus.kind == TARGET_WAITKIND_STOPPED) { diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c index 528b658..dc6017a 100644 --- a/gdb/gdbserver/server.c +++ b/gdb/gdbserver/server.c @@ -273,13 +273,12 @@ start_inferior (char **argv) if (wrapper_argv != NULL) { struct thread_resume resume_info; - ptid_t ptid; resume_info.thread = pid_to_ptid (signal_pid); resume_info.kind = resume_continue; resume_info.sig = 0; - ptid = mywait (pid_to_ptid (signal_pid), &last_status, 0, 0); + mywait (pid_to_ptid (signal_pid), &last_status, 0, 0); if (last_status.kind != TARGET_WAITKIND_STOPPED) return signal_pid; @@ -2155,11 +2154,6 @@ queue_stop_reply_callback (struct inferior_list_entry *entry, void *arg) manage the thread's last_status field. */ if (the_target->thread_stopped == NULL) { - struct target_waitstatus status; - - status.kind = TARGET_WAITKIND_STOPPED; - status.value.sig = TARGET_SIGNAL_TRAP; - /* Pass the last stop reply back to GDB, but don't notify yet. */ queue_stop_reply (entry->id, &thread->last_status); diff --git a/gdb/gdbserver/tracepoint.c b/gdb/gdbserver/tracepoint.c index 138d920..0e607d6 100644 --- a/gdb/gdbserver/tracepoint.c +++ b/gdb/gdbserver/tracepoint.c @@ -4126,13 +4126,10 @@ do_action_at_tracepoint (struct tracepoint_hit_ctx *ctx, } case 'R': { - struct collect_registers_action *raction; - unsigned char *regspace; struct regcache tregcache; struct regcache *context_regcache; - raction = (struct collect_registers_action *) taction; trace_debug ("Want to collect registers"); -- 2.7.4