Add target_ops argument to to_remove_vfork_catchpoint

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

	* target.h (struct target_ops) <to_remove_vfork_catchpoint>: Add
	argument.
	(target_remove_vfork_catchpoint): Add argument.
	* target.c (debug_to_remove_vfork_catchpoint): Add argument.
	(update_current_target): Update.
	* linux-nat.c (linux_child_remove_vfork_catchpoint): Add 'self'
	argument.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b0fc6b1a301b6f729163d2c83b2d2a0516e39ace..f9ab94b5c3bdfbac66b61361295950bc134f0385 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_vfork_catchpoint>: Add
+       argument.
+       (target_remove_vfork_catchpoint): Add argument.
+       * target.c (debug_to_remove_vfork_catchpoint): Add argument.
+       (update_current_target): Update.
+       * linux-nat.c (linux_child_remove_vfork_catchpoint): Add 'self'
+       argument.
+
 2014-02-19  Tom Tromey  <tromey@redhat.com>
 
        * target.h (struct target_ops) <to_insert_vfork_catchpoint>: Add

diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
index e5144a73c8883d53be86c22f65c7154f39a40f1d..fa862f6720c091012b087283ee6e3fa34bb17eda 100644 (file)
--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -714,7 +714,7 @@ linux_child_insert_vfork_catchpoint (struct target_ops *self, int pid)
 }
 
 static int
-linux_child_remove_vfork_catchpoint (int pid)
+linux_child_remove_vfork_catchpoint (struct target_ops *self, int pid)
 {
   return 0;
 }

diff --git a/gdb/target.c b/gdb/target.c
index 0726f2742351bd43c8b04bc3c4b0a34083d1ce4f..edc3b970fbea51e1e5fb533e258a0a236afce976 100644 (file)
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -801,7 +801,7 @@ update_current_target (void)
            (int (*) (struct target_ops *, int))
            return_one);
   de_fault (to_remove_vfork_catchpoint,
-           (int (*) (int))
+           (int (*) (struct target_ops *, int))
            return_one);
   de_fault (to_insert_exec_catchpoint,
            (int (*) (int))
@@ -4905,11 +4905,11 @@ debug_to_insert_vfork_catchpoint (struct target_ops *self, int pid)
 }
 
 static int
-debug_to_remove_vfork_catchpoint (int pid)
+debug_to_remove_vfork_catchpoint (struct target_ops *self, int pid)
 {
   int retval;
 
-  retval = debug_target.to_remove_vfork_catchpoint (pid);
+  retval = debug_target.to_remove_vfork_catchpoint (&debug_target, pid);
 
   fprintf_unfiltered (gdb_stdlog, "target_remove_vfork_catchpoint (%d) = %d\n",
                      pid, retval);

diff --git a/gdb/target.h b/gdb/target.h
index ff907b96f1a3b1f9991c842cf5420ca96288f8c5..0717e1a0b6a37da6b44286b7f8658360f0b73403 100644 (file)
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -501,7 +501,7 @@ struct target_ops
     int (*to_insert_fork_catchpoint) (struct target_ops *, int);
     int (*to_remove_fork_catchpoint) (struct target_ops *, int);
     int (*to_insert_vfork_catchpoint) (struct target_ops *, int);
-    int (*to_remove_vfork_catchpoint) (int);
+    int (*to_remove_vfork_catchpoint) (struct target_ops *, int);
     int (*to_follow_fork) (struct target_ops *, int, int);
     int (*to_insert_exec_catchpoint) (int);
     int (*to_remove_exec_catchpoint) (int);
@@ -1315,7 +1315,7 @@ void target_create_inferior (char *exec_file, char *args,
      (*current_target.to_insert_vfork_catchpoint) (&current_target, pid)
 
 #define target_remove_vfork_catchpoint(pid) \
-     (*current_target.to_remove_vfork_catchpoint) (pid)
+     (*current_target.to_remove_vfork_catchpoint) (&current_target, pid)
 
 /* If the inferior forks or vforks, this function will be called at
    the next resume in order to perform any bookkeeping and fiddling