-m680[01234]0-*-vxworks) gdb_target=vxworks68 ;;
-
-m68030-sony-*) gdb_target=news1000 ;;
-
-m68k-altos-*) gdb_target=altos ;;
-m68k-att-*) gdb_target=3b1 ;;
-
-m68k-cbm-sysv4*) gdb_target=amix ;;
-
-m68k-ericsson-*) gdb_target=es1800 ;;
-
-m68k-hp-bsd) gdb_target=hp300bsd ;;
-m68k-hp-hpux) gdb_target=hp300hpux ;;
-
-m68k-isi-*) gdb_target=isi ;;
-
-m68k-netx-*) gdb_target=vxworks68 ;;
-
-m68k-sony-*) gdb_target=news ;;
-
-m68k-*-aout) gdb_target=m68k-un ;;
-m68k-*-coff) gdb_target=m68k-noun ;;
-m68k-*-elf) gdb_target=m68k-noun ;;
-
-m68k-*-sunos3*) gdb_target=sun3os3 ;;
-m68k-*-sunos4*) gdb_target=sun3os4 ;;
-
-m68k-*-vxworks*) gdb_target=vxworks68 ;;
-
-m68k-*-os68k) gdb_target=os68k ;;
-
-m68kmote-tandem-*) gdb_target=st2000 ;;
+m68*-cbm-sysv4*) gdb_target=amix ;;
+m68*-bull-sysv*) gdb_target=dpx2 ;;
+m68*-hp-bsd*) gdb_target=hp300bsd ;;
+m68*-hp-hpux*) gdb_target=hp300hpux ;;
+
+m68*-altos-*) gdb_target=altos ;;
+m68*-att-*) gdb_target=3b1 ;;
+m68*-ericsson-*) gdb_target=es1800 ;;
+m68*-isi-*) gdb_target=isi ;;
+m68*-motorola-*) gdb_target=delta68 ;;
+m68*-netx-*) gdb_target=vxworks68 ;;
+m68*-sony-*) gdb_target=news ;;
+m68*-tandem-*) gdb_target=st2000 ;;
+
+m68*-rom68k-*) gdb_target=monitor ;;
+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*-*-os68k) gdb_target=os68k ;;
+m68*-*-sunos3*) gdb_target=sun3os3 ;;
+m68*-*-sunos4*) gdb_target=sun3os4 ;;
+m68*-*-vxworks*) gdb_target=vxworks68 ;;