* solib-svr4.c (legacy_svr4_fetch_link_map_offsets_hook): Remove.

	(solib_svr4_init): Initialize fetch_link_map_offsets to NULL.
	* solib-svr4.h (legacy_svr4_fetch_link_map_offsets_hook): Remove.
	* solib-legacy.c: Remove file.

	* config/alpha/alpha-linux.mt (TDEPFILES): Remove solib-legacy.o.
	* config/arm/linux.mt (TDEPFILES): Likewise.
	* config/i386/i386gnu.mh (NATDEPFILES): Likewise.
	* config/ia64/linux.mt (TDEPFILES): Likewise.
	* config/m32r/linux.mt (TDEPFILES): Likewise.
	* config/powerpc/linux.mt (TDEPFILES): Likewise.
	* config/s390/s390.mt (TDEPFILES): Likewise.

	* alpha-linux-tdep.c (alpha_linux_init_abi): Call
	set_solib_svr4_fetch_link_map_offsets.
	* i386gnu-tdep.c (i386gnu_init_abi): Likewise.
	* ia64-linux-tdep.c (ia64_linux_init_abi): Likewise.

	* i386gnu-tdep.c: Include "solib-svr4.h".
	* Makefile.in: Update dependencies.

7 files changed, 7 insertions, 9 deletions

diff --git a/gdb/config/alpha/alpha-linux.mt b/gdb/config/alpha/alpha-linux.mt
index 096c6c3..c0eefa6 100644
--- a/gdb/config/alpha/alpha-linux.mt
+++ b/gdb/config/alpha/alpha-linux.mt
@@ -1,3 +1,3 @@
 # Target: Little-endian Alpha
 TDEPFILES= alpha-tdep.o alpha-mdebug-tdep.o alpha-linux-tdep.o \
-	   solib.o solib-svr4.o solib-legacy.o
+	   solib.o solib-svr4.o
diff --git a/gdb/config/arm/linux.mt b/gdb/config/arm/linux.mt
index 8f4a853..8621b56 100644
--- a/gdb/config/arm/linux.mt
+++ b/gdb/config/arm/linux.mt
@@ -1,5 +1,4 @@
 # Target: ARM based machine running GNU/Linux
 TDEPFILES= arm-tdep.o arm-linux-tdep.o glibc-tdep.o solib.o \
-  solib-svr4.o solib-legacy.o symfile-mem.o \
-  corelow.o
+  solib-svr4.o symfile-mem.o corelow.o
 
diff --git a/gdb/config/i386/i386gnu.mh b/gdb/config/i386/i386gnu.mh
index 35b3947..fa7f7c3 100644
--- a/gdb/config/i386/i386gnu.mh
+++ b/gdb/config/i386/i386gnu.mh
@@ -1,6 +1,6 @@
 # Host: Intel 386 running the GNU Hurd
 NATDEPFILES= i386gnu-nat.o gnu-nat.o corelow.o core-regset.o \
-	     fork-child.o solib.o solib-svr4.o solib-legacy.o \
+	     fork-child.o solib.o solib-svr4.o \
 	     notify_S.o process_reply_S.o msg_reply_S.o \
 	     msg_U.o exc_request_U.o exc_request_S.o
 
diff --git a/gdb/config/ia64/linux.mt b/gdb/config/ia64/linux.mt
index 22aa171..f567769 100644
--- a/gdb/config/ia64/linux.mt
+++ b/gdb/config/ia64/linux.mt
@@ -1,3 +1,2 @@
 # Target: Intel IA-64 running GNU/Linux
-TDEPFILES= ia64-tdep.o ia64-linux-tdep.o \
-	solib.o solib-svr4.o solib-legacy.o symfile-mem.o
+TDEPFILES= ia64-tdep.o ia64-linux-tdep.o solib.o solib-svr4.o symfile-mem.o
diff --git a/gdb/config/m32r/linux.mt b/gdb/config/m32r/linux.mt
index 1a9cfaf..e27fc67 100644
--- a/gdb/config/m32r/linux.mt
+++ b/gdb/config/m32r/linux.mt
@@ -1,5 +1,5 @@
 # Target: Renesas M32R running GNU/Linux
-TDEPFILES= m32r-tdep.o m32r-linux-tdep.o remote-m32r-sdi.o glibc-tdep.o solib.o solib-svr4.o solib-legacy.o symfile-mem.o
+TDEPFILES= m32r-tdep.o m32r-linux-tdep.o remote-m32r-sdi.o glibc-tdep.o solib.o solib-svr4.o symfile-mem.o
 
 SIM_OBS = remote-sim.o
 SIM = ../sim/m32r/libsim.a
diff --git a/gdb/config/powerpc/linux.mt b/gdb/config/powerpc/linux.mt
index 846f8c3..863ebb4 100644
--- a/gdb/config/powerpc/linux.mt
+++ b/gdb/config/powerpc/linux.mt
@@ -1,6 +1,6 @@
 # Target: Motorola PPC on Linux
 TDEPFILES= rs6000-tdep.o ppc-linux-tdep.o ppc-sysv-tdep.o solib.o \
-	solib-svr4.o solib-legacy.o corelow.o symfile-mem.o
+	solib-svr4.o corelow.o symfile-mem.o
 
 SIM_OBS = remote-sim.o
 SIM = ../sim/ppc/libsim.a
diff --git a/gdb/config/s390/s390.mt b/gdb/config/s390/s390.mt
index 2299e7c..c9dfb24 100644
--- a/gdb/config/s390/s390.mt
+++ b/gdb/config/s390/s390.mt
@@ -1,2 +1,2 @@
 # Target: S390 running Linux
-TDEPFILES=s390-tdep.o solib.o solib-svr4.o solib-legacy.o
+TDEPFILES=s390-tdep.o solib.o solib-svr4.o