From e7d6a6d283ab5d304e0b21f94e8912f8310e4eaa Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Tue, 26 Oct 2004 14:44:00 +0000 Subject: [PATCH] 2004-10-26 Andrew Cagney * config/mips/tm-linux.h: Delete #undef SKIP_TRAMPOLINE_CODE. * mips-tdep.c (mips_skip_trampoline_code): Rename mips_skip_stub. (mips_gdbarch_init): Update. (mips_dump_tdep): Do not print SKIP_TRAMPOLINE_CODE. --- gdb/ChangeLog | 5 +++++ gdb/config/mips/tm-linux.h | 1 - gdb/mips-tdep.c | 12 +++--------- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f2f9729..164db5d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2004-10-26 Andrew Cagney + * config/mips/tm-linux.h: Delete #undef SKIP_TRAMPOLINE_CODE. + * mips-tdep.c (mips_skip_trampoline_code): Rename mips_skip_stub. + (mips_gdbarch_init): Update. + (mips_dump_tdep): Do not print SKIP_TRAMPOLINE_CODE. + * config/arm/tm-linux.h (IN_SOLIB_RETURN_TRAMPOLINE): Delete. * config/mips/tm-nbsd.h, config/mips/tm-linux.h: Delete #undef IN_SOLIB_RETURN_TRAMPOLINE. diff --git a/gdb/config/mips/tm-linux.h b/gdb/config/mips/tm-linux.h index 9ee0024..8ef4ce5 100644 --- a/gdb/config/mips/tm-linux.h +++ b/gdb/config/mips/tm-linux.h @@ -26,7 +26,6 @@ /* We don't want to inherit tm-mips.h's shared library trampoline code. */ -#undef SKIP_TRAMPOLINE_CODE #undef IGNORE_HELPER_CALL /* GNU/Linux MIPS has __SIGRTMAX == 127. */ diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c index 4deb31d..f20cd7d 100644 --- a/gdb/mips-tdep.c +++ b/gdb/mips-tdep.c @@ -5289,13 +5289,10 @@ mips_breakpoint_from_pc (CORE_ADDR *pcptr, int *lenptr) a return stub and the target PC is in $18. See the source code for the stubs in gcc/config/mips/mips16.S for - gory details. - - This function implements the SKIP_TRAMPOLINE_CODE macro. - */ + gory details. */ static CORE_ADDR -mips_skip_stub (CORE_ADDR pc) +mips_skip_trampoline_code (CORE_ADDR pc) { char *name; CORE_ADDR start_addr; @@ -5960,7 +5957,7 @@ mips_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) is sitting on? */ set_gdbarch_have_nonsteppable_watchpoint (gdbarch, 1); - set_gdbarch_skip_trampoline_code (gdbarch, mips_skip_stub); + set_gdbarch_skip_trampoline_code (gdbarch, mips_skip_trampoline_code); /* NOTE drow/2004-02-11: We overload the core solib trampoline code to support MIPS16. This is a bad thing. Make sure not to do it @@ -6185,9 +6182,6 @@ mips_dump_tdep (struct gdbarch *current_gdbarch, struct ui_file *file) "mips_dump_tdep: SETUP_ARBITRARY_FRAME # %s\n", XSTRING (SETUP_ARBITRARY_FRAME (NUMARGS, ARGS))); fprintf_unfiltered (file, - "mips_dump_tdep: SKIP_TRAMPOLINE_CODE # %s\n", - XSTRING (SKIP_TRAMPOLINE_CODE (PC))); - fprintf_unfiltered (file, "mips_dump_tdep: SOFTWARE_SINGLE_STEP # %s\n", XSTRING (SOFTWARE_SINGLE_STEP (SIG, BP_P))); fprintf_unfiltered (file, -- 2.7.4