From 943ca1dd02e2e88cb07e4a342d2b734694601714 Mon Sep 17 00:00:00 2001 From: Jie Zhang Date: Thu, 1 Sep 2011 03:14:10 +0000 Subject: [PATCH] * server.c (step_thread): Remove definition. (process_serial_event): Don't handle Hs. * server.h (step_thread): Remove declaration. * target.c (set_desired_inferior): Remove use of step_thread. --- gdb/gdbserver/ChangeLog | 7 +++++++ gdb/gdbserver/server.c | 3 --- gdb/gdbserver/server.h | 1 - gdb/gdbserver/target.c | 16 +--------------- 4 files changed, 8 insertions(+), 19 deletions(-) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 8bdb5b52f8..8fd3f2a8a6 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,10 @@ +2011-08-31 Jie Zhang + + * server.c (step_thread): Remove definition. + (process_serial_event): Don't handle Hs. + * server.h (step_thread): Remove declaration. + * target.c (set_desired_inferior): Remove use of step_thread. + 2011-08-24 Luis Machado * linux-low.c: Include linux-procfs.h. diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c index a97bf86138..79eeba55e4 100644 --- a/gdb/gdbserver/server.c +++ b/gdb/gdbserver/server.c @@ -32,7 +32,6 @@ ptid_t cont_thread; ptid_t general_thread; -ptid_t step_thread; int server_waiting; @@ -2931,8 +2930,6 @@ process_serial_event (void) } else if (own_buf[1] == 'c') cont_thread = thread_id; - else if (own_buf[1] == 's') - step_thread = thread_id; write_ok (own_buf); } diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h index 8d8b7f9efd..164d46bebf 100644 --- a/gdb/gdbserver/server.h +++ b/gdb/gdbserver/server.h @@ -282,7 +282,6 @@ void unloaded_dll (const char *name, CORE_ADDR base_addr); extern ptid_t cont_thread; extern ptid_t general_thread; -extern ptid_t step_thread; extern int server_waiting; extern int debug_threads; diff --git a/gdb/gdbserver/target.c b/gdb/gdbserver/target.c index 4780da428f..83eb27f435 100644 --- a/gdb/gdbserver/target.c +++ b/gdb/gdbserver/target.c @@ -31,21 +31,7 @@ set_desired_inferior (int use_general) if (use_general == 1) found = find_thread_ptid (general_thread); else - { - found = NULL; - - /* If we are continuing any (all) thread(s), use step_thread - to decide which thread to step and/or send the specified - signal to. */ - if ((!ptid_equal (step_thread, null_ptid) - && !ptid_equal (step_thread, minus_one_ptid)) - && (ptid_equal (cont_thread, null_ptid) - || ptid_equal (cont_thread, minus_one_ptid))) - found = find_thread_ptid (step_thread); - - if (found == NULL) - found = find_thread_ptid (cont_thread); - } + found = find_thread_ptid (cont_thread); if (found == NULL) current_inferior = (struct thread_info *) all_threads.head; -- 2.34.1