diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 80336bed5f..49290ee156 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jan 29 18:58:43 1992  Stu Grossman  (grossman at cygnus.com)
+
+	* sparc-pinsn.c (compare_opcodes):  Make it prefer v6, v7,
+	cypress, v8 mnemonics in that order.
+
 Tue Jan 28 17:32:13 1992  Per Bothner  (bothner at cygnus.com)
 
 	* sparc-pinsn.c:  Put the qsort() back in.
diff --git a/gdb/sparc-pinsn.c b/gdb/sparc-pinsn.c
index 3fddb13a1f..e303393d93 100644
--- a/gdb/sparc-pinsn.c
+++ b/gdb/sparc-pinsn.c
@@ -438,12 +438,19 @@ compare_opcodes (a, b)
      better have the same opcode.  This is a sanity check on the table.  */
   i = strcmp (op0->name, op1->name);
   if (i)
+    {
+      /* *** FIXME - There must be a better way to deal with this! */
+      /* We prefer names used in the earliest architecture */
+      if (op0->architecture != op1->architecture)
+	return op0->architecture - op1->architecture;
+
       if (op0->flags & F_ALIAS) /* If they're both aliases, be arbitrary. */
-	  return i;
+	return i;
       else
-	  fprintf (stderr,
-		   "Internal error: bad sparc-opcode.h: \"%s\" == \"%s\"\n",
-		   op0->name, op1->name);
+	fprintf (stderr,
+		 "Internal error: bad sparc-opcode.h: \"%s\" == \"%s\"\n",
+		 op0->name, op1->name);
+    }
 
   /* Fewer arguments are preferred.  */
   {