aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2018-07-04 11:32:50 -0600
committerTom Tromey <tom@tromey.com>2018-07-04 11:32:50 -0600
commita7d0f0f000b39269c25509a22a12549c6ef26b1f (patch)
tree9ba030bda9fcbca7f77d3848ead4b33aef8fd5e1
parent6242c6a690ce8e18aad711103902bfff00cc2757 (diff)
downloadgdb-a7d0f0f000b39269c25509a22a12549c6ef26b1f.zip
gdb-a7d0f0f000b39269c25509a22a12549c6ef26b1f.tar.gz
gdb-a7d0f0f000b39269c25509a22a12549c6ef26b1f.tar.bz2
Use exit_inferior in darwin_attach_pid
Commit a50c11c666 was intended to use exit_inferior in darwin_attach_pid, but I accidentally pushed the wrong version of the patch. This fixes the problem. gdb/ChangeLog 2018-07-04 Tom Tromey <tom@tromey.com> * darwin-nat.c (darwin_attach_pid): Use exit_inferior.
-rw-r--r--gdb/ChangeLog4
-rw-r--r--gdb/darwin-nat.c3
2 files changed, 5 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d2319c0..7bd0cc4 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2018-07-04 Tom Tromey <tom@tromey.com>
+
+ * darwin-nat.c (darwin_attach_pid): Use exit_inferior.
+
2018-07-04 Simon Marchi <simon.marchi@polymtl.ca>
* common/common-defs.h (HAVE_USEFUL_SBRK): Define.
diff --git a/gdb/darwin-nat.c b/gdb/darwin-nat.c
index 8104de5..5aed285 100644
--- a/gdb/darwin-nat.c
+++ b/gdb/darwin-nat.c
@@ -1662,8 +1662,7 @@ darwin_attach_pid (struct inferior *inf)
}
CATCH (ex, RETURN_MASK_ALL)
{
- inf->pid = 0;
- inf->priv.reset ();
+ exit_inferior (inf);
inferior_ptid = null_ptid;
throw_exception (ex);