* breakpoint.c (remove_breakpoint): Do not fail if unable to remove

	breakpoint from shared library.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 845b3b5..0477f24 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
 2008-08-26  Ulrich Weigand  <uweigand@de.ibm.com>
 
+       * breakpoint.c (remove_breakpoint): Do not fail if unable to remove
+       breakpoint from shared library.
+
+2008-08-26  Ulrich Weigand  <uweigand@de.ibm.com>
+
        * solib-svr4.c (read_program_header): New function.
        (scan_dyntag_auxv): New function.
        (elf_locate_base): Use it if scan_dyntag fails.

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 18e207f..847de00 100644 (file)
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -1665,6 +1665,13 @@ remove_breakpoint (struct bp_location *b, insertion_state_t is)
              val = 0;
            }
        }
+
+      /* In some cases, we might not be able to remove a breakpoint
+        in a shared library that has already been removed, but we
+        have not yet processed the shlib unload event.  */
+      if (val && solib_address (b->address))
+       val = 0;
+
       if (val)
        return val;
       b->inserted = (is == mark_inserted);