Revert:

	2011-07-31  Thiago Jung Bauermann  <bauerman@br.ibm.com>
	* breakpoint.c (insert_bp_location): Remove disabled_breaks
	argument.  Update callers.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6e20c0a48ed91966aa8f42f2391ec5e3565415fc..3e6e35024ec0f876e083556a4b111a250682f71c 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2011-08-01  Thiago Jung Bauermann  <bauerman@br.ibm.com>
+
+       Revert:
+       2011-07-31  Thiago Jung Bauermann  <bauerman@br.ibm.com>
+       * breakpoint.c (insert_bp_location): Remove disabled_breaks
+       argument.  Update callers.
+
 2011-08-01  Paul Pluzhnikov  <ppluzhnikov@google.com>
 
        PR gdb/13045

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 8fe16e6b4c0da726ae3c478491865b73529aaa6b..e1c1a55787f1ad0eae456b11a3888ed2ace0ab6e 100644 (file)
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -1573,7 +1573,7 @@ should_be_inserted (struct bp_location *bl)
 
 /* Insert a low-level "breakpoint" of some type.  BL is the breakpoint
    location.  Any error messages are printed to TMP_ERROR_STREAM; and
-   HW_BREAKPOINT_ERROR is used to report problems.
+   DISABLED_BREAKS, and HW_BREAKPOINT_ERROR are used to report problems.
    Returns 0 for success, 1 if the bp_location type is not supported or
    -1 for failure.
 
@@ -1582,6 +1582,7 @@ should_be_inserted (struct bp_location *bl)
 static int
 insert_bp_location (struct bp_location *bl,
                    struct ui_file *tmp_error_stream,
+                   int *disabled_breaks,
                    int *hw_breakpoint_error)
 {
   int val = 0;
@@ -1715,12 +1716,16 @@ insert_bp_location (struct bp_location *bl,
              val = 0;
              bl->shlib_disabled = 1;
              observer_notify_breakpoint_modified (bl->owner);
-             fprintf_unfiltered (tmp_error_stream, 
-                                 "Cannot insert breakpoint %d.\n", 
-                                 bl->owner->number);
-             fprintf_unfiltered (tmp_error_stream, 
-                                 "Temporarily disabling shared "
-                                 "library breakpoints:\n");
+             if (!*disabled_breaks)
+               {
+                 fprintf_unfiltered (tmp_error_stream, 
+                                     "Cannot insert breakpoint %d.\n", 
+                                     bl->owner->number);
+                 fprintf_unfiltered (tmp_error_stream, 
+                                     "Temporarily disabling shared "
+                                     "library breakpoints:\n");
+               }
+             *disabled_breaks = 1;
              fprintf_unfiltered (tmp_error_stream,
                                  "breakpoint #%d\n", bl->owner->number);
            }
@@ -1908,6 +1913,7 @@ insert_breakpoint_locations (void)
   struct bp_location *bl, **blp_tmp;
   int error = 0;
   int val = 0;
+  int disabled_breaks = 0;
   int hw_breakpoint_error = 0;
 
   struct ui_file *tmp_error_stream = mem_fileopen ();
@@ -1941,8 +1947,8 @@ insert_breakpoint_locations (void)
          && ptid_equal (inferior_ptid, null_ptid))
        continue;
 
-      val = insert_bp_location (bl, tmp_error_stream,
-                               &hw_breakpoint_error);
+      val = insert_bp_location (bl, tmp_error_stream, &disabled_breaks,
+                                   &hw_breakpoint_error);
       if (val)
        error = val;
     }
@@ -2049,7 +2055,7 @@ reattach_breakpoints (int pid)
   struct bp_location *bl, **blp_tmp;
   int val;
   struct ui_file *tmp_error_stream;
-  int dummy = 0;
+  int dummy1 = 0, dummy2 = 0;
   struct inferior *inf;
   struct thread_info *tp;
 
@@ -2073,7 +2079,7 @@ reattach_breakpoints (int pid)
     if (bl->inserted)
       {
        bl->inserted = 0;
-       val = insert_bp_location (bl, tmp_error_stream, &dummy);
+       val = insert_bp_location (bl, tmp_error_stream, &dummy1, &dummy2);
        if (val != 0)
          {
            do_cleanups (old_chain);