gas/

	* config/tc-m68k.c (m68k_ip):  Correct output of cpu aliases.
gas/testsuite/
	* gas/m68k/all.exp: Add mcf-trap.
	* gas/m68k/mcf-trap.[sd]: New.
opcodes/
	* m68k-opc.c (m68k_opcodes): Place trap instructions before set
	conditionals.  Add tpf coldfire instruction as alias for trapf.

1 files changed, 19 insertions, 17 deletions

diff --git a/gas/config/tc-m68k.c b/gas/config/tc-m68k.c
index 3f4382e..17b9f4f 100644
--- a/gas/config/tc-m68k.c
+++ b/gas/config/tc-m68k.c
@@ -2061,29 +2061,31 @@ m68k_ip (char *instring)
 		if (!cpu->alias && (cpu->arch & ok_arch))
 		  {
 		    const struct m68k_cpu *alias;
-
+		    int seen_master = 0;
+		    
 		    if (any)
 		      APPEND (", ");
 		    any = 0;
 		    APPEND (cpu->name);
-		    APPEND (" [");
-		    if (cpu != m68k_cpus)
-		      for (alias = cpu - 1; alias->alias; alias--)
+		    for (alias = cpu; alias != m68k_cpus; alias--)
+		      if (alias[-1].alias >= 0)
+			break;
+		    for (; !seen_master || alias->alias > 0; alias++)
 			{
-			  if (any)
-			    APPEND (", ");
-			  APPEND (alias->name);
-			  any = 1;
+			  if (!alias->alias)
+			    seen_master = 1;
+			  else
+			    {
+			      if (any)
+				APPEND (", ");
+			      else
+				APPEND (" [");
+			      APPEND (alias->name);
+			      any = 1;
+			    }
 			}
-		    for (alias = cpu + 1; alias->alias; alias++)
-		      {
-			if (any)
-			  APPEND (", ");
-			APPEND (alias->name);
-			any = 1;
-		      }
-		    
-		    APPEND ("]");
+		    if (any)
+		      APPEND ("]");
 		    any = 1;
 		  }
 	      if (paren)