Revert patch for revision.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b02f23f9926468e262d1ea7348116873f5b665a2..ebe8238129ede071293e598f0b93cdd74f205c5e 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -4,14 +4,6 @@
        * configure.tgt (powerpc64-*-linux*): Build gdbserver, please.
        * regformats/reg-ppc64.dat: New file.
 
-       Use gdbarch methods for solib stuff on PowerPC Linux.
-       * config/powerpc/tm-linux.h (IN_SOLIB_CALL_TRAMPOLINE,
-       SKIP_TRAMPOLINE_CODE): #undef these, so the gdbarch methods will
-       show through.
-       * ppc-linux-tdep.c (ppc_linux_init_abi): Register
-       IN_SOLIB_CALL_TRAMPOLINE and SKIP_TRAMPOLINE_CODE methods here,
-       giving the same effect as the #definitions above.
-
 2003-05-28  Jim Blandy  <jimb@redhat.com>
 
        * ppc-linux-nat.c (store_altivec_registers): Don't cast fourth

diff --git a/gdb/config/powerpc/tm-linux.h b/gdb/config/powerpc/tm-linux.h
index eba57c0f41132f774cef12ed5fe714861a5cf437..d69dfc1f5bfd4abf52b8665ac9085250f9fcf056 100644 (file)
--- a/gdb/config/powerpc/tm-linux.h
+++ b/gdb/config/powerpc/tm-linux.h
@@ -26,11 +26,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #undef SKIP_TRAMPOLINE_CODE
 #include "config/tm-linux.h"
 
-/* We've multi-arched these.  (Note that this completely undoes the
-   effect of config/tm-linux.h #including config/tm-sysv4.h.)  */
-#undef IN_SOLIB_CALL_TRAMPOLINE
-#undef SKIP_TRAMPOLINE_CODE
-
 /* We can single step on linux */
 #undef  SOFTWARE_SINGLE_STEP
 #define SOFTWARE_SINGLE_STEP(p,q) internal_error (__FILE__, __LINE__, "Will never execute!")

diff --git a/gdb/ppc-linux-tdep.c b/gdb/ppc-linux-tdep.c
index 44a5b81367f0f0809faa6adcc0ca6ab726e8a46f..9284751fd0ccac23f2b4bbccfed381fcb666733e 100644 (file)
--- a/gdb/ppc-linux-tdep.c
+++ b/gdb/ppc-linux-tdep.c
@@ -746,10 +746,6 @@ ppc_linux_init_abi (struct gdbarch_info info,
       set_solib_svr4_fetch_link_map_offsets
         (gdbarch, ppc_linux_svr4_fetch_link_map_offsets);
     }
-
-  /* Shared library handling.  */
-  set_gdbarch_in_solib_call_trampoline (gdbarch, in_plt_section);
-  set_gdbarch_skip_trampoline_code (gdbarch, find_solib_trampoline_target);
 }
 
 void