* target.h (struct thread_resume): Delete leave_stopped member.

[deliverable/binutils-gdb.git] / gdb / target.c

diff --git a/gdb/target.c b/gdb/target.c
index 0848fb7dc4f74c9ee9f20f650e4b7937f6a0c49c..86cdb71b78901292c9ba37b397b7deaa43106ed9 100644 (file)
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -136,8 +136,6 @@ static void debug_to_terminal_ours (void);
 
 static void debug_to_terminal_info (char *, int);
 
-static void debug_to_kill (void);
-
 static void debug_to_load (char *, int);
 
 static int debug_to_lookup_symbol (char *, CORE_ADDR *);
@@ -256,6 +254,24 @@ target_ignore (void)
 {
 }
 
+void
+target_kill (void)
+{
+  struct target_ops *t;
+
+  for (t = current_target.beneath; t != NULL; t = t->beneath)
+    if (t->to_kill != NULL)
+      {
+       if (targetdebug)
+         fprintf_unfiltered (gdb_stdlog, "target_kill ()\n");
+
+        t->to_kill (t);
+       return;
+      }
+
+  noprocess ();
+}
+
 void
 target_load (char *arg, int from_tty)
 {
@@ -341,7 +357,7 @@ kill_or_be_killed (int from_tty)
     {
       printf_unfiltered (_("You are already running a program:\n"));
       target_files_info ();
-      if (query ("Kill it? "))
+      if (query (_("Kill it? ")))
        {
          target_kill ();
          if (target_has_execution)
@@ -430,7 +446,7 @@ update_current_target (void)
       INHERIT (to_terminal_ours, t);
       INHERIT (to_terminal_save_ours, t);
       INHERIT (to_terminal_info, t);
-      INHERIT (to_kill, t);
+      /* Do not inherit to_kill.  */
       INHERIT (to_load, t);
       INHERIT (to_lookup_symbol, t);
       /* Do no inherit to_create_inferior.  */
@@ -556,9 +572,6 @@ update_current_target (void)
            target_ignore);
   de_fault (to_terminal_info,
            default_terminal_info);
-  de_fault (to_kill,
-           (void (*) (void))
-           noprocess);
   de_fault (to_load,
            (void (*) (char *, int))
            tcomplain);
@@ -3024,14 +3037,6 @@ debug_to_terminal_info (char *arg, int from_tty)
                      from_tty);
 }
 
-static void
-debug_to_kill (void)
-{
-  debug_target.to_kill ();
-
-  fprintf_unfiltered (gdb_stdlog, "target_kill ()\n");
-}
-
 static void
 debug_to_load (char *args, int from_tty)
 {
@@ -3227,7 +3232,6 @@ setup_target_debug (void)
   current_target.to_terminal_ours = debug_to_terminal_ours;
   current_target.to_terminal_save_ours = debug_to_terminal_save_ours;
   current_target.to_terminal_info = debug_to_terminal_info;
-  current_target.to_kill = debug_to_kill;
   current_target.to_load = debug_to_load;
   current_target.to_lookup_symbol = debug_to_lookup_symbol;
   current_target.to_post_startup_inferior = debug_to_post_startup_inferior;