Add target_ops argument to to_remove_fork_catchpoint

2014-02-19  Tom Tromey  <tromey@redhat.com>

	* target.h (struct target_ops) <to_remove_fork_catchpoint>: Add
	argument.
	(target_remove_fork_catchpoint): Add argument.
	* target.c (debug_to_remove_fork_catchpoint): Add argument.
	(update_current_target): Update.
	* linux-nat.c (linux_child_remove_fork_catchpoint): Add 'self'
	argument.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 561333c90b51ccb32ecf797fba29c5da5a7874d5..df51aab1a9b33a6e948558f918626bc13c51e846 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+2014-02-19  Tom Tromey  <tromey@redhat.com>
+
+       * target.h (struct target_ops) <to_remove_fork_catchpoint>: Add
+       argument.
+       (target_remove_fork_catchpoint): Add argument.
+       * target.c (debug_to_remove_fork_catchpoint): Add argument.
+       (update_current_target): Update.
+       * linux-nat.c (linux_child_remove_fork_catchpoint): Add 'self'
+       argument.
+
 2014-02-19  Tom Tromey  <tromey@redhat.com>
 
        * target.h (struct target_ops) <to_insert_fork_catchpoint>: Add

diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
index 95b003f989caa59186c67271883d33da98603fbd..d4f6bf4a1e8048ae113a640577336f0974241c99 100644 (file)
--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -702,7 +702,7 @@ linux_child_insert_fork_catchpoint (struct target_ops *self, int pid)
 }
 
 static int
-linux_child_remove_fork_catchpoint (int pid)
+linux_child_remove_fork_catchpoint (struct target_ops *self, int pid)
 {
   return 0;
 }

diff --git a/gdb/target.c b/gdb/target.c
index a0c7214b7d4045aaa836a6d5c76ba521d3b73ec6..c833645412d734b9b3abe20ac96f9025aba771ce 100644 (file)
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -795,7 +795,7 @@ update_current_target (void)
            (int (*) (struct target_ops *, int))
            return_one);
   de_fault (to_remove_fork_catchpoint,
-           (int (*) (int))
+           (int (*) (struct target_ops *, int))
            return_one);
   de_fault (to_insert_vfork_catchpoint,
            (int (*) (int))
@@ -4879,11 +4879,11 @@ debug_to_insert_fork_catchpoint (struct target_ops *self, int pid)
 }
 
 static int
-debug_to_remove_fork_catchpoint (int pid)
+debug_to_remove_fork_catchpoint (struct target_ops *self, int pid)
 {
   int retval;
 
-  retval = debug_target.to_remove_fork_catchpoint (pid);
+  retval = debug_target.to_remove_fork_catchpoint (&debug_target, pid);
 
   fprintf_unfiltered (gdb_stdlog, "target_remove_fork_catchpoint (%d) = %d\n",
                      pid, retval);

diff --git a/gdb/target.h b/gdb/target.h
index add3b0ceeea3a2c0ad0ac29c73dbeef655ea53dc..54cc0858778307400758e260dd0776b983505cd7 100644 (file)
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -499,7 +499,7 @@ struct target_ops
                                char *, char *, char **, int);
     void (*to_post_startup_inferior) (struct target_ops *, ptid_t);
     int (*to_insert_fork_catchpoint) (struct target_ops *, int);
-    int (*to_remove_fork_catchpoint) (int);
+    int (*to_remove_fork_catchpoint) (struct target_ops *, int);
     int (*to_insert_vfork_catchpoint) (int);
     int (*to_remove_vfork_catchpoint) (int);
     int (*to_follow_fork) (struct target_ops *, int, int);
@@ -1309,7 +1309,7 @@ void target_create_inferior (char *exec_file, char *args,
      (*current_target.to_insert_fork_catchpoint) (&current_target, pid)
 
 #define target_remove_fork_catchpoint(pid) \
-     (*current_target.to_remove_fork_catchpoint) (pid)
+     (*current_target.to_remove_fork_catchpoint) (&current_target, pid)
 
 #define target_insert_vfork_catchpoint(pid) \
      (*current_target.to_insert_vfork_catchpoint) (pid)