From cb851954200d7cf1d391dc9d28dddbefd9840eac Mon Sep 17 00:00:00 2001
From: Vladimir Prus <vladimir@codesourcery.com>
Date: Tue, 14 Aug 2007 11:09:45 +0000
Subject: 	gdb/ 	* breakpoint.c (disable_breakpoints_in_shlibs): Remove
 	the 'silent' parameter and code to implement that. 	* breakpoint.h
 (disable_breakpoints_in_shlibs): Adjust 	prototype. 	* win32-nat.c:
 Adjust. 	* solib.c: Adjust.

---
 gdb/ChangeLog     | 10 ++++++++++
 gdb/breakpoint.c  | 14 +-------------
 gdb/breakpoint.h  |  2 +-
 gdb/solib.c       |  2 +-
 gdb/win32-nat.c   |  2 +-
 gdb/windows-nat.c |  2 +-
 6 files changed, 15 insertions(+), 17 deletions(-)

(limited to 'gdb')

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9f58c40..da35d38 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,6 +1,16 @@
 2007-08-14  Vladimir Prus  <vladimir@codesourcery.com>
 
 	gdb/
+	* breakpoint.c (disable_breakpoints_in_shlibs): Remove
+	the 'silent' parameter and code to implement that.
+	* breakpoint.h (disable_breakpoints_in_shlibs): Adjust
+	prototype.
+	* win32-nat.c: Adjust.
+	* solib.c: Adjust.
+	
+2007-08-14  Vladimir Prus  <vladimir@codesourcery.com>
+
+	gdb/
 	* breakpoint.c (update_breakpoints_after_exec): Don't
 	set address to zero.
 
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 1fc3d10..f798710 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -4448,7 +4448,7 @@ create_solib_event_breakpoint (CORE_ADDR address)
    apply to enabled breakpoints, disabled ones can just stay disabled.  */
 
 void
-disable_breakpoints_in_shlibs (int silent)
+disable_breakpoints_in_shlibs (void)
 {
   struct breakpoint *b;
   int disabled_shlib_breaks = 0;
@@ -4463,19 +4463,7 @@ disable_breakpoints_in_shlibs (int silent)
 	&& solib_address (b->loc->address)
 #endif
 	)
-      {
 	b->enable_state = bp_shlib_disabled;
-	if (!silent)
-	  {
-	    if (!disabled_shlib_breaks)
-	      {
-		target_terminal_ours_for_output ();
-		warning (_("Temporarily disabling shared library breakpoints:"));
-	      }
-	    disabled_shlib_breaks = 1;
-	    warning (_("breakpoint #%d "), b->number);
-	  }
-      }
   }
 }
 
diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h
index 1573ac8..b7996a5 100644
--- a/gdb/breakpoint.h
+++ b/gdb/breakpoint.h
@@ -791,7 +791,7 @@ extern void remove_solib_event_breakpoints (void);
 
 extern void remove_thread_event_breakpoints (void);
 
-extern void disable_breakpoints_in_shlibs (int silent);
+extern void disable_breakpoints_in_shlibs (void);
 
 extern void re_enable_breakpoints_in_shlibs (void);
 
diff --git a/gdb/solib.c b/gdb/solib.c
index bd4cf51..7e2f758 100644
--- a/gdb/solib.c
+++ b/gdb/solib.c
@@ -854,7 +854,7 @@ clear_solib (void)
      So: disable breakpoints only if we're using ELF shared libs.  */
   if (exec_bfd != NULL
       && bfd_get_flavour (exec_bfd) != bfd_target_aout_flavour)
-    disable_breakpoints_in_shlibs (1);
+    disable_breakpoints_in_shlibs ();
 
   while (so_list_head)
     {
diff --git a/gdb/win32-nat.c b/gdb/win32-nat.c
index d312d17..91ee9cd 100644
--- a/gdb/win32-nat.c
+++ b/gdb/win32-nat.c
@@ -1585,7 +1585,7 @@ do_initial_win32_stuff (DWORD pid)
   current_event.dwProcessId = pid;
   memset (&current_event, 0, sizeof (current_event));
   push_target (&win32_ops);
-  disable_breakpoints_in_shlibs (1);
+  disable_breakpoints_in_shlibs ();
   win32_clear_solib ();
   clear_proceed_status ();
   init_wait_for_inferior ();
diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index d312d17..91ee9cd 100644
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -1585,7 +1585,7 @@ do_initial_win32_stuff (DWORD pid)
   current_event.dwProcessId = pid;
   memset (&current_event, 0, sizeof (current_event));
   push_target (&win32_ops);
-  disable_breakpoints_in_shlibs (1);
+  disable_breakpoints_in_shlibs ();
   win32_clear_solib ();
   clear_proceed_status ();
   init_wait_for_inferior ();
-- 
cgit v1.1