powerpc*) gdb_target_cpu=powerpc ;;
sparc*) gdb_target_cpu=sparc ;;
thumb*) gdb_target_cpu=arm ;;
+s390*) gdb_target_cpu=s390 ;;
strongarm*) gdb_target_cpu=arm ;;
xscale*) gdb_target_cpu=arm ;;
v850*) gdb_target_cpu=v850 ;;
configdirs="$configdirs rdi-share"
;;
+cris*) gdb_target=cris ;;
+
d10v-*-*) gdb_target=d10v ;;
d30v-*-*) gdb_target=d30v ;;
configdirs="${configdirs} nlm" ;;
i[3456]86-*-osf1mk*) gdb_target=i386mk ;;
i[3456]86-*-cygwin*) gdb_target=cygwin ;;
+i[3456]86-*-pe*) gdb_target=embed ;;
i[3456]86-*-vxworks*) gdb_target=vxworks ;;
i960-*-bout*) gdb_target=vxworks960 ;;
mips*-little-*) gdb_target=littlemips ;;
mips*-*-lnews*) gdb_target=embedl ;;
mips*-sgi-irix5*) gdb_target=irix5 ;;
-mips*-sgi-irix6*) gdb_target=irix5 ;;
+mips*-sgi-irix6*) gdb_target=irix6 ;;
mips*-sgi-*) gdb_target=irix3 ;;
mips*-sony-*) gdb_target=bigmips ;;
+mips*-*-linux*) gdb_target=linux ;;
mips*-*-mach3*) gdb_target=mipsm3 ;;
mips*-*-sysv4*) gdb_target=mipsv4 ;;
mips*-*-sysv*) gdb_target=bigmips ;;
rs6000-*-aix4*) gdb_target=aix4 ;;
rs6000-*-*) gdb_target=rs6000 ;;
+s390-*-*) gdb_target=s390 ;;
+s390x-*-*) gdb_target=s390x ;;
+
sh*-*-pe) gdb_target=wince ;;
sh-*-hms) gdb_target=embed ;;
sh-*-coff*) gdb_target=embed ;;
# map GDB target onto multi-arch support
case "${gdb_target}" in
+cris) gdb_multi_arch=yes ;;
+d10v) gdb_multi_arch=yes ;;
m68hc11) gdb_multi_arch=yes ;;
+mn10300) gdb_multi_arch=yes ;;
esac