c[12]-*-*) gdb_host=convex ;;
-hppa*-hp-bsd*) gdb_host=hppabsd ;;
-hppa*-hp-hpux*) gdb_host=hppahpux ;;
+hppa*-*-bsd*) gdb_host=hppabsd ;;
+hppa*-*-hpux*) gdb_host=hppahpux ;;
+hppa*-*-hiux*) gdb_host=hppahpux ;;
i[34]86-ncr-*) gdb_host=ncr3000 ;;
i[34]86-sequent-bsd*) gdb_host=symmetry ;; #dynix
i[34]86-*-aix*) gdb_host=i386aix ;;
i[34]86-*-bsd*) gdb_host=i386bsd ;;
-i[34]86-*-netbsd) gdb_host=i386bsd ;;
+i[34]86-*-netbsd*) gdb_host=i386bsd ;;
i[34]86-*-go32) gdb_host=go32 ;;
i[34]86-*-linux) gdb_host=linux ;;
i[34]86-*-lynx*) gdb_host=i386lynx ;;
m68*-sun-sunos4*) gdb_host=sun3os4 ;;
m68*-sun-*) gdb_host=sun3os4 ;;
-m88k-motorola-*) gdb_host=delta88 ;;
-m88k-*-*) gdb_host=m88k ;;
+m88*-motorola-sysv4*) gdb_host=delta88v4 ;;
+m88*-motorola-sysv*) gdb_host=delta88 ;;
+# I suspect this is just used for DGUX
+m88*-*-*) gdb_host=m88k ;;
mips-dec-*) gdb_host=decstation ;;
mips-little-*) gdb_host=littlemips ;;
case "${target_cpu}" in
+alpha) gdb_target_cpu=alpha ;;
c[12]) gdb_target_cpu=convex ;;
hppa*) gdb_target_cpu=pa ;;
i[34]86) gdb_target_cpu=i386 ;;
m68*) gdb_target_cpu=m68k ;;
+m8*) gdb_target_cpu=m88k ;;
np1) gdb_target_cpu=gould ;;
pn) gdb_target_cpu=gould ;;
pyramid) gdb_target_cpu=pyr ;;
a29k-*-sym1) gdb_target=ultra3 ;;
a29k-*-udi) gdb_target=a29k-udi ;;
+alpha-*-osf*) gdb_target=alpha-osf1 ;;
+
arm-*-*) gdb_target=arm ;;
c1-*-*) gdb_target=convex ;;
hppa*-*-bsd*) gdb_target=hppabsd ;;
hppa*-*-hpux*) gdb_target=hppahpux ;;
+hppa*-*-hiux*) gdb_target=hppahiux ;;
i[34]86-sequent-*) gdb_target=symmetry ;;
i[34]86-ncr-*) gdb_target=ncr3000 ;;
i[34]86-*-aix*) gdb_target=i386aix ;;
i[34]86-*-bsd*) gdb_target=i386bsd ;;
-i[34]86-*-netbsd) gdb_target=i386bsd ;;
+i[34]86-*-netbsd*) gdb_target=i386bsd ;;
i[34]86-*-go32) gdb_target=i386aout ;;
i[34]86-*-lynx*) gdb_target=i386lynx
configdirs="${configdirs} gdbserver"
i960-*-nindy) gdb_target=nindy960 ;;
i960-*-vxworks) gdb_target=vxworks960 ;;
-m68000-*-aout) gdb_target=m68k-nofp ;;
-m68000-*-coff) gdb_target=m68k-nofp ;;
-m68000-*-elf) gdb_target=m68k-nofp ;;
m68000-*-sunos3*) gdb_target=sun2os3 ;;
m68000-*-sunos4*) gdb_target=sun2os4 ;;
m68*-*bug-*) gdb_target=monitor ;;
m68*-monitor-*) gdb_target=monitor ;;
-m68*-*-aout) gdb_target=m68k-fp ;;
-m68*-*-coff) gdb_target=m68k-fp ;;
-m68*-*-elf) gdb_target=m68k-fp ;;
+m68*-*-aout) gdb_target=m68k-em ;;
+m68*-*-coff) gdb_target=m68k-em ;;
+m68*-*-elf) gdb_target=m68k-em ;;
m68*-*-os68k) gdb_target=os68k ;;
m68*-*-sunos3*) gdb_target=sun3os3 ;;
m68*-*-sunos4*) gdb_target=sun3os4 ;;
m68*-*-vxworks*) gdb_target=vxworks68 ;;
-m88k-motorola-*) gdb_target=delta88 ;;
-m88k-*-*) gdb_target=m88k ;;
+m88*-motorola-sysv4*) gdb_target=delta88v4 ;;
+m88*-motorola-*) gdb_target=delta88 ;;
+m88*-*-*) gdb_target=m88k ;;
mips-big-*) gdb_target=bigmips ;;
mips-dec-*) gdb_target=decstation ;;