;;
ia64*-*-*) gdb_target=ia64 ;;
-# OBSOLETE m32r-*-elf*) gdb_target=m32r ;;
+m32r-*-*) gdb_target=m32r ;;
m68hc11*-*-*|m6811*-*-*) gdb_target=m68hc11 ;;
m68*-*-vxworks*) gdb_target=vxworks68 ;;
mcore*-*-*) gdb_target=mcore ;;
+
+# "mipsisa64" targets are 64-bit MIPS, MIPS64 ISA. They need these
+# special cases because otherwise they (obviously) are not matched by
+# the "mips64" target cases, and would therefore be treated as 32-bit.
+mipsisa64*-*-linux*) gdb_target=linux64 ;;
+mipsisa64*-*-*) gdb_target=embed64 ;;
mips64*-big-*) gdb_target=mips64 ;;
mips*-big-*) gdb_target=mips ;;
mips*-dec-*) gdb_target=mips ;;
case "${gdb_target}" in
d10v) gdb_multi_arch=yes ;;
fbsd64) gdb_multi_arch=yes ;;
+m32r) gdb_multi_arch=yes ;;
m68hc11) gdb_multi_arch=yes ;;
mn10300) gdb_multi_arch=yes ;;
x86-64linux) gdb_multi_arch=yes ;;