Index: i386-nto-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/i386-nto-tdep.c,v
retrieving revision 1.18
diff -u -r1.18 i386-nto-tdep.c
--- i386-nto-tdep.c	24 Dec 2004 14:45:32 -0000	1.18
+++ i386-nto-tdep.c	11 Aug 2005 19:09:03 -0000
@@ -262,9 +262,6 @@
      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;
Index: nto-procfs.c
===================================================================
RCS file: /cvs/src/src/gdb/nto-procfs.c,v
retrieving revision 1.14
diff -u -r1.14 nto-procfs.c
--- nto-procfs.c	6 Jul 2005 14:54:34 -0000	1.14
+++ nto-procfs.c	11 Aug 2005 19:09:03 -0000
@@ -545,10 +545,8 @@
 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 @@
   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);
 }
Index: config/tm-nto.h
===================================================================
RCS file: /cvs/src/src/gdb/config/tm-nto.h,v
retrieving revision 1.3
diff -u -r1.3 tm-nto.h
--- config/tm-nto.h	14 Nov 2004 02:56:34 -0000	1.3
+++ config/tm-nto.h	11 Aug 2005 19:09:04 -0000
@@ -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