* config/alpha/alpha-linux.mt: Remove file.

	* config/alpha/alpha.mt: Remove file.
	* config/alpha/alpha-osf1.mt: Remove file.
	* config/alpha/fbsd.mt: Remove file.
	* config/alpha/nbsd.mt: Remove file.
	* config/alpha/obsd.mt: Remove file.
	* config/arm/embed.mt: Remove file.
	* config/arm/linux.mt: Remove file.
	* config/arm/nbsd.mt: Remove file.
	* config/arm/obsd.mt: Remove file.
	* config/arm/wince.mt: Remove file.
	* config/avr/avr.mt: Remove file.
	* config/cris/cris.mt: Remove file.
	* config/frv/frv.mt: Remove file.
	* config/h8300/h8300.mt: Remove file.
	* config/i386/cygwin.mt: Remove file.
	* config/i386/fbsd64.mt: Remove file.
	* config/i386/fbsd.mt: Remove file.
	* config/i386/i386gnu.mt: Remove file.
	* config/i386/i386.mt: Remove file.
	* config/i386/i386sol2.mt: Remove file.
	* config/i386/linux64.mt: Remove file.
	* config/i386/linux.mt: Remove file.
	* config/i386/mingw.mt: Remove file.
	* config/i386/nbsd64.mt: Remove file.
	* config/i386/nbsd.mt: Remove file.
	* config/i386/nto.mt: Remove file.
	* config/i386/obsd64.mt: Remove file.
	* config/i386/obsd.mt: Remove file.
	* config/i386/sol2-64.mt: Remove file.
	* config/ia64/ia64.mt: Remove file.
	* config/ia64/linux.mt: Remove file.
	* config/iq2000/iq2000.mt: Remove file.
	* config/m32c/m32c.mt: Remove file.
	* config/m32r/linux.mt: Remove file.
	* config/m32r/m32r.mt: Remove file.
	* config/m68hc11/m68hc11.mt: Remove file.
	* config/m68k/linux.mt: Remove file.
	* config/m68k/monitor.mt: Remove file.
	* config/m68k/nbsd.mt: Remove file.
	* config/m68k/obsd.mt: Remove file.
	* config/m88k/obsd.mt: Remove file.
	* config/mep/mep.mt: Remove file.
	* config/mips/embed.mt: Remove file.
	* config/mips/irix5.mt: Remove file.
	* config/mips/irix6.mt: Remove file.
	* config/mips/linux.mt: Remove file.
	* config/mips/nbsd.mt: Remove file.
	* config/mips/obsd64.mt: Remove file.
	* config/mn10300/linux.mt: Remove file.
	* config/mn10300/mn10300.mt: Remove file.
	* config/mt/mt.mt: Remove file.
	* config/pa/hppahpux.mt: Remove file.
	* config/pa/hppa.mt: Remove file.
	* config/pa/linux.mt: Remove file.
	* config/pa/obsd.mt: Remove file.
	* config/powerpc/aix.mt: Remove file.
	* config/powerpc/linux.mt: Remove file.
	* config/powerpc/nbsd.mt: Remove file.
	* config/powerpc/obsd.mt: Remove file.
	* config/powerpc/ppc-eabi.mt: Remove file.
	* config/s390/s390.mt: Remove file.
	* config/score/embed.mt: Remove file.
	* config/sh/embed.mt: Remove file.
	* config/sh/linux.mt: Remove file.
	* config/sh/nbsd.mt: Remove file.
	* config/sh/obsd.mt: Remove file.
	* config/sh/sh64.mt: Remove file.
	* config/sparc/embed.mt: Remove file.
	* config/sparc/fbsd.mt: Remove file.
	* config/sparc/linux64.mt: Remove file.
	* config/sparc/linux.mt: Remove file.
	* config/sparc/nbsd64.mt: Remove file.
	* config/sparc/nbsd.mt: Remove file.
	* config/sparc/obsd64.mt: Remove file.
	* config/sparc/obsd.mt: Remove file.
	* config/sparc/sol2-64.mt: Remove file.
	* config/sparc/sol2.mt: Remove file.
	* config/sparc/sparc64.mt: Remove file.
	* config/sparc/sparc.mt: Remove file.
	* config/spu/spu.mt: Remove file.
	* config/v850/v850.mt: Remove file.
	* config/vax/nbsd.mt: Remove file.
	* config/vax/obsd.mt: Remove file.
	* config/vax/vax.mt: Remove file.
	* config/xstormy16/xstormy16.mt: Remove file.
	* config/xtensa/xtensa.mt: Remove file.

	* configure.tgt (gdb_target_cpu): Remove.  Do not set anywhere.
	(gdb_target): Likewise.
	(gdb_target_obs): Document.  Set for every target to contents
	of TDEPFILES in former .mt makefile fragment.

	* configure.ac (TARGET_OBS): Define.
	(target_makefile_frag, gdb_target_cpu): Do not define.
	* configure: Regenerate.

	* Makefile.in (MT_FLAGS): Remove.
	(GLOBAL_CFLAGS): Update.
	(TARGET_OBS): Substitute from configure.
	(DEPFILES): Remove TDEPFILES, add TARGET_OBS.
	(@target_makefile_frag@): Remove.

doc/ChangeLog:

	* Makefile.in (Makefile): Do not depend on target_makefile_frag.

testsuite/ChangeLog:

	* Makefile.in (Makefile): Do not depend on target_makefile_frag.
	(target_cpu): Remove.

1 files changed, 238 insertions, 121 deletions

diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index e24835c..69e0b0e 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -2,8 +2,7 @@
 # invoked from the autoconf generated configure script.
 
 # This file sets the following shell variables:
-#  gdb_target_cpu	generic name of CPU
-#  gdb_target		name of GDB target definition to use
+#  gdb_target_obs	target-specific object files to use
 #  gdb_sim		simulator library for target
 #  gdb_osabi		default OS ABI to use with target
 #  build_gdbserver	set to "yes" if gdbserver supports target
@@ -26,86 +25,77 @@ case $target in
     ;;
 esac
 
-# Map target cpu into the config cpu subdirectory name.
-# The default is $target_cpu.
-
-case "${target_cpu}" in
-
-alpha*)			gdb_target_cpu=alpha ;;
-am33_2.0*)              gdb_target_cpu=mn10300 ;;
-arm*)			gdb_target_cpu=arm ;;
-avr*)			gdb_target_cpu=avr ;;
-fido*)			gdb_target_cpu=m68k ;;
-hppa*)			gdb_target_cpu=pa ;;
-i[34567]86*)		gdb_target_cpu=i386 ;;
-m68hc11*|m6811*)	gdb_target_cpu=m68hc11 ;;
-m68*)			gdb_target_cpu=m68k ;;
-m88*)			gdb_target_cpu=m88k ;;
-mips*)			gdb_target_cpu=mips ;;
-powerpc* | rs6000)	gdb_target_cpu=powerpc ;;
-sparc*)			gdb_target_cpu=sparc ;;
-thumb*)			gdb_target_cpu=arm ;;
-s390*)			gdb_target_cpu=s390 ;;
-score*)			gdb_target_cpu=score ;;
-sh*)			gdb_target_cpu=sh ;;
-spu*)			gdb_target_cpu=spu ;;
-strongarm*)		gdb_target_cpu=arm ;;
-xscale*)		gdb_target_cpu=arm ;;
-x86_64*)		gdb_target_cpu=i386 ;;
-xtensa*)		gdb_target_cpu=xtensa ;;
-*)			gdb_target_cpu=$target_cpu ;;
-
-esac
-
 # map target info into gdb names.
 
 case "${target}" in
 
 alpha*-*-osf*)
-	gdb_target=alpha-osf1
+	# Target: Little-endian Alpha running OSF/1
+	gdb_target_obs="alpha-tdep.o alpha-osf1-tdep.o alpha-mdebug-tdep.o"
 	;;
 alpha*-*-linux*)
-	gdb_target=alpha-linux
+	# Target: Little-endian Alpha running Linux
+	gdb_target_obs="alpha-tdep.o alpha-mdebug-tdep.o alpha-linux-tdep.o \
+			solib.o solib-svr4.o"
 	;;
 alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu)
-	gdb_target=fbsd
+	# 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"
 	;;
 alpha*-*-netbsd* | alpha*-*-knetbsd*-gnu)
-	gdb_target=nbsd
+	# 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 \
+			solib-svr4.o"
 	;;
 alpha*-*-openbsd*)
-	gdb_target=obsd
+	# 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"
 	;;
 alpha*-*-*)
-	gdb_target=alpha
+	# Target: Alpha
+	gdb_target_obs="alpha-tdep.o"
 	;;
 
-# mn10300 / am33 liunux
 am33_2.0*-*-linux*)
-	gdb_target=linux
+	# Target: Matsushita mn10300 (AM33) running Linux
+	gdb_target_obs="mn10300-tdep.o mn10300-linux-tdep.o corelow.o \
+			solib.o solib-svr4.o"
 	;;
 
 arm*-wince-pe | arm*-*-mingw32ce*)
-	gdb_target=wince
+	# 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"
 	build_gdbserver=yes
 	;;
 arm*-*-linux*)
-	gdb_target=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"
 	build_gdbserver=yes
 	;;
 arm*-*-netbsd* | arm*-*-knetbsd*-gnu)
-	gdb_target=nbsd
+	# Target: NetBSD/arm
+	gdb_target_obs="arm-tdep.o armnbsd-tdep.o solib.o solib-svr4.o"
 	;;
 arm*-*-openbsd*)
-	gdb_target=obsd
+	# 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"
 	;;
 arm*-*-* | thumb*-*-* | strongarm*-*-* | xscale-*-*)
-	gdb_target=embed
+	# Target: ARM embedded system
+	gdb_target_obs="arm-tdep.o"
 	gdb_sim=../sim/arm/libsim.a
 	;;
 
 avr-*-*)
-	gdb_target=avr
+	# Target: AVR
+	gdb_target_obs="avr-tdep.o"
 	# There is no simulator provided with gdb (yet).
 	# See <http://savannah.gnu.org/projects/simulavr/>
 	# for the simulator used during development of avr
@@ -113,291 +103,418 @@ avr-*-*)
 	;;
 
 cris*)
-	gdb_target=cris
+	# Target: CRIS
+	gdb_target_obs="cris-tdep.o corelow.o solib.o solib-svr4.o"
 	;;
 
 frv-*-*)
-	gdb_target=frv
+	# Target: Fujitsu FRV processor
+	gdb_target_obs="frv-tdep.o frv-linux-tdep.o \
+			solib.o solib-frv.o corelow.o"
 	gdb_sim=../sim/frv/libsim.a
 	;;
 
 h8300-*-*)
-	gdb_target=h8300
+	# Target: H8300 with HMS monitor and H8 simulator
+	gdb_target_obs="h8300-tdep.o monitor.o dsrec.o"
 	gdb_sim=../sim/h8300/libsim.a
 	;;
 
 hppa*-*-hpux*)
-	gdb_target=hppahpux
+	# 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"
 	;;
 hppa*-*-linux*)
-	gdb_target=linux
+	# Target: HP PA-RISC running Linux
+	gdb_target_obs="hppa-tdep.o hppa-linux-tdep.o glibc-tdep.o \
+			solib.o solib-svr4.o symfile-mem.o"
 	;;
 hppa*-*-openbsd*)
-	gdb_target=obsd
+	# Target: OpenBSD/hppa
+	gdb_target_obs="hppa-tdep.o hppabsd-tdep.o \
+			corelow.o solib.o solib-svr4.o"
 	;;
 hppa*-*-*)
-	gdb_target=hppa
+	# Target: HP PA-RISC
+	gdb_target_obs="hppa-tdep.o"
 	;;
 
 i[34567]86-*-freebsd* | i[34567]86-*-kfreebsd*-gnu)
-	gdb_target=fbsd
+	# 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"
 	;;
 i[34567]86-*-netbsd* | i[34567]86-*-knetbsd*-gnu)
-	gdb_target=nbsd
+	# 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"
 	;;
 i[34567]86-*-openbsd*)
-	gdb_target=obsd
+	# 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"
 	;;
 i[34567]86-*-nto*)
-	gdb_target=nto
+	# Target: Intel 386 running qnx6.
+	gdb_target_obs="i386-tdep.o i387-tdep.o corelow.o solib.o solib-svr4.o \
+			i386-nto-tdep.o nto-tdep.o"
 	;;
 i[34567]86-*-solaris2.1[0-9]*)
-	gdb_target=sol2-64
+	# 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"
 	;;
 i[34567]86-*-solaris*)
-	gdb_target=i386sol2
+	# 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"
 	;;
 i[34567]86-*-linux*)
-	gdb_target=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"
 	build_gdbserver=yes
 	;;
 i[34567]86-*-gnu*)
-	gdb_target=i386gnu
+	# Target: Intel 386 running the GNU Hurd
+	gdb_target_obs="i386-tdep.o i387-tdep.o i386gnu-tdep.o \
+			solib.o solib-svr4.o"
 	;;
 i[34567]86-*-cygwin*)
-	gdb_target=cygwin
+	# Target: Intel 386 running win32
+	gdb_target_obs="i386-tdep.o i386-cygwin-tdep.o i387-tdep.o \
+			solib-target.o corelow.o"
 	build_gdbserver=yes
 	;;
 i[34567]86-*-mingw32*)
-	gdb_target=mingw
+	# Target: Intel 386 running win32
+	gdb_target_obs="i386-tdep.o i386-cygwin-tdep.o i387-tdep.o \
+			solib-target.o corelow.o"
 	build_gdbserver=yes
 	;;
 i[34567]86-*-*)
-	gdb_target=i386
+	# Target: i386
+	gdb_target_obs="i386-tdep.o i387-tdep.o"
 	;;
 
 ia64-*-linux*)
-	gdb_target=linux
+	# Target: Intel IA-64 running GNU/Linux
+	gdb_target_obs="ia64-tdep.o ia64-linux-tdep.o \
+			solib.o solib-svr4.o symfile-mem.o"
 	build_gdbserver=yes
 	;;
 ia64*-*-*)
-	gdb_target=ia64
+	# Target: Intel IA-64
+	gdb_target_obs="ia64-tdep.o"
 	;;
 
 iq2000-*-*)
-	gdb_target=iq2000
+	gdb_target_obs="iq2000-tdep.o"
 	gdb_sim=../sim/iq2000/libsim.a
 	;;
 
 m32c-*-*)
-	gdb_target=m32c
+	# Target: Renesas M32C family
+	gdb_target_obs="m32c-tdep.o prologue-value.o"
 	# There may also be a SID / CGEN simulator for this,
 	# but we do have DJ Delorie's mini-sim.
 	gdb_sim=../sim/m32c/libsim.a
 	;;
 
 m32r*-*-linux*)
-	gdb_target=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"
 	gdb_sim=../sim/m32r/libsim.a
 	build_gdbserver=yes
 	;;
 m32r*-*-*)
-	gdb_target=m32r
+	# Target: Renesas m32r processor
+	gdb_target_obs="m32r-tdep.o monitor.o m32r-rom.o dsrec.o \
+			remote-m32r-sdi.o"
 	gdb_sim=../sim/m32r/libsim.a
 	;;
 
 m68hc11*-*-*|m6811*-*-*)
-	gdb_target=m68hc11
+	# Target: Motorola 68HC11 processor
+	gdb_target_obs="m68hc11-tdep.o"
 	gdb_sim=../sim/m68hc11/libsim.a
 	;;
 
 m68*-*-aout* | m68*-*-coff* | m68*-*-elf* | m68*-*-rtems* | m68*-*-uclinux* | \
 fido-*-elf*)
-	gdb_target=monitor
+	# Target: Motorola m68k embedded (e.g. bug monitors)
+	gdb_target_obs="m68k-tdep.o monitor.o dbug-rom.o dsrec.o"
 	;;
 m68*-*-linux*)
-	gdb_target=linux
+	# Target: Motorola m68k with a.out and ELF
+	gdb_target_obs="m68k-tdep.o m68klinux-tdep.o solib.o solib-svr4.o \
+			glibc-tdep.o symfile-mem.o"
 	build_gdbserver=yes
 	;;
 m68*-*-netbsd* | m68*-*-knetbsd*-gnu)
-	gdb_target=nbsd
+	# Target: NetBSD/m68k
+	gdb_target_obs="m68k-tdep.o m68kbsd-tdep.o \
+			corelow.o solib.o solib-svr4.o"
 	;;
 m68*-*-openbsd*)
-	gdb_target=obsd
+	# Target: OpenBSD/m68k
+	gdb_target_obs="m68k-tdep.o m68kbsd-tdep.o \
+			corelow.o solib.o solib-svr4.o"
 	;;
 
 m88*-*-openbsd*)
-	gdb_target=obsd
+	# Target: OpenBSD/m88k
+	gdb_target_obs="m88k-tdep.o corelow.o"
 	;;
 
 mep-*-*)
-	gdb_target=mep
+	# Target: Toshiba Media Processor (MEP)
+	gdb_target_obs="mep-tdep.o prologue-value.o"
+	# No sim needed. Target uses SID.
 	;;
 
 mips*-sgi-irix5*)
-	gdb_target=irix5
+	# Target: MIPS SGI running Irix 5
+	gdb_target_obs="mips-tdep.o mips-irix-tdep.o solib.o solib-irix.o"
 	;;
 mips*-sgi-irix6*)
-	gdb_target=irix6
+	# Target: MIPS SGI running Irix 6.x
+	gdb_target_obs="mips-tdep.o mips-irix-tdep.o solib.o solib-irix.o"
 	;;
 mips*-*-linux*)
-	gdb_target=linux
+	# Target: Linux/MIPS
+	gdb_target_obs="mips-tdep.o mips-linux-tdep.o \
+			corelow.o solib.o solib-svr4.o symfile-mem.o"
 	gdb_sim=../sim/mips/libsim.a
 	build_gdbserver=yes
 	;;
 mips*-*-netbsd* | mips*-*-knetbsd*-gnu)
-	gdb_target=nbsd
+	# Target: MIPS running NetBSD
+	gdb_target_obs="mips-tdep.o mipsnbsd-tdep.o \
+			corelow.o solib.o solib-svr4.o nbsd-tdep.o"
 	gdb_sim=../sim/mips/libsim.a
 	;;
 mips64*-*-openbsd*)
-	gdb_target=obsd64
+	# Target: OpenBSD/mips64
+	gdb_target_obs="mips-tdep.o mips64obsd-tdep.o \
+			corelow.o solib.o solib-svr4.o"
 	;;
 mips*-*-*)
-	gdb_target=embed
+	# Target: MIPS
+	gdb_target_obs="mips-tdep.o"
 	gdb_sim=../sim/mips/libsim.a
 	;;
 
 mn10300-*-*)
-	gdb_target=mn10300
+	# Target: Matsushita mn10300
+	gdb_target_obs="mn10300-tdep.o"
 	gdb_sim=../sim/mn10300/libsim.a
 	;;
 
 mt-*-*)
-	gdb_target=mt
+	# Target: Morpho Technologies ms1 processor
+	gdb_target_obs="mt-tdep.o"
 	;;
 
 powerpc-*-netbsd* | powerpc-*-knetbsd*-gnu)
-	gdb_target=nbsd
+	# Target: NetBSD/powerpc
+	gdb_target_obs="rs6000-tdep.o ppc-sysv-tdep.o ppcnbsd-tdep.o \
+			corelow.o solib.o solib-svr4.o"
 	gdb_sim=../sim/ppc/libsim.a
 	;;
 powerpc-*-openbsd*)
-	gdb_target=obsd
+	# Target: OpenBSD/powerpc
+	gdb_target_obs="rs6000-tdep.o ppc-sysv-tdep.o ppcobsd-tdep.o \
+			corelow.o solib.o solib-svr4.o"
 	;;
 powerpc-*-aix* | rs6000-*-*)
-	gdb_target=aix
+	# 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"
 	;;
 powerpc-*-linux* | powerpc64-*-linux*)
-	gdb_target=linux
+	# Target: PowerPC running Linux
+	gdb_target_obs="rs6000-tdep.o ppc-linux-tdep.o ppc-sysv-tdep.o \
+			solib.o solib-svr4.o corelow.o symfile-mem.o"
 	gdb_sim=../sim/ppc/libsim.a
 	build_gdbserver=yes
 	;;
 powerpc*-*-*)
-	gdb_target=ppc-eabi
+	# 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"
 	if test -f ../sim/ppc/Makefile; then
 	  gdb_sim=../sim/ppc/libsim.a
 	fi
 	;;
 
 s390*-*-*)
-	gdb_target=s390
+	# Target: S390 running Linux
+	gdb_target_obs="s390-tdep.o solib.o solib-svr4.o"
 	build_gdbserver=yes
 	;;
 
 score-*-*)
-	gdb_target=embed
+	# Target: S+core embedded system
+	gdb_target_obs="score-tdep.o"
 	;;
 
 # FIXME should that be sh*-*-linux*, perhaps?
 sh-*-linux*)
-	gdb_target=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"
 	gdb_sim=../sim/sh/libsim.a
 	build_gdbserver=yes
 	;;
 sh*-*-netbsdelf* | sh*-*-knetbsd*-gnu)
-	gdb_target=nbsd
+	# Target: NetBSD/sh
+	gdb_target_obs="sh-tdep.o shnbsd-tdep.o corelow.o solib.o solib-svr4.o"
 	gdb_sim=../sim/sh/libsim.a
 	;;
 sh*-*-openbsd*)
-	gdb_target=obsd
+	# Target: OpenBSD/sh
+	gdb_target_obs="sh-tdep.o sh64-tdep.o shnbsd-tdep.o \
+			corelow.o solib.o solib-svr4.o"
 	;;
 sh64-*-elf*)
-	gdb_target=sh64
+	# Target: Renesas/Super-H 64 bit with simulator
+	gdb_target_obs="sh-tdep.o sh64-tdep.o"
 	gdb_sim=../sim/sh64/libsim.a
 	;;
 sh*)
-	gdb_target=embed
+	# Target: Embedded Renesas Super-H with ICE and simulator
+	gdb_target_obs="sh-tdep.o sh64-tdep.o monitor.o dsrec.o"
 	gdb_sim=../sim/sh/libsim.a
 	;;
 
 sparc-*-linux*)
-	gdb_target=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"
 	;;
 sparc64-*-linux*)
-	gdb_target=linux64
+	# 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"
 	;;
 sparc*-*-freebsd* | sparc*-*-kfreebsd*-gnu)
-	gdb_target=fbsd
+	# Target: FreeBSD/sparc64
+	gdb_target_obs="sparc-tdep.o sparc64-tdep.o sparc64fbsd-tdep.o \
+			corelow.o solib.o solib-svr4.o"
 	;;
 sparc-*-netbsd* | sparc-*-knetbsd*-gnu)
-	gdb_target=nbsd
+	# Target: NetBSD/sparc
+	gdb_target_obs="sparc-tdep.o sparcnbsd-tdep.o nbsd-tdep.o \
+			corelow.o solib.o solib-svr4.o"
 	;;
 sparc64-*-netbsd* | sparc64-*-knetbsd*-gnu)
-	gdb_target=nbsd64
+	# 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"
 	;;
 sparc-*-openbsd*)
-	gdb_target=obsd
+	# 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"
 	;;
 sparc64-*-openbsd*)
-	gdb_target=obsd64
+	# 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"
 	;;
 sparc-*-solaris2.[0-6] | sparc-*-solaris2.[0-6].*)
-	gdb_target=sol2
+	# Target: Solaris SPARC
+	gdb_target_obs="sparc-tdep.o sparc-sol2-tdep.o sol2-tdep.o \
+			solib.o solib-svr4.o"
 	;;
 sparc-*-solaris2* | sparcv9-*-solaris2* | sparc64-*-solaris2*)
-	gdb_target=sol2-64
+	# 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-*-rtems*)
-	gdb_target=embed
+	# Target: SPARC embedded with simulator
+	gdb_target_obs="sparc-tdep.o"
 	gdb_sim=../sim/erc32/libsim.a
 	;;
 sparc-*-*)
-	gdb_target=sparc
+	# Target: SPARC
+	gdb_target_obs="sparc-tdep.o"
 	;;
 sparc64-*-*)
-	gdb_target=sparc64
+	# Target: UltraSPARC
+	gdb_target_obs="sparc-tdep.o sparc64-tdep.o"
 	;;
 
 spu*-*-*)
-	gdb_target=spu
+	# Target: Cell BE SPU
+	gdb_target_obs="spu-tdep.o"
 	build_gdbserver=yes
 	;;
 
 xstormy16-*-*)
-	gdb_target=xstormy16
+	# Target: Sanyo Xstormy16a processor
+	gdb_target_obs="xstormy16-tdep.o"
 	# No simulator libraries are needed -- target uses SID.
 	;;
 
 v850*-*-elf)
-	gdb_target=v850
+	# Target: NEC V850 processor
+	gdb_target_obs="v850-tdep.o"
 	gdb_sim=../sim/v850/libsim.a
 	;;
 
 vax-*-netbsd* | vax-*-knetbsd*-gnu)
-	gdb_target=nbsd
+	# Target: NetBSD/vax
+	gdb_target_obs="vax-tdep.o vaxnbsd-tdep.o \
+			corelow.o solib.o solib-svr4.o"
 	;;
 vax-*-openbsd*)
-	gdb_target=obsd
+	# Target: OpenBSD/vax
+	gdb_target_obs="vax-tdep.o vaxobsd-tdep.o corelow.o"
 	;;
 vax-*-*)
-	gdb_target=vax
+	# Target: VAX running 4.2BSD or Ultrix
+	gdb_target_obs="vax-tdep.o"
 	;;
 
 x86_64-*-linux*)
-	gdb_target=linux64
+	# 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"
 	build_gdbserver=yes
 	;;
 x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu)
-	gdb_target=fbsd64
+	# 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"
 	;;
 x86_64-*-netbsd* | x86_64-*-knetbsd*-gnu)
-	gdb_target=nbsd64
+	# 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"
 	;;
 x86_64-*-openbsd*)
-	gdb_target=obsd64
+	# 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"
 	;;
 
 xtensa*)
-	gdb_target=xtensa
+	# Target: Tensilica Xtensa processors
+	gdb_target_obs="xtensa-tdep.o xtensa-config.o"
 	;;
 
 esac