From 1c455146f805f11db47a26d6fe7726e3b49c0e84 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Tue, 16 Dec 2008 22:49:49 +0000 Subject: [PATCH] Merge from head: 2008-12-12 Pedro Alves * remote.c (extended_remote_mourn_1): Always call generic_mourn_inferior. --- gdb/ChangeLog.mp | 8 ++++++++ gdb/remote.c | 7 +++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/gdb/ChangeLog.mp b/gdb/ChangeLog.mp index 67033d30255..c1fc365df93 100644 --- a/gdb/ChangeLog.mp +++ b/gdb/ChangeLog.mp @@ -1,3 +1,11 @@ +2008-12-16 Pedro Alves + + Merge from head: + 2008-12-12 Pedro Alves + + * remote.c (extended_remote_mourn_1): Always call + generic_mourn_inferior. + 2008-12-16 Pedro Alves Merge from head: diff --git a/gdb/remote.c b/gdb/remote.c index ad4e3fb69b2..9e0ad4f0640 100644 --- 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 -- 2.47.2