2006-11-15  Nathan Sidwell  <nathan@codesourcery.com>

	* config/tc-m68k.c (m68k_ip):  Correct output of cpu aliases.

Index: config/tc-m68k.c
===================================================================
RCS file: /cvs/src/src/gas/config/tc-m68k.c,v
retrieving revision 1.77
diff -c -3 -p -r1.77 tc-m68k.c
*** config/tc-m68k.c	19 May 2006 11:26:11 -0000	1.77
--- config/tc-m68k.c	15 Nov 2006 16:33:48 -0000
*************** m68k_ip (char *instring)
*** 2061,2089 ****
  		if (!cpu->alias && (cpu->arch & ok_arch))
  		  {
  		    const struct m68k_cpu *alias;
! 
  		    if (any)
  		      APPEND (", ");
  		    any = 0;
  		    APPEND (cpu->name);
! 		    APPEND (" [");
! 		    if (cpu != m68k_cpus)
! 		      for (alias = cpu - 1; alias->alias; alias--)
  			{
! 			  if (any)
! 			    APPEND (", ");
! 			  APPEND (alias->name);
! 			  any = 1;
  			}
! 		    for (alias = cpu + 1; alias->alias; alias++)
! 		      {
! 			if (any)
! 			  APPEND (", ");
! 			APPEND (alias->name);
! 			any = 1;
! 		      }
! 		    
! 		    APPEND ("]");
  		    any = 1;
  		  }
  	      if (paren)
--- 2061,2091 ----
  		if (!cpu->alias && (cpu->arch & ok_arch))
  		  {
  		    const struct m68k_cpu *alias;
! 		    int seen_master = 0;
! 		    
  		    if (any)
  		      APPEND (", ");
  		    any = 0;
  		    APPEND (cpu->name);
! 		    for (alias = cpu; alias != m68k_cpus; alias--)
! 		      if (alias[-1].alias >= 0)
! 			break;
! 		    for (; !seen_master || alias->alias > 0; alias++)
  			{
! 			  if (!alias->alias)
! 			    seen_master = 1;
! 			  else
! 			    {
! 			      if (any)
! 				APPEND (", ");
! 			      else
! 				APPEND (" [");
! 			      APPEND (alias->name);
! 			      any = 1;
! 			    }
  			}
! 		    if (any)
! 		      APPEND ("]");
  		    any = 1;
  		  }
  	      if (paren)