From 6974274f54a973c0479eb15335073512f0b26c3f Mon Sep 17 00:00:00 2001 From: Jim Blandy Date: Thu, 12 Jun 2003 23:58:07 +0000 Subject: [PATCH] Actually finish the job started by my change of 2003-05-29. * config/powerpc/tm-linux.h (SKIP_TRAMPOLINE_CODE): Remove the other #definition of this. (ppc_linux_skip_trampoline_code): Remove declaration. * ppc-linux-tdep.c (ppc_linux_skip_trampoline_code): Make this static. (ppc_linux_init_abi): Register it as the skip_trampoline_code method for GDBARCH. --- gdb/config/powerpc/tm-linux.h | 4 ---- gdb/ppc-linux-tdep.c | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/gdb/config/powerpc/tm-linux.h b/gdb/config/powerpc/tm-linux.h index eba57c0f411..34d95cadca4 100644 --- a/gdb/config/powerpc/tm-linux.h +++ b/gdb/config/powerpc/tm-linux.h @@ -48,10 +48,6 @@ extern int at_subroutine_call_instruction_target(); in symfile.c) */ #undef IBM6000_TARGET -extern CORE_ADDR ppc_linux_skip_trampoline_code (CORE_ADDR pc); -#undef SKIP_TRAMPOLINE_CODE -#define SKIP_TRAMPOLINE_CODE(pc) ppc_linux_skip_trampoline_code (pc) - extern int ppc_linux_in_sigtramp (CORE_ADDR pc, char *func_name); #undef IN_SIGTRAMP #define IN_SIGTRAMP(pc,func_name) ppc_linux_in_sigtramp (pc,func_name) diff --git a/gdb/ppc-linux-tdep.c b/gdb/ppc-linux-tdep.c index ef1d9f0b344..279c17c465c 100644 --- a/gdb/ppc-linux-tdep.c +++ b/gdb/ppc-linux-tdep.c @@ -229,7 +229,7 @@ ppc_linux_at_sigtramp_return_path (CORE_ADDR pc) && insn_is_sigreturn (extract_unsigned_integer (buf, 4)))); } -CORE_ADDR +static CORE_ADDR ppc_linux_skip_trampoline_code (CORE_ADDR pc) { char buf[4]; @@ -749,7 +749,7 @@ ppc_linux_init_abi (struct gdbarch_info info, /* Shared library handling. */ set_gdbarch_in_solib_call_trampoline (gdbarch, in_plt_section); - set_gdbarch_skip_trampoline_code (gdbarch, find_solib_trampoline_target); + set_gdbarch_skip_trampoline_code (gdbarch, ppc_linux_skip_trampoline_code); } void -- 2.30.2