* cpu-h8300.c (h8300_scan, compatible): Prototype.

        (h8300_scan): Handle architecture:machine encodings typically
        found in linker scripts.
        * elf.c (prep_headers): Do not try to do H8 machine recognition
        here.
        * elf32-h8300.c:  Add some missing prototypes.
        (elf32_h8_mach, elf32_h8_final_write_processing): New functions.
        (elf32_h8_object_p): Similarly.

1 files changed, 1 insertions, 13 deletions

diff --git a/bfd/elf.c b/bfd/elf.c
index f03e3a1..f40b5a0 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -3452,19 +3452,7 @@ prep_headers (abfd)
       break;
       /* Also note that EM_M32, AT&T WE32100 is unknown to bfd.  */
     case bfd_arch_h8300:
-      switch (bfd_get_mach (abfd))
-	{
-	default:
-	case bfd_mach_h8300:
-	  i_ehdrp->e_machine = EM_H8_300;
-	  break;
-	case bfd_mach_h8300h:
-	  i_ehdrp->e_machine = EM_H8_300H;
-	  break;
-	case bfd_mach_h8300s:
-	  i_ehdrp->e_machine = EM_H8S;
-	  break;
-	}
+      i_ehdrp->e_machine = EM_H8_300;
       break;
     case bfd_arch_h8500:
       i_ehdrp->e_machine = EM_H8_500;