From 7cbd4a934e9cf3808e1199c62e65b4c25b24b4e5 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Mon, 8 Apr 2013 19:59:09 +0000
Subject: * minsyms.h (struct bound_minimal_symbol): New.
(lookup_minimal_symbol_and_objfile): Return bound_minimal_symbol. Remove
objfile argument. (lookup_minimal_symbol_by_pc_section,
lookup_minimal_symbol_by_pc): Return bound_minimal_symbol. * minsyms.c
(lookup_minimal_symbol_by_pc_1) (lookup_minimal_symbol_by_pc_section,
lookup_minimal_symbol_by_pc): Return bound_minimal_symbol.
(in_gnu_ifunc_stub): Update. (lookup_minimal_symbol_and_objfile): Return
bound_minimal_symbol. Remove 'objfile_p' argument.
(lookup_solib_trampoline_symbol_by_pc): Update. * ada-tasks.c,
amd64-windows-tdep.c, arm-tdep.c, arm-wince-tdep.c, block.c,
blockframe.c, breakpoint.c, btrace.c, c-valprint.c, dwarf2loc.c, elfread.c,
frame.c, frv-tdep.c, glibc-tdep.c, gnu-v2-abi.c, gnu-v3-abi.c,
hppa-hpux-tdep.c, i386-tdep.c, ia64-tdep.c, infcall.c, infcmd.c, jit.c,
linux-fork.c, m32c-tdep.c, m68hc11-tdep.c, maint.c, mips-tdep.c,
p-valprint.c, parse.c, ppc-linux-tdep.c, ppc-sysv-tdep.c, printcmd.c,
rs6000-tdep.c, sh64-tdep.c, stack.c, symtab.c, tui/tui-disasm.c: Update.
---
gdb/frv-tdep.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'gdb/frv-tdep.c')
diff --git a/gdb/frv-tdep.c b/gdb/frv-tdep.c
index 61997093174..3770667dcf2 100644
--- a/gdb/frv-tdep.c
+++ b/gdb/frv-tdep.c
@@ -1072,7 +1072,7 @@ frv_skip_main_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
{
LONGEST displ;
CORE_ADDR call_dest;
- struct minimal_symbol *s;
+ struct bound_minimal_symbol s;
displ = ((op & 0xfe000000) >> 7) | (op & 0x0003ffff);
if ((displ & 0x00800000) != 0)
@@ -1081,9 +1081,9 @@ frv_skip_main_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
call_dest = pc + 4 * displ;
s = lookup_minimal_symbol_by_pc (call_dest);
- if (s != NULL
- && SYMBOL_LINKAGE_NAME (s) != NULL
- && strcmp (SYMBOL_LINKAGE_NAME (s), "__main") == 0)
+ if (s.minsym != NULL
+ && SYMBOL_LINKAGE_NAME (s.minsym) != NULL
+ && strcmp (SYMBOL_LINKAGE_NAME (s.minsym), "__main") == 0)
{
pc += 4;
return pc;
--
cgit v1.2.1