* 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.
This commit is contained in:
Vladimir Prus 2007-08-14 11:09:45 +00:00
parent cf73852866
commit cb85195420
6 changed files with 15 additions and 17 deletions

View file

@ -1,3 +1,13 @@
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> 2007-08-14 Vladimir Prus <vladimir@codesourcery.com>
gdb/ gdb/

View file

@ -4448,7 +4448,7 @@ create_solib_event_breakpoint (CORE_ADDR address)
apply to enabled breakpoints, disabled ones can just stay disabled. */ apply to enabled breakpoints, disabled ones can just stay disabled. */
void void
disable_breakpoints_in_shlibs (int silent) disable_breakpoints_in_shlibs (void)
{ {
struct breakpoint *b; struct breakpoint *b;
int disabled_shlib_breaks = 0; int disabled_shlib_breaks = 0;
@ -4463,19 +4463,7 @@ disable_breakpoints_in_shlibs (int silent)
&& solib_address (b->loc->address) && solib_address (b->loc->address)
#endif #endif
) )
{
b->enable_state = bp_shlib_disabled; 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);
}
}
} }
} }

View file

@ -791,7 +791,7 @@ extern void remove_solib_event_breakpoints (void);
extern void remove_thread_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); extern void re_enable_breakpoints_in_shlibs (void);

View file

@ -854,7 +854,7 @@ clear_solib (void)
So: disable breakpoints only if we're using ELF shared libs. */ So: disable breakpoints only if we're using ELF shared libs. */
if (exec_bfd != NULL if (exec_bfd != NULL
&& bfd_get_flavour (exec_bfd) != bfd_target_aout_flavour) && bfd_get_flavour (exec_bfd) != bfd_target_aout_flavour)
disable_breakpoints_in_shlibs (1); disable_breakpoints_in_shlibs ();
while (so_list_head) while (so_list_head)
{ {

View file

@ -1585,7 +1585,7 @@ do_initial_win32_stuff (DWORD pid)
current_event.dwProcessId = pid; current_event.dwProcessId = pid;
memset (&current_event, 0, sizeof (current_event)); memset (&current_event, 0, sizeof (current_event));
push_target (&win32_ops); push_target (&win32_ops);
disable_breakpoints_in_shlibs (1); disable_breakpoints_in_shlibs ();
win32_clear_solib (); win32_clear_solib ();
clear_proceed_status (); clear_proceed_status ();
init_wait_for_inferior (); init_wait_for_inferior ();

View file

@ -1585,7 +1585,7 @@ do_initial_win32_stuff (DWORD pid)
current_event.dwProcessId = pid; current_event.dwProcessId = pid;
memset (&current_event, 0, sizeof (current_event)); memset (&current_event, 0, sizeof (current_event));
push_target (&win32_ops); push_target (&win32_ops);
disable_breakpoints_in_shlibs (1); disable_breakpoints_in_shlibs ();
win32_clear_solib (); win32_clear_solib ();
clear_proceed_status (); clear_proceed_status ();
init_wait_for_inferior (); init_wait_for_inferior ();