* sparc64obsd-tdep.c: Include "obsd-tdep.h".

(sparc64obsd_init_abi): Set skip_solib_resolver to
obsd_skip_solib_resolver instead of find_solib_trampoline_target.
* Makefile.in (sparc64obsd-tdep.o): Update dependencies.
* config/sparc/obsd64.mt (TDEPFILES): Add obsd-tdep.o.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 563b632..b7e5ba7 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
 2005-12-26  Mark Kettenis  <kettenis@gnu.org>
 
+       * sparc64obsd-tdep.c: Include "obsd-tdep.h".
+       (sparc64obsd_init_abi): Set skip_solib_resolver to
+       obsd_skip_solib_resolver instead of find_solib_trampoline_target.
+       * Makefile.in (sparc64obsd-tdep.o): Update dependencies.
+       * config/sparc/obsd64.mt (TDEPFILES): Add obsd-tdep.o.
+
        * sparcobsd-tdep.c: Include "obsd-tdep.h".
        (sparc32obsd_init_abi): Set skip_solib_resolver.
        * Makefile.in (sparcobsd-tdep.o): Update dependencies.

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 69a35af..5caded7 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -2605,7 +2605,8 @@ sparc64nbsd-tdep.o: sparc64nbsd-tdep.c $(defs_h) $(frame_h) \
        $(gdb_assert_h) $(gdb_string_h) $(sparc64_tdep_h) $(nbsd_tdep_h)
 sparc64obsd-tdep.o: sparc64obsd-tdep.c $(defs_h) $(frame_h) \
        $(frame_unwind_h) $(osabi_h) $(regset_h) $(symtab_h) $(objfiles_h) \
-       $(solib_svr4_h) $(trad_frame_h) $(gdb_assert_h) $(sparc64_tdep_h)
+       $(solib_svr4_h) $(trad_frame_h) $(gdb_assert_h) $(obsd_tdep_h) \
+       $(sparc64_tdep_h)
 sparc64-sol2-tdep.o: sparc64-sol2-tdep.c $(defs_h) $(frame_h) \
        $(frame_unwind_h) $(gdbarch_h) $(symtab_h) $(objfiles_h) $(osabi_h) \
        $(trad_frame_h) $(gdb_assert_h) $(sparc64_tdep_h) $(solib_svr4_h)

diff --git a/gdb/config/sparc/obsd64.mt b/gdb/config/sparc/obsd64.mt
index 7a4960b..8816c6f 100644 (file)
--- a/gdb/config/sparc/obsd64.mt
+++ b/gdb/config/sparc/obsd64.mt
@@ -1,4 +1,4 @@
 # Target: OpenBSD/sparc64
 TDEPFILES= sparc64-tdep.o sparc64nbsd-tdep.o sparc64obsd-tdep.o \
        sparc-tdep.o sparcnbsd-tdep.o sparcobsd-tdep.o nbsd-tdep.o \
-       corelow.o solib.o solib-svr4.o
+       obsd-tdep.o corelow.o solib.o solib-svr4.o

diff --git a/gdb/sparc64obsd-tdep.c b/gdb/sparc64obsd-tdep.c
index f45bc20..f5bf80d 100644 (file)
--- a/gdb/sparc64obsd-tdep.c
+++ b/gdb/sparc64obsd-tdep.c
@@ -31,6 +31,7 @@
 
 #include "gdb_assert.h"
 
+#include "obsd-tdep.h"
 #include "sparc64-tdep.h"
 
 /* OpenBSD uses the traditional NetBSD core file format, even for
@@ -212,9 +213,9 @@ sparc64obsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
   sparc64_init_abi (info, gdbarch);
 
   /* OpenBSD/sparc64 has SVR4-style shared libraries.  */
-  set_gdbarch_skip_trampoline_code (gdbarch, find_solib_trampoline_target);
   set_solib_svr4_fetch_link_map_offsets
     (gdbarch, svr4_lp64_fetch_link_map_offsets);
+  set_gdbarch_skip_solib_resolver (gdbarch, obsd_skip_solib_resolver);
 }
 \f