* config/sparc/linux.mt (TDEPFILES): Remove solib-legacy.o.

* config/sparc/linux64.mt (TDEPFILES): Likewise.
* config/sparc/sol2.mt (TDEPFILES): Add solib.o and solib-svr4.o.
* config/sparc/sol2.mh (NATDEPFILES): Remove solib.o, solib-svr4.o
and solib-legacy.o.
* config/sparc/sol2-64.mt (TDEPFILES): Add solib.o and
solib-svr4.o.
* config/sparc/tm-sol2.h: Update copyright year.  Include
"solib.h".

7 files changed, 20 insertions, 7 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 276b7db..7cc00a8 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,15 @@
 2004-04-07  Mark Kettenis  <kettenis@gnu.org>
 
+	* config/sparc/linux.mt (TDEPFILES): Remove solib-legacy.o.
+	* config/sparc/linux64.mt (TDEPFILES): Likewise.
+	* config/sparc/sol2.mt (TDEPFILES): Add solib.o and solib-svr4.o.
+	* config/sparc/sol2.mh (NATDEPFILES): Remove solib.o, solib-svr4.o
+	and solib-legacy.o.
+	* config/sparc/sol2-64.mt (TDEPFILES): Add solib.o and
+	solib-svr4.o.
+	* config/sparc/tm-sol2.h: Update copyright year.  Include
+	"solib.h".
+
 	* sparc-sol2-tdep.c: Update copyright year.  Include
 	"solib-svr4.h".
 	(sparc32_sol2_init_abi): Set solib_svr4_fetch_link_map_offsets.
diff --git a/gdb/config/sparc/linux.mt b/gdb/config/sparc/linux.mt
index e053f30..442983b 100644
--- a/gdb/config/sparc/linux.mt
+++ b/gdb/config/sparc/linux.mt
@@ -1,4 +1,4 @@
 # Target: GNU/Linux SPARC
 TDEPFILES= sparc-tdep.o sparc-sol2-tdep.o sparc-linux-tdep.o \
-	solib.o solib-svr4.o solib-legacy.o
+	solib.o solib-svr4.o
 TM_FILE= tm-linux.h
diff --git a/gdb/config/sparc/linux64.mt b/gdb/config/sparc/linux64.mt
index 4121314..ba7c22e 100644
--- a/gdb/config/sparc/linux64.mt
+++ b/gdb/config/sparc/linux64.mt
@@ -1,5 +1,5 @@
 # Target: GNU/Linux UltraSPARC
 TDEPFILES= sparc64-tdep.o sparc64-sol2-tdep.o sparc64-linux-tdep.o \
 	sparc-tdep.o sparc-sol2-tdep.o sparc-linux-tdep.o \
-	solib.o solib-svr4.o solib-legacy.o
+	solib.o solib-svr4.o
 TM_FILE= tm-linux.h
diff --git a/gdb/config/sparc/sol2-64.mt b/gdb/config/sparc/sol2-64.mt
index 92f8489..ec92e1f 100644
--- a/gdb/config/sparc/sol2-64.mt
+++ b/gdb/config/sparc/sol2-64.mt
@@ -1,3 +1,4 @@
 # Target: Solaris UltraSPARC
-TDEPFILES= sparc64-tdep.o sparc64-sol2-tdep.o sparc-tdep.o sparc-sol2-tdep.o
+TDEPFILES= sparc64-tdep.o sparc64-sol2-tdep.o sparc-tdep.o sparc-sol2-tdep.o \
+	solib.o solib-svr4.o
 TM_FILE= tm-sol2.h
diff --git a/gdb/config/sparc/sol2.mh b/gdb/config/sparc/sol2.mh
index 735b9ee..44a0601 100644
--- a/gdb/config/sparc/sol2.mh
+++ b/gdb/config/sparc/sol2.mh
@@ -2,5 +2,4 @@
 NAT_FILE= nm-sol2.h
 NATDEPFILES= sparc-sol2-nat.o \
 	corelow.o core-regset.o fork-child.o gcore.o \
-	procfs.o proc-api.o proc-events.o proc-flags.o proc-why.o \
-	solib.o solib-svr4.o solib-legacy.o
+	procfs.o proc-api.o proc-events.o proc-flags.o proc-why.o
diff --git a/gdb/config/sparc/sol2.mt b/gdb/config/sparc/sol2.mt
index 4037956..11fd4b8 100644
--- a/gdb/config/sparc/sol2.mt
+++ b/gdb/config/sparc/sol2.mt
@@ -1,3 +1,3 @@
 # Target: Solaris SPARC
-TDEPFILES= sparc-tdep.o sparc-sol2-tdep.o
+TDEPFILES= sparc-tdep.o sparc-sol2-tdep.o solib.o solib-svr4.o
 TM_FILE= tm-sol2.h
diff --git a/gdb/config/sparc/tm-sol2.h b/gdb/config/sparc/tm-sol2.h
index d111c1a..37dc285 100644
--- a/gdb/config/sparc/tm-sol2.h
+++ b/gdb/config/sparc/tm-sol2.h
@@ -1,6 +1,6 @@
 /* Target-dependent definitions for Solaris SPARC.
 
-   Copyright 2003 Free Software Foundation, Inc.
+   Copyright 2003, 2004 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -23,6 +23,9 @@
 
 #define GDB_MULTI_ARCH GDB_MULTI_ARCH_TM
 
+/* Shared library support.  */
+#include "solib.h"
+
 /* The Sun compilers (Sun ONE Studio, Forte Developer, Sun WorkShop,
    SunPRO) compiler puts out 0 instead of the address in N_SO stabs.
    Starting with SunPRO 3.0, the compiler does this for N_FUN stabs