gdb/

	Build gdb directly from *.o files not using libgdb.a.
	* Makefile.in (SUBDIR_TUI_OBS): Remove duplicate tui.o.
	(COMMON_OBS): Remove solib-target.o.
	(LIBGDB_OBS, libgdb.a): Move it before the gdb$(EXEEXT) rule.
	(gdb$(EXEEXT)): Replace libgdb.a with $(LIBGDB_OBS).
	(LIBGDB_OBS, libgdb.a): Move it above.
	* configure.tgt (alpha*-*-linux*, alpha*-*-freebsd*)
	(alpha*-*-kfreebsd*-gnu, alpha*-*-netbsd*, alpha*-*-knetbsd*-gnu)
	(alpha*-*-openbsd*, am33_2.0*-*-linux*, arm*-wince-pe)
	(arm*-*-mingw32ce*, arm*-*-linux*, arm*-*-netbsd*, arm*-*-knetbsd*-gnu)
	(arm*-*-openbsd*, cris*, frv-*-*, hppa*-*-hpux*, hppa*-*-linux*)
	(hppa*-*-netbsd*, hppa*-*-openbsd*, i[34567]86-*-darwin*)
	(i[34567]86-*-dicos*, i[34567]86-*-freebsd*, i[34567]86-*-kfreebsd*-gnu)
	(i[34567]86-*-netbsd*, i[34567]86-*-knetbsd*-gnu, i[34567]86-*-openbsd*)
	(i[34567]86-*-nto*, i[34567]86-*-solaris2.1[0-9]*)
	(x86_64-*-solaris2.1[0-9]*, i[34567]86-*-solaris*, i[34567]86-*-linux*)
	(i[34567]86-*-gnu*, ia64-*-linux*, m32r*-*-linux*, m68*-*-linux*)
	(m68*-*-netbsd*, m68*-*-knetbsd*-gnu, m68*-*-openbsd*)
	(microblaze*-linux-*, microblaze*-*-linux*, mips*-sgi-irix5*)
	(mips*-sgi-irix6*, mips*-*-linux*, mips*-*-netbsd*)
	(mips*-*-knetbsd*-gnu, mips64*-*-openbsd*, powerpc-*-netbsd*)
	(powerpc-*-knetbsd*-gnu, powerpc-*-openbsd*, powerpc-*-aix*, rs6000-*-*)
	(powerpc-*-linux*, powerpc64-*-linux*, powerpc*-*-*, s390*-*-*)
	(sh*-*-linux*, sh*-*-netbsdelf*, sh*-*-knetbsd*-gnu, sh*-*-openbsd*)
	(sparc-*-linux*, sparc64-*-linux*, sparc*-*-freebsd*)
	(sparc*-*-kfreebsd*-gnu, sparc-*-netbsd*, sparc-*-knetbsd*-gnu)
	(sparc64-*-netbsd*, sparc64-*-knetbsd*-gnu, sparc-*-openbsd*)
	(sparc64-*-openbsd*, sparc-*-solaris2.[0-6], sparc-*-solaris2.[0-6].*)
	(sparc-*-solaris2*, sparcv9-*-solaris2*, sparc64-*-solaris2*)
	(vax-*-netbsd*, vax-*-knetbsd*-gnu, x86_64-*-darwin*, x86_64-*-dicos*)
	(x86_64-*-linux*, x86_64-*-freebsd*, x86_64-*-kfreebsd*-gnu)
	(x86_64-*-netbsd*, x86_64-*-knetbsd*-gnu, x86_64-*-openbsd*)
	(xtensa*-*-linux*, xtensa*): Remove solib.o from gdb_target_obs.

3 files changed, 113 insertions, 80 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6abae404c85..fdb9b83284a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,41 @@
 2012-01-02  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
+	Build gdb directly from *.o files not using libgdb.a.
+	* Makefile.in (SUBDIR_TUI_OBS): Remove duplicate tui.o.
+	(COMMON_OBS): Remove solib-target.o.
+	(LIBGDB_OBS, libgdb.a): Move it before the gdb$(EXEEXT) rule.
+	(gdb$(EXEEXT)): Replace libgdb.a with $(LIBGDB_OBS).
+	(LIBGDB_OBS, libgdb.a): Move it above.
+	* configure.tgt (alpha*-*-linux*, alpha*-*-freebsd*)
+	(alpha*-*-kfreebsd*-gnu, alpha*-*-netbsd*, alpha*-*-knetbsd*-gnu)
+	(alpha*-*-openbsd*, am33_2.0*-*-linux*, arm*-wince-pe)
+	(arm*-*-mingw32ce*, arm*-*-linux*, arm*-*-netbsd*, arm*-*-knetbsd*-gnu)
+	(arm*-*-openbsd*, cris*, frv-*-*, hppa*-*-hpux*, hppa*-*-linux*)
+	(hppa*-*-netbsd*, hppa*-*-openbsd*, i[34567]86-*-darwin*)
+	(i[34567]86-*-dicos*, i[34567]86-*-freebsd*, i[34567]86-*-kfreebsd*-gnu)
+	(i[34567]86-*-netbsd*, i[34567]86-*-knetbsd*-gnu, i[34567]86-*-openbsd*)
+	(i[34567]86-*-nto*, i[34567]86-*-solaris2.1[0-9]*)
+	(x86_64-*-solaris2.1[0-9]*, i[34567]86-*-solaris*, i[34567]86-*-linux*)
+	(i[34567]86-*-gnu*, ia64-*-linux*, m32r*-*-linux*, m68*-*-linux*)
+	(m68*-*-netbsd*, m68*-*-knetbsd*-gnu, m68*-*-openbsd*)
+	(microblaze*-linux-*, microblaze*-*-linux*, mips*-sgi-irix5*)
+	(mips*-sgi-irix6*, mips*-*-linux*, mips*-*-netbsd*)
+	(mips*-*-knetbsd*-gnu, mips64*-*-openbsd*, powerpc-*-netbsd*)
+	(powerpc-*-knetbsd*-gnu, powerpc-*-openbsd*, powerpc-*-aix*, rs6000-*-*)
+	(powerpc-*-linux*, powerpc64-*-linux*, powerpc*-*-*, s390*-*-*)
+	(sh*-*-linux*, sh*-*-netbsdelf*, sh*-*-knetbsd*-gnu, sh*-*-openbsd*)
+	(sparc-*-linux*, sparc64-*-linux*, sparc*-*-freebsd*)
+	(sparc*-*-kfreebsd*-gnu, sparc-*-netbsd*, sparc-*-knetbsd*-gnu)
+	(sparc64-*-netbsd*, sparc64-*-knetbsd*-gnu, sparc-*-openbsd*)
+	(sparc64-*-openbsd*, sparc-*-solaris2.[0-6], sparc-*-solaris2.[0-6].*)
+	(sparc-*-solaris2*, sparcv9-*-solaris2*, sparc64-*-solaris2*)
+	(vax-*-netbsd*, vax-*-knetbsd*-gnu, x86_64-*-darwin*, x86_64-*-dicos*)
+	(x86_64-*-linux*, x86_64-*-freebsd*, x86_64-*-kfreebsd*-gnu)
+	(x86_64-*-netbsd*, x86_64-*-knetbsd*-gnu, x86_64-*-openbsd*)
+	(xtensa*-*-linux*, xtensa*): Remove solib.o from gdb_target_obs.
+
+2012-01-02  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
 	Remove the gdbtui binary.
 	* .gitignore (/gdbtui): Remove.
 	* Makefile.in (TUI): Remove.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index e39203c5f91..882bf2adc5f 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -228,7 +228,7 @@ SUBDIR_TUI_OBS = \
 	tui-command.o \
 	tui-data.o \
 	tui-disasm.o \
-	tui-file.o tui.o \
+	tui-file.o \
 	tui-hooks.o \
 	tui-interp.o \
 	tui-io.o \
@@ -908,7 +908,7 @@ COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $(YYOBJ) \
 	reggroups.o regset.o \
 	trad-frame.o \
 	tramp-frame.o \
-	solib.o solib-target.o \
+	solib.o \
 	prologue-value.o memory-map.o memrange.o \
 	xml-support.o xml-syscall.o xml-utils.o \
 	target-descriptions.o target-memory.o xml-tdesc.o xml-builtin.o \
@@ -1146,11 +1146,21 @@ init.c: $(INIT_FILES)
 
 .PRECIOUS: init.c
 
+# Create a library of the gdb object files and build GDB by linking
+# against that.
+#
+# init.o is very important.  It pulls in the rest of GDB.
+LIBGDB_OBS= $(COMMON_OBS) $(TSOBS) $(ADD_FILES) init.o
+libgdb.a: $(LIBGDB_OBS)
+	-rm -f libgdb.a
+	$(AR) q libgdb.a $(LIBGDB_OBS)
+	$(RANLIB) libgdb.a
+
 # Removing the old gdb first works better if it is running, at least on SunOS.
-gdb$(EXEEXT): gdb.o libgdb.a $(ADD_DEPS) $(CDEPS) $(TDEPLIBS)
+gdb$(EXEEXT): gdb.o $(LIBGDB_OBS) $(ADD_DEPS) $(CDEPS) $(TDEPLIBS)
 	rm -f gdb$(EXEEXT)
 	$(CC_LD) $(INTERNAL_LDFLAGS) $(WIN32LDAPP) \
-		-o gdb$(EXEEXT) gdb.o libgdb.a \
+		-o gdb$(EXEEXT) gdb.o $(LIBGDB_OBS) \
 		$(TDEPLIBS) $(TUI_LIBRARY) $(CLIBS) $(LOADLIBES)
 
 # Convenience rule to handle recursion.
@@ -1164,16 +1174,6 @@ all-lib: gnulib/Makefile
 all-data-directory: data-directory/Makefile
 	@$(MAKE) $(FLAGS_TO_PASS) DO=all DODIRS=data-directory subdir_do
 
-# Create a library of the gdb object files and build GDB by linking
-# against that.
-#
-# init.o is very important.  It pulls in the rest of GDB.
-LIBGDB_OBS= $(COMMON_OBS) $(TSOBS) $(ADD_FILES) init.o
-libgdb.a: $(LIBGDB_OBS)
-	-rm -f libgdb.a
-	$(AR) q libgdb.a $(LIBGDB_OBS)
-	$(RANLIB) libgdb.a
-
 # This is useful when debugging GDB, because some Unix's don't let you run GDB
 # on itself without copying the executable.  So "make gdb1" will make
 # gdb and put a copy in gdb1, and you can run it with "gdb gdb1".
diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index 137debae6fb..ebbe10b0268 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -39,24 +39,24 @@ alpha*-*-osf*)
 alpha*-*-linux*)
 	# Target: Little-endian Alpha running Linux
 	gdb_target_obs="alpha-tdep.o alpha-mdebug-tdep.o alpha-linux-tdep.o \
-			linux-tdep.o solib.o solib-svr4.o"
+			linux-tdep.o solib-svr4.o"
 	;;
 alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu)
 	# Target: FreeBSD/alpha
 	gdb_target_obs="alpha-tdep.o alpha-mdebug-tdep.o alphabsd-tdep.o \
-			alphafbsd-tdep.o corelow.o solib.o solib-svr4.o"
+			alphafbsd-tdep.o corelow.o solib-svr4.o"
 	;;
 alpha*-*-netbsd* | alpha*-*-knetbsd*-gnu)
 	# Target: NetBSD/alpha
 	gdb_target_obs="alpha-tdep.o alpha-mdebug-tdep.o alphabsd-tdep.o \
-			alphanbsd-tdep.o nbsd-tdep.o corelow.o solib.o \
+			alphanbsd-tdep.o nbsd-tdep.o corelow.o \
 			solib-svr4.o"
 	;;
 alpha*-*-openbsd*)
 	# Target: OpenBSD/alpha
 	gdb_target_obs="alpha-tdep.o alpha-mdebug-tdep.o alphabsd-tdep.o \
 			alphanbsd-tdep.o alphaobsd-tdep.o nbsd-tdep.o \
-			obsd-tdep.o corelow.o solib.o solib-svr4.o"
+			obsd-tdep.o corelow.o solib-svr4.o"
 	;;
 alpha*-*-*)
 	# Target: Alpha
@@ -66,29 +66,29 @@ alpha*-*-*)
 am33_2.0*-*-linux*)
 	# Target: Matsushita mn10300 (AM33) running Linux
 	gdb_target_obs="mn10300-tdep.o mn10300-linux-tdep.o linux-tdep.o \
-			corelow.o solib.o solib-svr4.o"
+			corelow.o solib-svr4.o"
 	;;
 
 arm*-wince-pe | arm*-*-mingw32ce*)
 	# Target: ARM based machine running Windows CE (win32)
 	gdb_target_obs="arm-tdep.o arm-wince-tdep.o corelow.o \
-			solib.o solib-target.o"
+			solib-target.o"
 	build_gdbserver=yes
 	;;
 arm*-*-linux*)
 	# Target: ARM based machine running GNU/Linux
 	gdb_target_obs="arm-tdep.o arm-linux-tdep.o glibc-tdep.o \
-			solib.o solib-svr4.o symfile-mem.o corelow.o linux-tdep.o"
+			solib-svr4.o symfile-mem.o corelow.o linux-tdep.o"
 	build_gdbserver=yes
 	;;
 arm*-*-netbsd* | arm*-*-knetbsd*-gnu)
 	# Target: NetBSD/arm
-	gdb_target_obs="arm-tdep.o armnbsd-tdep.o solib.o solib-svr4.o"
+	gdb_target_obs="arm-tdep.o armnbsd-tdep.o solib-svr4.o"
 	;;
 arm*-*-openbsd*)
 	# Target: OpenBSD/arm
 	gdb_target_obs="arm-tdep.o armbsd-tdep.o armobsd-tdep.o obsd-tdep.o \
-			corelow.o solib.o solib-svr4.o"
+			corelow.o solib-svr4.o"
 	;;
 arm*-*-symbianelf*)
 	# Target: SymbianOS/arm
@@ -120,13 +120,13 @@ bfin-*-*)
 
 cris*)
 	# Target: CRIS
-	gdb_target_obs="cris-tdep.o corelow.o solib.o solib-svr4.o"
+	gdb_target_obs="cris-tdep.o corelow.o solib-svr4.o"
 	;;
 
 frv-*-*)
 	# Target: Fujitsu FRV processor
 	gdb_target_obs="frv-tdep.o frv-linux-tdep.o linux-tdep.o \
-			solib.o solib-frv.o corelow.o"
+			solib-frv.o corelow.o"
 	gdb_sim=../sim/frv/libsim.a
 	;;
 
@@ -144,22 +144,22 @@ h8300-*-*)
 hppa*-*-hpux*)
 	# Target: HP PA-RISC running hpux
 	gdb_target_obs="hppa-tdep.o hppa-hpux-tdep.o corelow.o \
-			solib.o solib-som.o solib-pa64.o"
+			solib-som.o solib-pa64.o"
 	;;
 hppa*-*-linux*)
 	# Target: HP PA-RISC running Linux
 	gdb_target_obs="hppa-tdep.o hppa-linux-tdep.o glibc-tdep.o \
-			linux-tdep.o solib.o solib-svr4.o symfile-mem.o"
+			linux-tdep.o solib-svr4.o symfile-mem.o"
 	;;
 hppa*-*-netbsd*)
 	# Target: NetBSD/hppa
 	gdb_target_obs="hppa-tdep.o hppabsd-tdep.o hppanbsd-tdep.o \
-			corelow.o solib.o solib-svr4.o"
+			corelow.o solib-svr4.o"
 	;;
 hppa*-*-openbsd*)
 	# Target: OpenBSD/hppa
 	gdb_target_obs="hppa-tdep.o hppabsd-tdep.o hppaobsd-tdep.o \
-			corelow.o solib.o solib-svr4.o"
+			corelow.o solib-svr4.o"
 	;;
 hppa*-*-*)
 	# Target: HP PA-RISC
@@ -169,7 +169,7 @@ hppa*-*-*)
 i[34567]86-*-darwin*)
 	# Target: Darwin/i386
 	gdb_target_obs="i386-tdep.o i387-tdep.o \
-			i386-darwin-tdep.o solib.o solib-darwin.o"
+			i386-darwin-tdep.o solib-darwin.o"
 	if test "x$enable_64_bit_bfd" = "xyes"; then
 	    # Target: GNU/Linux x86-64
 	    gdb_target_obs="amd64-tdep.o amd64-darwin-tdep.o ${gdb_target_obs}"
@@ -179,26 +179,26 @@ i[34567]86-*-dicos*)
 	# Target: DICOS/i386
 	gdb_target_obs="i386-tdep.o i387-tdep.o \
 			dicos-tdep.o i386-dicos-tdep.o \
-			corelow.o solib.o solib-target.o"
+			corelow.o solib-target.o"
 	;;
 i[34567]86-*-freebsd* | i[34567]86-*-kfreebsd*-gnu)
 	# Target: FreeBSD/i386
 	gdb_target_obs="i386-tdep.o i387-tdep.o i386bsd-tdep.o i386fbsd-tdep.o \
-			bsd-uthread.o corelow.o solib.o solib-svr4.o"
+			bsd-uthread.o corelow.o solib-svr4.o"
 	;;
 i[34567]86-*-netbsd* | i[34567]86-*-knetbsd*-gnu)
 	# Target: NetBSD/i386
 	gdb_target_obs="i386-tdep.o i387-tdep.o i386bsd-tdep.o i386nbsd-tdep.o \
-			nbsd-tdep.o corelow.o solib.o solib-svr4.o"
+			nbsd-tdep.o corelow.o solib-svr4.o"
 	;;
 i[34567]86-*-openbsd*)
 	# Target: OpenBSD/i386
 	gdb_target_obs="i386-tdep.o i387-tdep.o i386bsd-tdep.o i386obsd-tdep.o \
-			bsd-uthread.o corelow.o solib.o solib-svr4.o"
+			bsd-uthread.o corelow.o solib-svr4.o"
 	;;
 i[34567]86-*-nto*)
 	# Target: Intel 386 running qnx6.
-	gdb_target_obs="i386-tdep.o i387-tdep.o corelow.o solib.o solib-svr4.o \
+	gdb_target_obs="i386-tdep.o i387-tdep.o corelow.o solib-svr4.o \
 			i386-nto-tdep.o nto-tdep.o"
 	build_gdbserver=yes
 	;;
@@ -206,17 +206,17 @@ i[34567]86-*-solaris2.1[0-9]* | x86_64-*-solaris2.1[0-9]*)
 	# Target: Solaris x86_64
 	gdb_target_obs="i386-tdep.o i387-tdep.o amd64-tdep.o amd64-sol2-tdep.o \
 			i386-sol2-tdep.o sol2-tdep.o \
-			corelow.o solib.o solib-svr4.o"
+			corelow.o solib-svr4.o"
 	;;
 i[34567]86-*-solaris*)
 	# Target: Solaris x86
 	gdb_target_obs="i386-tdep.o i387-tdep.o i386-sol2-tdep.o sol2-tdep.o \
-			corelow.o solib.o solib-svr4.o"
+			corelow.o solib-svr4.o"
 	;;
 i[34567]86-*-linux*)
 	# Target: Intel 386 running GNU/Linux
 	gdb_target_obs="i386-tdep.o i386-linux-tdep.o glibc-tdep.o i387-tdep.o \
-			solib.o solib-svr4.o symfile-mem.o corelow.o \
+			solib-svr4.o symfile-mem.o corelow.o \
 			linux-tdep.o linux-record.o"
 	if test "x$enable_64_bit_bfd" = "xyes"; then
 	    # Target: GNU/Linux x86-64
@@ -226,8 +226,7 @@ i[34567]86-*-linux*)
 	;;
 i[34567]86-*-gnu*)
 	# Target: Intel 386 running the GNU Hurd
-	gdb_target_obs="i386-tdep.o i387-tdep.o i386gnu-tdep.o \
-			solib.o solib-svr4.o"
+	gdb_target_obs="i386-tdep.o i387-tdep.o i386gnu-tdep.o solib-svr4.o"
 	;;
 i[34567]86-*-cygwin*)
 	# Target: Intel 386 running win32
@@ -253,7 +252,7 @@ ia64-*-hpux*)
 ia64-*-linux*)
 	# Target: Intel IA-64 running GNU/Linux
 	gdb_target_obs="ia64-tdep.o ia64-linux-tdep.o linux-tdep.o \
-			solib.o solib-svr4.o symfile-mem.o"
+			solib-svr4.o symfile-mem.o"
 	build_gdbserver=yes
 	;;
 ia64*-*-*)
@@ -282,7 +281,7 @@ m32c-*-*)
 m32r*-*-linux*)
 	# Target: Renesas M32R running GNU/Linux
 	gdb_target_obs="m32r-tdep.o m32r-linux-tdep.o remote-m32r-sdi.o \
-			glibc-tdep.o solib.o solib-svr4.o symfile-mem.o \
+			glibc-tdep.o solib-svr4.o symfile-mem.o \
 			linux-tdep.o"
 	gdb_sim=../sim/m32r/libsim.a
 	build_gdbserver=yes
@@ -307,19 +306,19 @@ fido-*-elf*)
 	;;
 m68*-*-linux*)
 	# Target: Motorola m68k with a.out and ELF
-	gdb_target_obs="m68k-tdep.o m68klinux-tdep.o solib.o solib-svr4.o \
+	gdb_target_obs="m68k-tdep.o m68klinux-tdep.o solib-svr4.o \
 			linux-tdep.o glibc-tdep.o symfile-mem.o"
 	build_gdbserver=yes
 	;;
 m68*-*-netbsd* | m68*-*-knetbsd*-gnu)
 	# Target: NetBSD/m68k
 	gdb_target_obs="m68k-tdep.o m68kbsd-tdep.o \
-			corelow.o solib.o solib-svr4.o"
+			corelow.o solib-svr4.o"
 	;;
 m68*-*-openbsd*)
 	# Target: OpenBSD/m68k
 	gdb_target_obs="m68k-tdep.o m68kbsd-tdep.o \
-			corelow.o solib.o solib-svr4.o"
+			corelow.o solib-svr4.o"
 	;;
 
 m88*-*-openbsd*)
@@ -336,7 +335,7 @@ mep-*-*)
 microblaze*-linux-*|microblaze*-*-linux*)
 	# Target: Xilinx MicroBlaze running Linux
 	gdb_target_obs="microblaze-tdep.o microblaze-linux-tdep.o microblaze-rom.o \
-			monitor.o dsrec.o solib.o solib-svr4.o corelow.o \
+			monitor.o dsrec.o solib-svr4.o corelow.o \
 			symfile-mem.o linux-tdep.o"
 	gdb_sim=../sim/microblaze/libsim.a
 	;;
@@ -348,16 +347,16 @@ microblaze*-*-*)
 
 mips*-sgi-irix5*)
 	# Target: MIPS SGI running Irix 5
-	gdb_target_obs="mips-tdep.o mips-irix-tdep.o solib.o solib-irix.o"
+	gdb_target_obs="mips-tdep.o mips-irix-tdep.o solib-irix.o"
 	;;
 mips*-sgi-irix6*)
 	# Target: MIPS SGI running Irix 6.x
-	gdb_target_obs="mips-tdep.o mips-irix-tdep.o solib.o solib-irix.o"
+	gdb_target_obs="mips-tdep.o mips-irix-tdep.o solib-irix.o"
 	;;
 mips*-*-linux*)
 	# Target: Linux/MIPS
 	gdb_target_obs="mips-tdep.o mips-linux-tdep.o glibc-tdep.o \
-			corelow.o solib.o solib-svr4.o symfile-mem.o \
+			corelow.o solib-svr4.o symfile-mem.o \
 			linux-tdep.o"
 	gdb_sim=../sim/mips/libsim.a
 	build_gdbserver=yes
@@ -365,13 +364,13 @@ mips*-*-linux*)
 mips*-*-netbsd* | mips*-*-knetbsd*-gnu)
 	# Target: MIPS running NetBSD
 	gdb_target_obs="mips-tdep.o mipsnbsd-tdep.o \
-			corelow.o solib.o solib-svr4.o nbsd-tdep.o"
+			corelow.o solib-svr4.o nbsd-tdep.o"
 	gdb_sim=../sim/mips/libsim.a
 	;;
 mips64*-*-openbsd*)
 	# Target: OpenBSD/mips64
 	gdb_target_obs="mips-tdep.o mips64obsd-tdep.o \
-			corelow.o solib.o solib-svr4.o"
+			corelow.o solib-svr4.o"
 	;;
 mips*-*-elf)
 	# Target: MIPS ELF
@@ -398,23 +397,23 @@ mt-*-*)
 powerpc-*-netbsd* | powerpc-*-knetbsd*-gnu)
 	# Target: NetBSD/powerpc
 	gdb_target_obs="rs6000-tdep.o ppc-sysv-tdep.o ppcnbsd-tdep.o \
-			corelow.o solib.o solib-svr4.o"
+			corelow.o solib-svr4.o"
 	gdb_sim=../sim/ppc/libsim.a
 	;;
 powerpc-*-openbsd*)
 	# Target: OpenBSD/powerpc
 	gdb_target_obs="rs6000-tdep.o ppc-sysv-tdep.o ppcobsd-tdep.o \
-			corelow.o solib.o solib-svr4.o"
+			corelow.o solib-svr4.o"
 	;;
 powerpc-*-aix* | rs6000-*-*)
 	# Target: PowerPC running AIX
 	gdb_target_obs="rs6000-tdep.o rs6000-aix-tdep.o xcoffread.o \
-			ppc-sysv-tdep.o solib.o solib-svr4.o"
+			ppc-sysv-tdep.o solib-svr4.o"
 	;;
 powerpc-*-linux* | powerpc64-*-linux*)
 	# Target: PowerPC running Linux
 	gdb_target_obs="rs6000-tdep.o ppc-linux-tdep.o ppc-sysv-tdep.o \
-			solib.o solib-svr4.o solib-spu.o spu-multiarch.o \
+			solib-svr4.o solib-spu.o spu-multiarch.o \
 			corelow.o symfile-mem.o linux-tdep.o"
 	gdb_sim=../sim/ppc/libsim.a
 	build_gdbserver=yes
@@ -422,7 +421,7 @@ powerpc-*-linux* | powerpc64-*-linux*)
 powerpc*-*-*)
 	# Target: PowerPC running eabi
 	gdb_target_obs="rs6000-tdep.o monitor.o dsrec.o ppcbug-rom.o \
-			dink32-rom.o ppc-sysv-tdep.o solib.o solib-svr4.o"
+			dink32-rom.o ppc-sysv-tdep.o solib-svr4.o"
 	if test -f ../sim/ppc/Makefile; then
 	  gdb_sim=../sim/ppc/libsim.a
 	fi
@@ -430,7 +429,7 @@ powerpc*-*-*)
 
 s390*-*-*)
 	# Target: S390 running Linux
-	gdb_target_obs="s390-tdep.o solib.o solib-svr4.o linux-tdep.o"
+	gdb_target_obs="s390-tdep.o solib-svr4.o linux-tdep.o"
 	build_gdbserver=yes
 	;;
 
@@ -452,20 +451,20 @@ score-*-*)
 sh*-*-linux*)
 	# Target: GNU/Linux Super-H
 	gdb_target_obs="sh-tdep.o sh64-tdep.o sh-linux-tdep.o monitor.o \
-			dsrec.o solib.o solib-svr4.o symfile-mem.o \
+			dsrec.o solib-svr4.o symfile-mem.o \
 			glibc-tdep.o corelow.o linux-tdep.o"
 	gdb_sim=../sim/sh/libsim.a
 	build_gdbserver=yes
 	;;
 sh*-*-netbsdelf* | sh*-*-knetbsd*-gnu)
 	# Target: NetBSD/sh
-	gdb_target_obs="sh-tdep.o shnbsd-tdep.o corelow.o solib.o solib-svr4.o"
+	gdb_target_obs="sh-tdep.o shnbsd-tdep.o corelow.o solib-svr4.o"
 	gdb_sim=../sim/sh/libsim.a
 	;;
 sh*-*-openbsd*)
 	# Target: OpenBSD/sh
 	gdb_target_obs="sh-tdep.o sh64-tdep.o shnbsd-tdep.o \
-			corelow.o solib.o solib-svr4.o"
+			corelow.o solib-svr4.o"
 	;;
 sh64-*-elf*)
 	# Target: Renesas/Super-H 64 bit with simulator
@@ -481,7 +480,7 @@ sh*)
 sparc-*-linux*)
 	# Target: GNU/Linux SPARC
 	gdb_target_obs="sparc-tdep.o sparc-sol2-tdep.o sol2-tdep.o \
-			sparc-linux-tdep.o solib.o solib-svr4.o symfile-mem.o \
+			sparc-linux-tdep.o solib-svr4.o symfile-mem.o \
 			linux-tdep.o"
 	if test "x$enable_64_bit_bfd" = "xyes"; then
 	    # Target: GNU/Linux UltraSPARC
@@ -493,47 +492,46 @@ sparc64-*-linux*)
 	# Target: GNU/Linux UltraSPARC
 	gdb_target_obs="sparc64-tdep.o sparc64-sol2-tdep.o sol2-tdep.o \
 			sparc64-linux-tdep.o sparc-tdep.o sparc-sol2-tdep.o \
-			sparc-linux-tdep.o solib.o solib-svr4.o linux-tdep.o"
+			sparc-linux-tdep.o solib-svr4.o linux-tdep.o"
 	build_gdbserver=yes
 	;;
 sparc*-*-freebsd* | sparc*-*-kfreebsd*-gnu)
 	# Target: FreeBSD/sparc64
 	gdb_target_obs="sparc-tdep.o sparc64-tdep.o sparc64fbsd-tdep.o \
-			corelow.o solib.o solib-svr4.o"
+			corelow.o solib-svr4.o"
 	;;
 sparc-*-netbsd* | sparc-*-knetbsd*-gnu)
 	# Target: NetBSD/sparc
 	gdb_target_obs="sparc-tdep.o sparcnbsd-tdep.o nbsd-tdep.o \
-			corelow.o solib.o solib-svr4.o"
+			corelow.o solib-svr4.o"
 	;;
 sparc64-*-netbsd* | sparc64-*-knetbsd*-gnu)
 	# Target: NetBSD/sparc64
 	gdb_target_obs="sparc64-tdep.o sparc64nbsd-tdep.o sparc-tdep.o \
 			sparcnbsd-tdep.o nbsd-tdep.o \
-			corelow.o solib.o solib-svr4.o"
+			corelow.o solib-svr4.o"
 	;;
 sparc-*-openbsd*)
 	# Target: OpenBSD/sparc
 	gdb_target_obs="sparc-tdep.o sparcnbsd-tdep.o sparcobsd-tdep.o \
 			nbsd-tdep.o obsd-tdep.o bsd-uthread.o \
-			corelow.o solib.o solib-svr4.o"
+			corelow.o solib-svr4.o"
 	;;
 sparc64-*-openbsd*)
 	# Target: OpenBSD/sparc64
 	gdb_target_obs="sparc64-tdep.o sparc64nbsd-tdep.o sparc64obsd-tdep.o \
 			sparc-tdep.o sparcnbsd-tdep.o sparcobsd-tdep.o \
 			nbsd-tdep.o obsd-tdep.o bsd-uthread.o \
-			corelow.o solib.o solib-svr4.o"
+			corelow.o solib-svr4.o"
 	;;
 sparc-*-solaris2.[0-6] | sparc-*-solaris2.[0-6].*)
 	# Target: Solaris SPARC
-	gdb_target_obs="sparc-tdep.o sparc-sol2-tdep.o sol2-tdep.o \
-			solib.o solib-svr4.o"
+	gdb_target_obs="sparc-tdep.o sparc-sol2-tdep.o sol2-tdep.o solib-svr4.o"
 	;;
 sparc-*-solaris2* | sparcv9-*-solaris2* | sparc64-*-solaris2*)
 	# Target: Solaris UltraSPARC
 	gdb_target_obs="sparc64-tdep.o sparc64-sol2-tdep.o sparc-tdep.o \
-			sparc-sol2-tdep.o sol2-tdep.o solib.o solib-svr4.o"
+			sparc-sol2-tdep.o sol2-tdep.o solib-svr4.o"
 	;;
 sparc-*-*)
 	# Target: SPARC
@@ -578,7 +576,7 @@ v850*-*-elf)
 vax-*-netbsd* | vax-*-knetbsd*-gnu)
 	# Target: NetBSD/vax
 	gdb_target_obs="vax-tdep.o vaxnbsd-tdep.o \
-			corelow.o solib.o solib-svr4.o"
+			corelow.o solib-svr4.o"
 	;;
 vax-*-openbsd*)
 	# Target: OpenBSD/vax
@@ -593,20 +591,20 @@ x86_64-*-darwin*)
 	# Target: Darwin/x86-64
 	gdb_target_obs="amd64-tdep.o i386-tdep.o i387-tdep.o \
 			i386-darwin-tdep.o amd64-darwin-tdep.o \
-                        solib.o solib-darwin.o"
+                        solib-darwin.o"
 	;;
 
 x86_64-*-dicos*)
 	# Target: DICOS/x86-64
 	gdb_target_obs="amd64-tdep.o i386-tdep.o i387-tdep.o \
 			dicos-tdep.o i386-dicos-tdep.o amd64-dicos-tdep.o \
-			corelow.o solib.o solib-target.o"
+			corelow.o solib-target.o"
 	;;
 x86_64-*-linux*)
 	# Target: GNU/Linux x86-64
 	gdb_target_obs="amd64-tdep.o amd64-linux-tdep.o i386-tdep.o \
 			i387-tdep.o i386-linux-tdep.o glibc-tdep.o \
-			solib.o solib-svr4.o corelow.o symfile-mem.o linux-tdep.o \
+			solib-svr4.o corelow.o symfile-mem.o linux-tdep.o \
 			linux-record.o"
 	build_gdbserver=yes
 	;;
@@ -614,7 +612,7 @@ x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu)
 	# Target: FreeBSD/amd64
 	gdb_target_obs="amd64-tdep.o amd64fbsd-tdep.o i386-tdep.o \
 			i387-tdep.o i386bsd-tdep.o i386fbsd-tdep.o \
-			bsd-uthread.o corelow.o solib.o solib-svr4.o"
+			bsd-uthread.o corelow.o solib-svr4.o"
 	;;
 x86_64-*-mingw*)
         # Target: MingW/amd64
@@ -626,24 +624,23 @@ x86_64-*-mingw*)
 x86_64-*-netbsd* | x86_64-*-knetbsd*-gnu)
 	# Target: NetBSD/amd64
 	gdb_target_obs="amd64-tdep.o amd64nbsd-tdep.o i386-tdep.o i387-tdep.o \
-			nbsd-tdep.o corelow.o solib.o solib-svr4.o"
+			nbsd-tdep.o corelow.o solib-svr4.o"
 	;;
 x86_64-*-openbsd*)
 	# Target: OpenBSD/amd64
 	gdb_target_obs="amd64-tdep.o amd64obsd-tdep.o i386-tdep.o \
 			i387-tdep.o i386bsd-tdep.o i386obsd-tdep.o \
-			bsd-uthread.o corelow.o solib.o solib-svr4.o"
+			bsd-uthread.o corelow.o solib-svr4.o"
 	;;
 xtensa*-*-linux*)	gdb_target=linux
 	# Target: GNU/Linux Xtensa
 	gdb_target_obs="xtensa-tdep.o xtensa-config.o xtensa-linux-tdep.o \
-			solib.o solib-svr4.o corelow.o symfile-mem.o \
-			linux-tdep.o"
+			solib-svr4.o corelow.o symfile-mem.o linux-tdep.o"
 	build_gdbserver=yes
 	;;
 xtensa*)
 	# Target: Tensilica Xtensa processors
-	gdb_target_obs="xtensa-tdep.o xtensa-config.o solib.o solib-svr4.o"
+	gdb_target_obs="xtensa-tdep.o xtensa-config.o solib-svr4.o"
 	;;
 
 esac