diff options
| author | Pedro Alves <pedro@codesourcery.com> | 2008-12-16 22:49:49 +0000 |
|---|---|---|
| committer | Pedro Alves <pedro@codesourcery.com> | 2008-12-16 22:49:49 +0000 |
| commit | afd707cb598439ab45421a828aa61bec6617d84a (patch) | |
| tree | 4325f4093404ba9339f21f1cdacd7ce919bcba00 | |
| parent | e33e6409504273f77f9322237669aeebe9af4b32 (diff) | |
| download | gdb-afd707cb598439ab45421a828aa61bec6617d84a.tar.gz | |
Merge from head:
2008-12-12 Pedro Alves <pedro@codesourcery.com>
* remote.c (extended_remote_mourn_1): Always call
generic_mourn_inferior.
| -rw-r--r-- | gdb/ChangeLog.mp | 8 | ||||
| -rw-r--r-- | 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 @@ -3,6 +3,14 @@ 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: + 2008-12-12 Pedro Alves <pedro@codesourcery.com> + * remote.c (remote_detach_1): Don't delete the inferior here. (process_stop_reply): Ditto. (extended_remote_kill): Ditto. 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 |