diff options
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/darwin-nat.c | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index eacb247..423ada3 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2011-07-01 Joel Brobecker <brobecker@adacore.com> + * darwin-nat.c (darwin_detach): Call darwin_resume_inferior + only when inf->private->no_ptrace. + +2011-07-01 Joel Brobecker <brobecker@adacore.com> + * ada-lang.c (print_it_exception): Print temporary catchpoints as "Temporary catchpoint". (print_mention_exception): Likewise. diff --git a/gdb/darwin-nat.c b/gdb/darwin-nat.c index 7be85d5..fc5263a 100644 --- a/gdb/darwin-nat.c +++ b/gdb/darwin-nat.c @@ -1601,7 +1601,11 @@ darwin_detach (struct target_ops *ops, char *args, int from_tty) darwin_reply_to_all_pending_messages (inf); - darwin_resume_inferior (inf); + /* When using ptrace, we have just performed a PT_DETACH, which + resumes the inferior. On the other hand, when we are not using + ptrace, we need to resume its execution ourselves. */ + if (inf->private->no_ptrace) + darwin_resume_inferior (inf); darwin_mourn_inferior (ops); } |