gdb/

	* Makefile.in (ALL_TARGET_OBS): Remove solib-target.o.
	* configure.tgt (arm*-wince-pe, arm*-*-mingw32ce*, arm*-*-symbianelf*)
	(i[34567]86-*-dicos*, i[34567]86-*-cygwin*, i[34567]86-*-mingw32*)
	(x86_64-*-dicos*, x86_64-*-mingw*): Remove solib-target.o.
	Revert this part of:
	2012-01-02  Jan Kratochvil  <jan.kratochvil@redhat.com>
	Build gdb directly from *.o files not using libgdb.a.
	* Makefile.in (COMMON_OBS): Remove solib-target.o.

3 files changed, 20 insertions, 10 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0095cde..bdb00c1 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,14 @@
+2012-01-02  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* Makefile.in (ALL_TARGET_OBS): Remove solib-target.o.
+	* configure.tgt (arm*-wince-pe, arm*-*-mingw32ce*, arm*-*-symbianelf*)
+	(i[34567]86-*-dicos*, i[34567]86-*-cygwin*, i[34567]86-*-mingw32*)
+	(x86_64-*-dicos*, x86_64-*-mingw*): Remove solib-target.o.
+	Revert this part of:
+	2012-01-02  Jan Kratochvil  <jan.kratochvil@redhat.com>
+	Build gdb directly from *.o files not using libgdb.a.
+	* Makefile.in (COMMON_OBS): Remove solib-target.o.
+
 2012-01-02  Joel Brobecker  <brobecker@adacore.com>
 
 	* gdb/common/gdb_thread_db.h, gdb/dbxread.c, gdb/environ.c,
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 882bf2a..89776b9 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -577,7 +577,7 @@ ALL_TARGET_OBS = \
 	bsd-uthread.o \
 	nbsd-tdep.o obsd-tdep.o \
 	sol2-tdep.o \
-	solib-frv.o solib-irix.o solib-svr4.o solib-target.o \
+	solib-frv.o solib-irix.o solib-svr4.o \
 	solib-som.o solib-pa64.o solib-darwin.o solib-dsbt.o \
 	dbug-rom.o dink32-rom.o ppcbug-rom.o m32r-rom.o dsrec.o monitor.o \
 	remote-m32r-sdi.o remote-mips.o \
@@ -908,7 +908,7 @@ COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $(YYOBJ) \
 	reggroups.o regset.o \
 	trad-frame.o \
 	tramp-frame.o \
-	solib.o \
+	solib.o solib-target.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 \
diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index ebbe10b..178bad7 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -71,8 +71,7 @@ am33_2.0*-*-linux*)
 
 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-target.o"
+	gdb_target_obs="arm-tdep.o arm-wince-tdep.o corelow.o"
 	build_gdbserver=yes
 	;;
 arm*-*-linux*)
@@ -92,7 +91,7 @@ arm*-*-openbsd*)
 	;;
 arm*-*-symbianelf*)
 	# Target: SymbianOS/arm
-	gdb_target_obs="arm-tdep.o solib-target.o arm-symbian-tdep.o"
+	gdb_target_obs="arm-tdep.o arm-symbian-tdep.o"
 	;;
 arm*-*-*)
 	# Target: ARM embedded system
@@ -179,7 +178,7 @@ 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-target.o"
+			corelow.o"
 	;;
 i[34567]86-*-freebsd* | i[34567]86-*-kfreebsd*-gnu)
 	# Target: FreeBSD/i386
@@ -231,13 +230,13 @@ i[34567]86-*-gnu*)
 i[34567]86-*-cygwin*)
 	# Target: Intel 386 running win32
 	gdb_target_obs="i386-tdep.o i386-cygwin-tdep.o i387-tdep.o \
-			solib-target.o corelow.o windows-tdep.o"
+			corelow.o windows-tdep.o"
 	build_gdbserver=yes
 	;;
 i[34567]86-*-mingw32*)
 	# Target: Intel 386 running win32
 	gdb_target_obs="i386-tdep.o i386-cygwin-tdep.o i387-tdep.o \
-			solib-target.o corelow.o windows-tdep.o"
+			corelow.o windows-tdep.o"
 	build_gdbserver=yes
 	;;
 i[34567]86-*-*)
@@ -598,7 +597,7 @@ 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-target.o"
+			corelow.o"
 	;;
 x86_64-*-linux*)
 	# Target: GNU/Linux x86-64
@@ -618,7 +617,7 @@ x86_64-*-mingw*)
         # Target: MingW/amd64
 	gdb_target_obs="amd64-tdep.o amd64-windows-tdep.o \
                         i386-tdep.o i386-cygwin-tdep.o i387-tdep.o \
-                        solib-target.o windows-tdep.o"
+                        windows-tdep.o"
 	build_gdbserver=yes
         ;;
 x86_64-*-netbsd* | x86_64-*-knetbsd*-gnu)