-arm-*-* | thumb-*-* | strongarm-*-*)
- gdb_target=arm ;;
-# OBSOLETE c1-*-*) gdb_target=convex ;;
-# OBSOLETE c2-*-*) gdb_target=convex ;;
+arm*-wince-pe) gdb_target=wince ;;
+arm*-*-linux*) gdb_target=linux
+ configdirs="$configdirs gdbserver"
+ ;;
+arm*-*-* | thumb*-*-* | strongarm*-*-*)
+ gdb_target=embed
+ configdirs="$configdirs rdi-share"
+ ;;
+xscale-*-*) gdb_target=embed
+ configdirs="$configdirs rdi-share"
+ ;;
+
+cris*) gdb_target=cris ;;