6 files changed, 26 insertions, 11 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 00e5652..023b19b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,14 @@
+2004-04-10  Mark Kettenis  <kettenis@gnu.org>
+
+	* i386-sol2-tdep.c: Include "solib-svr4.h".
+	(i386_sol2_init_abi): Set solib_svr4_fetch_link_map_offsets.
+	* Makefile.in (i386-sol2-tdep.o): Update dependencies.
+	* config/i386/tm-i386sol2.h: Include :solib.h".
+	* config/i386/i386sol2.mh (NATDEPFILES): Remove solib.o,
+	solib-svr4.o and solib-legacy.o.
+	* config/i386/i386sol2.mt (TDEPFILES): Add solib.o and
+	solib-svr4.o.
+
 2004-04-09  Mark Kettenis  <kettenis@gnu.org>
 
 	* amd64-linux-nat.c (fetch_inferior_registers): Correctly check
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 7ca4942..30a357e 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1877,7 +1877,7 @@ i386obsd-tdep.o: i386obsd-tdep.c $(defs_h) $(arch_utils_h) $(frame_h) \
 	$(osabi_h) $(target_h) $(gdb_assert_h) $(gdb_string_h) \
 	$(i386_tdep_h) $(i387_tdep_h) $(solib_svr4_h)
 i386-sol2-tdep.o: i386-sol2-tdep.c $(defs_h) $(value_h) $(osabi_h) \
-	$(i386_tdep_h)
+	$(i386_tdep_h) $(solib_svr4_h)
 i386-stub.o: i386-stub.c
 i386-tdep.o: i386-tdep.c $(defs_h) $(arch_utils_h) $(command_h) \
 	$(dummy_frame_h) $(dwarf2_frame_h) $(doublest_h) $(floatformat_h) \
diff --git a/gdb/config/i386/i386sol2.mh b/gdb/config/i386/i386sol2.mh
index 1245ca7..750b9f0 100644
--- a/gdb/config/i386/i386sol2.mh
+++ b/gdb/config/i386/i386sol2.mh
@@ -1,8 +1,5 @@
-# Host: Intel 386 running Solaris 2 (SVR4)
-
-XM_FILE= xm-i386.h
-
-NAT_FILE= nm-i386sol2.h
+# Host: Solaris x86
 NATDEPFILES= fork-child.o i386v4-nat.o \
-	procfs.o proc-api.o proc-events.o proc-flags.o proc-why.o gcore.o \
-        solib.o solib-svr4.o solib-legacy.o
+	procfs.o proc-api.o proc-events.o proc-flags.o proc-why.o gcore.o
+NAT_FILE= nm-i386sol2.h
+XM_FILE= xm-i386.h
diff --git a/gdb/config/i386/i386sol2.mt b/gdb/config/i386/i386sol2.mt
index 863f615..1ced287 100644
--- a/gdb/config/i386/i386sol2.mt
+++ b/gdb/config/i386/i386sol2.mt
@@ -1,3 +1,4 @@
-# Target: Intel 386 running Solaris 2 (SVR4)
-TDEPFILES= i386-tdep.o i387-tdep.o i386-sol2-tdep.o corelow.o
+# Target: Solaris x86
+TDEPFILES= i386-tdep.o i387-tdep.o i386-sol2-tdep.o \
+	corelow.o solib.o solib-svr4.o
 TM_FILE= tm-i386sol2.h
diff --git a/gdb/config/i386/tm-i386sol2.h b/gdb/config/i386/tm-i386sol2.h
index 3f9aaa5..3dfbbbb 100644
--- a/gdb/config/i386/tm-i386sol2.h
+++ b/gdb/config/i386/tm-i386sol2.h
@@ -22,6 +22,8 @@
 #ifndef TM_I386SOL2_H
 #define TM_I386SOL2_H 1
 
+#include "solib.h"
+
 /* The SunPRO compiler puts out 0 instead of the address in N_SO symbols,
    and for SunPRO 3.0, N_FUN symbols too.  */
 #define SOFUN_ADDRESS_MAYBE_MISSING
@@ -30,4 +32,4 @@ extern char *sunpro_static_transform_name (char *);
 #define STATIC_TRANSFORM_NAME(x) sunpro_static_transform_name (x)
 #define IS_STATIC_TRANSFORM_NAME(name) ((name)[0] == '.')
 
-#endif /* ifndef TM_I386SOL2_H */
+#endif /* tm-i386sol2.h */
diff --git a/gdb/i386-sol2-tdep.c b/gdb/i386-sol2-tdep.c
index e261d56..698066f 100644
--- a/gdb/i386-sol2-tdep.c
+++ b/gdb/i386-sol2-tdep.c
@@ -24,6 +24,7 @@
 #include "osabi.h"
 
 #include "i386-tdep.h"
+#include "solib-svr4.h"
 
 /* From <ia32/sys/reg.h>.  */
 static int i386_sol2_gregset_reg_offset[] =
@@ -93,6 +94,9 @@ i386_sol2_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
   tdep->sigcontext_addr = i386_sol2_mcontext_addr;
   tdep->sc_reg_offset = tdep->gregset_reg_offset;
   tdep->sc_num_regs = tdep->gregset_num_regs;
+
+  set_solib_svr4_fetch_link_map_offsets
+    (gdbarch, svr4_ilp32_fetch_link_map_offsets);
 }