2007-07-02 Markus Deuling <deuling@de.ibm.com>

	* breakpoint.c (insert_bp_location): Remove dead code
	(DISABLE_UNSETTABLE_BREAK).
	(disable_breakpoints_in_shlibs)
	(disable_breakpoints_in_unloaded_shlib): Likewise (comment).

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d16ca15eee7bb3dce71a16baca1fb4be70ed9c56..799bbde43a21aedded1a776beee1dc89078005c0 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2007-07-02  Markus Deuling  <deuling@de.ibm.com>
+
+       * 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  <dan@codesourcery.com>
 
        * breakpoint.c (reattach_breakpoints): Do not use remove_breakpoint.

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index e294315bf6f3669905393e799dcb566db5dca817..4c19dffe607bdf23bf5b090393326b79746adffd 100644 (file)
--- 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