diff options
| -rw-r--r-- | gdb/ChangeLog | 9 | ||||
| -rw-r--r-- | gdb/config/tm-nto.h | 5 | ||||
| -rw-r--r-- | gdb/i386-nto-tdep.c | 3 | ||||
| -rw-r--r-- | gdb/nto-procfs.c | 8 |
4 files changed, 11 insertions, 14 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 637919add06..706879d20c3 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2005-08-12 Kris Warkentin <kewarken@qnx.com> + + * i386-nto-tdep.c (i386nto_init_abi): Don't set gdbarch skip + trampoline code hook. + * nto-procfs.c (procfs_post_attach): Call solib_create_inferior_hook + instead of SOLIB_CREATE_INFERIOR_HOOK. + (procfs_create_inferior): Ditto. + * config/tm-nto.h: Don't define SKIP_TRAMPOLINE_CODE. + 2005-08-11 Andreas Schwab <schwab@suse.de> PR exp/1978 diff --git a/gdb/config/tm-nto.h b/gdb/config/tm-nto.h index 5ca3c063cea..5224a878aa3 100644 --- a/gdb/config/tm-nto.h +++ b/gdb/config/tm-nto.h @@ -26,11 +26,6 @@ #ifndef _TM_QNXNTO_H #define _TM_QNXNTO_H -/* If PC is in a shared library trampoline code, return the PC - where the function itself actually starts. If not, return 0. */ - -#define SKIP_TRAMPOLINE_CODE(pc) find_solib_trampoline_target (pc) - /* Setup the valid realtime signal range. */ #define REALTIME_LO 41 #define REALTIME_HI 56 diff --git a/gdb/i386-nto-tdep.c b/gdb/i386-nto-tdep.c index 744b8c934a6..d58af0c26e7 100644 --- a/gdb/i386-nto-tdep.c +++ b/gdb/i386-nto-tdep.c @@ -262,9 +262,6 @@ i386nto_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) default which is [unfortunately] to decrement the PC. */ set_gdbarch_decr_pc_after_break (gdbarch, 0); - /* NTO has shared libraries. */ - set_gdbarch_skip_trampoline_code (gdbarch, find_solib_trampoline_target); - tdep->gregset_reg_offset = i386nto_gregset_reg_offset; tdep->gregset_num_regs = ARRAY_SIZE (i386nto_gregset_reg_offset); tdep->sizeof_gregset = NUM_GPREGS * 4; diff --git a/gdb/nto-procfs.c b/gdb/nto-procfs.c index c7aac005b14..624ef063a58 100644 --- a/gdb/nto-procfs.c +++ b/gdb/nto-procfs.c @@ -545,10 +545,8 @@ procfs_attach (char *args, int from_tty) static void procfs_post_attach (pid_t pid) { -#ifdef SOLIB_CREATE_INFERIOR_HOOK if (exec_bfd) - SOLIB_CREATE_INFERIOR_HOOK (pid); -#endif + solib_create_inferior_hook (); } static ptid_t @@ -1091,11 +1089,9 @@ procfs_create_inferior (char *exec_file, char *allargs, char **env, push_target (&procfs_ops); target_terminal_init (); -#ifdef SOLIB_CREATE_INFERIOR_HOOK if (exec_bfd != NULL || (symfile_objfile != NULL && symfile_objfile->obfd != NULL)) - SOLIB_CREATE_INFERIOR_HOOK (pid); -#endif + solib_create_inferior_hook (); stop_soon = 0; proceed (-1, TARGET_SIGNAL_DEFAULT, 0); } |