From: Marc Khouzam <marc.khouzam@ericsson.com>
Date: Mon, 16 Jul 2012 19:07:16 +0000 (+0000)
Subject: 2012-07-16  Marc Khouzam  <marc.khouzam@ericsson.com>
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ae5e0686eef580b284df2f764cf29b38ee41b675;p=binutils-gdb.git

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.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a63e67bd878..717d5fd62a7 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 7ed666f0b12..d2a529ae6d4 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);