From 340ba4bf679856ffdfd0f44808ce5c17d3668ff5 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 18 Dec 2013 10:32:56 -0700 Subject: [PATCH] convert to_post_startup_inferior 2014-02-19 Tom Tromey * target-delegates.c: Rebuild. * target.c (update_current_target): Don't inherit or default to_post_startup_inferior. * target.h (struct target_ops) : Use TARGET_DEFAULT_IGNORE. --- gdb/ChangeLog | 8 ++++++++ gdb/target-delegates.c | 15 +++++++++++++++ gdb/target.c | 5 +---- gdb/target.h | 3 ++- 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 3a0a45a..7971a42 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -2,6 +2,14 @@ * target-delegates.c: Rebuild. * target.c (update_current_target): Don't inherit or default + to_post_startup_inferior. + * target.h (struct target_ops) : Use + TARGET_DEFAULT_IGNORE. + +2014-02-19 Tom Tromey + + * target-delegates.c: Rebuild. + * target.c (update_current_target): Don't inherit or default to_load. * target.h (struct target_ops) : Use TARGET_DEFAULT_NORETURN. diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c index 80e7ede..fec714a 100644 --- a/gdb/target-delegates.c +++ b/gdb/target-delegates.c @@ -311,6 +311,18 @@ tdefault_load (struct target_ops *self, char *arg1, int arg2) } 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) { self = self->beneath; @@ -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 08b217c..6a2c2ea 100644 --- 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 b37d070..3560fab 100644 --- 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); -- 2.7.4