Merge from head:

	2008-12-12  Pedro Alves  <pedro@codesourcery.com>

	* remote.c (extended_remote_mourn_1): Always call
	generic_mourn_inferior.

diff --git a/gdb/ChangeLog.mp b/gdb/ChangeLog.mp
index 67033d3025516ac8d8cb4a46bf25f3125628dca8..c1fc365df93c8d9cdd9305f31afe33630f4528d8 100644 (file)
--- a/gdb/ChangeLog.mp
+++ b/gdb/ChangeLog.mp
@@ -1,3 +1,11 @@
+2008-12-16  Pedro Alves  <pedro@codesourcery.com>
+
+       Merge from head:
+       2008-12-12  Pedro Alves  <pedro@codesourcery.com>
+
+       * remote.c (extended_remote_mourn_1): Always call
+       generic_mourn_inferior.
+
 2008-12-16  Pedro Alves  <pedro@codesourcery.com>
 
        Merge from head:

diff --git a/gdb/remote.c b/gdb/remote.c
index ad4e3fb69b2c6cfab289d08de73afcf6da5b220a..9e0ad4f06404ab0de3f5690f9bc434c9774d27bb 100644 (file)
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -6677,6 +6677,9 @@ extended_remote_mourn_1 (struct target_ops *target)
   /* Unlike "target remote", we do not want to unpush the target; then
      the next time the user says "run", we won't be connected.  */
 
+  /* Call common code to mark the inferior as not running.    */
+  generic_mourn_inferior ();
+
   if (have_real_inferiors ())
     {
       extern void nullify_last_target_wait_ptid ();
@@ -6688,10 +6691,6 @@ extended_remote_mourn_1 (struct target_ops *target)
     }
   else
     {
-      struct remote_state *rs = get_remote_state ();
-
-      /* Call common code to mark the inferior as not running. */
-      generic_mourn_inferior ();
       if (!remote_multi_process_p (rs))
        {
          /* Check whether the target is running now - some remote stubs