- Rebase to FSF GDB 7.2.50.20101117 (which is a 7.3 pre-release).
This commit is contained in:
Jan Kratochvil
parent
1bcf9b6604
commit
e00e5eae57
49 changed files with 5128 additions and 16456 deletions
|
|
@ -21,10 +21,10 @@
|
|||
|
||||
Port to GDB-6.8pre.
|
||||
|
||||
Index: gdb-7.1.90.20100711/gdb/inferior.h
|
||||
Index: gdb-7.2.50.20101116/gdb/inferior.h
|
||||
===================================================================
|
||||
--- gdb-7.1.90.20100711.orig/gdb/inferior.h 2010-07-12 10:00:56.000000000 +0200
|
||||
+++ gdb-7.1.90.20100711/gdb/inferior.h 2010-07-12 10:04:25.000000000 +0200
|
||||
--- gdb-7.2.50.20101116.orig/gdb/inferior.h 2010-06-24 17:17:30.000000000 +0200
|
||||
+++ gdb-7.2.50.20101116/gdb/inferior.h 2010-11-16 07:54:36.000000000 +0100
|
||||
@@ -198,7 +198,15 @@ extern void reopen_exec_file (void);
|
||||
/* The `resume' routine should only be called in special circumstances.
|
||||
Normally, use `proceed', which handles a lot of bookkeeping. */
|
||||
|
|
@ -42,11 +42,11 @@ Index: gdb-7.1.90.20100711/gdb/inferior.h
|
|||
|
||||
/* From misc files */
|
||||
|
||||
Index: gdb-7.1.90.20100711/gdb/infrun.c
|
||||
Index: gdb-7.2.50.20101116/gdb/infrun.c
|
||||
===================================================================
|
||||
--- gdb-7.1.90.20100711.orig/gdb/infrun.c 2010-07-12 10:00:56.000000000 +0200
|
||||
+++ gdb-7.1.90.20100711/gdb/infrun.c 2010-07-12 10:05:26.000000000 +0200
|
||||
@@ -76,7 +76,7 @@ static int follow_fork (void);
|
||||
--- gdb-7.2.50.20101116.orig/gdb/infrun.c 2010-11-16 07:53:59.000000000 +0100
|
||||
+++ gdb-7.2.50.20101116/gdb/infrun.c 2010-11-16 07:55:23.000000000 +0100
|
||||
@@ -74,7 +74,7 @@ static int follow_fork (void);
|
||||
static void set_schedlock_func (char *args, int from_tty,
|
||||
struct cmd_list_element *c);
|
||||
|
||||
|
|
@ -55,7 +55,7 @@ Index: gdb-7.1.90.20100711/gdb/infrun.c
|
|||
|
||||
static int currently_stepping_or_nexting_callback (struct thread_info *tp,
|
||||
void *data);
|
||||
@@ -1549,7 +1549,7 @@ maybe_software_singlestep (struct gdbarc
|
||||
@@ -1557,7 +1557,7 @@ maybe_software_singlestep (struct gdbarc
|
||||
STEP nonzero if we should step (zero to continue instead).
|
||||
SIG is the signal to give the inferior (zero for none). */
|
||||
void
|
||||
|
|
@ -64,8 +64,8 @@ Index: gdb-7.1.90.20100711/gdb/infrun.c
|
|||
{
|
||||
int should_resume = 1;
|
||||
struct cleanup *old_cleanups = make_cleanup (resume_cleanups, 0);
|
||||
@@ -1562,10 +1562,12 @@ resume (int step, enum target_signal sig
|
||||
QUIT;
|
||||
@@ -1589,10 +1589,12 @@ resume (int step, enum target_signal sig
|
||||
}
|
||||
|
||||
if (debug_infrun)
|
||||
- fprintf_unfiltered (gdb_stdlog,
|
||||
|
|
@ -81,7 +81,7 @@ Index: gdb-7.1.90.20100711/gdb/infrun.c
|
|||
|
||||
/* Normally, by the time we reach `resume', the breakpoints are either
|
||||
removed or inserted, as appropriate. The exception is if we're sitting
|
||||
@@ -1678,9 +1680,10 @@ a command like `return' or `jump' to con
|
||||
@@ -1710,9 +1712,10 @@ a command like `return' or `jump' to con
|
||||
individually. */
|
||||
resume_ptid = inferior_ptid;
|
||||
}
|
||||
|
|
@ -94,7 +94,7 @@ Index: gdb-7.1.90.20100711/gdb/infrun.c
|
|||
{
|
||||
/* User-settable 'scheduler' mode requires solo thread resume. */
|
||||
resume_ptid = inferior_ptid;
|
||||
@@ -1889,7 +1892,7 @@ proceed (CORE_ADDR addr, enum target_sig
|
||||
@@ -1921,7 +1924,7 @@ proceed (CORE_ADDR addr, enum target_sig
|
||||
struct thread_info *tp;
|
||||
CORE_ADDR pc;
|
||||
struct address_space *aspace;
|
||||
|
|
@ -103,7 +103,7 @@ Index: gdb-7.1.90.20100711/gdb/infrun.c
|
|||
|
||||
/* If we're stopped at a fork/vfork, follow the branch set by the
|
||||
"set follow-fork-mode" command; otherwise, we'll just proceed
|
||||
@@ -1924,13 +1927,13 @@ proceed (CORE_ADDR addr, enum target_sig
|
||||
@@ -1956,13 +1959,13 @@ proceed (CORE_ADDR addr, enum target_sig
|
||||
actually be executing the breakpoint insn anyway.
|
||||
We'll be (un-)executing the previous instruction. */
|
||||
|
||||
|
|
@ -119,7 +119,7 @@ Index: gdb-7.1.90.20100711/gdb/infrun.c
|
|||
}
|
||||
else
|
||||
{
|
||||
@@ -1971,13 +1974,13 @@ proceed (CORE_ADDR addr, enum target_sig
|
||||
@@ -2003,13 +2006,13 @@ proceed (CORE_ADDR addr, enum target_sig
|
||||
is required it returns TRUE and sets the current thread to
|
||||
the old thread. */
|
||||
if (prepare_to_proceed (step))
|
||||
|
|
@ -135,7 +135,7 @@ Index: gdb-7.1.90.20100711/gdb/infrun.c
|
|||
{
|
||||
tp->trap_expected = 1;
|
||||
/* If displaced stepping is enabled, we can step over the
|
||||
@@ -2064,8 +2067,13 @@ proceed (CORE_ADDR addr, enum target_sig
|
||||
@@ -2096,8 +2099,13 @@ proceed (CORE_ADDR addr, enum target_sig
|
||||
/* Reset to normal state. */
|
||||
init_infwait_state ();
|
||||
|
||||
|
|
@ -150,7 +150,7 @@ Index: gdb-7.1.90.20100711/gdb/infrun.c
|
|||
|
||||
/* Wait for it to stop (if not standalone)
|
||||
and in any case decode why it stopped, and act accordingly. */
|
||||
@@ -4903,13 +4911,18 @@ infrun: not switching back to stepped th
|
||||
@@ -4859,13 +4867,18 @@ infrun: not switching back to stepped th
|
||||
|
||||
/* Is thread TP in the middle of single-stepping? */
|
||||
|
||||
|
|
@ -174,11 +174,11 @@ Index: gdb-7.1.90.20100711/gdb/infrun.c
|
|||
}
|
||||
|
||||
/* Returns true if any thread *but* the one passed in "data" is in the
|
||||
Index: gdb-7.1.90.20100711/gdb/linux-nat.c
|
||||
Index: gdb-7.2.50.20101116/gdb/linux-nat.c
|
||||
===================================================================
|
||||
--- gdb-7.1.90.20100711.orig/gdb/linux-nat.c 2010-07-12 10:00:56.000000000 +0200
|
||||
+++ gdb-7.1.90.20100711/gdb/linux-nat.c 2010-07-12 10:04:25.000000000 +0200
|
||||
@@ -2827,7 +2827,10 @@ count_events_callback (struct lwp_info *
|
||||
--- gdb-7.2.50.20101116.orig/gdb/linux-nat.c 2010-11-16 07:53:59.000000000 +0100
|
||||
+++ gdb-7.2.50.20101116/gdb/linux-nat.c 2010-11-16 07:54:36.000000000 +0100
|
||||
@@ -2883,7 +2883,10 @@ count_events_callback (struct lwp_info *
|
||||
static int
|
||||
select_singlestep_lwp_callback (struct lwp_info *lp, void *data)
|
||||
{
|
||||
|
|
@ -190,10 +190,10 @@ Index: gdb-7.1.90.20100711/gdb/linux-nat.c
|
|||
return 1;
|
||||
else
|
||||
return 0;
|
||||
Index: gdb-7.1.90.20100711/gdb/linux-nat.h
|
||||
Index: gdb-7.2.50.20101116/gdb/linux-nat.h
|
||||
===================================================================
|
||||
--- gdb-7.1.90.20100711.orig/gdb/linux-nat.h 2010-06-11 14:10:12.000000000 +0200
|
||||
+++ gdb-7.1.90.20100711/gdb/linux-nat.h 2010-07-12 10:04:25.000000000 +0200
|
||||
--- gdb-7.2.50.20101116.orig/gdb/linux-nat.h 2010-07-27 22:51:37.000000000 +0200
|
||||
+++ gdb-7.2.50.20101116/gdb/linux-nat.h 2010-11-16 07:54:36.000000000 +0100
|
||||
@@ -55,8 +55,8 @@ struct lwp_info
|
||||
/* If non-zero, a pending wait status. */
|
||||
int status;
|
||||
|
|
|
|||
Loading…
Reference in a new issue