* linux-nat.c (linux_nat_terminal_inferior)

	(linux_nat_terminal_ours): Don't check sync_execution.
	* remote.c (remote_terminal_inferior, remote_terminal_ours):
	Don't check sync_execution.  Update comments.
	* target.c (target_terminal_inferior): New.
	* target.h (target_terminal_inferior): Delete macro, and declare
	as function.
	* event-top.c (async_disable_stdin): Make idempotent.  Don't give
	the target the terminal here.
	* inflow.c (terminal_ours_1): Don't return early without setting
	`terminal_is_ours'.

7 files changed, 41 insertions, 38 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c45f8aa..5622305 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,19 @@
 2009-05-21  Pedro Alves  <pedro@codesourcery.com>
 
+	* linux-nat.c (linux_nat_terminal_inferior)
+	(linux_nat_terminal_ours): Don't check sync_execution.
+	* remote.c (remote_terminal_inferior, remote_terminal_ours):
+	Don't check sync_execution.  Update comments.
+	* target.c (target_terminal_inferior): New.
+	* target.h (target_terminal_inferior): Delete macro, and declare
+	as function.
+	* event-top.c (async_disable_stdin): Make idempotent.  Don't give
+	the target the terminal here.
+	* inflow.c (terminal_ours_1): Don't return early without setting
+	`terminal_is_ours'.
+
+2009-05-21  Pedro Alves  <pedro@codesourcery.com>
+
 	* target.h (TARGET_WNOHANG): New.
 	* target.c (target_wait): Add `options' argument.  Adjust.
 	(struct target_ops) <to_wait>: Add `options' argument.
diff --git a/gdb/event-top.c b/gdb/event-top.c
index fd7c521..31ebd4e 100644
--- a/gdb/event-top.c
+++ b/gdb/event-top.c
@@ -458,14 +458,11 @@ async_enable_stdin (void)
 void
 async_disable_stdin (void)
 {
-  sync_execution = 1;
-  push_prompt ("", "", "");
-  /* FIXME: cagney/1999-09-27: At present this call is technically
-     redundant since infcmd.c and infrun.c both already call
-     target_terminal_inferior().  As the terminal handling (in
-     sync/async mode) is refined, the duplicate calls can be
-     eliminated (Here or in infcmd.c/infrun.c). */
-  target_terminal_inferior ();
+  if (!sync_execution)
+    {
+      sync_execution = 1;
+      push_prompt ("", "", "");
+    }
 }
 
 
diff --git a/gdb/inflow.c b/gdb/inflow.c
index 6ca5bd8..27995cc 100644
--- a/gdb/inflow.c
+++ b/gdb/inflow.c
@@ -361,6 +361,8 @@ terminal_ours_1 (int output_only)
   if (terminal_is_ours)
     return;
 
+  terminal_is_ours = 1;
+
   /* Checking inferior->run_terminal is necessary so that
      if GDB is running in the background, it won't block trying
      to do the ioctl()'s below.  Checking gdb_has_a_terminal
@@ -371,7 +373,6 @@ terminal_ours_1 (int output_only)
   if (inf->terminal_info->run_terminal != NULL || gdb_has_a_terminal () == 0)
     return;
 
-  if (!terminal_is_ours)
     {
 #ifdef SIGTTOU
       /* Ignore this signal since it will happen when we try to set the
@@ -380,8 +381,6 @@ terminal_ours_1 (int output_only)
 #endif
       int result;
 
-      terminal_is_ours = 1;
-
 #ifdef SIGTTOU
       if (job_control)
 	osigttou = (void (*)()) signal (SIGTTOU, SIG_IGN);
diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
index 8f12587..9057442 100644
--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -4360,14 +4360,9 @@ linux_nat_terminal_inferior (void)
       return;
     }
 
-  /* GDB should never give the terminal to the inferior, if the
-     inferior is running in the background (run&, continue&, etc.).
-     This check can be removed when the common code is fixed.  */
-  if (!sync_execution)
-    return;
-
   terminal_inferior ();
 
+  /* Calls to target_terminal_*() are meant to be idempotent.  */
   if (!async_terminal_is_ours)
     return;
 
@@ -4393,9 +4388,6 @@ linux_nat_terminal_ours (void)
      but claiming it sure should.  */
   terminal_ours ();
 
-  if (!sync_execution)
-    return;
-
   if (async_terminal_is_ours)
     return;
 
diff --git a/gdb/remote.c b/gdb/remote.c
index 199120d..8a1a0d4 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -4078,19 +4078,12 @@ remote_terminal_inferior (void)
     /* Nothing to do.  */
     return;
 
-  /* FIXME: cagney/1999-09-27: Shouldn't need to test for
-     sync_execution here.  This function should only be called when
-     GDB is resuming the inferior in the forground.  A background
-     resume (``run&'') should leave GDB in control of the terminal and
-     consequently should not call this code.  */
-  if (!sync_execution)
-    return;
-  /* FIXME: cagney/1999-09-27: Closely related to the above.  Make
-     calls target_terminal_*() idenpotent. The event-loop GDB talking
-     to an asynchronous target with a synchronous command calls this
-     function from both event-top.c and infrun.c/infcmd.c.  Once GDB
-     stops trying to transfer the terminal to the target when it
-     shouldn't this guard can go away.  */
+  /* FIXME: cagney/1999-09-27: Make calls to target_terminal_*()
+     idempotent.  The event-loop GDB talking to an asynchronous target
+     with a synchronous command calls this function from both
+     event-top.c and infrun.c/infcmd.c.  Once GDB stops trying to
+     transfer the terminal to the target when it shouldn't this guard
+     can go away.  */
   if (!remote_async_terminal_ours_p)
     return;
   delete_file_handler (input_fd);
@@ -4109,9 +4102,6 @@ remote_terminal_ours (void)
     return;
 
   /* See FIXME in remote_terminal_inferior.  */
-  if (!sync_execution)
-    return;
-  /* See FIXME in remote_terminal_inferior.  */
   if (remote_async_terminal_ours_p)
     return;
   cleanup_sigint_signal_handler (NULL);
diff --git a/gdb/target.c b/gdb/target.c
index 8cbde1b..6dfa736 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -301,6 +301,18 @@ target_create_inferior (char *exec_file, char *args,
 		  "could not find a target to create inferior");
 }
 
+void
+target_terminal_inferior (void)
+{
+  /* A background resume (``run&'') should leave GDB in control of the
+     terminal.  */
+  if (target_is_async_p () && !sync_execution)
+    return;
+
+  /* If GDB is resuming the inferior in the foreground, install
+     inferior's terminal modes.  */
+  (*current_target.to_terminal_inferior) ();
+}
 
 static int
 nomemory (CORE_ADDR memaddr, char *myaddr, int len, int write,
diff --git a/gdb/target.h b/gdb/target.h
index 5ec06a0..b1fe403 100644
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -763,8 +763,7 @@ extern void print_section_info (struct target_ops *, bfd *);
 /* Put the inferior's terminal settings into effect.
    This is preparation for starting or resuming the inferior.  */
 
-#define target_terminal_inferior() \
-     (*current_target.to_terminal_inferior) ()
+extern void target_terminal_inferior (void);
 
 /* Put some of our terminal settings into effect,
    enough to get proper results from our output,