i[34]86-*-sunos*) gdb_host=sun386 ;;
i[34]86-*-sysv3.2*) gdb_host=i386v32 ;;
i[34]86-*-sysv4*) gdb_host=i386v4 ;;
+i[34]86-*-unixware) gdb_host=i386v4 ;;
i[34]86-*-sysv*) gdb_host=i386v ;;
i[34]86-*-isc*) gdb_host=i386v32 ;;
mips-little-*) gdb_host=littlemips ;;
mips-sgi-irix3*) gdb_host=irix3 ;;
mips-sgi-irix4*) gdb_host=irix4 ;;
+mips-sgi-irix5*) gdb_host=irix5 ;;
mips-sony-*) gdb_host=news-mips ;;
mips-*-sysv*) gdb_host=riscos ;;
mips-*-riscos*) gdb_host=riscos ;;
i[34]86) gdb_target_cpu=i386 ;;
m68*) gdb_target_cpu=m68k ;;
m8*) gdb_target_cpu=m88k ;;
+mips*) gdb_target_cpu=mips ;;
np1) gdb_target_cpu=gould ;;
pn) gdb_target_cpu=gould ;;
pyramid) gdb_target_cpu=pyr ;;
a29k-*-udi*) gdb_target=a29k-udi ;;
alpha-*-osf*) gdb_target=alpha-osf1 ;;
+alpha-*-netware*) gdb_target=alpha-nw ;;
arm-*-*) gdb_target=arm ;;
c2-*-*) gdb_target=convex ;;
h8300-*-*) gdb_target=h8300hms ;;
-h8300h-*-*) gdb_target=h8300hms gdb_target_cpu=h8300 ;;
h8500-*-*) gdb_target=h8500hms ;;
sh-*-*) gdb_target=sh ;;
hppa*-*-bsd*) gdb_target=hppabsd ;;
hppa*-*-hpux*) gdb_target=hppahpux ;;
-hppa*-*-hiux*) gdb_target=hppahiux ;;
+hppa*-*-hiux*) gdb_target=hppahpux ;;
i[34]86-sequent-*) gdb_target=symmetry ;;
i[34]86-ncr-*) gdb_target=ncr3000 ;;
m68*-*bug-*) gdb_target=monitor ;;
m68*-monitor-*) gdb_target=monitor ;;
-m68*-*-aout*) gdb_target=m68k-em ;;
-m68*-*-coff*) gdb_target=m68k-em ;;
-m68*-*-elf*) gdb_target=m68k-em ;;
+# These next four used to be m68k-em
+m68*-*-aout*) gdb_target=monitor ;;
+m68*-*-coff*) gdb_target=monitor ;;
+m68*-*-elf*) gdb_target=monitor ;;
m68*-*-lynxos*) gdb_target=m68klynx
configdirs="${configdirs} gdbserver"
;;
m88*-motorola-*) gdb_target=delta88 ;;
m88*-*-*) gdb_target=m88k ;;
-mips-big-*) gdb_target=bigmips ;;
-mips-dec-*) gdb_target=decstation ;;
-mips-idt-ecoffl*) gdb_target=idtl ;;
-mips-idt-ecoff*) gdb_target=idt ;;
-mips-little-*) gdb_target=littlemips ;;
-mips-sgi-*) gdb_target=irix3 ;;
-mips-sony-*) gdb_target=bigmips ;;
-mips-*-sysv*) gdb_target=bigmips ;;
-mips-*-riscos*) gdb_target=bigmips ;;
-mips-*-mach*) gdb_target=mipsm3 ;;
+mips*-big-*) gdb_target=bigmips ;;
+mips*-dec-*) gdb_target=decstation ;;
+mips*el-*-ecoff*) gdb_target=idtl ;;
+mips*-idt-ecoff*) gdb_target=idt ;;
+mips*el-*-elf*) gdb_target=idtl ;;
+mips*-*-elf*) gdb_target=idt ;;
+mips*-little-*) gdb_target=littlemips ;;
+mips*-sgi-irix5*) gdb_target=irix5 ;;
+mips*-sgi-*) gdb_target=irix3 ;;
+mips*-sony-*) gdb_target=bigmips ;;
+mips*-*-sysv*) gdb_target=bigmips ;;
+mips*-*-riscos*) gdb_target=bigmips ;;
+mips*-*-mach*) gdb_target=mipsm3 ;;
none-*-*) gdb_target=none ;;