223,224c223,226
< /* Process each program header. */
< for (phindex = 0; phindex < i_ehdrp->e_phnum; ++phindex)
---
> /* Set the machine architecture. Do this before processing the
> program headers since we need to know the architecture type
> when processing the notes of some systems' core files. */
> if (! bfd_default_set_arch_mach (abfd, ebd->arch, 0))
226c228,229
< if (! bfd_section_from_phdr (abfd, i_phdrp + phindex, (int) phindex))
---
> /* It's OK if this fails for the generic target. */
> if (ebd->elf_machine_code != EM_NONE)
230,231c233,234
< /* Set the machine architecture. */
< if (! bfd_default_set_arch_mach (abfd, ebd->arch, 0))
---
> /* Process each program header. */
> for (phindex = 0; phindex < i_ehdrp->e_phnum; ++phindex)
233,234c236
< /* It's OK if this fails for the generic target. */
< if (ebd->elf_machine_code != EM_NONE)
---
> if (! bfd_section_from_phdr (abfd, i_phdrp + phindex, (int) phindex))