a29k-*-udi*) gdb_target=a29k-udi ;;
alpha-*-osf*) gdb_target=alpha-osf1 ;;
+alpha-*-netware*) gdb_target=alpha-nw ;;
arm-*-*) gdb_target=arm ;;
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"
;;