diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index fd929792a6..d4b4a6b4fb 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-18  Andrew Cagney  <cagney@ops1.cygnus.com>
+
+	* mips-tdep.c (mips_gdbarch_init): Check arches->gdbarch and not
+	current_gdbarch for a match.
+
 2000-08-18  J.T. Conklin  <jtc@redback.com>
 
 	* MAINTAINERS: Add myself as dcache.c maintainer.
diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index 4139bbc2a0..20d5446b47 100644
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -3884,9 +3884,9 @@ mips_gdbarch_init (struct gdbarch_info info,
     {
       /* MIPS needs to be pedantic about which ABI the object is
          using. */
-      if (gdbarch_tdep (current_gdbarch)->elf_flags != elf_flags)
+      if (gdbarch_tdep (arches->gdbarch)->elf_flags != elf_flags)
 	continue;
-      if (gdbarch_tdep (current_gdbarch)->mips_abi != mips_abi)
+      if (gdbarch_tdep (arches->gdbarch)->mips_abi != mips_abi)
 	continue;
       return arches->gdbarch;
     }