- Rebase to FSF GDB 7.2.50.20110117 (which is a 7.3 pre-release).
- Fix callback-mode readline-6.0 regression for CTRL-C (for RHEL-6.0). - Fix occasional NULL dereference of the readline-6.0 workaround (BZ 575516).
This commit is contained in:
Jan Kratochvil
parent
a174f683ec
commit
b0e03f562d
18 changed files with 1396 additions and 1629 deletions
|
|
@ -21,10 +21,10 @@
|
|||
|
||||
Port to GDB-6.8pre.
|
||||
|
||||
Index: gdb-7.2.50.20101231/gdb/inferior.h
|
||||
Index: gdb-7.2.50.20110117/gdb/inferior.h
|
||||
===================================================================
|
||||
--- gdb-7.2.50.20101231.orig/gdb/inferior.h 2011-01-01 01:25:01.000000000 +0100
|
||||
+++ gdb-7.2.50.20101231/gdb/inferior.h 2011-01-01 01:25:16.000000000 +0100
|
||||
--- gdb-7.2.50.20110117.orig/gdb/inferior.h 2011-01-09 04:08:56.000000000 +0100
|
||||
+++ gdb-7.2.50.20110117/gdb/inferior.h 2011-01-17 15:48:39.000000000 +0100
|
||||
@@ -186,7 +186,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,10 +42,10 @@ Index: gdb-7.2.50.20101231/gdb/inferior.h
|
|||
|
||||
/* From misc files */
|
||||
|
||||
Index: gdb-7.2.50.20101231/gdb/infrun.c
|
||||
Index: gdb-7.2.50.20110117/gdb/infrun.c
|
||||
===================================================================
|
||||
--- gdb-7.2.50.20101231.orig/gdb/infrun.c 2011-01-01 01:25:01.000000000 +0100
|
||||
+++ gdb-7.2.50.20101231/gdb/infrun.c 2011-01-01 01:25:29.000000000 +0100
|
||||
--- gdb-7.2.50.20110117.orig/gdb/infrun.c 2011-01-09 04:08:56.000000000 +0100
|
||||
+++ gdb-7.2.50.20110117/gdb/infrun.c 2011-01-17 15:49:40.000000000 +0100
|
||||
@@ -76,7 +76,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.2.50.20101231/gdb/infrun.c
|
|||
|
||||
static int currently_stepping_or_nexting_callback (struct thread_info *tp,
|
||||
void *data);
|
||||
@@ -1570,7 +1570,7 @@ maybe_software_singlestep (struct gdbarc
|
||||
@@ -1577,7 +1577,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,7 +64,7 @@ Index: gdb-7.2.50.20101231/gdb/infrun.c
|
|||
{
|
||||
int should_resume = 1;
|
||||
struct cleanup *old_cleanups = make_cleanup (resume_cleanups, 0);
|
||||
@@ -1602,10 +1602,12 @@ resume (int step, enum target_signal sig
|
||||
@@ -1609,10 +1609,12 @@ resume (int step, enum target_signal sig
|
||||
}
|
||||
|
||||
if (debug_infrun)
|
||||
|
|
@ -81,7 +81,7 @@ Index: gdb-7.2.50.20101231/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
|
||||
@@ -1723,9 +1725,10 @@ a command like `return' or `jump' to con
|
||||
@@ -1730,9 +1732,10 @@ a command like `return' or `jump' to con
|
||||
individually. */
|
||||
resume_ptid = inferior_ptid;
|
||||
}
|
||||
|
|
@ -92,9 +92,9 @@ Index: gdb-7.2.50.20101231/gdb/infrun.c
|
|||
+ && (step == RESUME_STEP_USER
|
||||
+ || singlestep_breakpoints_inserted_p)))
|
||||
{
|
||||
/* User-settable 'scheduler' mode requires solo thread resume. */
|
||||
/* User-settable 'scheduler' mode requires solo thread resume. */
|
||||
resume_ptid = inferior_ptid;
|
||||
@@ -1934,7 +1937,7 @@ proceed (CORE_ADDR addr, enum target_sig
|
||||
@@ -1941,7 +1944,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.2.50.20101231/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
|
||||
@@ -1969,13 +1972,13 @@ proceed (CORE_ADDR addr, enum target_sig
|
||||
@@ -1976,13 +1979,13 @@ proceed (CORE_ADDR addr, enum target_sig
|
||||
actually be executing the breakpoint insn anyway.
|
||||
We'll be (un-)executing the previous instruction. */
|
||||
|
||||
|
|
@ -119,9 +119,9 @@ Index: gdb-7.2.50.20101231/gdb/infrun.c
|
|||
}
|
||||
else
|
||||
{
|
||||
@@ -2016,13 +2019,13 @@ proceed (CORE_ADDR addr, enum target_sig
|
||||
@@ -2023,13 +2026,13 @@ proceed (CORE_ADDR addr, enum target_sig
|
||||
is required it returns TRUE and sets the current thread to
|
||||
the old thread. */
|
||||
the old thread. */
|
||||
if (prepare_to_proceed (step))
|
||||
- oneproc = 1;
|
||||
+ resume_step = RESUME_STEP_USER;
|
||||
|
|
@ -135,7 +135,7 @@ Index: gdb-7.2.50.20101231/gdb/infrun.c
|
|||
{
|
||||
tp->control.trap_expected = 1;
|
||||
/* If displaced stepping is enabled, we can step over the
|
||||
@@ -2109,8 +2112,13 @@ proceed (CORE_ADDR addr, enum target_sig
|
||||
@@ -2116,8 +2119,13 @@ proceed (CORE_ADDR addr, enum target_sig
|
||||
/* Reset to normal state. */
|
||||
init_infwait_state ();
|
||||
|
||||
|
|
@ -150,7 +150,7 @@ Index: gdb-7.2.50.20101231/gdb/infrun.c
|
|||
|
||||
/* Wait for it to stop (if not standalone)
|
||||
and in any case decode why it stopped, and act accordingly. */
|
||||
@@ -4933,14 +4941,19 @@ infrun: not switching back to stepped th
|
||||
@@ -4957,14 +4965,19 @@ process_event_stop_test:
|
||||
|
||||
/* Is thread TP in the middle of single-stepping? */
|
||||
|
||||
|
|
@ -176,11 +176,11 @@ Index: gdb-7.2.50.20101231/gdb/infrun.c
|
|||
}
|
||||
|
||||
/* Returns true if any thread *but* the one passed in "data" is in the
|
||||
Index: gdb-7.2.50.20101231/gdb/linux-nat.c
|
||||
Index: gdb-7.2.50.20110117/gdb/linux-nat.c
|
||||
===================================================================
|
||||
--- gdb-7.2.50.20101231.orig/gdb/linux-nat.c 2011-01-01 01:25:16.000000000 +0100
|
||||
+++ gdb-7.2.50.20101231/gdb/linux-nat.c 2011-01-01 01:25:16.000000000 +0100
|
||||
@@ -2908,7 +2908,10 @@ count_events_callback (struct lwp_info *
|
||||
--- gdb-7.2.50.20110117.orig/gdb/linux-nat.c 2011-01-17 15:47:37.000000000 +0100
|
||||
+++ gdb-7.2.50.20110117/gdb/linux-nat.c 2011-01-17 15:48:39.000000000 +0100
|
||||
@@ -2928,7 +2928,10 @@ count_events_callback (struct lwp_info *
|
||||
static int
|
||||
select_singlestep_lwp_callback (struct lwp_info *lp, void *data)
|
||||
{
|
||||
|
|
@ -192,10 +192,10 @@ Index: gdb-7.2.50.20101231/gdb/linux-nat.c
|
|||
return 1;
|
||||
else
|
||||
return 0;
|
||||
Index: gdb-7.2.50.20101231/gdb/linux-nat.h
|
||||
Index: gdb-7.2.50.20110117/gdb/linux-nat.h
|
||||
===================================================================
|
||||
--- gdb-7.2.50.20101231.orig/gdb/linux-nat.h 2011-01-01 01:25:16.000000000 +0100
|
||||
+++ gdb-7.2.50.20101231/gdb/linux-nat.h 2011-01-01 01:25:16.000000000 +0100
|
||||
--- gdb-7.2.50.20110117.orig/gdb/linux-nat.h 2011-01-17 15:47:37.000000000 +0100
|
||||
+++ gdb-7.2.50.20110117/gdb/linux-nat.h 2011-01-17 15:48:39.000000000 +0100
|
||||
@@ -55,8 +55,8 @@ struct lwp_info
|
||||
/* If non-zero, a pending wait status. */
|
||||
int status;
|
||||
|
|
|
|||
Loading…
Reference in a new issue