X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fconfigure.tgt;h=36d4304cbdfe1f7dc61908102e16ea4fdc66e9de;hb=aa0fbdd82c86c683f6d2bf39dcc9dedfc9c7a8d0;hp=7a9a3ac2509bc659ead384d03c6dc4af650ad999;hpb=13a38d4599fb310f85991d93967759d2d8c6f9c1;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index 7a9a3ac250..36d4304cbd 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -2,315 +2,660 @@
 # 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
-
-# This file may also modify configdirs.
-
-# Map target cpu into the config cpu subdirectory name.
-# The default is $target_cpu.
-
-case "${target_cpu}" in
-
-alpha*)			gdb_target_cpu=alpha ;;
-arm*)			gdb_target_cpu=arm ;;
-avr*)			gdb_target_cpu=avr ;;
-hppa*)			gdb_target_cpu=pa ;;
-i[3456]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*)		gdb_target_cpu=powerpc ;;
-sparc*)			gdb_target_cpu=sparc ;;
-thumb*)			gdb_target_cpu=arm ;;
-s390*)			gdb_target_cpu=s390 ;;
-sh*)			gdb_target_cpu=sh ;;
-strongarm*)		gdb_target_cpu=arm ;;
-xscale*)		gdb_target_cpu=arm ;;
-v850*)			gdb_target_cpu=v850 ;;
-x86_64*)		gdb_target_cpu=i386 ;;
-*)			gdb_target_cpu=$target_cpu ;;
-
+#  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
+
+# NOTE: Every file added to a gdb_target_obs variable for any target here
+#       must also be added to either ALL_TARGET_OBS or ALL_64_TARGET_OBS
+#	in Makefile.in!
+
+case $targ in
+ d10v-*-* | \
+ hppa*-*-hiux* | \
+ i[34567]86-ncr-* | \
+ m68*-cisco*-* | \
+ m68*-tandem-* | \
+ m68*-*-os68k* | \
+ mips*-*-pe | \
+ rs6000-*-lynxos* | \
+ sh*-*-pe | \
+ null)
+    echo "*** Configuration $targ is obsolete." >&2
+    echo "*** Support has been REMOVED." >&2
+    exit 1
+    ;;
 esac
 
 # map target info into gdb names.
 
-case "${target}" in
-
-alpha*-*-osf*)		gdb_target=alpha-osf1 ;;
-alpha*-*-linux*)	gdb_target=alpha-linux ;;
-alpha*-*-freebsd*)	gdb_target=fbsd ;;
-alpha*-*-netbsd*)	gdb_target=nbsd ;;
-
-arc-*-*)		gdb_target=arc ;;
-
-arm*-wince-pe)		gdb_target=wince ;;
-arm*-*-linux*)		gdb_target=linux
-			build_gdbserver=yes
-			;;
-arm*-*-netbsd*)		gdb_target=nbsd
-			gdb_multi_arch=yes ;;
-arm*-*-* | thumb*-*-* | strongarm*-*-*)
-			gdb_target=embed
-                        configdirs="$configdirs rdi-share"
-                        ;;
-xscale-*-*)		gdb_target=embed
-                        configdirs="$configdirs rdi-share"
-                        ;;
-
-avr-*-*)		gdb_target=avr
-			gdb_multi_arch=yes
-			;;
-
-cris*)                  gdb_target=cris ;;
-
-d10v-*-*)		gdb_target=d10v ;;
-d30v-*-*)		gdb_target=d30v ;;
-
-h8300-*-*)		gdb_target=h8300 ;;
-h8500-*-*)		gdb_target=h8500 ;;
-
-
-fr30-*-elf*)		gdb_target=fr30 ;;
-
-
-hppa*-*-bsd*)		gdb_target=hppabsd ;;
-hppa*-*-pro*)		gdb_target=hppapro ;;
-hppa*64*-*-hpux11*)	gdb_target=hppa64 ;;
-hppa*-*-hpux*)		gdb_target=hppahpux ;;
-hppa*-*-hiux*)		gdb_target=hppahpux ;;
-hppa*-*-osf*)		gdb_target=hppaosf ;;
-
-i[3456]86-sequent-bsd*)	gdb_target=symmetry ;;
-i[3456]86-sequent-sysv4*) gdb_target=ptx4 ;;
-i[3456]86-sequent-sysv*) gdb_target=ptx ;;
-i[3456]86-ncr-*)	gdb_target=ncr3000 ;;
-i[3456]86-*-aout*)	gdb_target=embed ;;
-i[3456]86-*-coff*)	gdb_target=embed ;;
-i[3456]86-*-elf*)	gdb_target=embed ;;
-i[3456]86-*-aix*)	gdb_target=i386aix ;;
-i[3456]86-*-bsd*)	gdb_target=i386bsd ;;
-i[3456]86-*-freebsd*)	gdb_target=fbsd ;;
-i[3456]86-*-netbsdelf*)	gdb_target=nbsdelf ;;
-i[3456]86-*-netbsd*)	gdb_target=nbsd ;;
-i[3456]86-*-os9k)	gdb_target=i386os9k ;;
-i[3456]86-*-go32*)	gdb_target=i386aout ;;
-i[3456]86-*-msdosdjgpp*) gdb_target=go32 ;;
-i[3456]86-*-lynxos*)	gdb_target=i386lynx ;;
-i[3456]86-*-openbsd*)	gdb_target=obsd ;;
-i[3456]86-*-solaris*)	gdb_target=i386sol2 ;;
-i[3456]86-*-sysv4.2*)	gdb_target=i386v42mp ;;
-i[3456]86-*-sysv4*)	gdb_target=i386v4 ;;
-i[3456]86-*-sysv5*)	gdb_target=i386v42mp ;;
-i[3456]86-*-unixware2*)	gdb_target=i386v42mp ;;
-i[3456]86-*-unixware*)	gdb_target=i386v4 ;;
-i[3456]86-*-sco3.2v4*)	gdb_target=i386sco4 ;;
-i[3456]86-*-sco3.2v5*)	gdb_target=i386sco5 ;;
-i[3456]86-*-sco*)	gdb_target=i386v ;;
-i[3456]86-*-sysv*)	gdb_target=i386v ;;
-i[3456]86-*-linux*)	gdb_target=linux
-			build_gdbserver=yes
-			;;
-i[3456]86-*-isc*)	gdb_target=i386v ;;
-i[3456]86-*-mach3*)	gdb_target=i386m3 ;;
-i[3456]86-*-gnu*)	gdb_target=i386gnu ;;
-i[3456]86-*-netware*)	gdb_target=i386nw
-		configdirs="${configdirs} nlm" ;;
-i[3456]86-*-osf1mk*)	gdb_target=i386mk ;;
-i[3456]86-*-cygwin*)	gdb_target=cygwin  ;;
-i[3456]86-*-pe*)	gdb_target=embed  ;;
-i[3456]86-*-vxworks*)	gdb_target=vxworks ;;
-
-i960-*-bout*)		gdb_target=vxworks960 ;;
-i960-nindy-coff*)	gdb_target=nindy960 ;;
-i960-*-coff*)		gdb_target=mon960 ;;
-i960-nindy-elf*)	gdb_target=nindy960 ;;
-i960-*-elf*)		gdb_target=mon960 ;;
-i960-*-nindy*)		gdb_target=nindy960 ;;
-i960-*-vxworks*)	gdb_target=vxworks960 ;;
-
-ia64-*-aix*)		gdb_target=aix ;;
-ia64-*-linux*)		gdb_target=linux
-			build_gdbserver=yes
-			;;
-
-m32r-*-elf*)		gdb_target=m32r ;;
-
-m68hc11*-*-*|m6811*-*-*)	gdb_target=m68hc11 ;;
-
-m68000-*-sunos3*)	gdb_target=sun2os3 ;;
-m68000-*-sunos4*)	gdb_target=sun2os4 ;;
-
-m68*-apollo*-bsd*)	gdb_target=apollo68b ;;
-m68*-bull-sysv*)	gdb_target=dpx2 ;;
-m68*-hp-bsd*)		gdb_target=hp300bsd ;;
-m68*-hp-hpux*)		gdb_target=hp300hpux ;;
-m68*-att-*)		gdb_target=3b1 ;;
-m68*-cisco*-*)		gdb_target=cisco ;;
-m68*-ericsson-*)	gdb_target=es1800 ;;
-m68*-motorola-*)	gdb_target=delta68 ;;
-m68*-netx-*)		gdb_target=vxworks68 ;;
-m68*-tandem-*)		gdb_target=st2000 ;;
-m68*-*-aout*)		gdb_target=monitor ;;
-m68*-*-coff*)		gdb_target=monitor ;;
-m68*-*-elf*)		gdb_target=monitor ;;
-m68*-*-linux*)		gdb_target=linux
-			build_gdbserver=yes
-			;;
-m68*-*-lynxos*)		gdb_target=m68klynx ;;
-m68*-*-netbsd*)		gdb_target=nbsd ;;
-m68*-*-os68k*)		gdb_target=os68k ;;
-m68*-*-sunos3*)		gdb_target=sun3os3 ;;
-m68*-*-sunos4*)		gdb_target=sun3os4 ;;
-m68*-*-sysv4*)		gdb_target=m68kv4 ;;
-m68*-*-vxworks*)	gdb_target=vxworks68 ;;
-
-m88*-motorola-sysv4*)	gdb_target=delta88v4 ;;
-m88*-motorola-*)	gdb_target=delta88 ;;
-m88*-*-*)		gdb_target=m88k ;;
-
-mcore*-*-*)		gdb_target=mcore ;;
-mips64*-big-*)		gdb_target=bigmips64 ;;
-mips*-big-*)		gdb_target=bigmips ;;
-mips*-dec-mach3*)	gdb_target=mach3 ;;
-mips*-dec-*)		gdb_target=decstation ;;
-mips*-*-pe)		gdb_target=wince ;;
-mips64*el-*-ecoff*)	gdb_target=embedl64 ;;
-mips64*-*-ecoff*)	gdb_target=embed64 ;;
-mips64*vr4xxx*el-*-elf*)gdb_target=vr4xxxel ;;
-mips64*vr4xxx*-*-elf*)	gdb_target=vr4xxx ;;
-mips64*vr4300*el-*-elf*)	gdb_target=vr4300el ;;
-mips64*vr4300*-*-elf*)	gdb_target=vr4300 ;;
-mips64*vr4100*el-*-elf*)	gdb_target=vr4300el ;;
-mips64*vr4100*-*-elf*)	gdb_target=vr4100 ;;
-mips64*vr5000*el-*-elf*)	gdb_target=vr5000el ;;
-mips64*vr5000*-*-elf*)	gdb_target=vr5000 ;;
-mips*tx39*el*-elf*)	gdb_target=tx39l ;;
-mips*tx39*-elf*)	gdb_target=tx39 ;;
-mips64*el-*-elf*)	gdb_target=embedl64 ;;
-mips64*-*-elf*)		gdb_target=embed64 ;;
-mips*el-*-ecoff*)	gdb_target=embedl ;;
-mips*-*-ecoff*)		gdb_target=embed ;;
-mips*el-*-elf*)		gdb_target=embedl ;;
-mips*-*-elf*)		gdb_target=embed ;;
-mips*-little-*)		gdb_target=littlemips ;;
-mips*-*-lnews*)		gdb_target=embedl ;;
-mips*-sgi-irix5*)	gdb_target=irix5 ;;
-mips*-sgi-irix6*)	gdb_target=irix6 ;;
-mips*-sgi-*)		gdb_target=irix3 ;;
-mips*-sony-*)		gdb_target=bigmips ;;
-mips*-*-linux*)		gdb_target=linux
-			build_gdbserver=yes
-			;;
-mips*-*-mach3*)		gdb_target=mipsm3 ;;
-mips*-*-sysv4*)		gdb_target=mipsv4 ;;
-mips*-*-sysv*)		gdb_target=bigmips ;;
-mips*-*-riscos*)	gdb_target=bigmips ;;
-mips*-*-vxworks*)       gdb_target=vxmips ;;
-
-mn10200-*-*)		gdb_target=mn10200 ;;
-mn10300-*-*)		gdb_target=mn10300 ;;
-
-none-*-*)		gdb_target=none ;;
-
-ns32k-*-netbsd*)	gdb_target=nbsd ;;
-
-powerpc-*-netbsd*)	gdb_target=nbsd ;;
-powerpc-*-aix*)		gdb_target=aix ;;
-powerpc-*-eabi* | powerpc-*-sysv* | powerpc-*-elf*)
-			if test -f ../sim/ppc/Makefile; then
-			  gdb_target=ppc-sim
-			else
-			  gdb_target=ppc-eabi
-			fi ;;
-powerpcle-*-eabi* | powerpcle-*-sysv* | powerpcle-*-elf*)
-			if test -f ../sim/ppc/Makefile; then
-			  gdb_target=ppcle-sim
-			else
-			  gdb_target=ppcle-eabi
-			fi ;;
-powerpc-*-linux*)	gdb_target=linux
-			build_gdbserver=yes
-			;;
-powerpc-*-vxworks*)	gdb_target=vxworks ;;
-
-rs6000-*-lynxos*)	gdb_target=rs6000lynx ;;
-rs6000-*-aix4*)		gdb_target=aix4 ;;
-rs6000-*-*)		gdb_target=rs6000 ;;
-
-s390-*-*)		gdb_target=s390
-			build_gdbserver=yes
-			;;
-s390x-*-*)		gdb_target=s390x
-			build_gdbserver=yes
-			;;
-
-sh*-*-pe)		gdb_target=wince ;;
-sh-*-hms)		gdb_target=embed ;;
-sh-*-coff*)		gdb_target=embed ;;
-sh-*-elf*)		gdb_target=embed ;;
-sh-*-linux*)		gdb_target=linux
-			build_gdbserver=yes
-			;;
-sh*-*-netbsdelf*)	gdb_target=nbsd ;;
-
-sparc-*-aout*)		gdb_target=sparc-em ;;
-sparc-*-coff*)		gdb_target=sparc-em ;;
-sparc-*-elf*)		gdb_target=sparc-em ;;
-sparc-*-linux*)		gdb_target=linux ;;
-sparc-*-lynxos*)	gdb_target=sparclynx ;;
-sparc-*-netbsd*)	gdb_target=nbsd ;;
-sparc-*-solaris2*)	gdb_target=sun4sol2 ;;
-sparc-*-sunos4*)	gdb_target=sun4os4 ;;
-sparc-*-sunos5*)	gdb_target=sun4sol2 ;;
-sparc-*-vxworks*)	gdb_target=vxsparc ;;
-sparc-*-*)		gdb_target=sun4os4 ;;
-sparclet-*-*)		gdb_target=sparclet;;
-sparclite-*-*)		gdb_target=sparclite ;;
-sparc86x-*-*)		gdb_target=sparclite ;;
-# It's not clear what the right solution for "v8plus" systems is yet.
-# For now, stick with sparc-sun-solaris2 since that's what config.guess
-# should return.  Work is still needed to get gdb to print the 64 bit
-# regs (some of which are usable in v8plus) so sp64sol.mt hasn't been
-# deleted though presumably it should be eventually.
-#sparc64-*-solaris2*)	gdb_target=sp64sol2 ;;
-sparc64-*-freebsd*|ultrasparc-*-freebsd*|sparcv9-*-freebsd*)
-			gdb_target=fbsd ;;
-sparc64-*-linux*)	gdb_target=sp64linux ;;
-sparcv9-*-* | sparc64-*-*) gdb_target=sp64 ;;
-
-xstormy16-*-*)          gdb_target=xstormy16 ;;
-
-vax-*-*)		gdb_target=vax ;;
-
-fr30-*-*)		gdb_target=fr30
-			;;
-
-v850*-*-*)		gdb_target=v850
-			case ${gdb_host} in
-			cygwin*)
-				CONFIG_OBS="${CONFIG_OBS} v850ice.o" ;;
-			* ) ;;
-			esac
-			;;
-
-x86_64-*-linux*)	gdb_target=x86-64linux
-			build_gdbserver=yes
-			;;
-
-
-z8k-*-coff*)		gdb_target=z8k ;;
+case "${targ}" in
+
+alpha*-*-osf*)
+	# Target: Little-endian Alpha running OSF/1
+	gdb_target_obs="alpha-tdep.o alpha-osf1-tdep.o alpha-mdebug-tdep.o"
+	;;
+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-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 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 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 solib-svr4.o"
+	;;
+alpha*-*-*)
+	# Target: Alpha
+	gdb_target_obs="alpha-tdep.o"
+	;;
+
+am33_2.0*-*-linux*)
+	# Target: Matsushita mn10300 (AM33) running Linux
+	gdb_target_obs="mn10300-tdep.o mn10300-linux-tdep.o linux-tdep.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"
+	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-svr4.o symfile-mem.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-svr4.o"
+	;;
+arm*-*-openbsd*)
+	# Target: OpenBSD/arm
+	gdb_target_obs="arm-tdep.o armbsd-tdep.o armobsd-tdep.o obsd-tdep.o \
+			solib-svr4.o"
+	;;
+arm*-*-symbianelf*)
+	# Target: SymbianOS/arm
+	gdb_target_obs="arm-tdep.o arm-symbian-tdep.o"
+	;;
+arm*-*-*)
+	# Target: ARM embedded system
+	gdb_target_obs="arm-tdep.o"
+	gdb_sim=../sim/arm/libsim.a
+	;;
+
+avr-*-*)
+	# Target: AVR
+	gdb_target_obs="avr-tdep.o"
+	gdb_sim=../sim/avr/libsim.a
+	;;
+
+bfin-*-*linux*)
+	# Target: Blackfin Linux
+	gdb_target_obs="bfin-tdep.o bfin-linux-tdep.o linux-tdep.o"
+	gdb_sim=../sim/bfin/libsim.a
+	build_gdbserver=yes
+	;;
+bfin-*-*)
+	# Target: Blackfin processor
+	gdb_target_obs="bfin-tdep.o"
+	gdb_sim=../sim/bfin/libsim.a
+	;;
+
+cris*)
+	# Target: CRIS
+	gdb_target_obs="cris-tdep.o solib-svr4.o"
+	;;
+
+frv-*-*)
+	# Target: Fujitsu FRV processor
+	gdb_target_obs="frv-tdep.o frv-linux-tdep.o linux-tdep.o solib-frv.o"
+	gdb_sim=../sim/frv/libsim.a
+	;;
+
+moxie-*-elf)
+	gdb_target_obs="moxie-tdep.o"
+	gdb_sim=../sim/moxie/libsim.a
+	;;
+
+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*)
+	# Target: HP PA-RISC running hpux
+	gdb_target_obs="hppa-tdep.o hppa-hpux-tdep.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-svr4.o symfile-mem.o"
+	;;
+hppa*-*-netbsd*)
+	# Target: NetBSD/hppa
+	gdb_target_obs="hppa-tdep.o hppabsd-tdep.o hppanbsd-tdep.o solib-svr4.o"
+	;;
+hppa*-*-openbsd*)
+	# Target: OpenBSD/hppa
+	gdb_target_obs="hppa-tdep.o hppabsd-tdep.o hppaobsd-tdep.o solib-svr4.o"
+	;;
+hppa*-*-*)
+	# Target: HP PA-RISC
+	gdb_target_obs="hppa-tdep.o"
+	;;
+
+i[34567]86-*-darwin*)
+	# Target: Darwin/i386
+	gdb_target_obs="i386-tdep.o i387-tdep.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}"
+	fi
+	;;
+i[34567]86-*-dicos*)
+	# Target: DICOS/i386
+	gdb_target_obs="i386-tdep.o i387-tdep.o dicos-tdep.o i386-dicos-tdep.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 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 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 solib-svr4.o"
+	;;
+i[34567]86-*-nto*)
+	# Target: Intel 386 running qnx6.
+	gdb_target_obs="i386-tdep.o i387-tdep.o solib-svr4.o \
+			i386-nto-tdep.o nto-tdep.o"
+	build_gdbserver=yes
+	;;
+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 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 \
+			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-svr4.o symfile-mem.o \
+			linux-tdep.o linux-record.o"
+	if test "x$enable_64_bit_bfd" = "xyes"; then
+	    # Target: GNU/Linux x86-64
+	    gdb_target_obs="amd64-tdep.o amd64-linux-tdep.o ${gdb_target_obs}"
+	fi
+	build_gdbserver=yes
+	;;
+i[34567]86-*-gnu*)
+	# Target: Intel 386 running the GNU Hurd
+	gdb_target_obs="i386-tdep.o i387-tdep.o i386gnu-tdep.o solib-svr4.o"
+	;;
+i[34567]86-*-cygwin*)
+	# Target: Intel 386 running win32
+	gdb_target_obs="i386-tdep.o i386-cygwin-tdep.o i387-tdep.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 \
+			windows-tdep.o"
+	build_gdbserver=yes
+	;;
+i[34567]86-*-*)
+	# Target: i386
+	gdb_target_obs="i386-tdep.o i387-tdep.o"
+	;;
+
+ia64-*-hpux*)
+	# Target: Intel IA-64 running HP-UX
+	gdb_target_obs="ia64-tdep.o ia64-hpux-tdep.o"
+	;;
+ia64-*-linux*)
+	# Target: Intel IA-64 running GNU/Linux
+	gdb_target_obs="ia64-tdep.o ia64-linux-tdep.o linux-tdep.o \
+			solib-svr4.o symfile-mem.o"
+	build_gdbserver=yes
+	;;
+ia64-*-*vms*)
+	# Target: Intel IA-64 running OpenVMS
+	gdb_target_obs="ia64-tdep.o ia64-vms-tdep.o"
+	;;
+ia64*-*-*)
+	# Target: Intel IA-64
+	gdb_target_obs="ia64-tdep.o"
+	;;
+
+iq2000-*-*)
+	gdb_target_obs="iq2000-tdep.o"
+	gdb_sim=../sim/iq2000/libsim.a
+	;;
+
+lm32-*-*)		
+	gdb_target_obs="lm32-tdep.o" 
+	gdb_sim=../sim/lm32/libsim.a
+	;;
+
+m32c-*-*)
+	# Target: Renesas M32C family
+	gdb_target_obs="m32c-tdep.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*)
+	# Target: Renesas M32R running GNU/Linux
+	gdb_target_obs="m32r-tdep.o m32r-linux-tdep.o remote-m32r-sdi.o \
+			glibc-tdep.o solib-svr4.o symfile-mem.o \
+			linux-tdep.o"
+	gdb_sim=../sim/m32r/libsim.a
+	build_gdbserver=yes
+	;;
+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*-*-*)
+	# 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*)
+	# Target: Motorola m68k embedded (e.g. bug monitors)
+	gdb_target_obs="m68k-tdep.o monitor.o dbug-rom.o dsrec.o"
+	;;
+m68*-*-linux*)
+	# Target: Motorola m68k with a.out and ELF
+	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 solib-svr4.o"
+	;;
+m68*-*-openbsd*)
+	# Target: OpenBSD/m68k
+	gdb_target_obs="m68k-tdep.o m68kbsd-tdep.o solib-svr4.o"
+	;;
+
+m88*-*-openbsd*)
+	# Target: OpenBSD/m88k
+	gdb_target_obs="m88k-tdep.o"
+	;;
+
+mep-*-*)
+	# Target: Toshiba Media Processor (MEP)
+	gdb_target_obs="mep-tdep.o"
+	# No sim needed. Target uses SID.
+	;;
+
+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-svr4.o symfile-mem.o linux-tdep.o"
+	gdb_sim=../sim/microblaze/libsim.a
+	;;
+microblaze*-*-*)
+	# Target: Xilinx MicroBlaze running standalone
+	gdb_target_obs="microblaze-tdep.o microblaze-rom.o monitor.o dsrec.o"
+	gdb_sim=../sim/microblaze/libsim.a
+	;;
+
+mips*-sgi-irix5*)
+	# Target: MIPS SGI running Irix 5
+	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-irix.o"
+	;;
+mips*-*-linux*)
+	# Target: Linux/MIPS
+	gdb_target_obs="mips-tdep.o mips-linux-tdep.o glibc-tdep.o \
+			solib-svr4.o symfile-mem.o linux-tdep.o"
+	gdb_sim=../sim/mips/libsim.a
+	build_gdbserver=yes
+	;;
+mips*-*-netbsd* | mips*-*-knetbsd*-gnu)
+	# Target: MIPS running NetBSD
+	gdb_target_obs="mips-tdep.o mipsnbsd-tdep.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 solib-svr4.o"
+	;;
+mips*-*-elf)
+	# Target: MIPS ELF
+	gdb_target_obs="mips-tdep.o remote-mips.o"
+	gdb_sim=../sim/mips/libsim.a
+	;;
+mips*-*-*)
+	# Target: MIPS
+	gdb_target_obs="mips-tdep.o"
+	gdb_sim=../sim/mips/libsim.a
+	;;
+
+mn10300-*-*)
+	# Target: Matsushita mn10300
+	gdb_target_obs="mn10300-tdep.o"
+	gdb_sim=../sim/mn10300/libsim.a
+	;;
+
+mt-*-*)
+	# Target: Morpho Technologies ms1 processor
+	gdb_target_obs="mt-tdep.o"
+	;;
+
+powerpc-*-netbsd* | powerpc-*-knetbsd*-gnu)
+	# Target: NetBSD/powerpc
+	gdb_target_obs="rs6000-tdep.o ppc-sysv-tdep.o ppcnbsd-tdep.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 \
+			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-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-svr4.o solib-spu.o spu-multiarch.o \
+			glibc-tdep.o symfile-mem.o linux-tdep.o"
+	gdb_sim=../sim/ppc/libsim.a
+	build_gdbserver=yes
+	;;
+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-svr4.o"
+	if test -f ../sim/ppc/Makefile; then
+	  gdb_sim=../sim/ppc/libsim.a
+	fi
+	;;
+
+s390*-*-*)
+	# Target: S390 running Linux
+	gdb_target_obs="s390-tdep.o solib-svr4.o linux-tdep.o"
+	build_gdbserver=yes
+	;;
+
+rl78-*-elf)
+	# Target: Renesas rl78
+	gdb_target_obs="rl78-tdep.o"
+	gdb_sim=../sim/rl78/libsim.a
+	;;
+
+rx-*-elf)
+	# Target: Renesas RX
+	gdb_target_obs="rx-tdep.o"
+	gdb_sim=../sim/rx/libsim.a
+	;;
+
+score-*-*)
+	# Target: S+core embedded system
+	gdb_target_obs="score-tdep.o"
+	if test -f ../sim/score/Makefile; then
+	  gdb_sim=../sim/score/libsim.a
+	fi
+	build_gdbserver=yes
+	;;
+
+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-svr4.o symfile-mem.o \
+			glibc-tdep.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 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 solib-svr4.o"
+	;;
+sh64-*-elf*)
+	# Target: Renesas/Super-H 64 bit with simulator
+	gdb_target_obs="sh-tdep.o sh64-tdep.o"
+	gdb_sim=../sim/sh64/libsim.a
+	;;
+sh*)
+	# 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*)
+	# Target: GNU/Linux SPARC
+	gdb_target_obs="sparc-tdep.o sparc-sol2-tdep.o sol2-tdep.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
+	    gdb_target_obs="sparc64-tdep.o sparc64-sol2-tdep.o \
+			    sparc64-linux-tdep.o ${gdb_target_obs}"
+	fi
+	build_gdbserver=yes
+	;;
+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-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 \
+			solib-svr4.o"
+	;;
+sparc-*-netbsd* | sparc-*-knetbsd*-gnu)
+	# Target: NetBSD/sparc
+	gdb_target_obs="sparc-tdep.o sparcnbsd-tdep.o nbsd-tdep.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 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 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 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-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-svr4.o"
+	;;
+sparc-*-*)
+	# Target: SPARC
+	gdb_target_obs="sparc-tdep.o ravenscar-thread.o \
+			ravenscar-sparc-thread.o"
+	gdb_sim=../sim/erc32/libsim.a
+	;;
+sparc64-*-*)
+	# Target: UltraSPARC
+	gdb_target_obs="sparc-tdep.o sparc64-tdep.o"
+	;;
+
+spu*-*-*)
+	# Target: Cell BE SPU
+	gdb_target_obs="spu-tdep.o"
+	build_gdbserver=yes
+	;;
+
+tic6x-*-*linux)
+	# Target: GNU/Linux TI C6x
+	gdb_target_obs="tic6x-tdep.o tic6x-linux-tdep.o solib-dsbt.o \
+			glibc-tdep.o linux-tdep.o"
+	;;
+
+tic6x-*-*)
+	# Target: TI C6X 
+	gdb_target_obs="tic6x-tdep.o"
+	;;
+
+tilegx-*-linux*)
+        # Target: TILE-Gx
+        gdb_target_obs="tilegx-tdep.o tilegx-linux-tdep.o solib-svr4.o \
+			symfile-mem.o glibc-tdep.o linux-tdep.o"
+        ;;
+
+xstormy16-*-*)
+	# Target: Sanyo Xstormy16a processor
+	gdb_target_obs="xstormy16-tdep.o"
+	# No simulator libraries are needed -- target uses SID.
+	;;
+
+v850*-*-elf | v850*-*-rtems*)
+	# Target: NEC V850 processor
+	gdb_target_obs="v850-tdep.o"
+	gdb_sim=../sim/v850/libsim.a
+	;;
+
+vax-*-netbsd* | vax-*-knetbsd*-gnu)
+	# Target: NetBSD/vax
+	gdb_target_obs="vax-tdep.o vaxnbsd-tdep.o solib-svr4.o"
+	;;
+vax-*-openbsd*)
+	# Target: OpenBSD/vax
+	gdb_target_obs="vax-tdep.o vaxobsd-tdep.o"
+	;;
+vax-*-*)
+	# Target: VAX running 4.2BSD or Ultrix
+	gdb_target_obs="vax-tdep.o"
+	;;
+
+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-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"
+	;;
+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-svr4.o symfile-mem.o linux-tdep.o linux-record.o"
+	build_gdbserver=yes
+	;;
+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 solib-svr4.o"
+	;;
+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 \
+                        windows-tdep.o"
+	build_gdbserver=yes
+        ;;
+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 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 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-svr4.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-svr4.o"
+	;;
 
 esac
 
-
-# map GDB target onto multi-arch support
-
-case "${gdb_target}" in
-d10v)		gdb_multi_arch=yes ;;
-m68hc11)	gdb_multi_arch=yes ;;
-mn10300)	gdb_multi_arch=yes ;;
-x86-64linux)    gdb_multi_arch=yes ;;
-xstormy16)      gdb_multi_arch=yes ;;
+# map target onto default OS ABI
+
+case "${targ}" in
+*-*-freebsd* | *-*-kfreebsd*-gnu)
+		gdb_osabi=GDB_OSABI_FREEBSD_ELF ;;
+*-*-linux* | *-*-uclinux*)
+		gdb_osabi=GDB_OSABI_LINUX ;;
+*-*-nto*)	gdb_osabi=GDB_OSABI_QNXNTO ;;
+m68*-*-openbsd* | m88*-*-openbsd* | vax-*-openbsd*) ;;
+*-*-openbsd*)	gdb_osabi=GDB_OSABI_OPENBSD_ELF ;;
+*-*-solaris*)	gdb_osabi=GDB_OSABI_SOLARIS ;;
+*-*-*-gnu*)	;; # prevent non-GNU kernels to match the Hurd rule below
+*-*-gnu*)	gdb_osabi=GDB_OSABI_HURD ;;
+*-*-mingw32ce*)	gdb_osabi=GDB_OSABI_WINCE ;;
+*-*-mingw* | *-*-cygwin*)
+		gdb_osabi=GDB_OSABI_CYGWIN ;;
+*-*-dicos*)	gdb_osabi=GDB_OSABI_DICOS ;;
+*-*-symbianelf*)
+		gdb_osabi=GDB_OSABI_SYMBIAN ;;
 esac