Index: ChangeLog
===================================================================
RCS file: /cvs/src/src/gdb/ChangeLog,v
retrieving revision 1.11117
diff -u -p -r1.11117 ChangeLog
--- ChangeLog	27 Nov 2009 16:11:56 -0000	1.11117
+++ ChangeLog	28 Nov 2009 16:57:39 -0000
@@ -1,3 +1,8 @@
+2009-11-28  Vladimir Prus  <vladimir@codesourcery.com>
+
+	* target.c (target_terminal_inferior): Use target_can_async_p, not
+	target_is_async_p.
+
 2009-11-27  Ulrich Weigand  <uweigand@de.ibm.com>
 
 	* s390-nat.c (s390_can_use_hw_breakpoint): Only support breakpoints
Index: target.c
===================================================================
RCS file: /cvs/src/src/gdb/target.c,v
retrieving revision 1.233
diff -u -p -r1.233 target.c
--- target.c	20 Nov 2009 17:23:38 -0000	1.233
+++ target.c	28 Nov 2009 16:57:39 -0000
@@ -481,8 +481,10 @@ void
 target_terminal_inferior (void)
 {
   /* A background resume (``run&'') should leave GDB in control of the
-     terminal.  */
-  if (target_is_async_p () && !sync_execution)
+     terminal. Use target_can_async_p, not target_is_async_p, since at
+     this point the target is not async yet.  However, if sync_execution
+     is not set, we know it will become async prior to resume.  */
+  if (target_can_async_p () && !sync_execution)
     return;
 
   /* If GDB is resuming the inferior in the foreground, install