From 6d097e655a5687059556804d993e03ac4eaff7d8 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Fri, 6 Feb 2009 01:23:00 +0000 Subject: [PATCH] * remote.c (extended_remote_can_run): Delete. (init_remote_ops): Don't register it. * target.c (target_get_osdata): Don't check for target_can_run. Instead any target that has already been pushed, otherwise fallback to the default run target.. --- gdb/ChangeLog | 8 ++++++++ gdb/remote.c | 10 ---------- gdb/target.c | 11 ++++------- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ac2419d3a50..eded4cb0268 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2009-02-06 Pedro Alves + + * remote.c (extended_remote_can_run): Delete. + (init_remote_ops): Don't register it. + * target.c (target_get_osdata): Don't check for target_can_run. + Instead any target that has already been pushed, otherwise + fallback to the default run target.. + 2009-02-06 Pedro Alves * target.c (target_create_inferior, target_detach) diff --git a/gdb/remote.c b/gdb/remote.c index 4864dde3845..8cb37faf624 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -8674,15 +8674,6 @@ remote_supports_multi_process (void) return remote_multi_process_p (rs); } -static int -extended_remote_can_run (void) -{ - if (remote_desc != NULL) - return 1; - - return 0; -} - static void init_remote_ops (void) { @@ -8768,7 +8759,6 @@ Specify the serial device it is connected to (e.g. /dev/ttya)."; extended_remote_ops.to_detach = extended_remote_detach; extended_remote_ops.to_attach = extended_remote_attach; extended_remote_ops.to_kill = extended_remote_kill; - extended_remote_ops.to_can_run = extended_remote_can_run; } static int diff --git a/gdb/target.c b/gdb/target.c index 875046f462f..de33d114c16 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -2218,18 +2218,15 @@ target_get_osdata (const char *type) char *document; struct target_ops *t; - if (target_can_run (¤t_target)) - t = ¤t_target; - else + if (current_target.to_stratum == dummy_stratum) t = find_default_run_target ("get OS data"); + else + t = current_target.beneath; if (!t) return NULL; - document = target_read_stralloc (t, - TARGET_OBJECT_OSDATA, - type); - return document; + return target_read_stralloc (t, TARGET_OBJECT_OSDATA, type); } static int