From 9bbf65bb0848c4ea2887cdd4ca39561249ef11f5 Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Mon, 2 Jul 2007 18:30:19 +0000 Subject: [PATCH] 2007-07-02 Markus Deuling * breakpoint.c (insert_bp_location): Remove dead code (DISABLE_UNSETTABLE_BREAK). (disable_breakpoints_in_shlibs) (disable_breakpoints_in_unloaded_shlib): Likewise (comment). --- gdb/ChangeLog | 7 +++++++ gdb/breakpoint.c | 10 +--------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d16ca15..799bbde 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2007-07-02 Markus Deuling + + * breakpoint.c (insert_bp_location): Remove dead code + (DISABLE_UNSETTABLE_BREAK). + (disable_breakpoints_in_shlibs) + (disable_breakpoints_in_unloaded_shlib): Likewise (comment). + 2007-07-02 Daniel Jacobowitz * breakpoint.c (reattach_breakpoints): Do not use remove_breakpoint. diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index e294315..4c19dff 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -963,13 +963,7 @@ Note: automatically using hardware breakpoints for read-only addresses.\n")); if (val) { /* Can't set the breakpoint. */ - if ( -#if defined (DISABLE_UNSETTABLE_BREAK) - DISABLE_UNSETTABLE_BREAK (bpt->address) -#else - solib_address (bpt->address) -#endif - ) + if (solib_address (bpt->address)) { /* See also: disable_breakpoints_in_shlibs. */ val = 0; @@ -4484,7 +4478,6 @@ disable_breakpoints_in_shlibs (int silent) struct breakpoint *b; int disabled_shlib_breaks = 0; - /* See also: insert_breakpoints, under DISABLE_UNSETTABLE_BREAK. */ ALL_BREAKPOINTS (b) { if (((b->type == bp_breakpoint) || (b->type == bp_hardware_breakpoint)) @@ -4520,7 +4513,6 @@ disable_breakpoints_in_unloaded_shlib (struct so_list *solib) struct breakpoint *b; int disabled_shlib_breaks = 0; - /* See also: insert_breakpoints, under DISABLE_UNSETTABLE_BREAK. */ ALL_BREAKPOINTS (b) { if ((b->loc->loc_type == bp_loc_hardware_breakpoint -- 2.7.4