diff options
| -rw-r--r-- | gdb/ChangeLog | 9 | ||||
| -rw-r--r-- | gdb/target-delegates.c | 16 | ||||
| -rw-r--r-- | gdb/target.c | 6 | ||||
| -rw-r--r-- | gdb/target.h | 3 |
4 files changed, 29 insertions, 5 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 8002644..8368621 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -2,6 +2,15 @@ * target-delegates.c: Rebuild. * target.c (update_current_target): Don't inherit or default + to_supports_evaluation_of_breakpoint_conditions. + * target.h (struct target_ops) + <to_supports_evaluation_of_breakpoint_conditions>: Use + TARGET_DEFAULT_RETURN. + +2014-02-19 Tom Tromey <tromey@redhat.com> + + * target-delegates.c: Rebuild. + * target.c (update_current_target): Don't inherit or default to_augmented_libraries_svr4_read. * target.h (struct target_ops) <to_augmented_libraries_svr4_read>: Use TARGET_DEFAULT_RETURN. diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c index 0ddfbc1..509cc7a 100644 --- a/gdb/target-delegates.c +++ b/gdb/target-delegates.c @@ -630,6 +630,19 @@ tdefault_supports_string_tracing (struct target_ops *self) return 0; } +static int +delegate_supports_evaluation_of_breakpoint_conditions (struct target_ops *self) +{ + self = self->beneath; + return self->to_supports_evaluation_of_breakpoint_conditions (self); +} + +static int +tdefault_supports_evaluation_of_breakpoint_conditions (struct target_ops *self) +{ + return 0; +} + static struct gdbarch * delegate_thread_architecture (struct target_ops *self, ptid_t arg1) { @@ -1149,6 +1162,8 @@ install_delegators (struct target_ops *ops) ops->to_supports_enable_disable_tracepoint = delegate_supports_enable_disable_tracepoint; if (ops->to_supports_string_tracing == NULL) ops->to_supports_string_tracing = delegate_supports_string_tracing; + if (ops->to_supports_evaluation_of_breakpoint_conditions == NULL) + ops->to_supports_evaluation_of_breakpoint_conditions = delegate_supports_evaluation_of_breakpoint_conditions; if (ops->to_thread_architecture == NULL) ops->to_thread_architecture = delegate_thread_architecture; if (ops->to_trace_init == NULL) @@ -1273,6 +1288,7 @@ install_dummy_methods (struct target_ops *ops) ops->to_supports_multi_process = tdefault_supports_multi_process; ops->to_supports_enable_disable_tracepoint = tdefault_supports_enable_disable_tracepoint; ops->to_supports_string_tracing = tdefault_supports_string_tracing; + ops->to_supports_evaluation_of_breakpoint_conditions = tdefault_supports_evaluation_of_breakpoint_conditions; ops->to_thread_architecture = default_thread_architecture; ops->to_trace_init = tdefault_trace_init; ops->to_download_tracepoint = tdefault_download_tracepoint; diff --git a/gdb/target.c b/gdb/target.c index 0178f56..64c5cd6 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -715,7 +715,8 @@ update_current_target (void) /* Do not inherit to_can_use_agent. */ /* Do not inherit to_augmented_libraries_svr4_read. */ INHERIT (to_magic, t); - INHERIT (to_supports_evaluation_of_breakpoint_conditions, t); + /* Do not inherit + to_supports_evaluation_of_breakpoint_conditions. */ INHERIT (to_can_run_breakpoint_commands, t); /* Do not inherit to_memory_map. */ /* Do not inherit to_flash_erase. */ @@ -748,9 +749,6 @@ update_current_target (void) (void (*) (struct target_ops *, ptid_t)) target_ignore); current_target.to_read_description = NULL; - de_fault (to_supports_evaluation_of_breakpoint_conditions, - (int (*) (struct target_ops *)) - return_zero); de_fault (to_can_run_breakpoint_commands, (int (*) (struct target_ops *)) return_zero); diff --git a/gdb/target.h b/gdb/target.h index 7dfe61a..97c5384 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -730,7 +730,8 @@ struct target_ops /* Does this target support evaluation of breakpoint conditions on its end? */ - int (*to_supports_evaluation_of_breakpoint_conditions) (struct target_ops *); + int (*to_supports_evaluation_of_breakpoint_conditions) (struct target_ops *) + TARGET_DEFAULT_RETURN (0); /* Does this target support evaluation of breakpoint commands on its end? */ |