convert to_remove_fork_catchpoint

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

	* target-delegates.c: Rebuild.
	* target.c (update_current_target): Don't inherit or default
	to_remove_fork_catchpoint.
	* target.h (struct target_ops) <to_remove_fork_catchpoint>: Use
	TARGET_DEFAULT_RETURN.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 372c04280d6d43c91eabf846e59694ad702762ff..c1132020813c46b11af59e439c626c09dc073884 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2014-02-19  Tom Tromey  <tromey@redhat.com>
+
+       * target-delegates.c: Rebuild.
+       * target.c (update_current_target): Don't inherit or default
+       to_remove_fork_catchpoint.
+       * target.h (struct target_ops) <to_remove_fork_catchpoint>: Use
+       TARGET_DEFAULT_RETURN.
+
 2014-02-19  Tom Tromey  <tromey@redhat.com>
 
        * target-delegates.c: Rebuild.

diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c
index 4399bb07f4382e9862e3bd41d6c418b6d8032bc8..98169718d8bb1ed7b52c31454693d7803afc7f32 100644 (file)
--- a/gdb/target-delegates.c
+++ b/gdb/target-delegates.c
@@ -335,6 +335,19 @@ tdefault_insert_fork_catchpoint (struct target_ops *self, int arg1)
   return 1;
 }
 
+static int
+delegate_remove_fork_catchpoint (struct target_ops *self, int arg1)
+{
+  self = self->beneath;
+  return self->to_remove_fork_catchpoint (self, arg1);
+}
+
+static int
+tdefault_remove_fork_catchpoint (struct target_ops *self, int arg1)
+{
+  return 1;
+}
+
 static void
 delegate_rcmd (struct target_ops *self, char *arg1, struct ui_file *arg2)
 {
@@ -456,6 +469,8 @@ install_delegators (struct target_ops *ops)
     ops->to_post_startup_inferior = delegate_post_startup_inferior;
   if (ops->to_insert_fork_catchpoint == NULL)
     ops->to_insert_fork_catchpoint = delegate_insert_fork_catchpoint;
+  if (ops->to_remove_fork_catchpoint == NULL)
+    ops->to_remove_fork_catchpoint = delegate_remove_fork_catchpoint;
   if (ops->to_rcmd == NULL)
     ops->to_rcmd = delegate_rcmd;
   if (ops->to_can_async_p == NULL)
@@ -502,6 +517,7 @@ install_dummy_methods (struct target_ops *ops)
   ops->to_load = tdefault_load;
   ops->to_post_startup_inferior = tdefault_post_startup_inferior;
   ops->to_insert_fork_catchpoint = tdefault_insert_fork_catchpoint;
+  ops->to_remove_fork_catchpoint = tdefault_remove_fork_catchpoint;
   ops->to_rcmd = default_rcmd;
   ops->to_can_async_p = find_default_can_async_p;
   ops->to_is_async_p = find_default_is_async_p;

diff --git a/gdb/target.c b/gdb/target.c
index 1e1b6d749ff1394610371f3ac79b0ccb0f306d94..3f5cb3b70cdea21e379df7b1a20605f579b1b74f 100644 (file)
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -631,7 +631,7 @@ update_current_target (void)
       /* Do no inherit to_create_inferior.  */
       /* Do not inherit to_post_startup_inferior.  */
       /* Do not inherit to_insert_fork_catchpoint.  */
-      INHERIT (to_remove_fork_catchpoint, t);
+      /* Do not inherit to_remove_fork_catchpoint.  */
       INHERIT (to_insert_vfork_catchpoint, t);
       INHERIT (to_remove_vfork_catchpoint, t);
       /* Do not inherit to_follow_fork.  */
@@ -734,9 +734,6 @@ update_current_target (void)
            (int (*) (CORE_ADDR, gdb_byte *, int, int,
                      struct mem_attrib *, struct target_ops *))
            nomemory);
-  de_fault (to_remove_fork_catchpoint,
-           (int (*) (struct target_ops *, int))
-           return_one);
   de_fault (to_insert_vfork_catchpoint,
            (int (*) (struct target_ops *, int))
            return_one);

diff --git a/gdb/target.h b/gdb/target.h
index 59f95c7ed531c15c852ccac33e657e4066732322..6bcb1d97729a130582d18fad41788f24dab5ebae 100644 (file)
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -521,7 +521,8 @@ struct target_ops
       TARGET_DEFAULT_IGNORE ();
     int (*to_insert_fork_catchpoint) (struct target_ops *, int)
       TARGET_DEFAULT_RETURN (1);
-    int (*to_remove_fork_catchpoint) (struct target_ops *, int);
+    int (*to_remove_fork_catchpoint) (struct target_ops *, int)
+      TARGET_DEFAULT_RETURN (1);
     int (*to_insert_vfork_catchpoint) (struct target_ops *, int);
     int (*to_remove_vfork_catchpoint) (struct target_ops *, int);
     int (*to_follow_fork) (struct target_ops *, int, int);