From: palves <palves>
Date: Wed, 18 Mar 2009 02:24:01 +0000 (+0000)
Subject: 	* remote.c (remote_close): Don't call generic_mourn_inferior.
X-Git-Tag: cgen-snapshot-20091101~3364
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1c78175504f7ec824081d001febc3fc0dfb50b8b;p=pf3gnuchains%2Fpf3gnuchains4x.git

	* 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 4c04a74cf0..7ac905a0d9 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
 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
 	init_wait_for_inferior in non-stop mode.
 
diff --git a/gdb/remote.c b/gdb/remote.c
index a1904867d5..950f71e3c0 100644
--- 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