merge from gcc

[deliverable/binutils-gdb.git] / gdb / configure.tgt

diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index 14dedbeefe2bea36ef288f472c17ce8a113bf268..e13ec76078024efd136d2974dc6eb3e5c9c38ea6 100644 (file)
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -50,8 +50,7 @@ arm*-wince-pe)                gdb_target=wince ;;
 arm*-*-linux*)         gdb_target=linux
                        build_gdbserver=yes
                        ;;
-arm*-*-netbsd*)                gdb_target=nbsd
-                       gdb_multi_arch=yes ;;
+arm*-*-netbsd*)                gdb_target=nbsd ;;
 arm-*-nto*)            gdb_target=nto ;;
 arm*-*-* | thumb*-*-* | strongarm*-*-*)
                        gdb_target=embed
@@ -61,31 +60,22 @@ xscale-*-*)         gdb_target=embed
                         configdirs="$configdirs rdi-share"
                         ;;
 
-avr-*-*)               gdb_target=avr
-                       gdb_multi_arch=yes
-                       ;;
+avr-*-*)               gdb_target=avr ;;
 
 cris*)                  gdb_target=cris ;;
 
 d10v-*-*)              gdb_target=d10v ;;
 
 h8300-*-*)             gdb_target=h8300 ;;
-# OBSOLETE h8500-*-*)          gdb_target=h8500 ;;
 
 
 frv-*-*)               gdb_target=frv ;;
 
-# OBSOLETE hppa*-*-bsd*)               gdb_target=hppabsd ;;
-# OBSOLETE hppa*-*-pro*)               gdb_target=hppapro ;;
 hppa*64*-*-hpux11*)    gdb_target=hppa64 ;;
 hppa*-*-hpux*)         gdb_target=hppahpux ;;
 hppa*-*-hiux*)         gdb_target=hppahpux ;;
-# OBSOLETE hppa*-*-osf*)               gdb_target=hppaosf ;;
 hppa*-*-*)             gdb_target=hppa ;;
 
-# OBSOLETE i[3456]86-sequent-bsd*)     gdb_target=symmetry ;;
-# OBSOLETE i[3456]86-sequent-sysv4*) gdb_target=ptx4 ;;
-# OBSOLETE i[3456]86-sequent-sysv*) gdb_target=ptx ;;
 i[34567]86-ncr-*)      gdb_target=ncr3000 ;;
 i[34567]86-*-bsd*)     gdb_target=i386bsd ;;
 i[34567]86-*-netbsd*)  gdb_target=nbsd ;;
@@ -114,7 +104,7 @@ ia64-*-linux*)              gdb_target=linux
                        ;;
 ia64*-*-*)             gdb_target=ia64 ;;
 
-# OBSOLETE m32r-*-elf*)                gdb_target=m32r ;;
+m32r-*-*)              gdb_target=m32r ;;
 
 m68hc11*-*-*|m6811*-*-*)       gdb_target=m68hc11 ;;
 
@@ -131,7 +121,6 @@ m68*-*-aout*)               gdb_target=monitor ;;
 m68*-*-coff*)          gdb_target=monitor ;;
 m68*-*-elf*)           gdb_target=monitor ;;
 m68*-*-linux*)         gdb_target=linux
-                       gdb_multi_arch=1
                        build_gdbserver=yes
                        ;;
 m68*-*-lynxos*)                gdb_target=m68klynx ;;
@@ -143,39 +132,18 @@ m68*-*-sysv4*)            gdb_target=m68kv4 ;;
 m68*-*-vxworks*)       gdb_target=vxworks68 ;;
 
 mcore*-*-*)            gdb_target=mcore ;;
-mips64*-big-*)         gdb_target=mips64 ;;
-mips*-big-*)           gdb_target=mips ;;
-mips*-dec-*)           gdb_target=mips ;;
+
 mips*-*-pe)            gdb_target=wince ;;
-mips64*el-*-ecoff*)    gdb_target=embedl64 ;;
-mips64*-*-ecoff*)      gdb_target=embed64 ;;
-mips64*vr*-*-elf*)     gdb_target=mips64 ;;
-mips*tx39*-elf*)       gdb_target=tx39 ;;
-mips64*el-*-elf*)      gdb_target=embedl64 ;;
-mips64*-*-elf*)                gdb_target=embed64 ;;
-mips64*-*-linux*)      gdb_target=linux64 ;;
-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=mips ;;
-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=mips64 ;;
 mips*-*-linux*)                gdb_target=linux
                        build_gdbserver=yes
                        ;;
 mips*-*-netbsd*)       gdb_target=nbsd ;;
-# OBSOLETE mips*-*-mach3*)             gdb_target=mipsm3 ;;
 mips*-*-sysv4*)                gdb_target=mipsv4 ;;
-mips*-*-sysv*)         gdb_target=mips ;;
-mips*-*-riscos*)       gdb_target=mips ;;
 mips*-*-vxworks*)       gdb_target=vxmips ;;
 mips*-*-*)             gdb_target=embed ;;
 
-# OBSOLETE mn10200-*-*)                gdb_target=mn10200 ;;
 mn10300-*-*)           gdb_target=mn10300 ;;
 
 none-*-*)              gdb_target=none ;;
@@ -209,6 +177,7 @@ s390x-*-*)          gdb_target=s390x
 sh*-*-pe)              gdb_target=wince ;;
 sh-*-coff*)            gdb_target=embed ;;
 sh-*-elf*)             gdb_target=embed ;;
+# FIXME should that be sh*-*-linux*, perhaps?
 sh-*-linux*)           gdb_target=linux
                        build_gdbserver=yes
                        ;;
@@ -227,9 +196,6 @@ sparc-*-sunos4*)    gdb_target=sun4os4 ;;
 sparc-*-sunos5*)       gdb_target=sun4sol2 ;;
 sparc-*-vxworks*)      gdb_target=vxsparc ;;
 sparc-*-*)             gdb_target=sun4os4 ;;
-# OBSOLETE sparclet-*-*)               gdb_target=sparclet;;
-# OBSOLETE sparclite-*-*)              gdb_target=sparclite ;;
-# OBSOLETE 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
@@ -255,23 +221,8 @@ v850*-*-*)         gdb_target=v850
 x86_64-*-linux*)       gdb_target=x86-64linux
                        build_gdbserver=yes
                        ;;
+x86_64-*-netbsd*)      gdb_target=nbsd64 ;;
 
-# OBSOLETE z8k-*-coff*)                gdb_target=z8k ;;
-
-esac
-
-
-# map GDB target onto multi-arch support
-
-case "${gdb_target}" in
-d10v)          gdb_multi_arch=yes ;;
-fbsd64)                gdb_multi_arch=yes ;;
-m68hc11)       gdb_multi_arch=yes ;;
-mn10300)       gdb_multi_arch=yes ;;
-x86-64linux)    gdb_multi_arch=yes ;;
-v850)           gdb_multi_arch=yes ;;
-xstormy16)      gdb_multi_arch=yes ;;
-mcore)         gdb_multi_arch=yes ;;
 esac
 
 # map target onto default OS ABI