bfd:

	* archures.c (bfd_mach_mcf_isa_a_nodiv, bfd_mach_mcf_isa_b_nousp):
	New.  Adjust other variants.
	(bfd_default_scan): Update.
	* bfd-in2.h: Rebuilt.
	* cpu-m68k.c: Adjust.
	(bfd_m68k_compatible): New. Use it for architectures.
	* elf32-m68k.c (elf32_m68k_object_p): Adjust.
	(elf32_m68k_merge_private_bfd_data): Adjust.  Correct isa-a/b
	mismatch.
	(elf32_m68k_print_private_bfd_data): Adjust.
	* ieee.c (ieee_write_processor): Adjust.

	binutils:
	* readelf.c (get_machine_flags): Adjust.

	gas:
	* config/tc-m68k.c (m68k_extensions): Allow 'float' on both m68k
	and cf.
	(m68k_ip): <case 'J'> Check we have some control regs.
	(md_parse_option): Allow raw arch switch.
	(m68k_init_arch): Better detection of arch/cpu mismatch.  Detect
	whether 68881 or cfloat was meant by -mfloat.
	(md_show_usage): Adjust extension display.
	(m68k_elf_final_processing): Adjust.

	gas/testsuite:
	* gas/m68k/arch-cpu-1.s: Tweak.
	* gas/m68k/arch-cpu-1.d: Tweak.

	include/elf:
	* m68k.h (EF_M68K_ISA_MASK, EF_M68K_ISA_A,
	EF_M68K_ISA_A_PLUS, EF_M68K_ISA_B, EF_M68K_ISA_C): Adjust.
	(EF_M68K_ISA_A_NODIV, EF_M68K_ISA_B_NOUSP): New.
	(EF_M68K_HW_DIV, EF_M68K_USP): Remove.
	(EF_M68K_MAC, EF_M68K_EMAC, EF_M68K_FLOAT): Adjust.
	(EF_M68K_EMAC_B): New.

	ld/testsuite:
	* ld-m68k: New tests.

6 files changed, 164 insertions, 97 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 691d6c4..f0c7a86 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,17 @@
+2006-03-06  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* archures.c (bfd_mach_mcf_isa_a_nodiv, bfd_mach_mcf_isa_b_nousp):
+	New.  Adjust other variants.
+	(bfd_default_scan): Update.
+	* bfd-in2.h: Rebuilt.
+	* cpu-m68k.c: Adjust.
+	(bfd_m68k_compatible): New. Use it for architectures.
+	* elf32-m68k.c (elf32_m68k_object_p): Adjust.
+	(elf32_m68k_merge_private_bfd_data): Adjust.  Correct isa-a/b
+	mismatch.
+	(elf32_m68k_print_private_bfd_data): Adjust.
+	* ieee.c (ieee_write_processor): Adjust.
+	
 2006-03-06  Alan Modra  <amodra@bigpond.net.au>
 
 	* dwarf2.c: Formatting.
diff --git a/bfd/archures.c b/bfd/archures.c
index fc2f85b..f4080a6 100644
--- a/bfd/archures.c
+++ b/bfd/archures.c
@@ -80,22 +80,22 @@ DESCRIPTION
 .#define bfd_mach_m68040 6
 .#define bfd_mach_m68060 7
 .#define bfd_mach_cpu32  8
-.#define bfd_mach_mcf_isa_a 9
-.#define bfd_mach_mcf_isa_a_div 10
-.#define bfd_mach_mcf_isa_a_div_mac 11
-.#define bfd_mach_mcf_isa_a_div_emac 12
+.#define bfd_mach_mcf_isa_a_nodiv 9
+.#define bfd_mach_mcf_isa_a 10
+.#define bfd_mach_mcf_isa_a_mac 11
+.#define bfd_mach_mcf_isa_a_emac 12
 .#define bfd_mach_mcf_isa_aplus 13
 .#define bfd_mach_mcf_isa_aplus_mac 14
 .#define bfd_mach_mcf_isa_aplus_emac 15
-.#define bfd_mach_mcf_isa_aplus_usp 16
-.#define bfd_mach_mcf_isa_aplus_usp_mac 17
-.#define bfd_mach_mcf_isa_aplus_usp_emac 18
+.#define bfd_mach_mcf_isa_b_nousp 16
+.#define bfd_mach_mcf_isa_b_nousp_mac 17
+.#define bfd_mach_mcf_isa_b_nousp_emac 18
 .#define bfd_mach_mcf_isa_b 19
 .#define bfd_mach_mcf_isa_b_mac 20
 .#define bfd_mach_mcf_isa_b_emac 21
-.#define bfd_mach_mcf_isa_b_usp_float 22
-.#define bfd_mach_mcf_isa_b_usp_float_mac 23
-.#define bfd_mach_mcf_isa_b_usp_float_emac 24
+.#define bfd_mach_mcf_isa_b_float 22
+.#define bfd_mach_mcf_isa_b_float_mac 23
+.#define bfd_mach_mcf_isa_b_float_emac 24
 .  bfd_arch_vax,       {* DEC Vax *}
 .  bfd_arch_i960,      {* Intel 960 *}
 .    {* The order of the following is important.
@@ -1016,23 +1016,23 @@ bfd_default_scan (const bfd_arch_info_type *info, const char *string)
       break;
     case 5200:
       arch = bfd_arch_m68k;
-      number = bfd_mach_mcf_isa_a;
+      number = bfd_mach_mcf_isa_a_nodiv;
       break;
     case 5206:
       arch = bfd_arch_m68k;
-      number = bfd_mach_mcf_isa_a_div_mac;
+      number = bfd_mach_mcf_isa_a_mac;
       break;
     case 5307:
       arch = bfd_arch_m68k;
-      number = bfd_mach_mcf_isa_a_div_mac;
+      number = bfd_mach_mcf_isa_a_mac;
       break;
     case 5407:
       arch = bfd_arch_m68k;
-      number = bfd_mach_mcf_isa_b_mac;
+      number = bfd_mach_mcf_isa_b_nousp_mac;
       break;
     case 5282:
       arch = bfd_arch_m68k;
-      number = bfd_mach_mcf_isa_b_usp_float_emac;
+      number = bfd_mach_mcf_isa_aplus_emac;
       break;
 
     case 32000:
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index cc9eb24..8782bf9 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -1674,22 +1674,22 @@ enum bfd_architecture
 #define bfd_mach_m68040 6
 #define bfd_mach_m68060 7
 #define bfd_mach_cpu32  8
-#define bfd_mach_mcf_isa_a 9
-#define bfd_mach_mcf_isa_a_div 10
-#define bfd_mach_mcf_isa_a_div_mac 11
-#define bfd_mach_mcf_isa_a_div_emac 12
+#define bfd_mach_mcf_isa_a_nodiv 9
+#define bfd_mach_mcf_isa_a 10
+#define bfd_mach_mcf_isa_a_mac 11
+#define bfd_mach_mcf_isa_a_emac 12
 #define bfd_mach_mcf_isa_aplus 13
 #define bfd_mach_mcf_isa_aplus_mac 14
 #define bfd_mach_mcf_isa_aplus_emac 15
-#define bfd_mach_mcf_isa_aplus_usp 16
-#define bfd_mach_mcf_isa_aplus_usp_mac 17
-#define bfd_mach_mcf_isa_aplus_usp_emac 18
+#define bfd_mach_mcf_isa_b_nousp 16
+#define bfd_mach_mcf_isa_b_nousp_mac 17
+#define bfd_mach_mcf_isa_b_nousp_emac 18
 #define bfd_mach_mcf_isa_b 19
 #define bfd_mach_mcf_isa_b_mac 20
 #define bfd_mach_mcf_isa_b_emac 21
-#define bfd_mach_mcf_isa_b_usp_float 22
-#define bfd_mach_mcf_isa_b_usp_float_mac 23
-#define bfd_mach_mcf_isa_b_usp_float_emac 24
+#define bfd_mach_mcf_isa_b_float 22
+#define bfd_mach_mcf_isa_b_float_mac 23
+#define bfd_mach_mcf_isa_b_float_emac 24
   bfd_arch_vax,       /* DEC Vax */
   bfd_arch_i960,      /* Intel 960 */
     /* The order of the following is important.
diff --git a/bfd/cpu-m68k.c b/bfd/cpu-m68k.c
index 93b60f9..83aaa25 100644
--- a/bfd/cpu-m68k.c
+++ b/bfd/cpu-m68k.c
@@ -24,8 +24,12 @@
 #include "libbfd.h"
 #include "opcode/m68k.h"
 
+static const bfd_arch_info_type *
+bfd_m68k_compatible (const bfd_arch_info_type *a,
+		     const bfd_arch_info_type *b);
+
 #define N(name, print,d,next)  \
-{  32, 32, 8, bfd_arch_m68k, name, "m68k",print,2,d,bfd_default_compatible,bfd_default_scan, next, }
+{  32, 32, 8, bfd_arch_m68k, name, "m68k",print,2,d,bfd_m68k_compatible,bfd_default_scan, next, }
 
 static const bfd_arch_info_type arch_info_struct[] =
   {
@@ -39,25 +43,25 @@ static const bfd_arch_info_type arch_info_struct[] =
     N(bfd_mach_cpu32,   "m68k:cpu32", FALSE, &arch_info_struct[8]),
 
     /* Various combinations of CF architecture features */
-    N(bfd_mach_mcf_isa_a, "m68k:isa-a",
+    N(bfd_mach_mcf_isa_a_nodiv, "m68k:isa-a:nodiv",
       FALSE, &arch_info_struct[9]),
-    N(bfd_mach_mcf_isa_a_div, "m68k:isa-a:div",
+    N(bfd_mach_mcf_isa_a, "m68k:isa-a",
       FALSE, &arch_info_struct[10]),
-    N(bfd_mach_mcf_isa_a_div_mac, "m68k:isa-a:div:mac",
+    N(bfd_mach_mcf_isa_a_mac, "m68k:isa-a:mac",
       FALSE, &arch_info_struct[11]),
-    N(bfd_mach_mcf_isa_a_div_emac, "m68k:isa-a:div:emac",
+    N(bfd_mach_mcf_isa_a_emac, "m68k:isa-a:emac",
       FALSE, &arch_info_struct[12]),
-    N(bfd_mach_mcf_isa_aplus, "m68k:isa-a+",
+    N(bfd_mach_mcf_isa_aplus, "m68k:isa-aplus",
       FALSE, &arch_info_struct[13]),
-    N(bfd_mach_mcf_isa_aplus_mac, "m68k:isa-a+:mac",
+    N(bfd_mach_mcf_isa_aplus_mac, "m68k:isa-aplus:mac",
       FALSE, &arch_info_struct[14]),
-    N(bfd_mach_mcf_isa_aplus_emac, "m68k:isa-a+:emac",
+    N(bfd_mach_mcf_isa_aplus_emac, "m68k:isa-aplus:emac",
       FALSE, &arch_info_struct[15]),
-    N(bfd_mach_mcf_isa_aplus_usp, "m68k:isa-a+:usp",
+    N(bfd_mach_mcf_isa_b_nousp, "m68k:isa-b:nousp",
       FALSE, &arch_info_struct[16]),
-    N(bfd_mach_mcf_isa_aplus_usp_mac, "m68k:isa-a+:usp:mac",
+    N(bfd_mach_mcf_isa_b_nousp_mac, "m68k:isa-b:nousp:mac",
       FALSE, &arch_info_struct[17]),
-    N(bfd_mach_mcf_isa_aplus_usp_emac, "m68k:isa-a+:usp:emac",
+    N(bfd_mach_mcf_isa_b_nousp_emac, "m68k:isa-b:nousp:emac",
       FALSE, &arch_info_struct[18]),
     N(bfd_mach_mcf_isa_b, "m68k:isa-b",
       FALSE, &arch_info_struct[19]),
@@ -65,28 +69,26 @@ static const bfd_arch_info_type arch_info_struct[] =
       FALSE, &arch_info_struct[20]),
     N(bfd_mach_mcf_isa_b_emac, "m68k:isa-b:emac",
       FALSE, &arch_info_struct[21]),
-    N(bfd_mach_mcf_isa_b_usp_float, "m68k:isa-b:usp:float",
+    N(bfd_mach_mcf_isa_b_float, "m68k:isa-b:float",
       FALSE, &arch_info_struct[22]),
-    N(bfd_mach_mcf_isa_b_usp_float_mac, "m68k:isa-b:usp:float:mac",
+    N(bfd_mach_mcf_isa_b_float_mac, "m68k:isa-b:float:mac",
       FALSE, &arch_info_struct[23]),
-    N(bfd_mach_mcf_isa_b_usp_float_emac, "m68k:isa-b:usp:float:emac",
+    N(bfd_mach_mcf_isa_b_float_emac, "m68k:isa-b:float:emac",
       FALSE, &arch_info_struct[24]),
 
     /* Legacy names for CF architectures */
-    N(bfd_mach_mcf_isa_a, "m68k:5200",  FALSE, &arch_info_struct[25]),
-    N(bfd_mach_mcf_isa_a_div_mac,"m68k:5206e", FALSE, &arch_info_struct[26]),
-    N(bfd_mach_mcf_isa_a_div_mac, "m68k:5307",  FALSE, &arch_info_struct[27]),
-    N(bfd_mach_mcf_isa_b_mac, "m68k:5407",  FALSE, &arch_info_struct[28]),
-    N(bfd_mach_mcf_isa_aplus_usp_emac, "m68k:528x",
-      FALSE, &arch_info_struct[29]),
-    N(bfd_mach_mcf_isa_aplus_usp_emac, "m68k:521x",
-      FALSE, &arch_info_struct[30]),
-    N(bfd_mach_mcf_isa_a_div_emac, "m68k:5249",  FALSE, &arch_info_struct[31]),
-    N(bfd_mach_mcf_isa_b_usp_float_emac, "m68k:547x",
+    N(bfd_mach_mcf_isa_a_nodiv, "m68k:5200", FALSE, &arch_info_struct[25]),
+    N(bfd_mach_mcf_isa_a_mac,"m68k:5206e", FALSE, &arch_info_struct[26]),
+    N(bfd_mach_mcf_isa_a_mac, "m68k:5307", FALSE, &arch_info_struct[27]),
+    N(bfd_mach_mcf_isa_b_nousp_mac, "m68k:5407", FALSE, &arch_info_struct[28]),
+    N(bfd_mach_mcf_isa_aplus_emac, "m68k:528x", FALSE, &arch_info_struct[29]),
+    N(bfd_mach_mcf_isa_aplus_emac, "m68k:521x", FALSE, &arch_info_struct[30]),
+    N(bfd_mach_mcf_isa_a_emac, "m68k:5249", FALSE, &arch_info_struct[31]),
+    N(bfd_mach_mcf_isa_b_float_emac, "m68k:547x",
       FALSE, &arch_info_struct[32]),
-    N(bfd_mach_mcf_isa_b_usp_float_emac, "m68k:548x",
+    N(bfd_mach_mcf_isa_b_float_emac, "m68k:548x",
       FALSE, &arch_info_struct[33]),
-    N(bfd_mach_mcf_isa_b_usp_float_emac,  "m68k:cfv4e", FALSE, 0),
+    N(bfd_mach_mcf_isa_b_float_emac, "m68k:cfv4e", FALSE, 0),
   };
 
 const bfd_arch_info_type bfd_m68k_arch =
@@ -109,15 +111,15 @@ static const unsigned m68k_arch_features[] =
   mcfisa_a|mcfhwdiv,
   mcfisa_a|mcfhwdiv|mcfmac,
   mcfisa_a|mcfhwdiv|mcfemac,
-  mcfisa_a|mcfisa_aa|mcfhwdiv,
-  mcfisa_a|mcfisa_aa|mcfhwdiv|mcfmac,
-  mcfisa_a|mcfisa_aa|mcfhwdiv|mcfemac,
   mcfisa_a|mcfisa_aa|mcfhwdiv|mcfusp,
   mcfisa_a|mcfisa_aa|mcfhwdiv|mcfusp|mcfmac,
   mcfisa_a|mcfisa_aa|mcfhwdiv|mcfusp|mcfemac,
   mcfisa_a|mcfhwdiv|mcfisa_b,
   mcfisa_a|mcfhwdiv|mcfisa_b|mcfmac,
   mcfisa_a|mcfhwdiv|mcfisa_b|mcfemac,
+  mcfisa_a|mcfhwdiv|mcfisa_b|mcfusp,
+  mcfisa_a|mcfhwdiv|mcfisa_b|mcfusp|mcfmac,
+  mcfisa_a|mcfhwdiv|mcfisa_b|mcfusp|mcfemac,
   mcfisa_a|mcfhwdiv|mcfisa_b|mcfusp|cfloat,
   mcfisa_a|mcfhwdiv|mcfisa_b|mcfusp|cfloat|mcfmac,
   mcfisa_a|mcfhwdiv|mcfisa_b|mcfusp|cfloat|mcfemac,
@@ -181,3 +183,36 @@ int bfd_m68k_features_to_mach (unsigned features)
     }
   return superset ? superset : subset;
 }
+
+static const bfd_arch_info_type *
+bfd_m68k_compatible (const bfd_arch_info_type *a,
+		     const bfd_arch_info_type *b)
+{
+  if (a->arch != b->arch)
+    return NULL;
+
+  if (a->bits_per_word != b->bits_per_word)
+    return NULL;
+
+  if (!a->mach)
+    return b;
+  if (!b->mach)
+    return a;
+  
+  if (a->mach <= bfd_mach_m68060 && b->mach <= bfd_mach_m68060)
+    /* Merge m68k machine. */
+    return a->mach > b->mach ? a : b;
+  else if (a->mach >= bfd_mach_mcf_isa_a_nodiv
+	   && b->mach >= bfd_mach_mcf_isa_a_nodiv)
+    {
+      /* Merge cf machine.  */
+      unsigned features = (bfd_m68k_mach_to_features (a->mach)
+			   | bfd_m68k_mach_to_features (b->mach));
+      unsigned machine = bfd_m68k_features_to_mach (features);
+
+      return bfd_lookup_arch (a->arch, machine);
+    }
+  else
+    /* They are incompatible.  */
+    return NULL;
+}
diff --git a/bfd/elf32-m68k.c b/bfd/elf32-m68k.c
index 98b0b12..978dbd2 100644
--- a/bfd/elf32-m68k.c
+++ b/bfd/elf32-m68k.c
@@ -390,18 +390,22 @@ elf32_m68k_object_p (bfd *abfd)
     {
       switch (eflags & EF_M68K_ISA_MASK)
 	{
-	case EF_M68K_ISA_B:
-	  features |= mcfisa_b;
-	  /* FALLTHROUGH */
-	case EF_M68K_ISA_A_PLUS:
-	  features |= mcfisa_aa;
-	  /* FALLTHROUGH */
-	case EF_M68K_ISA_A:
+	case EF_M68K_ISA_A_NODIV:
 	  features |= mcfisa_a;
 	  break;
+	case EF_M68K_ISA_A:
+	  features |= mcfisa_a|mcfhwdiv;
+	  break;
+	case EF_M68K_ISA_A_PLUS:
+	  features |= mcfisa_a|mcfisa_aa|mcfhwdiv|mcfusp;
+	  break;
+	case EF_M68K_ISA_B_NOUSP:
+	  features |= mcfisa_a|mcfisa_b|mcfhwdiv;
+	  break;
+	case EF_M68K_ISA_B:
+	  features |= mcfisa_a|mcfisa_b|mcfhwdiv|mcfusp;
+	  break;
 	}
-      if (eflags & EF_M68K_HW_DIV)
-	features |= mcfhwdiv;
       switch (eflags & EF_M68K_MAC_MASK)
 	{
 	case EF_M68K_MAC:
@@ -411,8 +415,6 @@ elf32_m68k_object_p (bfd *abfd)
 	  features |= mcfemac;
 	  break;
 	}
-      if (eflags & EF_M68K_USP)
-	features |= mcfusp;
       if (eflags & EF_M68K_FLOAT)
 	features |= cfloat;
     }
@@ -462,7 +464,8 @@ elf32_m68k_merge_private_bfd_data (ibfd, obfd)
 	  if (in_mach > out_mach)
 	    out_mach = in_mach;
 	}
-      else if (in_mach >= bfd_mach_mcf_isa_a && out_mach >= bfd_mach_mcf_isa_a)
+      else if (in_mach >= bfd_mach_mcf_isa_a_nodiv
+	       && out_mach >= bfd_mach_mcf_isa_a_nodiv)
 	/* Merge cf machine.  */
 	out_mach = bfd_m68k_features_to_mach
 	  (bfd_m68k_mach_to_features (in_mach)
@@ -483,27 +486,37 @@ elf32_m68k_merge_private_bfd_data (ibfd, obfd)
     }
   else
     {
+      flagword isa_in = in_flags & EF_M68K_ISA_MASK;
+      flagword isa_out = out_flags & EF_M68K_ISA_MASK;
+      
+      
       /* Copy legacy flags.  */
       out_flags |= in_flags & (EF_M68K_CPU32 | EF_M68K_M68000 | EF_M68K_CFV4E);
 
-      if (((in_flags | out_flags) & EF_M68K_ISA_MASK)
+      if ((isa_in | isa_out)
 	  && ((in_flags | out_flags) & (EF_M68K_CPU32 | EF_M68K_M68000)))
 	/* Mixing m68k and cf is not allowed */
 	return FALSE;
       
-      if (in_flags & EF_M68K_ISA_MASK)
+      if (isa_in)
 	{
-	  if (out_flags & EF_M68K_ISA_MASK)
+	  if (isa_out)
 	    {
-	      /* Merge cf specific flags */
-	      if ((in_flags & EF_M68K_ISA_MASK)
-		  > (out_flags & EF_M68K_ISA_MASK))
-		{
-		  out_flags ^= out_flags & EF_M68K_ISA_MASK;
-		  out_flags |= in_flags & EF_M68K_ISA_MASK;
-		}
-	      out_flags |= in_flags
-		& (EF_M68K_HW_DIV | EF_M68K_USP | EF_M68K_FLOAT);
+	      if (isa_out == EF_M68K_ISA_A_PLUS
+		  && (isa_in == EF_M68K_ISA_B_NOUSP
+		      || isa_in == EF_M68K_ISA_B))
+		/* Cannot mix A+ and B */
+		return FALSE;
+	      if (isa_in == EF_M68K_ISA_A_PLUS
+		  && (isa_out == EF_M68K_ISA_B_NOUSP
+		      || isa_out == EF_M68K_ISA_B))
+		/* Cannot mix B and A+ */
+		return FALSE;
+	      
+	      if (isa_in > isa_out)
+		out_flags ^= isa_in ^ isa_out;
+
+	      out_flags |= in_flags & EF_M68K_FLOAT;
 	      if (in_flags & EF_M68K_MAC_MASK)
 		{
 		  if (!(out_flags & EF_M68K_MAC_MASK))
@@ -559,22 +572,31 @@ elf32_m68k_print_private_bfd_data (abfd, ptr)
     {
       char const *isa = _("unknown");
       char const *mac = _("unknown");
+      char const *additional = "";
       
       switch (eflags & EF_M68K_ISA_MASK)
 	{
+	case EF_M68K_ISA_A_NODIV:
+	  isa = "A";
+	  additional = " [nodiv]";
+	  break;
 	case EF_M68K_ISA_A:
 	  isa = "A";
 	  break;
 	case EF_M68K_ISA_A_PLUS:
 	  isa = "A+";
 	  break;
+	case EF_M68K_ISA_B_NOUSP:
+	  isa = "B";
+	  additional = " [nousp]";
+	  break;
 	case EF_M68K_ISA_B:
 	  isa = "B";
 	  break;
 	}
-      fprintf (file, " [isa %s]", isa);
-      if (eflags & EF_M68K_HW_DIV)
-	fprintf (file, " [hwdiv]");
+      fprintf (file, " [isa %s]%s", isa, additional);
+      if (eflags & EF_M68K_FLOAT)
+	fprintf (file, " [float]");
       switch (eflags & EF_M68K_MAC_MASK)
 	{
 	case 0:
@@ -589,10 +611,6 @@ elf32_m68k_print_private_bfd_data (abfd, ptr)
 	}
       if (mac)
 	fprintf (file, " [%s]", mac);
-      if (eflags & EF_M68K_USP)
-	fprintf (file, " [usp");
-      if (eflags & EF_M68K_FLOAT)
-	fprintf (file, " [float]");
     }
   
   fputc ('\n', file);
diff --git a/bfd/ieee.c b/bfd/ieee.c
index 248551f..be8455c 100644
--- a/bfd/ieee.c
+++ b/bfd/ieee.c
@@ -3466,22 +3466,22 @@ ieee_write_processor (bfd *abfd)
 	  case bfd_mach_m68040: id = "68040"; break;
 	  case bfd_mach_m68060: id = "68060"; break;
 	  case bfd_mach_cpu32:  id = "cpu32"; break;
+	  case bfd_mach_mcf_isa_a_nodiv: id = "isa-a:nodiv"; break;
 	  case bfd_mach_mcf_isa_a: id = "isa-a"; break;
-	  case bfd_mach_mcf_isa_a_div: id = "isa-a:div"; break;
-	  case bfd_mach_mcf_isa_a_div_mac: id = "isa-a:div:mac"; break;
-	  case bfd_mach_mcf_isa_a_div_emac: id = "isa-a:div:emac"; break;
-	  case bfd_mach_mcf_isa_aplus: id = "isa-a+"; break;
-	  case bfd_mach_mcf_isa_aplus_mac: id = "isa-a+:mac"; break;
-	  case bfd_mach_mcf_isa_aplus_emac: id = "isa-a+:mac"; break;
-	  case bfd_mach_mcf_isa_aplus_usp: id = "isa-a+:usp"; break;
-	  case bfd_mach_mcf_isa_aplus_usp_mac: id = "isa-a+:usp:mac"; break;
-	  case bfd_mach_mcf_isa_aplus_usp_emac: id = "isa-a+:usp:emac"; break;
+	  case bfd_mach_mcf_isa_a_mac: id = "isa-a:mac"; break;
+	  case bfd_mach_mcf_isa_a_emac: id = "isa-a:emac"; break;
+	  case bfd_mach_mcf_isa_aplus: id = "isa-aplus"; break;
+	  case bfd_mach_mcf_isa_aplus_mac: id = "isa-aplus:mac"; break;
+	  case bfd_mach_mcf_isa_aplus_emac: id = "isa-aplus:mac"; break;
+	  case bfd_mach_mcf_isa_b_nousp: id = "isa-b:nousp"; break;
+	  case bfd_mach_mcf_isa_b_nousp_mac: id = "isa-b:nousp:mac"; break;
+	  case bfd_mach_mcf_isa_b_nousp_emac: id = "isa-b:nousp:emac"; break;
 	  case bfd_mach_mcf_isa_b: id = "isa-b"; break;
 	  case bfd_mach_mcf_isa_b_mac: id = "isa-b:mac"; break;
 	  case bfd_mach_mcf_isa_b_emac: id = "isa-b:emac"; break;
-	  case bfd_mach_mcf_isa_b_usp_float: id = "isa-b:usp:float"; break;
-	  case bfd_mach_mcf_isa_b_usp_float_mac: id = "isa-b:usp:float:mac"; break;
-	  case bfd_mach_mcf_isa_b_usp_float_emac: id = "isa-b:usp:float:emac"; break;
+	  case bfd_mach_mcf_isa_b_float: id = "isa-b:float"; break;
+	  case bfd_mach_mcf_isa_b_float_mac: id = "isa-b:float:mac"; break;
+	  case bfd_mach_mcf_isa_b_float_emac: id = "isa-b:float:emac"; break;
 	  }
 
 	if (! ieee_write_id (abfd, id))