Add target_ops argument to to_remove_exec_catchpoint

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

	* target.h (struct target_ops) <to_remove_exec_catchpoint>: Add
	argument.
	(target_remove_exec_catchpoint): Add argument.
	* target.c (debug_to_remove_exec_catchpoint): Add argument.
	(update_current_target): Update.
	* linux-nat.c (linux_child_remove_exec_catchpoint): Add 'self'
	argument.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c2bb891e463c3a65fa3e6d6659342b22c30190d1..bcf582aaf859bc18212124b06765b10d16101e10 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_exec_catchpoint>: Add
+       argument.
+       (target_remove_exec_catchpoint): Add argument.
+       * target.c (debug_to_remove_exec_catchpoint): Add argument.
+       (update_current_target): Update.
+       * linux-nat.c (linux_child_remove_exec_catchpoint): Add 'self'
+       argument.
+
 2014-02-19  Tom Tromey  <tromey@redhat.com>
 
        * target.h (struct target_ops) <to_insert_exec_catchpoint>: Add

diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
index 1a37ec5552a8feec3ece6fe0c5a06ff9a7368880..c158f32a9fce1b5b0ab20fa3a36328a175bc9fa7 100644 (file)
--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -726,7 +726,7 @@ linux_child_insert_exec_catchpoint (struct target_ops *self, int pid)
 }
 
 static int
-linux_child_remove_exec_catchpoint (int pid)
+linux_child_remove_exec_catchpoint (struct target_ops *self, int pid)
 {
   return 0;
 }

diff --git a/gdb/target.c b/gdb/target.c
index 0b10f39a86776fe63f06384cdec3a022a2140368..72ab8f3fa0ab8ba2588a35f18d053ec2e414aeba 100644 (file)
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -807,7 +807,7 @@ update_current_target (void)
            (int (*) (struct target_ops *, int))
            return_one);
   de_fault (to_remove_exec_catchpoint,
-           (int (*) (int))
+           (int (*) (struct target_ops *, int))
            return_one);
   de_fault (to_set_syscall_catchpoint,
            (int (*) (int, int, int, int, int *))
@@ -4931,11 +4931,11 @@ debug_to_insert_exec_catchpoint (struct target_ops *self, int pid)
 }
 
 static int
-debug_to_remove_exec_catchpoint (int pid)
+debug_to_remove_exec_catchpoint (struct target_ops *self, int pid)
 {
   int retval;
 
-  retval = debug_target.to_remove_exec_catchpoint (pid);
+  retval = debug_target.to_remove_exec_catchpoint (&debug_target, pid);
 
   fprintf_unfiltered (gdb_stdlog, "target_remove_exec_catchpoint (%d) = %d\n",
                      pid, retval);

diff --git a/gdb/target.h b/gdb/target.h
index e1925638437376204833d48212fdff6b03defd12..e500e92335b26782365e764a2fd614cc04b75113 100644 (file)
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -504,7 +504,7 @@ struct target_ops
     int (*to_remove_vfork_catchpoint) (struct target_ops *, int);
     int (*to_follow_fork) (struct target_ops *, int, int);
     int (*to_insert_exec_catchpoint) (struct target_ops *, int);
-    int (*to_remove_exec_catchpoint) (int);
+    int (*to_remove_exec_catchpoint) (struct target_ops *, int);
     int (*to_set_syscall_catchpoint) (int, int, int, int, int *);
     int (*to_has_exited) (int, int, int *);
     void (*to_mourn_inferior) (struct target_ops *);
@@ -1336,7 +1336,7 @@ int target_follow_fork (int follow_child, int detach_fork);
      (*current_target.to_insert_exec_catchpoint) (&current_target, pid)
 
 #define target_remove_exec_catchpoint(pid) \
-     (*current_target.to_remove_exec_catchpoint) (pid)
+     (*current_target.to_remove_exec_catchpoint) (&current_target, pid)
 
 /* Syscall catch.