From 70b216c81352409f3bf52fff20f9213378e99109 Mon Sep 17 00:00:00 2001
From: Mark Kettenis <kettenis@gnu.org>
Date: Wed, 7 Apr 2004 00:04:29 +0000
Subject: [PATCH] * sparc-sol2-tdep.c: Update copyright year.  Include
 "solib-svr4.h". (sparc32_sol2_init_abi): Set
 solib_svr4_fetch_link_map_offsets. * sparc64-sol2-tdep.c: Include
 "solib-svr4.h". (sparc64_sol2_init_abi): Set
 solib_svr4_fetch_link_map_offsets. * Makefile.in (sparc-sol2-tdep.o,
 sparc64-sol2-tdep.o): ): Update dependencies.

---
 gdb/ChangeLog           | 10 ++++++++++
 gdb/Makefile.in         |  4 ++--
 gdb/sparc-sol2-tdep.c   |  5 ++++-
 gdb/sparc64-sol2-tdep.c |  3 +++
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b36ee1fadb1..b9915233260 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+2004-04-07  Mark Kettenis  <kettenis@gnu.org>
+
+	* sparc-sol2-tdep.c: Update copyright year.  Include
+	"solib-svr4.h".
+	(sparc32_sol2_init_abi): Set solib_svr4_fetch_link_map_offsets.
+	* sparc64-sol2-tdep.c: Include "solib-svr4.h".
+	(sparc64_sol2_init_abi): Set solib_svr4_fetch_link_map_offsets.
+	* Makefile.in (sparc-sol2-tdep.o, sparc64-sol2-tdep.o): ): Update
+	dependencies.
+
 2004-04-06  Andrew Cagney  <cagney@redhat.com>
 
 	* infttrace.c: Include "infttrace.h".
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index f0727fe8b06..c405138e159 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -2357,7 +2357,7 @@ sparc64obsd-tdep.o: sparc64obsd-tdep.c $(defs_h) $(frame_h) \
 	$(trad_frame_h) $(gdb_assert_h) $(sparc64_tdep_h) $(nbsd_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)
+	$(trad_frame_h) $(gdb_assert_h) $(sparc64_tdep_h) $(solib_svr4_h)
 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) \
@@ -2383,7 +2383,7 @@ sparc-sol2-nat.o: sparc-sol2-nat.c $(defs_h) $(regcache_h) $(gregset_h) \
 sparc-sol2-tdep.o: sparc-sol2-tdep.c $(defs_h) $(frame_h) $(frame_unwind_h) \
 	$(gdbcore_h) $(symtab_h) $(objfiles_h) $(osabi_h) $(regcache_h) \
 	$(target_h) $(trad_frame_h) $(gdb_assert_h) $(gdb_string_h) \
-	$(sparc_tdep_h)
+	$(sparc_tdep_h) $(solib_svr4_h)
 sparc-stub.o: sparc-stub.c
 sparc-tdep.o: sparc-tdep.c $(defs_h) $(arch_utils_h) $(dis_asm_h) \
 	$(floatformat_h) $(frame_h) $(frame_base_h) $(frame_unwind_h) \
diff --git a/gdb/sparc-sol2-tdep.c b/gdb/sparc-sol2-tdep.c
index 0885d470400..7944326fa21 100644
--- a/gdb/sparc-sol2-tdep.c
+++ b/gdb/sparc-sol2-tdep.c
@@ -1,6 +1,6 @@
 /* Target-dependent code for Solaris SPARC.
 
-   Copyright 2003 Free Software Foundation, Inc.
+   Copyright 2003, 2004 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -34,6 +34,7 @@
 #include "gdb_string.h"
 
 #include "sparc-tdep.h"
+#include "solib-svr4.h"
 
 /* From <sys/regset.h>.  */
 const struct sparc_gregset sparc32_sol2_gregset =
@@ -177,6 +178,8 @@ sparc32_sol2_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
   /* Solaris has SVR4-style shared libraries...  */
   set_gdbarch_in_solib_call_trampoline (gdbarch, in_plt_section);
   set_gdbarch_skip_trampoline_code (gdbarch, find_solib_trampoline_target);
+  set_solib_svr4_fetch_link_map_offsets
+    (gdbarch, svr4_ilp32_fetch_link_map_offsets);
 
   /* ...which means that we need some special handling when doing
      prologue analysis.  */
diff --git a/gdb/sparc64-sol2-tdep.c b/gdb/sparc64-sol2-tdep.c
index 43057fe76e5..48f07603626 100644
--- a/gdb/sparc64-sol2-tdep.c
+++ b/gdb/sparc64-sol2-tdep.c
@@ -31,6 +31,7 @@
 #include "gdb_assert.h"
 
 #include "sparc64-tdep.h"
+#include "solib-svr4.h"
 
 /* From <sys/regset.h>.  */
 const struct sparc_gregset sparc64_sol2_gregset =
@@ -161,6 +162,8 @@ sparc64_sol2_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
   /* Solaris has SVR4-style shared libraries...  */
   set_gdbarch_in_solib_call_trampoline (gdbarch, in_plt_section);
   set_gdbarch_skip_trampoline_code (gdbarch, find_solib_trampoline_target);
+  set_solib_svr4_fetch_link_map_offsets
+    (gdbarch, svr4_lp64_fetch_link_map_offsets);
 
   /* ...which means that we need some special handling when doing
      prologue analysis.  */