mirrors/binutils-gdb
1
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-11-24 10:35:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

gdb: Fix remote-sim/MinGW/Darwin builds

Browse Source 
The recent commit e671cd59 ("Per-inferior target_terminal state, fix
PR gdb/13211, more") missed adjusting a few targets to the new
target_ops->to_interrupt interface, breaking the build for those
targets.  This fixes it.

Note: remote-sim doesn't really support async execution, so I don't
think gdbsim_interrupt is ever reached via target_interrupt.  (It is
reached via gdbsim_cntrl_c though).

The inflow.c changes are a bit ugly, but they're just doing what other
parts of the file already do to handle the same missing functions.
Targets that don't have 'kill', like mingw have their own
target_ops->to_interrupt implementation, so it's fine to make
child_interrupt be a nop.

gdb/ChangeLog:
2018-01-31  Pedro Alves  <palves@redhat.com>

	* darwin-nat.c (darwin_interrupt): Remove ptid_t parameter.
	* inflow.c (child_terminal_save_inferior): Wrap reference to
	tcgetpgrp in HAVE_TERMIOS_H.
	(child_interrupt, child_pass_ctrlc): Wrap references to signal in
	_WIN32.
	* remote-sim.c (gdbsim_interrupt): Remove ptid_t parameter and
	always iterate over all inferiors.
	(gdbsim_cntrl_c): Adjust.
	* windows-nat.c (windows_interrupt): Remove 'ptid_t' parameter.
This commit is contained in:
Pedro Alves 2018-01-31 13:45:06 +00:00
parent bf3077a6c3
commit f6cfb42730
4 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gdb/darwin-nat.c
View File

@ -83,7 +83,7 @@
#define PTRACE(CMD, PID, ADDR, SIG) \
darwin_ptrace(#CMD, CMD, (PID), (ADDR), (SIG))
static void darwin_interrupt (struct target_ops *self, ptid_t);
static void darwin_interrupt (struct target_ops *self);
static void darwin_resume_to (struct target_ops *ops, ptid_t ptid, int step,
enum gdb_signal signal);
@ -1342,7 +1342,7 @@ darwin_wait_to (struct target_ops *ops,
}
static void
darwin_interrupt (struct target_ops *self, ptid_t t)
darwin_interrupt (struct target_ops *self)
{
struct inferior *inf = current_inferior ();
darwin_inferior *priv = get_darwin_inferior (inf);

6
gdb/inflow.c
View File

@ -469,7 +469,9 @@ child_terminal_save_inferior (struct target_ops *self)
xfree (tinfo->ttystate);
tinfo->ttystate = serial_get_tty_state (stdin_serial);
#ifdef HAVE_TERMIOS_H
tinfo->process_group = tcgetpgrp (0);
#endif
#ifdef F_GETFL
tinfo->tflags = fcntl (0, F_GETFL, 0);
@ -563,7 +565,9 @@ child_interrupt (struct target_ops *self)
either Ctrl-C or with kill(3) with negative PID) sends a
SIGINT to each process in the process group, and we may not
be debugging all processes in the process group. */
#ifndef _WIN32
kill (resumed->inf->pid, SIGINT);
#endif
}
}
@ -606,7 +610,9 @@ child_pass_ctrlc (struct target_ops *self)
{
gdb_assert (inf->pid != 0);
#ifndef _WIN32
kill (inf->pid, SIGINT);
#endif
return;
}
}

23
gdb/remote-sim.c
View File

@ -86,7 +86,7 @@ static void gdbsim_files_info (struct target_ops *target);
static void gdbsim_mourn_inferior (struct target_ops *target);
static void gdbsim_interrupt (struct target_ops *self, ptid_t ptid);
static void gdbsim_interrupt (struct target_ops *self);
void simulator_command (char *args, int from_tty);
@ -920,24 +920,9 @@ gdbsim_interrupt_inferior (struct inferior *inf, void *arg)
}
static void
gdbsim_interrupt (struct target_ops *self, ptid_t ptid)
gdbsim_interrupt (struct target_ops *self)
{
struct sim_inferior_data *sim_data;
if (ptid_equal (ptid, minus_one_ptid))
{
iterate_over_inferiors (gdbsim_interrupt_inferior, NULL);
}
else
{
struct inferior *inf = find_inferior_ptid (ptid);
if (inf == NULL)
error (_("Can't stop pid %d. No inferior found."),
ptid_get_pid (ptid));
gdbsim_interrupt_inferior (inf, NULL);
}
iterate_over_inferiors (gdbsim_interrupt_inferior, NULL);
}
/* GDB version of os_poll_quit callback.
@ -961,7 +946,7 @@ gdb_os_poll_quit (host_callback *p)
static void
gdbsim_cntrl_c (int signo)
{
gdbsim_interrupt (NULL, minus_one_ptid);
gdbsim_interrupt (NULL);
}
static ptid_t

4
gdb/windows-nat.c
View File

@ -201,7 +201,7 @@ typedef enum
#define DEBUG_MEM(x) if (debug_memory) printf_unfiltered x
#define DEBUG_EXCEPT(x) if (debug_exceptions) printf_unfiltered x
static void windows_interrupt (struct target_ops *self, ptid_t);
static void windows_interrupt (struct target_ops *self);
static int windows_thread_alive (struct target_ops *, ptid_t);
static void windows_kill_inferior (struct target_ops *);
@ -2777,7 +2777,7 @@ windows_mourn_inferior (struct target_ops *ops)
^C on the controlling terminal. */
static void
windows_interrupt (struct target_ops *self, ptid_t ptid)
windows_interrupt (struct target_ops *self)
{
DEBUG_EVENTS (("gdb: GenerateConsoleCtrlEvent (CTRLC_EVENT, 0)\n"));
CHECK (GenerateConsoleCtrlEvent (CTRL_C_EVENT, current_event.dwProcessId));