diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 47205a1cbb..a73b37f25a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-25  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* mips-tdep.c (mips_gdbarch_init): Also check the compressed ISA
+	variation in gdbarch matching.
+
 2014-07-25  Tom Tromey  <tromey@redhat.com>
 
 	* exec.c (using_exec_ops): Remove.
diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index c3e8e77d93..9a530a8055 100644
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -8296,12 +8296,14 @@ mips_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
        arches != NULL;
        arches = gdbarch_list_lookup_by_info (arches->next, &info))
     {
-      /* MIPS needs to be pedantic about which ABI the object is
-         using.  */
+      /* MIPS needs to be pedantic about which ABI and the compressed
+         ISA variation the object is using.  */
       if (gdbarch_tdep (arches->gdbarch)->elf_flags != elf_flags)
 	continue;
       if (gdbarch_tdep (arches->gdbarch)->mips_abi != mips_abi)
 	continue;
+      if (gdbarch_tdep (arches->gdbarch)->mips_isa != mips_isa)
+	continue;
       /* Need to be pedantic about which register virtual size is
          used.  */
       if (gdbarch_tdep (arches->gdbarch)->mips64_transfers_32bit_regs_p