convert to_post_startup_inferior

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

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

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3a0a45a30f95af985e4f6695b6bac835a98902c4..7971a421af10c0a6ac2a888bc2d9e779dd1f474d 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_post_startup_inferior.
+       * target.h (struct target_ops) <to_post_startup_inferior>: Use
+       TARGET_DEFAULT_IGNORE.
+
 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 80e7ede9c1b311ce54ba550386349012b3354f21..fec714a43198099a88b31416644b063d89e7d0f0 100644 (file)
--- a/gdb/target-delegates.c
+++ b/gdb/target-delegates.c
@@ -310,6 +310,18 @@ tdefault_load (struct target_ops *self, char *arg1, int arg2)
   tcomplain ();
 }
 
+static void
+delegate_post_startup_inferior (struct target_ops *self, ptid_t arg1)
+{
+  self = self->beneath;
+  self->to_post_startup_inferior (self, arg1);
+}
+
+static void
+tdefault_post_startup_inferior (struct target_ops *self, ptid_t arg1)
+{
+}
+
 static void
 delegate_rcmd (struct target_ops *self, char *arg1, struct ui_file *arg2)
 {
@@ -427,6 +439,8 @@ install_delegators (struct target_ops *ops)
     ops->to_terminal_info = delegate_terminal_info;
   if (ops->to_load == NULL)
     ops->to_load = delegate_load;
+  if (ops->to_post_startup_inferior == NULL)
+    ops->to_post_startup_inferior = delegate_post_startup_inferior;
   if (ops->to_rcmd == NULL)
     ops->to_rcmd = delegate_rcmd;
   if (ops->to_can_async_p == NULL)
@@ -471,6 +485,7 @@ install_dummy_methods (struct target_ops *ops)
   ops->to_terminal_save_ours = tdefault_terminal_save_ours;
   ops->to_terminal_info = default_terminal_info;
   ops->to_load = tdefault_load;
+  ops->to_post_startup_inferior = tdefault_post_startup_inferior;
   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 08b217c60e49f47f5c3d95ea4bed521b2117a202..6a2c2ea24020b645bec0d85db19551d4cb3e95d7 100644 (file)
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -629,7 +629,7 @@ update_current_target (void)
       /* Do not inherit to_kill.  */
       /* Do not inherit to_load.  */
       /* Do no inherit to_create_inferior.  */
-      INHERIT (to_post_startup_inferior, t);
+      /* Do not inherit to_post_startup_inferior.  */
       INHERIT (to_insert_fork_catchpoint, t);
       INHERIT (to_remove_fork_catchpoint, t);
       INHERIT (to_insert_vfork_catchpoint, t);
@@ -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_post_startup_inferior,
-           (void (*) (struct target_ops *, ptid_t))
-           target_ignore);
   de_fault (to_insert_fork_catchpoint,
            (int (*) (struct target_ops *, int))
            return_one);

diff --git a/gdb/target.h b/gdb/target.h
index b37d07038a0e8c1066554b086d9dc1622200c8f3..3560fabcad27154e7e6442596ad5a6fa355717cb 100644 (file)
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -517,7 +517,8 @@ struct target_ops
       TARGET_DEFAULT_NORETURN (tcomplain ());
     void (*to_create_inferior) (struct target_ops *, 
                                char *, char *, char **, int);
-    void (*to_post_startup_inferior) (struct target_ops *, ptid_t);
+    void (*to_post_startup_inferior) (struct target_ops *, ptid_t)
+      TARGET_DEFAULT_IGNORE ();
     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);