aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorMarc Khouzam <marc.khouzam@ericsson.com>2012-07-16 19:07:16 +0000
committerMarc Khouzam <marc.khouzam@ericsson.com>2012-07-16 19:07:16 +0000
commitae5e0686eef580b284df2f764cf29b38ee41b675 (patch)
treebfa5c4e0475cb1643f7dc567011ec6b8a4b4fead /gdb
parentb7fd7c377d73ed78d6f4e7127aab381276a5d8ac (diff)
downloadgdb-ae5e0686eef580b284df2f764cf29b38ee41b675.zip
gdb-ae5e0686eef580b284df2f764cf29b38ee41b675.tar.gz
gdb-ae5e0686eef580b284df2f764cf29b38ee41b675.tar.bz2
2012-07-16 Marc Khouzam <marc.khouzam@ericsson.com>
Pedro Alves <palves@redhat.com> * linux-nat.c (linux_nat_detach): Don't unregister from the event loop.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/ChangeLog6
-rw-r--r--gdb/linux-nat.c7
2 files changed, 8 insertions, 5 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a63e67b..717d5fd 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-16 Marc Khouzam <marc.khouzam@ericsson.com>
+ Pedro Alves <palves@redhat.com>
+
+ * linux-nat.c (linux_nat_detach): Don't unregister from the event
+ loop.
+
2012-07-16 Tom Tromey <tromey@redhat.com>
* jv-typeprint.c (c_type_print_varspec_suffix): Don't declare.
diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
index 7ed666f..d2a529a 100644
--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -1848,8 +1848,8 @@ linux_nat_detach (struct target_ops *ops, char *args, int from_tty)
pid = GET_PID (inferior_ptid);
- if (target_can_async_p ())
- linux_nat_async (NULL, 0);
+ /* Don't unregister from the event loop, as there may be other
+ inferiors running. */
/* Stop all threads before detaching. ptrace requires that the
thread is stopped to sucessfully detach. */
@@ -1892,9 +1892,6 @@ linux_nat_detach (struct target_ops *ops, char *args, int from_tty)
the current fork, and context-switch to the first
available. */
linux_fork_detach (args, from_tty);
-
- if (non_stop && target_can_async_p ())
- target_async (inferior_event_handler, 0);
}
else
linux_ops->to_detach (ops, args, from_tty);