This is the mail archive of the
archer@sourceware.org
mailing list for the Archer project.
[delayed-symfile] [commit] Update from FSF GDB HEAD conflict
- From: Jan Kratochvil <jan dot kratochvil at redhat dot com>
- To: Tom Tromey <tromey at redhat dot com>
- Cc: archer at sourceware dot org
- Date: Mon, 10 Aug 2009 00:20:50 +0200
- Subject: [delayed-symfile] [commit] Update from FSF GDB HEAD conflict
Hi,
minor conflict, resolved in: d73baf081a4ad1760a1e08f70705b9e6dce96420
Conflicting with:
http://sourceware.org/ml/gdb-cvs/2009-08/msg00026.html
(made s/fde/fde_table/)
Just FYI, checked-in.
Regards,
Jan
static struct dwarf2_fde *
dwarf2_frame_find_fde (CORE_ADDR *pc)
{
struct objfile *objfile;
ALL_OBJFILES (objfile)
{
struct dwarf2_fde_table *fde_table;
struct dwarf2_fde **p_fde;
CORE_ADDR offset;
CORE_ADDR seek_pc;
<<<<<<< HEAD:gdb/dwarf2-frame.c
if (objfile->quick_addrmap)
{
if (!addrmap_find (objfile->quick_addrmap, *pc))
continue;
}
/* FIXME: Read-in only .debug_frame/.eh_frame without .debug_info? */
require_partial_symbols (objfile);
fde = objfile_data (objfile, dwarf2_frame_objfile_data);
if (fde == NULL)
=======
fde_table = objfile_data (objfile, dwarf2_frame_objfile_data);
if (fde_table == NULL)
>>>>>>> f80adbadde1c393245886ba552e52db127c960f3:gdb/dwarf2-frame.c
continue;
gdb_assert (objfile->section_offsets);
offset = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));