* remote.c (remote_close): Don't call generic_mourn_inferior.

	(remote_mourn_1): Call generic_mourn_inferior after closing the
	target.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4c04a74cf08632f140b0c70fc32bd5046990db28..7ac905a0d9eb3740ca2e2a708baf23e5ca1ebe3f 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2009-03-18  Pedro Alves  <pedro@codesourcery.com>
+
+       * remote.c (remote_close): Don't call generic_mourn_inferior.
+       (remote_mourn_1): Call generic_mourn_inferior after closing the
+       target.
+
 2009-03-18  Pedro Alves  <pedro@codesourcery.com>
 
        * remote.c (remote_start_remote): Add missing call to

diff --git a/gdb/remote.c b/gdb/remote.c
index a1904867d5014380cc09427fde9494d9f9184656..950f71e3c0e5fd5f13c42512b690ae65991d9c49 100644 (file)
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -2398,8 +2398,6 @@ remote_close (int quitting)
     delete_async_event_handler (&remote_async_inferior_event_token);
   if (remote_async_get_pending_events_token)
     delete_async_event_handler (&remote_async_get_pending_events_token);
-
-  generic_mourn_inferior ();
 }
 
 /* Query the remote side for the text, data and bss offsets.  */
@@ -6604,7 +6602,8 @@ remote_mourn_1 (struct target_ops *target)
 {
   unpush_target (target);
 
-  /* remote_close takes care of cleaning up.  */
+  /* remote_close takes care of doing most of the clean up.  */
+  generic_mourn_inferior ();
 }
 
 static int