Skip ld.so resolver on sparc too.

3 files changed, 7 insertions, 4 deletions

diff --git a/gnu/usr.bin/binutils/gdb/Makefile.in b/gnu/usr.bin/binutils/gdb/Makefile.in
index 080335fcbf2..528771018c4 100644
--- a/gnu/usr.bin/binutils/gdb/Makefile.in
+++ b/gnu/usr.bin/binutils/gdb/Makefile.in
@@ -2553,7 +2553,7 @@ sparc64-tdep.o: sparc64-tdep.c $(defs_h) $(arch_utils_h) $(floatformat_h) \
 	$(frame_h) $(frame_base_h) $(frame_unwind_h) $(gdbcore_h) \
 	$(gdbtypes_h) $(inferior_h) $(symtab_h) $(objfiles_h) $(osabi_h) \
 	$(regcache_h) $(target_h) $(value_h) $(gdb_assert_h) $(gdb_string_h) \
-	$(sparc64_tdep_h)
+	$(obsd_tdep_h) $(sparc64_tdep_h)
 sparc-linux-tdep.o: sparc-linux-tdep.c $(defs_h) $(floatformat_h) $(frame_h) \
 	$(frame_unwind_h) $(gdbarch_h) $(gdbcore_h) $(osabi_h) $(regcache_h) \
 	$(solib_svr4_h) $(symtab_h) $(trad_frame_h) $(gdb_assert_h) \
@@ -2569,7 +2569,7 @@ sparcnbsd-tdep.o: sparcnbsd-tdep.c $(defs_h) $(floatformat_h) $(frame_h) \
 	$(gdb_string_h) $(sparc_tdep_h) $(nbsd_tdep_h)
 sparcobsd-tdep.o: sparcobsd-tdep.c $(defs_h) $(floatformat_h) $(frame_h) \
 	$(frame_unwind_h) $(osabi_h) $(solib_svr4_h) $(symtab_h) \
-	$(trad_frame_h) $(gdb_assert_h) $(sparc_tdep_h)
+	$(trad_frame_h) $(gdb_assert_h) $(obsd_tdep_h) $(sparc_tdep_h)
 sparc-sol2-nat.o: sparc-sol2-nat.c $(defs_h) $(regcache_h) $(gregset_h) \
 	$(sparc_tdep_h) $(sparc64_tdep_h)
 sparc-sol2-tdep.o: sparc-sol2-tdep.c $(defs_h) $(frame_h) $(frame_unwind_h) \
diff --git a/gnu/usr.bin/binutils/gdb/config/sparc/obsd.mt b/gnu/usr.bin/binutils/gdb/config/sparc/obsd.mt
index a24b7e9ad64..a17c5e108e4 100644
--- a/gnu/usr.bin/binutils/gdb/config/sparc/obsd.mt
+++ b/gnu/usr.bin/binutils/gdb/config/sparc/obsd.mt
@@ -1,4 +1,4 @@
 # Target: OpenBSD/sparc
 TDEPFILES= 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
 DEPRECATED_TM_FILE= solib.h
diff --git a/gnu/usr.bin/binutils/gdb/sparcobsd-tdep.c b/gnu/usr.bin/binutils/gdb/sparcobsd-tdep.c
index 7c3bcc91ae7..1f31857664f 100644
--- a/gnu/usr.bin/binutils/gdb/sparcobsd-tdep.c
+++ b/gnu/usr.bin/binutils/gdb/sparcobsd-tdep.c
@@ -1,6 +1,6 @@
 /* Target-dependent code for OpenBSD/sparc.
 
-   Copyright 2004 Free Software Foundation, Inc.
+   Copyright 2004, 2005 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -30,6 +30,7 @@
 
 #include "gdb_assert.h"
 
+#include "obsd-tdep.h"
 #include "sparc-tdep.h"
 
 /* Signal trampolines.  */
@@ -150,6 +151,8 @@ sparc32obsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
   /* OpenBSD/sparc is very similar to NetBSD/sparc ELF.  */
   sparc32nbsd_elf_init_abi (info, gdbarch);
 
+  set_gdbarch_skip_solib_resolver (gdbarch, obsd_skip_solib_resolver);
+
   frame_unwind_append_sniffer (gdbarch, sparc32obsd_sigtramp_frame_sniffer);
 }