2011-06-23 Yao Qi <yao@codesourcery.com>
* infrun.c (start_remote): Move call init_wait_for_inferior to ... * remote.c (remote_start_remote): ... here. * monitor.c (monitor_open): ... here.
This commit is contained in:
parent
ab5c6a729c
commit
6e586cc565
4 changed files with 19 additions and 1 deletions
|
@ -1,3 +1,9 @@
|
||||||
|
2011-06-23 Yao Qi <yao@codesourcery.com>
|
||||||
|
|
||||||
|
* infrun.c (start_remote): Move call init_wait_for_inferior to ...
|
||||||
|
* remote.c (remote_start_remote): ... here.
|
||||||
|
* monitor.c (monitor_open): ... here.
|
||||||
|
|
||||||
2011-06-23 Andrew Burgess <aburgess@broadcom.com>
|
2011-06-23 Andrew Burgess <aburgess@broadcom.com>
|
||||||
|
|
||||||
* gdbtypes.c (append_composite_type_field_aligned): Fix
|
* gdbtypes.c (append_composite_type_field_aligned): Fix
|
||||||
|
|
|
@ -2246,7 +2246,6 @@ start_remote (int from_tty)
|
||||||
{
|
{
|
||||||
struct inferior *inferior;
|
struct inferior *inferior;
|
||||||
|
|
||||||
init_wait_for_inferior ();
|
|
||||||
inferior = current_inferior ();
|
inferior = current_inferior ();
|
||||||
inferior->control.stop_soon = STOP_QUIETLY_REMOTE;
|
inferior->control.stop_soon = STOP_QUIETLY_REMOTE;
|
||||||
|
|
||||||
|
|
|
@ -844,6 +844,8 @@ monitor_open (char *args, struct monitor_ops *mon_ops, int from_tty)
|
||||||
|
|
||||||
monitor_printf (current_monitor->line_term);
|
monitor_printf (current_monitor->line_term);
|
||||||
|
|
||||||
|
init_wait_for_inferior ();
|
||||||
|
|
||||||
start_remote (from_tty);
|
start_remote (from_tty);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
11
gdb/remote.c
11
gdb/remote.c
|
@ -3280,6 +3280,17 @@ remote_start_remote (int from_tty, struct target_ops *target, int extended_p)
|
||||||
/* Always add the main thread. */
|
/* Always add the main thread. */
|
||||||
add_thread_silent (inferior_ptid);
|
add_thread_silent (inferior_ptid);
|
||||||
|
|
||||||
|
/* init_wait_for_inferior should be called before get_offsets in order
|
||||||
|
to manage `inserted' flag in bp loc in a correct state.
|
||||||
|
breakpoint_init_inferior, called from init_wait_for_inferior, set
|
||||||
|
`inserted' flag to 0, while before breakpoint_re_set, called from
|
||||||
|
start_remote, set `inserted' flag to 1. In the initialization of
|
||||||
|
inferior, breakpoint_init_inferior should be called first, and then
|
||||||
|
breakpoint_re_set can be called. If this order is broken, state of
|
||||||
|
`inserted' flag is wrong, and cause some problems on breakpoint
|
||||||
|
manipulation. */
|
||||||
|
init_wait_for_inferior ();
|
||||||
|
|
||||||
get_offsets (); /* Get text, data & bss offsets. */
|
get_offsets (); /* Get text, data & bss offsets. */
|
||||||
|
|
||||||
/* If we could not find a description using qXfer, and we know
|
/* If we could not find a description using qXfer, and we know
|
||||||
|
|
Loading…
Reference in a new issue