rpms
/
gdb
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Archer update to the snapshot: 837d9879980148af05eae540d92caeb7200f1813 

- Archer backport: 8340d06295c8db80c544503458305197891e0348
- Fixes [master] regression for Eclipse CDT testsuite.
- Archer backport: 16328456d5740917ade0a49bcecc14c4564b9a99
- Fixes #2 [expr] compatibility with gcc-4.4 on gdb.cp/namespace-using.exp.
- Rebase [expr] on the Keith Seitz's sync with FSF GDB fixing the former
    merge.
This commit is contained in:
Jan Kratochvil 2009-03-27 08:52:16 +00:00
parent d5fb1cc724
commit 3ce5394498
4 changed files with 493 additions and 315 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
gdb-6.8-inlining-addon.patch
View File

@ -7,8 +7,8 @@ gdb.mi/mi-nsmoribund.exp
Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-bt.c Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-bt.c
=================================================================== ===================================================================
--- gdb-6.8.50.20090302.orig/gdb/testsuite/gdb.opt/inline-bt.c 2009-03-06 19:07:30.000000000 +0100 --- gdb-6.8.50.20090302.orig/gdb/testsuite/gdb.opt/inline-bt.c 2009-03-25 22:33:02.000000000 +0100
+++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-bt.c 2009-03-06 19:07:30.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-bt.c 2009-03-25 22:34:02.000000000 +0100
@@ -13,10 +13,16 @@ @@ -13,10 +13,16 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */ along with this program. If not, see <http://www.gnu.org/licenses/>. */
@ -30,8 +30,8 @@ Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-bt.c
{ {
Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-bt.exp Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-bt.exp
=================================================================== ===================================================================
--- gdb-6.8.50.20090302.orig/gdb/testsuite/gdb.opt/inline-bt.exp 2009-03-06 19:07:30.000000000 +0100 --- gdb-6.8.50.20090302.orig/gdb/testsuite/gdb.opt/inline-bt.exp 2009-03-25 22:33:02.000000000 +0100
+++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-bt.exp 2009-03-06 19:07:30.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-bt.exp 2009-03-25 22:34:02.000000000 +0100
@@ -41,18 +41,19 @@ if { [skip_inline_frame_tests] } { @@ -41,18 +41,19 @@ if { [skip_inline_frame_tests] } {
return return
} }
@ -62,8 +62,8 @@ Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-bt.exp
gdb_test "backtrace" "#0 bar.*#1 .*func1.*#2 .*func2.*#3 .*main.*" \ gdb_test "backtrace" "#0 bar.*#1 .*func1.*#2 .*func2.*#3 .*main.*" \
Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-cmds.c Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-cmds.c
=================================================================== ===================================================================
--- gdb-6.8.50.20090302.orig/gdb/testsuite/gdb.opt/inline-cmds.c 2009-03-06 19:07:30.000000000 +0100 --- gdb-6.8.50.20090302.orig/gdb/testsuite/gdb.opt/inline-cmds.c 2009-03-25 22:33:02.000000000 +0100
+++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-cmds.c 2009-03-06 19:07:30.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-cmds.c 2009-03-25 22:34:02.000000000 +0100
@@ -13,13 +13,19 @@ @@ -13,13 +13,19 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */ along with this program. If not, see <http://www.gnu.org/licenses/>. */
@ -88,8 +88,8 @@ Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-cmds.c
bar (); bar ();
Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-cmds.exp Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-cmds.exp
=================================================================== ===================================================================
--- gdb-6.8.50.20090302.orig/gdb/testsuite/gdb.opt/inline-cmds.exp 2009-03-06 19:07:30.000000000 +0100 --- gdb-6.8.50.20090302.orig/gdb/testsuite/gdb.opt/inline-cmds.exp 2009-03-25 22:33:02.000000000 +0100
+++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-cmds.exp 2009-03-06 19:07:30.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-cmds.exp 2009-03-25 22:34:02.000000000 +0100
@@ -45,28 +45,28 @@ if { [skip_inline_frame_tests] } { @@ -45,28 +45,28 @@ if { [skip_inline_frame_tests] } {
# First, check that the things we expected to be inlined really were, # First, check that the things we expected to be inlined really were,
@ -182,8 +182,8 @@ Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-cmds.exp
+gdb_test "info frame" " in main \[^\n\]*\n source language.*" "main not inlined" +gdb_test "info frame" " in main \[^\n\]*\n source language.*" "main not inlined"
Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-locals.c Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-locals.c
=================================================================== ===================================================================
--- gdb-6.8.50.20090302.orig/gdb/testsuite/gdb.opt/inline-locals.c 2009-03-06 19:07:30.000000000 +0100 --- gdb-6.8.50.20090302.orig/gdb/testsuite/gdb.opt/inline-locals.c 2009-03-25 22:33:02.000000000 +0100
+++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-locals.c 2009-03-06 19:07:30.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-locals.c 2009-03-25 22:34:02.000000000 +0100
@@ -13,11 +13,16 @@ @@ -13,11 +13,16 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */ along with this program. If not, see <http://www.gnu.org/licenses/>. */
@ -205,8 +205,8 @@ Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-locals.c
{ {
Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-locals.exp Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-locals.exp
=================================================================== ===================================================================
--- gdb-6.8.50.20090302.orig/gdb/testsuite/gdb.opt/inline-locals.exp 2009-03-06 19:07:30.000000000 +0100 --- gdb-6.8.50.20090302.orig/gdb/testsuite/gdb.opt/inline-locals.exp 2009-03-25 22:33:02.000000000 +0100
+++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-locals.exp 2009-03-06 19:07:30.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-locals.exp 2009-03-25 22:34:02.000000000 +0100
@@ -43,8 +43,8 @@ if { [skip_inline_var_tests] } { @@ -43,8 +43,8 @@ if { [skip_inline_var_tests] } {
set no_frames [skip_inline_frame_tests] set no_frames [skip_inline_frame_tests]
@ -238,8 +238,8 @@ Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-locals.exp
gdb_test "print array\[0\]" "\\\$$decimal = 184" "print local (3)" gdb_test "print array\[0\]" "\\\$$decimal = 184" "print local (3)"
Index: gdb-6.8.50.20090302/gdb/frame.c Index: gdb-6.8.50.20090302/gdb/frame.c
=================================================================== ===================================================================
--- gdb-6.8.50.20090302.orig/gdb/frame.c 2009-03-06 19:07:30.000000000 +0100 --- gdb-6.8.50.20090302.orig/gdb/frame.c 2009-03-25 22:33:02.000000000 +0100
+++ gdb-6.8.50.20090302/gdb/frame.c 2009-03-06 19:07:30.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/frame.c 2009-03-25 22:34:02.000000000 +0100
@@ -269,7 +269,7 @@ fprint_frame (struct ui_file *file, stru @@ -269,7 +269,7 @@ fprint_frame (struct ui_file *file, stru
static struct frame_info * static struct frame_info *
skip_inlined_frames (struct frame_info *frame) skip_inlined_frames (struct frame_info *frame)
@ -278,8 +278,8 @@ Index: gdb-6.8.50.20090302/gdb/frame.c
sal->line = SYMBOL_LINE (sym); sal->line = SYMBOL_LINE (sym);
Index: gdb-6.8.50.20090302/gdb/breakpoint.c Index: gdb-6.8.50.20090302/gdb/breakpoint.c
=================================================================== ===================================================================
--- gdb-6.8.50.20090302.orig/gdb/breakpoint.c 2009-03-06 19:07:30.000000000 +0100 --- gdb-6.8.50.20090302.orig/gdb/breakpoint.c 2009-03-25 22:33:02.000000000 +0100
+++ gdb-6.8.50.20090302/gdb/breakpoint.c 2009-03-06 19:07:30.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/breakpoint.c 2009-03-25 22:34:02.000000000 +0100
@@ -57,6 +57,7 @@ @@ -57,6 +57,7 @@
#include "top.h" #include "top.h"
#include "wrapper.h" #include "wrapper.h"
@ -330,7 +330,7 @@ Index: gdb-6.8.50.20090302/gdb/breakpoint.c
} }
/* Print nothing for this entry if we dont stop or if we dont print. */ /* Print nothing for this entry if we dont stop or if we dont print. */
@@ -5168,9 +5189,9 @@ set_momentary_breakpoint (struct symtab_ @@ -5169,9 +5190,9 @@ set_momentary_breakpoint (struct symtab_
{ {
struct breakpoint *b; struct breakpoint *b;
@ -345,8 +345,8 @@ Index: gdb-6.8.50.20090302/gdb/breakpoint.c
b->enable_state = bp_enabled; b->enable_state = bp_enabled;
Index: gdb-6.8.50.20090302/gdb/inline-frame.c Index: gdb-6.8.50.20090302/gdb/inline-frame.c
=================================================================== ===================================================================
--- gdb-6.8.50.20090302.orig/gdb/inline-frame.c 2009-03-06 19:07:30.000000000 +0100 --- gdb-6.8.50.20090302.orig/gdb/inline-frame.c 2009-03-25 22:33:02.000000000 +0100
+++ gdb-6.8.50.20090302/gdb/inline-frame.c 2009-03-06 19:07:30.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/inline-frame.c 2009-03-25 22:34:02.000000000 +0100
@@ -183,6 +183,12 @@ inline_frame_sniffer (const struct frame @@ -183,6 +183,12 @@ inline_frame_sniffer (const struct frame
if (frame_block == NULL) if (frame_block == NULL)
return 0; return 0;
@ -425,8 +425,8 @@ Index: gdb-6.8.50.20090302/gdb/inline-frame.c
Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-markers.c Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-markers.c
=================================================================== ===================================================================
--- gdb-6.8.50.20090302.orig/gdb/testsuite/gdb.opt/inline-markers.c 2009-03-06 19:07:30.000000000 +0100 --- gdb-6.8.50.20090302.orig/gdb/testsuite/gdb.opt/inline-markers.c 2009-03-25 22:33:02.000000000 +0100
+++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-markers.c 2009-03-06 19:07:30.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-markers.c 2009-03-25 22:34:02.000000000 +0100
@@ -15,11 +15,6 @@ @@ -15,11 +15,6 @@
extern int x, y; extern int x, y;
@ -441,8 +441,8 @@ Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-markers.c
x += y; /* set breakpoint 2 here */ x += y; /* set breakpoint 2 here */
Index: gdb-6.8.50.20090302/gdb/gdbthread.h Index: gdb-6.8.50.20090302/gdb/gdbthread.h
=================================================================== ===================================================================
--- gdb-6.8.50.20090302.orig/gdb/gdbthread.h 2009-03-06 19:07:30.000000000 +0100 --- gdb-6.8.50.20090302.orig/gdb/gdbthread.h 2009-03-25 22:33:02.000000000 +0100
+++ gdb-6.8.50.20090302/gdb/gdbthread.h 2009-03-06 19:07:30.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/gdbthread.h 2009-03-25 22:34:02.000000000 +0100
@@ -180,6 +180,12 @@ struct thread_info @@ -180,6 +180,12 @@ struct thread_info
/* Private data used by the target vector implementation. */ /* Private data used by the target vector implementation. */
@ -458,8 +458,8 @@ Index: gdb-6.8.50.20090302/gdb/gdbthread.h
/* Create an empty thread list, or empty the existing one. */ /* Create an empty thread list, or empty the existing one. */
Index: gdb-6.8.50.20090302/gdb/infcmd.c Index: gdb-6.8.50.20090302/gdb/infcmd.c
=================================================================== ===================================================================
--- gdb-6.8.50.20090302.orig/gdb/infcmd.c 2009-03-06 19:07:30.000000000 +0100 --- gdb-6.8.50.20090302.orig/gdb/infcmd.c 2009-03-25 22:33:02.000000000 +0100
+++ gdb-6.8.50.20090302/gdb/infcmd.c 2009-03-06 19:07:30.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/infcmd.c 2009-03-25 22:34:02.000000000 +0100
@@ -1391,11 +1391,11 @@ finish_command_continuation (void *arg) @@ -1391,11 +1391,11 @@ finish_command_continuation (void *arg)
struct type *value_type; struct type *value_type;
@ -602,8 +602,8 @@ Index: gdb-6.8.50.20090302/gdb/infcmd.c
Index: gdb-6.8.50.20090302/gdb/infrun.c Index: gdb-6.8.50.20090302/gdb/infrun.c
=================================================================== ===================================================================
--- gdb-6.8.50.20090302.orig/gdb/infrun.c 2009-03-06 19:07:30.000000000 +0100 --- gdb-6.8.50.20090302.orig/gdb/infrun.c 2009-03-25 22:33:02.000000000 +0100
+++ gdb-6.8.50.20090302/gdb/infrun.c 2009-03-06 19:07:30.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/infrun.c 2009-03-25 22:34:02.000000000 +0100
@@ -1152,8 +1152,6 @@ a command like `return' or `jump' to con @@ -1152,8 +1152,6 @@ a command like `return' or `jump' to con
step = 0; step = 0;
} }
@ -624,8 +624,8 @@ Index: gdb-6.8.50.20090302/gdb/infrun.c
static int static int
Index: gdb-6.8.50.20090302/gdb/target.c Index: gdb-6.8.50.20090302/gdb/target.c
=================================================================== ===================================================================
--- gdb-6.8.50.20090302.orig/gdb/target.c 2009-03-06 19:07:26.000000000 +0100 --- gdb-6.8.50.20090302.orig/gdb/target.c 2009-03-25 22:26:51.000000000 +0100
+++ gdb-6.8.50.20090302/gdb/target.c 2009-03-06 19:07:30.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/target.c 2009-03-25 22:34:02.000000000 +0100
@@ -41,6 +41,7 @@ @@ -41,6 +41,7 @@
#include "target-descriptions.h" #include "target-descriptions.h"
#include "gdbthread.h" #include "gdbthread.h"
@ -644,8 +644,8 @@ Index: gdb-6.8.50.20090302/gdb/target.c
for (t = current_target.beneath; t != NULL; t = t->beneath) for (t = current_target.beneath; t != NULL; t = t->beneath)
Index: gdb-6.8.50.20090302/gdb/inline-frame.h Index: gdb-6.8.50.20090302/gdb/inline-frame.h
=================================================================== ===================================================================
--- gdb-6.8.50.20090302.orig/gdb/inline-frame.h 2009-03-06 19:07:30.000000000 +0100 --- gdb-6.8.50.20090302.orig/gdb/inline-frame.h 2009-03-25 22:33:02.000000000 +0100
+++ gdb-6.8.50.20090302/gdb/inline-frame.h 2009-03-06 19:07:30.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/inline-frame.h 2009-03-25 22:34:02.000000000 +0100
@@ -43,6 +43,10 @@ void clear_inline_frame_state (ptid_t pt @@ -43,6 +43,10 @@ void clear_inline_frame_state (ptid_t pt
void step_into_inline_frame (ptid_t ptid); void step_into_inline_frame (ptid_t ptid);
@ -659,8 +659,8 @@ Index: gdb-6.8.50.20090302/gdb/inline-frame.h
Index: gdb-6.8.50.20090302/gdb/infcall.c Index: gdb-6.8.50.20090302/gdb/infcall.c
=================================================================== ===================================================================
--- gdb-6.8.50.20090302.orig/gdb/infcall.c 2009-03-06 19:07:30.000000000 +0100 --- gdb-6.8.50.20090302.orig/gdb/infcall.c 2009-03-25 22:33:02.000000000 +0100
+++ gdb-6.8.50.20090302/gdb/infcall.c 2009-03-06 19:07:30.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/infcall.c 2009-03-25 22:34:02.000000000 +0100
@@ -898,8 +898,15 @@ The program being debugged exited while @@ -898,8 +898,15 @@ The program being debugged exited while
if (unwind_on_signal_p) if (unwind_on_signal_p)
@ -681,17 +681,17 @@ Index: gdb-6.8.50.20090302/gdb/infcall.c
long if it's a C++ name with arguments and stuff. */ long if it's a C++ name with arguments and stuff. */
Index: gdb-6.8.50.20090302/gdb/dwarf2read.c Index: gdb-6.8.50.20090302/gdb/dwarf2read.c
=================================================================== ===================================================================
--- gdb-6.8.50.20090302.orig/gdb/dwarf2read.c 2009-03-06 19:07:30.000000000 +0100 --- gdb-6.8.50.20090302.orig/gdb/dwarf2read.c 2009-03-25 22:33:44.000000000 +0100
+++ gdb-6.8.50.20090302/gdb/dwarf2read.c 2009-03-06 19:07:40.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/dwarf2read.c 2009-03-25 22:34:11.000000000 +0100
@@ -3463,6 +3463,7 @@ read_func_scope (struct die_info *die, s @@ -3471,6 +3471,7 @@ read_func_scope (struct die_info *die, s
unsigned die_children = 0; unsigned die_children;
struct attribute *call_line, *call_file; struct attribute *call_line, *call_file;
int inlined_func = (die->tag == DW_TAG_inlined_subroutine); int inlined_func = (die->tag == DW_TAG_inlined_subroutine);
+ struct type *type; + struct type *type;
if (inlined_func) if (inlined_func)
{ {
@@ -3504,7 +3505,10 @@ read_func_scope (struct die_info *die, s @@ -3513,7 +3514,10 @@ read_func_scope (struct die_info *die, s
add_to_cu_func_list (name, lowpc, highpc, cu); add_to_cu_func_list (name, lowpc, highpc, cu);
new = push_context (0, lowpc); new = push_context (0, lowpc);
@ -703,7 +703,7 @@ Index: gdb-6.8.50.20090302/gdb/dwarf2read.c
/* If there is a location expression for DW_AT_frame_base, record /* If there is a location expression for DW_AT_frame_base, record
it. */ it. */
@@ -8746,6 +8750,7 @@ read_type_die (struct die_info *die, str @@ -8751,6 +8755,7 @@ read_type_die (struct die_info *die, str
break; break;
case DW_TAG_subprogram: case DW_TAG_subprogram:
case DW_TAG_subroutine_type: case DW_TAG_subroutine_type:

157
gdb-6.8-inlining.patch
View File

@ -7,8 +7,8 @@ Removed dwarf_expr_frame_base NULL check duplicity with *-vla.patch.
Index: gdb-6.8.50.20090302/gdb/NEWS Index: gdb-6.8.50.20090302/gdb/NEWS
=================================================================== ===================================================================
--- gdb-6.8.50.20090302.orig/gdb/NEWS 2009-03-21 21:06:02.000000000 +0100 --- gdb-6.8.50.20090302.orig/gdb/NEWS 2009-03-27 00:14:19.000000000 +0100
+++ gdb-6.8.50.20090302/gdb/NEWS 2009-03-21 21:06:16.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/NEWS 2009-03-27 00:14:33.000000000 +0100
@@ -1,6 +1,11 @@ @@ -1,6 +1,11 @@
What has changed in GDB? What has changed in GDB?
(Organized release by release) (Organized release by release)
@ -23,8 +23,8 @@ Index: gdb-6.8.50.20090302/gdb/NEWS
* GDB now has support for multi-byte and wide character sets on the * GDB now has support for multi-byte and wide character sets on the
Index: gdb-6.8.50.20090302/gdb/block.c Index: gdb-6.8.50.20090302/gdb/block.c
=================================================================== ===================================================================
--- gdb-6.8.50.20090302.orig/gdb/block.c 2009-03-21 21:06:02.000000000 +0100 --- gdb-6.8.50.20090302.orig/gdb/block.c 2009-03-27 00:14:19.000000000 +0100
+++ gdb-6.8.50.20090302/gdb/block.c 2009-03-21 21:06:16.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/block.c 2009-03-27 00:14:33.000000000 +0100
@@ -47,8 +47,16 @@ contained_in (const struct block *a, con @@ -47,8 +47,16 @@ contained_in (const struct block *a, con
{ {
if (!a || !b) if (!a || !b)
@ -70,7 +70,7 @@ Index: gdb-6.8.50.20090302/gdb/block.c
Index: gdb-6.8.50.20090302/gdb/block.h Index: gdb-6.8.50.20090302/gdb/block.h
=================================================================== ===================================================================
--- gdb-6.8.50.20090302.orig/gdb/block.h 2009-01-03 06:57:50.000000000 +0100 --- gdb-6.8.50.20090302.orig/gdb/block.h 2009-01-03 06:57:50.000000000 +0100
+++ gdb-6.8.50.20090302/gdb/block.h 2009-03-21 21:06:16.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/block.h 2009-03-27 00:14:33.000000000 +0100
@@ -65,7 +65,7 @@ struct block @@ -65,7 +65,7 @@ struct block
CORE_ADDR endaddr; CORE_ADDR endaddr;
@ -92,7 +92,7 @@ Index: gdb-6.8.50.20090302/gdb/block.h
Index: gdb-6.8.50.20090302/gdb/blockframe.c Index: gdb-6.8.50.20090302/gdb/blockframe.c
=================================================================== ===================================================================
--- gdb-6.8.50.20090302.orig/gdb/blockframe.c 2009-01-03 06:57:50.000000000 +0100 --- gdb-6.8.50.20090302.orig/gdb/blockframe.c 2009-01-03 06:57:50.000000000 +0100
+++ gdb-6.8.50.20090302/gdb/blockframe.c 2009-03-21 21:06:16.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/blockframe.c 2009-03-27 00:14:33.000000000 +0100
@@ -36,6 +36,7 @@ @@ -36,6 +36,7 @@
#include "command.h" #include "command.h"
#include "gdbcmd.h" #include "gdbcmd.h"
@ -163,8 +163,8 @@ Index: gdb-6.8.50.20090302/gdb/blockframe.c
frame = get_prev_frame (frame); frame = get_prev_frame (frame);
Index: gdb-6.8.50.20090302/gdb/breakpoint.c Index: gdb-6.8.50.20090302/gdb/breakpoint.c
=================================================================== ===================================================================
--- gdb-6.8.50.20090302.orig/gdb/breakpoint.c 2009-03-21 21:06:05.000000000 +0100 --- gdb-6.8.50.20090302.orig/gdb/breakpoint.c 2009-03-27 00:14:24.000000000 +0100
+++ gdb-6.8.50.20090302/gdb/breakpoint.c 2009-03-21 21:06:16.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/breakpoint.c 2009-03-27 00:14:33.000000000 +0100
@@ -2641,19 +2641,21 @@ watchpoint_check (void *p) @@ -2641,19 +2641,21 @@ watchpoint_check (void *p)
within_current_scope = 1; within_current_scope = 1;
else else
@ -344,8 +344,8 @@ Index: gdb-6.8.50.20090302/gdb/breakpoint.c
} }
Index: gdb-6.8.50.20090302/gdb/buildsym.c Index: gdb-6.8.50.20090302/gdb/buildsym.c
=================================================================== ===================================================================
--- gdb-6.8.50.20090302.orig/gdb/buildsym.c 2009-03-21 21:06:02.000000000 +0100 --- gdb-6.8.50.20090302.orig/gdb/buildsym.c 2009-03-27 00:14:19.000000000 +0100
+++ gdb-6.8.50.20090302/gdb/buildsym.c 2009-03-21 21:06:16.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/buildsym.c 2009-03-27 00:14:33.000000000 +0100
@@ -1155,6 +1155,12 @@ end_symtab (CORE_ADDR end_addr, struct o @@ -1155,6 +1155,12 @@ end_symtab (CORE_ADDR end_addr, struct o
struct symbol *sym; struct symbol *sym;
struct dict_iterator iter; struct dict_iterator iter;
@ -361,8 +361,8 @@ Index: gdb-6.8.50.20090302/gdb/buildsym.c
sym = dict_iterator_next (&iter)) sym = dict_iterator_next (&iter))
Index: gdb-6.8.50.20090302/gdb/doc/gdb.texinfo Index: gdb-6.8.50.20090302/gdb/doc/gdb.texinfo
=================================================================== ===================================================================
--- gdb-6.8.50.20090302.orig/gdb/doc/gdb.texinfo 2009-03-21 21:06:05.000000000 +0100 --- gdb-6.8.50.20090302.orig/gdb/doc/gdb.texinfo 2009-03-27 00:14:24.000000000 +0100
+++ gdb-6.8.50.20090302/gdb/doc/gdb.texinfo 2009-03-21 21:06:16.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/doc/gdb.texinfo 2009-03-27 00:14:33.000000000 +0100
@@ -137,6 +137,7 @@ software in general. We will miss him. @@ -137,6 +137,7 @@ software in general. We will miss him.
* Stack:: Examining the stack * Stack:: Examining the stack
* Source:: Examining source files * Source:: Examining source files
@ -514,8 +514,8 @@ Index: gdb-6.8.50.20090302/gdb/doc/gdb.texinfo
Index: gdb-6.8.50.20090302/gdb/dwarf2loc.c Index: gdb-6.8.50.20090302/gdb/dwarf2loc.c
=================================================================== ===================================================================
--- gdb-6.8.50.20090302.orig/gdb/dwarf2loc.c 2009-03-21 21:06:02.000000000 +0100 --- gdb-6.8.50.20090302.orig/gdb/dwarf2loc.c 2009-03-27 00:14:19.000000000 +0100
+++ gdb-6.8.50.20090302/gdb/dwarf2loc.c 2009-03-21 21:06:16.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/dwarf2loc.c 2009-03-27 00:14:33.000000000 +0100
@@ -31,6 +31,7 @@ @@ -31,6 +31,7 @@
#include "regcache.h" #include "regcache.h"
#include "objfiles.h" #include "objfiles.h"
@ -538,8 +538,8 @@ Index: gdb-6.8.50.20090302/gdb/dwarf2loc.c
some function associated with a frame. If we can't find the frame, some function associated with a frame. If we can't find the frame,
Index: gdb-6.8.50.20090302/gdb/dwarf2read.c Index: gdb-6.8.50.20090302/gdb/dwarf2read.c
=================================================================== ===================================================================
--- gdb-6.8.50.20090302.orig/gdb/dwarf2read.c 2009-03-21 21:06:04.000000000 +0100 --- gdb-6.8.50.20090302.orig/gdb/dwarf2read.c 2009-03-27 00:14:24.000000000 +0100
+++ gdb-6.8.50.20090302/gdb/dwarf2read.c 2009-03-21 21:06:16.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/dwarf2read.c 2009-03-27 00:16:07.000000000 +0100
@@ -50,6 +50,7 @@ @@ -50,6 +50,7 @@
#include "c-lang.h" #include "c-lang.h"
#include "typeprint.h" #include "typeprint.h"
@ -548,7 +548,7 @@ Index: gdb-6.8.50.20090302/gdb/dwarf2read.c
#include <fcntl.h> #include <fcntl.h>
#include "gdb_string.h" #include "gdb_string.h"
@@ -2984,12 +2985,8 @@ process_die (struct die_info *die, struc @@ -2992,12 +2993,8 @@ process_die (struct die_info *die, struc
read_file_scope (die, cu); read_file_scope (die, cu);
break; break;
case DW_TAG_subprogram: case DW_TAG_subprogram:
@ -562,10 +562,10 @@ Index: gdb-6.8.50.20090302/gdb/dwarf2read.c
break; break;
case DW_TAG_lexical_block: case DW_TAG_lexical_block:
case DW_TAG_try_block: case DW_TAG_try_block:
@@ -3464,6 +3461,22 @@ read_func_scope (struct die_info *die, s @@ -3472,6 +3469,22 @@ read_func_scope (struct die_info *die, s
CORE_ADDR baseaddr; CORE_ADDR baseaddr;
struct block *block; struct block *block;
unsigned die_children = 0; unsigned die_children;
+ struct attribute *call_line, *call_file; + struct attribute *call_line, *call_file;
+ int inlined_func = (die->tag == DW_TAG_inlined_subroutine); + int inlined_func = (die->tag == DW_TAG_inlined_subroutine);
+ +
@ -585,7 +585,7 @@ Index: gdb-6.8.50.20090302/gdb/dwarf2read.c
baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile)); baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
@@ -7524,6 +7537,9 @@ die_specification (struct die_info *die, @@ -7531,6 +7544,9 @@ die_specification (struct die_info *die,
*spec_cu); *spec_cu);
if (spec_attr == NULL) if (spec_attr == NULL)
@ -595,7 +595,7 @@ Index: gdb-6.8.50.20090302/gdb/dwarf2read.c
return NULL; return NULL;
else else
return follow_die_ref (die, spec_attr, spec_cu); return follow_die_ref (die, spec_attr, spec_cu);
@@ -8207,6 +8223,7 @@ new_symbol (struct die_info *die, struct @@ -8214,6 +8230,7 @@ new_symbol (struct die_info *die, struct
struct attribute *attr = NULL; struct attribute *attr = NULL;
struct attribute *attr2 = NULL; struct attribute *attr2 = NULL;
CORE_ADDR baseaddr; CORE_ADDR baseaddr;
@ -603,7 +603,7 @@ Index: gdb-6.8.50.20090302/gdb/dwarf2read.c
baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile)); baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
@@ -8257,13 +8274,17 @@ new_symbol (struct die_info *die, struct @@ -8264,13 +8281,17 @@ new_symbol (struct die_info *die, struct
SYMBOL_TYPE (sym) = type; SYMBOL_TYPE (sym) = type;
else else
SYMBOL_TYPE (sym) = die_type (die, cu); SYMBOL_TYPE (sym) = die_type (die, cu);
@ -623,7 +623,7 @@ Index: gdb-6.8.50.20090302/gdb/dwarf2read.c
if (attr) if (attr)
{ {
int file_index = DW_UNSND (attr); int file_index = DW_UNSND (attr);
@@ -8310,6 +8331,14 @@ new_symbol (struct die_info *die, struct @@ -8317,6 +8338,14 @@ new_symbol (struct die_info *die, struct
add_symbol_to_list (sym, cu->list_in_scope); add_symbol_to_list (sym, cu->list_in_scope);
} }
break; break;
@ -638,7 +638,7 @@ Index: gdb-6.8.50.20090302/gdb/dwarf2read.c
case DW_TAG_variable: case DW_TAG_variable:
/* Compilation with minimal debug info may result in variables /* Compilation with minimal debug info may result in variables
with missing type entries. Change the misleading `void' type with missing type entries. Change the misleading `void' type
@@ -8365,7 +8394,14 @@ new_symbol (struct die_info *die, struct @@ -8372,7 +8401,14 @@ new_symbol (struct die_info *die, struct
} }
break; break;
case DW_TAG_formal_parameter: case DW_TAG_formal_parameter:
@ -657,7 +657,7 @@ Index: gdb-6.8.50.20090302/gdb/dwarf2read.c
Index: gdb-6.8.50.20090302/gdb/frame-unwind.c Index: gdb-6.8.50.20090302/gdb/frame-unwind.c
=================================================================== ===================================================================
--- gdb-6.8.50.20090302.orig/gdb/frame-unwind.c 2009-01-03 06:57:51.000000000 +0100 --- gdb-6.8.50.20090302.orig/gdb/frame-unwind.c 2009-01-03 06:57:51.000000000 +0100
+++ gdb-6.8.50.20090302/gdb/frame-unwind.c 2009-03-21 21:06:16.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/frame-unwind.c 2009-03-27 00:14:33.000000000 +0100
@@ -21,6 +21,7 @@ @@ -21,6 +21,7 @@
#include "frame.h" #include "frame.h"
#include "frame-unwind.h" #include "frame-unwind.h"
@ -680,8 +680,8 @@ Index: gdb-6.8.50.20090302/gdb/frame-unwind.c
Index: gdb-6.8.50.20090302/gdb/frame.c Index: gdb-6.8.50.20090302/gdb/frame.c
=================================================================== ===================================================================
--- gdb-6.8.50.20090302.orig/gdb/frame.c 2009-03-21 21:06:03.000000000 +0100 --- gdb-6.8.50.20090302.orig/gdb/frame.c 2009-03-27 00:14:21.000000000 +0100
+++ gdb-6.8.50.20090302/gdb/frame.c 2009-03-21 21:06:16.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/frame.c 2009-03-27 00:14:33.000000000 +0100
@@ -41,8 +41,14 @@ @@ -41,8 +41,14 @@
#include "objfiles.h" #include "objfiles.h"
#include "exceptions.h" #include "exceptions.h"
@ -1041,7 +1041,7 @@ Index: gdb-6.8.50.20090302/gdb/frame.c
Index: gdb-6.8.50.20090302/gdb/frame.h Index: gdb-6.8.50.20090302/gdb/frame.h
=================================================================== ===================================================================
--- gdb-6.8.50.20090302.orig/gdb/frame.h 2009-02-05 18:28:20.000000000 +0100 --- gdb-6.8.50.20090302.orig/gdb/frame.h 2009-02-05 18:28:20.000000000 +0100
+++ gdb-6.8.50.20090302/gdb/frame.h 2009-03-21 21:06:16.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/frame.h 2009-03-27 00:14:33.000000000 +0100
@@ -34,6 +34,9 @@ @@ -34,6 +34,9 @@
frame_unwind_WHAT...(): Unwind THIS frame's WHAT from the NEXT frame_unwind_WHAT...(): Unwind THIS frame's WHAT from the NEXT
frame. frame.
@ -1105,8 +1105,8 @@ Index: gdb-6.8.50.20090302/gdb/frame.h
/* Assuming that a frame is `normal', return its base-address, or 0 if /* Assuming that a frame is `normal', return its base-address, or 0 if
Index: gdb-6.8.50.20090302/gdb/gdbthread.h Index: gdb-6.8.50.20090302/gdb/gdbthread.h
=================================================================== ===================================================================
--- gdb-6.8.50.20090302.orig/gdb/gdbthread.h 2009-03-21 21:06:02.000000000 +0100 --- gdb-6.8.50.20090302.orig/gdb/gdbthread.h 2009-03-27 00:14:19.000000000 +0100
+++ gdb-6.8.50.20090302/gdb/gdbthread.h 2009-03-21 21:06:16.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/gdbthread.h 2009-03-27 00:14:33.000000000 +0100
@@ -83,6 +83,13 @@ struct thread_info @@ -83,6 +83,13 @@ struct thread_info
This is how we know when we step into a subroutine call, and how This is how we know when we step into a subroutine call, and how
to set the frame for the breakpoint used to step out. */ to set the frame for the breakpoint used to step out. */
@ -1123,8 +1123,8 @@ Index: gdb-6.8.50.20090302/gdb/gdbthread.h
Index: gdb-6.8.50.20090302/gdb/infcall.c Index: gdb-6.8.50.20090302/gdb/infcall.c
=================================================================== ===================================================================
--- gdb-6.8.50.20090302.orig/gdb/infcall.c 2009-03-21 21:06:02.000000000 +0100 --- gdb-6.8.50.20090302.orig/gdb/infcall.c 2009-03-27 00:14:19.000000000 +0100
+++ gdb-6.8.50.20090302/gdb/infcall.c 2009-03-21 21:06:16.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/infcall.c 2009-03-27 00:14:33.000000000 +0100
@@ -898,15 +898,8 @@ The program being debugged exited while @@ -898,15 +898,8 @@ The program being debugged exited while
if (unwind_on_signal_p) if (unwind_on_signal_p)
@ -1145,8 +1145,8 @@ Index: gdb-6.8.50.20090302/gdb/infcall.c
long if it's a C++ name with arguments and stuff. */ long if it's a C++ name with arguments and stuff. */
Index: gdb-6.8.50.20090302/gdb/infcmd.c Index: gdb-6.8.50.20090302/gdb/infcmd.c
=================================================================== ===================================================================
--- gdb-6.8.50.20090302.orig/gdb/infcmd.c 2009-03-21 21:06:02.000000000 +0100 --- gdb-6.8.50.20090302.orig/gdb/infcmd.c 2009-03-27 00:14:19.000000000 +0100
+++ gdb-6.8.50.20090302/gdb/infcmd.c 2009-03-21 21:06:16.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/infcmd.c 2009-03-27 00:14:33.000000000 +0100
@@ -52,6 +52,7 @@ @@ -52,6 +52,7 @@
#include "cli/cli-decode.h" #include "cli/cli-decode.h"
#include "gdbthread.h" #include "gdbthread.h"
@ -1250,8 +1250,8 @@ Index: gdb-6.8.50.20090302/gdb/infcmd.c
function = find_pc_function (get_frame_pc (get_selected_frame (NULL))); function = find_pc_function (get_frame_pc (get_selected_frame (NULL)));
Index: gdb-6.8.50.20090302/gdb/inferior.h Index: gdb-6.8.50.20090302/gdb/inferior.h
=================================================================== ===================================================================
--- gdb-6.8.50.20090302.orig/gdb/inferior.h 2009-03-21 21:06:02.000000000 +0100 --- gdb-6.8.50.20090302.orig/gdb/inferior.h 2009-03-27 00:14:19.000000000 +0100
+++ gdb-6.8.50.20090302/gdb/inferior.h 2009-03-21 21:06:16.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/inferior.h 2009-03-27 00:14:33.000000000 +0100
@@ -259,6 +259,9 @@ extern void error_is_running (void); @@ -259,6 +259,9 @@ extern void error_is_running (void);
/* Calls error_is_running if the current thread is running. */ /* Calls error_is_running if the current thread is running. */
extern void ensure_not_running (void); extern void ensure_not_running (void);
@ -1264,8 +1264,8 @@ Index: gdb-6.8.50.20090302/gdb/inferior.h
extern void tty_command (char *, int); extern void tty_command (char *, int);
Index: gdb-6.8.50.20090302/gdb/infrun.c Index: gdb-6.8.50.20090302/gdb/infrun.c
=================================================================== ===================================================================
--- gdb-6.8.50.20090302.orig/gdb/infrun.c 2009-03-21 21:06:04.000000000 +0100 --- gdb-6.8.50.20090302.orig/gdb/infrun.c 2009-03-27 00:14:23.000000000 +0100
+++ gdb-6.8.50.20090302/gdb/infrun.c 2009-03-21 21:06:16.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/infrun.c 2009-03-27 00:14:33.000000000 +0100
@@ -48,6 +48,7 @@ @@ -48,6 +48,7 @@
#include "gdb_assert.h" #include "gdb_assert.h"
#include "mi/mi-common.h" #include "mi/mi-common.h"
@ -1541,7 +1541,7 @@ Index: gdb-6.8.50.20090302/gdb/infrun.c
Index: gdb-6.8.50.20090302/gdb/inline-frame.c Index: gdb-6.8.50.20090302/gdb/inline-frame.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ gdb-6.8.50.20090302/gdb/inline-frame.c 2009-03-21 21:06:16.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/inline-frame.c 2009-03-27 00:14:33.000000000 +0100
@@ -0,0 +1,382 @@ @@ -0,0 +1,382 @@
+/* Inline frame unwinder for GDB. +/* Inline frame unwinder for GDB.
+ +
@ -1928,7 +1928,7 @@ Index: gdb-6.8.50.20090302/gdb/inline-frame.c
Index: gdb-6.8.50.20090302/gdb/inline-frame.h Index: gdb-6.8.50.20090302/gdb/inline-frame.h
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ gdb-6.8.50.20090302/gdb/inline-frame.h 2009-03-21 21:06:16.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/inline-frame.h 2009-03-27 00:14:33.000000000 +0100
@@ -0,0 +1,62 @@ @@ -0,0 +1,62 @@
+/* Definitions for inline frame support. +/* Definitions for inline frame support.
+ +
@ -1994,8 +1994,8 @@ Index: gdb-6.8.50.20090302/gdb/inline-frame.h
+#endif /* !defined (INLINE_FRAME_H) */ +#endif /* !defined (INLINE_FRAME_H) */
Index: gdb-6.8.50.20090302/gdb/minsyms.c Index: gdb-6.8.50.20090302/gdb/minsyms.c
=================================================================== ===================================================================
--- gdb-6.8.50.20090302.orig/gdb/minsyms.c 2009-03-21 21:06:03.000000000 +0100 --- gdb-6.8.50.20090302.orig/gdb/minsyms.c 2009-03-27 00:14:22.000000000 +0100
+++ gdb-6.8.50.20090302/gdb/minsyms.c 2009-03-21 21:06:16.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/minsyms.c 2009-03-27 00:14:33.000000000 +0100
@@ -795,7 +795,7 @@ prim_record_minimal_symbol_and_info (con @@ -795,7 +795,7 @@ prim_record_minimal_symbol_and_info (con
if (msym_bunch_index == BUNCH_SIZE) if (msym_bunch_index == BUNCH_SIZE)
@ -2008,7 +2008,7 @@ Index: gdb-6.8.50.20090302/gdb/minsyms.c
Index: gdb-6.8.50.20090302/gdb/s390-tdep.c Index: gdb-6.8.50.20090302/gdb/s390-tdep.c
=================================================================== ===================================================================
--- gdb-6.8.50.20090302.orig/gdb/s390-tdep.c 2009-02-22 02:02:19.000000000 +0100 --- gdb-6.8.50.20090302.orig/gdb/s390-tdep.c 2009-02-22 02:02:19.000000000 +0100
+++ gdb-6.8.50.20090302/gdb/s390-tdep.c 2009-03-21 21:06:16.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/s390-tdep.c 2009-03-27 00:14:33.000000000 +0100
@@ -1182,6 +1182,7 @@ s390_prologue_frame_unwind_cache (struct @@ -1182,6 +1182,7 @@ s390_prologue_frame_unwind_cache (struct
CORE_ADDR prev_sp; CORE_ADDR prev_sp;
int frame_pointer; int frame_pointer;
@ -2044,8 +2044,8 @@ Index: gdb-6.8.50.20090302/gdb/s390-tdep.c
/* See the comment in s390_in_function_epilogue_p on why this is /* See the comment in s390_in_function_epilogue_p on why this is
Index: gdb-6.8.50.20090302/gdb/stack.c Index: gdb-6.8.50.20090302/gdb/stack.c
=================================================================== ===================================================================
--- gdb-6.8.50.20090302.orig/gdb/stack.c 2009-03-21 21:06:02.000000000 +0100 --- gdb-6.8.50.20090302.orig/gdb/stack.c 2009-03-27 00:14:19.000000000 +0100
+++ gdb-6.8.50.20090302/gdb/stack.c 2009-03-21 21:06:16.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/stack.c 2009-03-27 00:14:33.000000000 +0100
@@ -45,6 +45,7 @@ @@ -45,6 +45,7 @@
#include "valprint.h" #include "valprint.h"
#include "gdbthread.h" #include "gdbthread.h"
@ -2194,16 +2194,15 @@ Index: gdb-6.8.50.20090302/gdb/stack.c
RETURN_VALUE to NULL, and QUERY_PREFIX to an informational RETURN_VALUE to NULL, and QUERY_PREFIX to an informational
Index: gdb-6.8.50.20090302/gdb/symtab.c Index: gdb-6.8.50.20090302/gdb/symtab.c
=================================================================== ===================================================================
--- gdb-6.8.50.20090302.orig/gdb/symtab.c 2009-03-21 21:06:03.000000000 +0100 --- gdb-6.8.50.20090302.orig/gdb/symtab.c 2009-03-27 00:14:22.000000000 +0100
+++ gdb-6.8.50.20090302/gdb/symtab.c 2009-03-21 21:06:49.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/symtab.c 2009-03-27 00:15:36.000000000 +0100
@@ -1417,11 +1417,14 @@ lookup_symbol_aux_local (const char *nam @@ -1426,10 +1426,13 @@ lookup_symbol_aux_local (const char *nam
sym = lookup_symbol_aux_block (name, linkage_name, block_iterator, domain); return sym;
if (sym != NULL) }
return sym;
+ + if (BLOCK_FUNCTION (block_iterator) != NULL && block_inlined_p (block_iterator))
+ if (BLOCK_FUNCTION (block) != NULL && block_inlined_p (block))
+ break; + break;
+
block_iterator = BLOCK_SUPERBLOCK (block_iterator); block_iterator = BLOCK_SUPERBLOCK (block_iterator);
} }
@ -2212,7 +2211,7 @@ Index: gdb-6.8.50.20090302/gdb/symtab.c
return NULL; return NULL;
} }
@@ -2678,6 +2681,7 @@ find_function_start_sal (struct symbol * @@ -2686,6 +2689,7 @@ find_function_start_sal (struct symbol *
CORE_ADDR pc; CORE_ADDR pc;
struct symtab_and_line sal; struct symtab_and_line sal;
@ -2220,7 +2219,7 @@ Index: gdb-6.8.50.20090302/gdb/symtab.c
pc = BLOCK_START (block); pc = BLOCK_START (block);
fixup_symbol_section (sym, objfile); fixup_symbol_section (sym, objfile);
@@ -2716,6 +2720,25 @@ find_function_start_sal (struct symbol * @@ -2724,6 +2728,25 @@ find_function_start_sal (struct symbol *
sal.pc = pc; sal.pc = pc;
@ -2246,7 +2245,7 @@ Index: gdb-6.8.50.20090302/gdb/symtab.c
return sal; return sal;
} }
@@ -3738,6 +3761,24 @@ add_macro_name (const char *name, const @@ -3746,6 +3769,24 @@ add_macro_name (const char *name, const
datum->text, datum->word); datum->text, datum->word);
} }
@ -2271,7 +2270,7 @@ Index: gdb-6.8.50.20090302/gdb/symtab.c
char ** char **
default_make_symbol_completion_list (char *text, char *word) default_make_symbol_completion_list (char *text, char *word)
{ {
@@ -3750,9 +3791,9 @@ default_make_symbol_completion_list (cha @@ -3758,9 +3799,9 @@ default_make_symbol_completion_list (cha
struct partial_symtab *ps; struct partial_symtab *ps;
struct minimal_symbol *msymbol; struct minimal_symbol *msymbol;
struct objfile *objfile; struct objfile *objfile;
@ -2283,7 +2282,7 @@ Index: gdb-6.8.50.20090302/gdb/symtab.c
struct partial_symbol **psym; struct partial_symbol **psym;
/* The symbol we are completing on. Points in same buffer as text. */ /* The symbol we are completing on. Points in same buffer as text. */
char *sym_text; char *sym_text;
@@ -3862,41 +3903,43 @@ default_make_symbol_completion_list (cha @@ -3870,41 +3911,43 @@ default_make_symbol_completion_list (cha
} }
/* Search upwards from currently selected frame (so that we can /* Search upwards from currently selected frame (so that we can
@ -2358,7 +2357,7 @@ Index: gdb-6.8.50.20090302/gdb/symtab.c
/* Go through the symtabs and check the externs and statics for /* Go through the symtabs and check the externs and statics for
symbols which match. */ symbols which match. */
@@ -3915,9 +3958,6 @@ default_make_symbol_completion_list (cha @@ -3923,9 +3966,6 @@ default_make_symbol_completion_list (cha
{ {
QUIT; QUIT;
b = BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), STATIC_BLOCK); b = BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), STATIC_BLOCK);
@ -2368,7 +2367,7 @@ Index: gdb-6.8.50.20090302/gdb/symtab.c
ALL_BLOCK_SYMBOLS (b, iter, sym) ALL_BLOCK_SYMBOLS (b, iter, sym)
{ {
COMPLETION_LIST_ADD_SYMBOL (sym, sym_text, sym_text_len, text, word); COMPLETION_LIST_ADD_SYMBOL (sym, sym_text, sym_text_len, text, word);
@@ -4384,6 +4424,25 @@ skip_prologue_using_sal (CORE_ADDR func_ @@ -4392,6 +4432,25 @@ skip_prologue_using_sal (CORE_ADDR func_
line mark the prologue -> body transition. */ line mark the prologue -> body transition. */
if (sal.line >= prologue_sal.line) if (sal.line >= prologue_sal.line)
break; break;
@ -2396,8 +2395,8 @@ Index: gdb-6.8.50.20090302/gdb/symtab.c
the function looking for address ranges whose the function looking for address ranges whose
Index: gdb-6.8.50.20090302/gdb/symtab.h Index: gdb-6.8.50.20090302/gdb/symtab.h
=================================================================== ===================================================================
--- gdb-6.8.50.20090302.orig/gdb/symtab.h 2009-03-21 21:06:02.000000000 +0100 --- gdb-6.8.50.20090302.orig/gdb/symtab.h 2009-03-27 00:14:19.000000000 +0100
+++ gdb-6.8.50.20090302/gdb/symtab.h 2009-03-21 21:06:16.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/symtab.h 2009-03-27 00:14:33.000000000 +0100
@@ -556,9 +556,18 @@ struct symbol @@ -556,9 +556,18 @@ struct symbol
unsigned is_argument : 1; unsigned is_argument : 1;
@ -2431,7 +2430,7 @@ Index: gdb-6.8.50.20090302/gdb/symtab.h
Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.base/break.exp Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.base/break.exp
=================================================================== ===================================================================
--- gdb-6.8.50.20090302.orig/gdb/testsuite/gdb.base/break.exp 2009-01-19 20:05:01.000000000 +0100 --- gdb-6.8.50.20090302.orig/gdb/testsuite/gdb.base/break.exp 2009-01-19 20:05:01.000000000 +0100
+++ gdb-6.8.50.20090302/gdb/testsuite/gdb.base/break.exp 2009-03-21 21:06:16.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/testsuite/gdb.base/break.exp 2009-03-27 00:14:33.000000000 +0100
@@ -880,6 +880,13 @@ gdb_expect { @@ -880,6 +880,13 @@ gdb_expect {
# marker4() is defined at line 46 when compiled with -DPROTOTYPES # marker4() is defined at line 46 when compiled with -DPROTOTYPES
pass "run until breakpoint set at small function, optimized file (line bp_location14)" pass "run until breakpoint set at small function, optimized file (line bp_location14)"
@ -2449,7 +2448,7 @@ Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.base/break.exp
Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.cp/annota2.exp Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.cp/annota2.exp
=================================================================== ===================================================================
--- gdb-6.8.50.20090302.orig/gdb/testsuite/gdb.cp/annota2.exp 2009-01-03 06:58:04.000000000 +0100 --- gdb-6.8.50.20090302.orig/gdb/testsuite/gdb.cp/annota2.exp 2009-01-03 06:58:04.000000000 +0100
+++ gdb-6.8.50.20090302/gdb/testsuite/gdb.cp/annota2.exp 2009-03-21 21:06:16.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/testsuite/gdb.cp/annota2.exp 2009-03-27 00:14:33.000000000 +0100
@@ -119,10 +119,11 @@ gdb_expect { @@ -119,10 +119,11 @@ gdb_expect {
# continue until exit # continue until exit
# this will test: # this will test:
@ -2466,7 +2465,7 @@ Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.cp/annota2.exp
Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-bt.c Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-bt.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-bt.c 2009-03-21 21:06:16.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-bt.c 2009-03-27 00:14:33.000000000 +0100
@@ -0,0 +1,47 @@ @@ -0,0 +1,47 @@
+/* Copyright (C) 2008 Free Software Foundation, Inc. +/* Copyright (C) 2008 Free Software Foundation, Inc.
+ +
@ -2518,7 +2517,7 @@ Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-bt.c
Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-bt.exp Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-bt.exp
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-bt.exp 2009-03-21 21:06:17.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-bt.exp 2009-03-27 00:14:33.000000000 +0100
@@ -0,0 +1,63 @@ @@ -0,0 +1,63 @@
+# Copyright 2008 Free Software Foundation, Inc. +# Copyright 2008 Free Software Foundation, Inc.
+ +
@ -2586,7 +2585,7 @@ Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-bt.exp
Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-cmds.c Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-cmds.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-cmds.c 2009-03-21 21:06:17.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-cmds.c 2009-03-27 00:14:33.000000000 +0100
@@ -0,0 +1,85 @@ @@ -0,0 +1,85 @@
+/* Copyright (C) 2008 Free Software Foundation, Inc. +/* Copyright (C) 2008 Free Software Foundation, Inc.
+ +
@ -2676,7 +2675,7 @@ Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-cmds.c
Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-cmds.exp Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-cmds.exp
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-cmds.exp 2009-03-21 21:06:17.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-cmds.exp 2009-03-27 00:14:33.000000000 +0100
@@ -0,0 +1,279 @@ @@ -0,0 +1,279 @@
+# Copyright 2008 Free Software Foundation, Inc. +# Copyright 2008 Free Software Foundation, Inc.
+ +
@ -2960,7 +2959,7 @@ Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-cmds.exp
Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-locals.c Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-locals.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-locals.c 2009-03-21 21:06:17.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-locals.c 2009-03-27 00:14:33.000000000 +0100
@@ -0,0 +1,52 @@ @@ -0,0 +1,52 @@
+/* Copyright (C) 2008 Free Software Foundation, Inc. +/* Copyright (C) 2008 Free Software Foundation, Inc.
+ +
@ -3017,7 +3016,7 @@ Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-locals.c
Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-locals.exp Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-locals.exp
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-locals.exp 2009-03-21 21:06:17.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-locals.exp 2009-03-27 00:14:33.000000000 +0100
@@ -0,0 +1,118 @@ @@ -0,0 +1,118 @@
+# Copyright 2008 Free Software Foundation, Inc. +# Copyright 2008 Free Software Foundation, Inc.
+ +
@ -3140,7 +3139,7 @@ Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-locals.exp
Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-markers.c Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-markers.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-markers.c 2009-03-21 21:06:17.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-markers.c 2009-03-27 00:14:33.000000000 +0100
@@ -0,0 +1,36 @@ @@ -0,0 +1,36 @@
+/* Copyright (C) 2008 Free Software Foundation, Inc. +/* Copyright (C) 2008 Free Software Foundation, Inc.
+ +
@ -3180,8 +3179,8 @@ Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/inline-markers.c
+} +}
Index: gdb-6.8.50.20090302/gdb/testsuite/lib/gdb.exp Index: gdb-6.8.50.20090302/gdb/testsuite/lib/gdb.exp
=================================================================== ===================================================================
--- gdb-6.8.50.20090302.orig/gdb/testsuite/lib/gdb.exp 2009-03-21 21:06:04.000000000 +0100 --- gdb-6.8.50.20090302.orig/gdb/testsuite/lib/gdb.exp 2009-03-27 00:14:23.000000000 +0100
+++ gdb-6.8.50.20090302/gdb/testsuite/lib/gdb.exp 2009-03-21 21:06:17.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/testsuite/lib/gdb.exp 2009-03-27 00:14:33.000000000 +0100
@@ -1474,6 +1474,37 @@ proc skip_hp_tests {} { @@ -1474,6 +1474,37 @@ proc skip_hp_tests {} {
return $skip_hp return $skip_hp
} }
@ -3222,8 +3221,8 @@ Index: gdb-6.8.50.20090302/gdb/testsuite/lib/gdb.exp
set hp_cc_compiler 0 set hp_cc_compiler 0
Index: gdb-6.8.50.20090302/gdb/valops.c Index: gdb-6.8.50.20090302/gdb/valops.c
=================================================================== ===================================================================
--- gdb-6.8.50.20090302.orig/gdb/valops.c 2009-03-21 21:06:03.000000000 +0100 --- gdb-6.8.50.20090302.orig/gdb/valops.c 2009-03-27 00:14:20.000000000 +0100
+++ gdb-6.8.50.20090302/gdb/valops.c 2009-03-21 21:06:17.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/valops.c 2009-03-27 00:14:33.000000000 +0100
@@ -1072,7 +1072,7 @@ value_of_variable (struct symbol *var, s @@ -1072,7 +1072,7 @@ value_of_variable (struct symbol *var, s
frame = block_innermost_frame (b); frame = block_innermost_frame (b);
if (!frame) if (!frame)
@ -3235,8 +3234,8 @@ Index: gdb-6.8.50.20090302/gdb/valops.c
SYMBOL_PRINT_NAME (BLOCK_FUNCTION (b))); SYMBOL_PRINT_NAME (BLOCK_FUNCTION (b)));
Index: gdb-6.8.50.20090302/gdb/Makefile.in Index: gdb-6.8.50.20090302/gdb/Makefile.in
=================================================================== ===================================================================
--- gdb-6.8.50.20090302.orig/gdb/Makefile.in 2009-03-21 21:06:04.000000000 +0100 --- gdb-6.8.50.20090302.orig/gdb/Makefile.in 2009-03-27 00:14:23.000000000 +0100
+++ gdb-6.8.50.20090302/gdb/Makefile.in 2009-03-21 21:06:17.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/Makefile.in 2009-03-27 00:14:33.000000000 +0100
@@ -667,6 +667,7 @@ SFILES = ada-exp.y ada-lang.c ada-typepr @@ -667,6 +667,7 @@ SFILES = ada-exp.y ada-lang.c ada-typepr
inf-loop.c \ inf-loop.c \
infcall.c \ infcall.c \
@ -3256,7 +3255,7 @@ Index: gdb-6.8.50.20090302/gdb/Makefile.in
Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/Makefile.in Index: gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/Makefile.in
=================================================================== ===================================================================
--- gdb-6.8.50.20090302.orig/gdb/testsuite/gdb.opt/Makefile.in 2008-04-18 01:06:54.000000000 +0200 --- gdb-6.8.50.20090302.orig/gdb/testsuite/gdb.opt/Makefile.in 2008-04-18 01:06:54.000000000 +0200
+++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/Makefile.in 2009-03-21 21:06:17.000000000 +0100 +++ gdb-6.8.50.20090302/gdb/testsuite/gdb.opt/Makefile.in 2009-03-27 00:14:33.000000000 +0100
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
VPATH = @srcdir@ VPATH = @srcdir@
srcdir = @srcdir@ srcdir = @srcdir@

563
gdb-archer.patch
View File

File diff suppressed because it is too large Load Diff

10
gdb.spec
View File

@ -13,7 +13,7 @@ Version: 6.8.50.20090302
# The release always contains a leading reserved number, start it at 1. # The release always contains a leading reserved number, start it at 1.
# `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing. # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
Release: 11%{?_with_upstream:.upstream}%{?dist} Release: 12%{?_with_upstream:.upstream}%{?dist}
License: GPLv3+ License: GPLv3+
Group: Development/Debuggers Group: Development/Debuggers
@ -851,6 +851,14 @@ fi
%endif %endif
%changelog %changelog
* Fri Mar 27 2009 Jan Kratochvil <jan.kratochvil@redhat.com> - 6.8.50.20090302-12
- Archer update to the snapshot: 837d9879980148af05eae540d92caeb7200f1813
- Archer backport: 8340d06295c8db80c544503458305197891e0348
- Fixes [master] regression for Eclipse CDT testsuite.
- Archer backport: 16328456d5740917ade0a49bcecc14c4564b9a99
- Fixes #2 [expr] compatibility with gcc-4.4 on gdb.cp/namespace-using.exp.
- Rebase [expr] on the Keith Seitz's sync with FSF GDB fixing the former merge.
* Sun Mar 22 2009 Jan Kratochvil <jan.kratochvil@redhat.com> - 6.8.50.20090302-11 * Sun Mar 22 2009 Jan Kratochvil <jan.kratochvil@redhat.com> - 6.8.50.20090302-11
- Archer update to the snapshot: e734ed95d296a3342d4147873c4641cea6c4d7fe - Archer update to the snapshot: e734ed95d296a3342d4147873c4641cea6c4d7fe
- Archer backport: 1e1d73cda98b1adda884b80e07c7b4929c175628 - Archer backport: 1e1d73cda98b1adda884b80e07c7b4929c175628