From a863b201d73bc238cbcfdbb11eac0a9ba2489a55 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 17 Dec 2013 21:31:52 -0700 Subject: [PATCH] Add target_ops argument to to_insert_fork_catchpoint 2014-02-19 Tom Tromey * target.h (struct target_ops) : Add argument. (target_insert_fork_catchpoint): Add argument. * target.c (debug_to_insert_fork_catchpoint): Add argument. (update_current_target): Update. * linux-nat.c (linux_child_insert_fork_catchpoint): Add 'self' argument. --- gdb/ChangeLog | 10 ++++++++++ gdb/linux-nat.c | 2 +- gdb/target.c | 6 +++--- gdb/target.h | 4 ++-- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 87f2d46bc9a..561333c90b5 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2014-02-19 Tom Tromey + + * target.h (struct target_ops) : Add + argument. + (target_insert_fork_catchpoint): Add argument. + * target.c (debug_to_insert_fork_catchpoint): Add argument. + (update_current_target): Update. + * linux-nat.c (linux_child_insert_fork_catchpoint): Add 'self' + argument. + 2014-02-19 Tom Tromey * target.h (struct target_ops) : Add diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c index 07289397f40..95b003f989c 100644 --- a/gdb/linux-nat.c +++ b/gdb/linux-nat.c @@ -696,7 +696,7 @@ holding the child stopped. Try \"set detach-on-fork\" or \ static int -linux_child_insert_fork_catchpoint (int pid) +linux_child_insert_fork_catchpoint (struct target_ops *self, int pid) { return !linux_supports_tracefork (); } diff --git a/gdb/target.c b/gdb/target.c index 699b55e9d4b..a0c7214b7d4 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -792,7 +792,7 @@ update_current_target (void) (void (*) (struct target_ops *, ptid_t)) target_ignore); de_fault (to_insert_fork_catchpoint, - (int (*) (int)) + (int (*) (struct target_ops *, int)) return_one); de_fault (to_remove_fork_catchpoint, (int (*) (int)) @@ -4866,11 +4866,11 @@ debug_to_post_startup_inferior (struct target_ops *self, ptid_t ptid) } static int -debug_to_insert_fork_catchpoint (int pid) +debug_to_insert_fork_catchpoint (struct target_ops *self, int pid) { int retval; - retval = debug_target.to_insert_fork_catchpoint (pid); + retval = debug_target.to_insert_fork_catchpoint (&debug_target, pid); fprintf_unfiltered (gdb_stdlog, "target_insert_fork_catchpoint (%d) = %d\n", pid, retval); diff --git a/gdb/target.h b/gdb/target.h index 433925e7d54..add3b0ceeea 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -498,7 +498,7 @@ struct target_ops void (*to_create_inferior) (struct target_ops *, char *, char *, char **, int); void (*to_post_startup_inferior) (struct target_ops *, ptid_t); - int (*to_insert_fork_catchpoint) (int); + int (*to_insert_fork_catchpoint) (struct target_ops *, int); int (*to_remove_fork_catchpoint) (int); int (*to_insert_vfork_catchpoint) (int); int (*to_remove_vfork_catchpoint) (int); @@ -1306,7 +1306,7 @@ void target_create_inferior (char *exec_file, char *args, catchpoint type is not supported and -1 for failure. */ #define target_insert_fork_catchpoint(pid) \ - (*current_target.to_insert_fork_catchpoint) (pid) + (*current_target.to_insert_fork_catchpoint) (¤t_target, pid) #define target_remove_fork_catchpoint(pid) \ (*current_target.to_remove_fork_catchpoint) (pid) -- 2.30.2