aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorJoel Brobecker <brobecker@gnat.com>2009-03-12 22:29:30 +0000
committerJoel Brobecker <brobecker@gnat.com>2009-03-12 22:29:30 +0000
commit2ab1c2d9363e668a724ec76119de9d85f50a7809 (patch)
tree23d0bf50a7de8ec6d86a20c0beced74c37a21209 /gdb
parent11436dee516f7acb3e0648129e2cd43990257683 (diff)
downloadgdb-2ab1c2d9363e668a724ec76119de9d85f50a7809.zip
gdb-2ab1c2d9363e668a724ec76119de9d85f50a7809.tar.gz
gdb-2ab1c2d9363e668a724ec76119de9d85f50a7809.tar.bz2
Fix a build failure on Darwin following some changes in
the profile of some target_ops methods. * darwin-nat.c (darwin_kill_inferior): Add target_ops parameter where missing. (darwin_stop_inferior, darwin_detach): Likewise.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/ChangeLog9
-rw-r--r--gdb/darwin-nat.c12
2 files changed, 15 insertions, 6 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2aeca94..cf51df0 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2009-03-12 Jonas Maebe <jonas.maebe@elis.ugent.be> (obvious change)
+
+ Fix a build failure on Darwin following some changes in
+ the profile of some target_ops methods.
+
+ * darwin-nat.c (darwin_kill_inferior): Add target_ops parameter
+ where missing.
+ (darwin_stop_inferior, darwin_detach): Likewise.
+
2009-03-12 Vladimir Prus <vladimir@codesourcery.com>
Include token in ^running notification for CLI commands.
diff --git a/gdb/darwin-nat.c b/gdb/darwin-nat.c
index 15a4b55..cabd4e2 100644
--- a/gdb/darwin-nat.c
+++ b/gdb/darwin-nat.c
@@ -90,7 +90,7 @@ static void darwin_mourn_inferior (struct target_ops *ops);
static int darwin_lookup_task (char *args, task_t * ptask, int *ppid);
-static void darwin_kill_inferior (void);
+static void darwin_kill_inferior (struct target_ops *ops);
static void darwin_ptrace_me (void);
@@ -668,7 +668,7 @@ darwin_mourn_inferior (struct target_ops *ops)
}
static void
-darwin_stop_inferior (darwin_inferior *inf)
+darwin_stop_inferior (struct target_ops *ops, darwin_inferior *inf)
{
struct target_waitstatus wstatus;
ptid_t ptid;
@@ -688,7 +688,7 @@ darwin_stop_inferior (darwin_inferior *inf)
if (res != 0)
warning (_("cannot kill: %s\n"), strerror (errno));
- ptid = darwin_wait (inferior_ptid, &wstatus);
+ ptid = darwin_wait (ops, inferior_ptid, &wstatus);
gdb_assert (wstatus.kind = TARGET_WAITKIND_STOPPED);
}
@@ -706,7 +706,7 @@ darwin_kill_inferior (struct target_ops *ops)
if (ptid_equal (inferior_ptid, null_ptid))
return;
- darwin_stop_inferior (darwin_inf);
+ darwin_stop_inferior (ops, darwin_inf);
res = PTRACE (PT_KILL, darwin_inf->pid, 0, 0);
gdb_assert (res == 0);
@@ -720,7 +720,7 @@ darwin_kill_inferior (struct target_ops *ops)
kret = task_resume (darwin_inf->task);
MACH_CHECK_ERROR (kret);
- ptid = darwin_wait (inferior_ptid, &wstatus);
+ ptid = darwin_wait (ops, inferior_ptid, &wstatus);
/* This double wait seems required... */
res = waitpid (darwin_inf->pid, &status, 0);
@@ -1011,7 +1011,7 @@ darwin_detach (struct target_ops *ops, char *args, int from_tty)
gdb_flush (gdb_stdout);
}
- darwin_stop_inferior (darwin_inf);
+ darwin_stop_inferior (ops, darwin_inf);
kret = darwin_restore_exception_ports (darwin_inf);
MACH_CHECK_ERROR (kret);