yggdrasil/binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Fix fbsd core matching"

Browse Source 
This reverts commit a7e29f797c.

I accidentally pushed this, so revert.
This commit is contained in:
Tom de Vries
2022-06-14 11:08:43 +02:00
parent c5a72a8d1c
commit 476288fa2b
1 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bfd/elfcore.h
+30 -10
View File
@@ -149,14 +149,37 @@ elf_core_file_p (bfd *abfd)
&& (ebd->elf_machine_alt1 == 0
|| i_ehdrp->e_machine != ebd->elf_machine_alt1)
&& (ebd->elf_machine_alt2 == 0
|| i_ehdrp->e_machine != ebd->elf_machine_alt2)
&& ebd->elf_machine_code != EM_NONE)
goto wrong;
|| i_ehdrp->e_machine != ebd->elf_machine_alt2))
{
const bfd_target * const *target_ptr;
if (ebd->elf_machine_code != EM_NONE
&& i_ehdrp->e_ident[EI_OSABI] != ebd->elf_osabi
&& ebd->elf_osabi != ELFOSABI_NONE)
goto wrong;
if (ebd->elf_machine_code != EM_NONE)
goto wrong;
/* This is the generic ELF target. Let it match any ELF target
for which we do not have a specific backend. */
for (target_ptr = bfd_target_vector; *target_ptr != NULL; target_ptr++)
{
const struct elf_backend_data *back;
if ((*target_ptr)->flavour != bfd_target_elf_flavour)
continue;
back = xvec_get_elf_backend_data (*target_ptr);
if (back->s->arch_size != ARCH_SIZE)
continue;
if (back->elf_machine_code == i_ehdrp->e_machine
|| (back->elf_machine_alt1 != 0
&& i_ehdrp->e_machine == back->elf_machine_alt1)
|| (back->elf_machine_alt2 != 0
&& i_ehdrp->e_machine == back->elf_machine_alt2))
{
/* target_ptr is an ELF backend which matches this
object file, so reject the generic ELF target. */
goto wrong;
}
}
}
/* If there is no program header, or the type is not a core file, then
we are hosed. */
@@ -176,9 +199,6 @@ elf_core_file_p (bfd *abfd)
Elf_Internal_Shdr i_shdr;
file_ptr where = (file_ptr) i_ehdrp->e_shoff;
if (i_ehdrp->e_shoff < sizeof (x_ehdr))
goto wrong;
/* Seek to the section header table in the file. */
if (bfd_seek (abfd, where, SEEK_SET) != 0)
goto fail;