bfd/

	* elf32-m69k.c (elf32_m68k_print_private_bfd_data): Detect EMAC_B
	variant.

	binutils/
	* readelf.c (get_machine_flags): Detect CF ISA C and EMAC_B
	variants.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 895707d..e1c543b 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-13  Nathan Sidwell  <nathan@codesourcery.com>
+
+       * elf32-m69k.c (elf32_m68k_print_private_bfd_data): Detect EMAC_B
+       variant.
+
 2010-08-12  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR binutils/11909

diff --git a/bfd/elf32-m68k.c b/bfd/elf32-m68k.c
index ff37a3c..c0a5ef1 100644 (file)
--- a/bfd/elf32-m68k.c
+++ b/bfd/elf32-m68k.c
@@ -1293,6 +1293,9 @@ elf32_m68k_print_private_bfd_data (bfd *abfd, void * ptr)
            case EF_M68K_CF_EMAC:
              mac = "emac";
              break;
+           case EF_M68K_CF_EMAC_B:
+             mac = "emac_b";
+             break;
            }
          if (mac)
            fprintf (file, " [%s]", mac);

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 3648503..cfa33e4 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-13  Nathan Sidwell  <nathan@codesourcery.com>
+
+       * readelf.c (get_machine_flags): Detect CF ISA C and EMAC_B
+       variants.
+
 2010-08-13  Tom Tromey  <tromey@redhat.com>
 
        * dwarf.c (process_debug_info): Don't subtract section address

diff --git a/binutils/readelf.c b/binutils/readelf.c
index 30a7fcc..4c40e6e 100644 (file)
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -2310,6 +2310,13 @@ get_machine_flags (unsigned e_flags, unsigned e_machine)
                case EF_M68K_CF_ISA_B:
                  isa = "B";
                  break;
+               case EF_M68K_CF_ISA_C:
+                 isa = "C";
+                 break;
+               case EF_M68K_CF_ISA_C_NODIV:
+                 isa = "C";
+                 additional = ", nodiv";
+                 break;
                }
              strcat (buf, ", cf, isa ");
              strcat (buf, isa);
@@ -2328,6 +2335,9 @@ get_machine_flags (unsigned e_flags, unsigned e_machine)
                case EF_M68K_CF_EMAC:
                  mac = "emac";
                  break;
+               case EF_M68K_CF_EMAC_B:
+                 mac = "emac_b";
+                 break;
                }
              if (mac)
                {