darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

(elf_core_file_p): Compare alternate machine codes for ELF backends when

Browse source 
checking if the generic ELF target should be used.
This commit is contained in:
Nick Clifton 2003-02-14 09:21:21 +00:00
parent e325dceca7
commit 3193e2343c
2 changed files with 37 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
bfd/ChangeLog
View file

@ -1,3 +1,8 @@
2003-02-14 Bob Wilson <bob.wilson@acm.org>
* elfcore.h (elf_core_file_p): Compare alternate machine codes for ELF
backends when checking if the generic ELF target should be used.
2003-02-14 Alan Modra <amodra@bigpond.net.au> 2003-02-14 Alan Modra <amodra@bigpond.net.au>
* elf64-ppc.c (ppc64_elf_link_hash_table_create): Init tls_get_addr. * elf64-ppc.c (ppc64_elf_link_hash_table_create): Init tls_get_addr.

65
bfd/elfcore.h
View file

@ -1,22 +1,22 @@
/* ELF core file support for BFD. /* ELF core file support for BFD.
Copyright 1995, 1996, 1997, 1998, 2000, 2001, 2002 Copyright 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003
Free Software Foundation, Inc. Free Software Foundation, Inc.
This file is part of BFD, the Binary File Descriptor library. This file is part of BFD, the Binary File Descriptor library.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or the Free Software Foundation; either version 2 of the License, or
(at your option) any later version. (at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
char* char*
elf_core_file_failing_command (abfd) elf_core_file_failing_command (abfd)
@ -48,11 +48,11 @@ elf_core_file_matches_executable_p (core_bfd, exec_bfd)
} }
/* See if the name in the corefile matches the executable name. */ /* See if the name in the corefile matches the executable name. */
corename = elf_tdata (core_bfd)->core_program; corename = elf_tdata (core_bfd)->core_program;
if (corename != NULL) if (corename != NULL)
{ {
const char* execname = strrchr (exec_bfd->filename, '/'); const char* execname = strrchr (exec_bfd->filename, '/');
execname = execname ? execname + 1 : exec_bfd->filename; execname = execname ? execname + 1 : exec_bfd->filename;
if (strcmp(execname, corename) != 0) if (strcmp(execname, corename) != 0)
@ -71,17 +71,15 @@ elf_core_file_matches_executable_p (core_bfd, exec_bfd)
register set) and the floating point register set are stored in a register set) and the floating point register set are stored in a
segment of type PT_NOTE. We handcraft a couple of extra bfd sections segment of type PT_NOTE. We handcraft a couple of extra bfd sections
that allow standard bfd access to the general registers (.reg) and the that allow standard bfd access to the general registers (.reg) and the
floating point registers (.reg2). floating point registers (.reg2). */
*/
const bfd_target * const bfd_target *
elf_core_file_p (abfd) elf_core_file_p (abfd)
bfd *abfd; bfd *abfd;
{ {
Elf_External_Ehdr x_ehdr; /* Elf file header, external form */ Elf_External_Ehdr x_ehdr; /* Elf file header, external form. */
Elf_Internal_Ehdr *i_ehdrp; /* Elf file header, internal form */ Elf_Internal_Ehdr *i_ehdrp; /* Elf file header, internal form. */
Elf_Internal_Phdr *i_phdrp; /* Elf program header, internal form */ Elf_Internal_Phdr *i_phdrp; /* Elf program header, internal form. */
unsigned int phindex; unsigned int phindex;
struct elf_backend_data *ebd; struct elf_backend_data *ebd;
struct bfd_preserve preserve; struct bfd_preserve preserve;
@ -103,7 +101,7 @@ elf_core_file_p (abfd)
if (! elf_file_p (&x_ehdr)) if (! elf_file_p (&x_ehdr))
goto wrong; goto wrong;
/* FIXME: Check EI_VERSION here ! */ /* FIXME: Check EI_VERSION here ! */
/* Check the address size ("class"). */ /* Check the address size ("class"). */
if (x_ehdr.e_ident[EI_CLASS] != ELFCLASS) if (x_ehdr.e_ident[EI_CLASS] != ELFCLASS)
@ -112,11 +110,11 @@ elf_core_file_p (abfd)
/* Check the byteorder. */ /* Check the byteorder. */
switch (x_ehdr.e_ident[EI_DATA]) switch (x_ehdr.e_ident[EI_DATA])
{ {
case ELFDATA2MSB: /* Big-endian */ case ELFDATA2MSB: /* Big-endian. */
if (! bfd_big_endian (abfd)) if (! bfd_big_endian (abfd))
goto wrong; goto wrong;
break; break;
case ELFDATA2LSB: /* Little-endian */ case ELFDATA2LSB: /* Little-endian. */
if (! bfd_little_endian (abfd)) if (! bfd_little_endian (abfd))
goto wrong; goto wrong;
break; break;
@ -168,7 +166,11 @@ elf_core_file_p (abfd)
if ((*target_ptr)->flavour != bfd_target_elf_flavour) if ((*target_ptr)->flavour != bfd_target_elf_flavour)
continue; continue;
back = (struct elf_backend_data *) (*target_ptr)->backend_data; back = (struct elf_backend_data *) (*target_ptr)->backend_data;
if (back->elf_machine_code == i_ehdrp->e_machine) 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 /* target_ptr is an ELF backend which matches this
object file, so reject the generic ELF target. */ object file, so reject the generic ELF target. */
@ -203,6 +205,7 @@ elf_core_file_p (abfd)
for (phindex = 0; phindex < i_ehdrp->e_phnum; ++phindex) for (phindex = 0; phindex < i_ehdrp->e_phnum; ++phindex)
{ {
Elf_External_Phdr x_phdr; Elf_External_Phdr x_phdr;
if (bfd_bread ((PTR) &x_phdr, (bfd_size_type) sizeof (x_phdr), abfd) if (bfd_bread ((PTR) &x_phdr, (bfd_size_type) sizeof (x_phdr), abfd)
!= sizeof (x_phdr)) != sizeof (x_phdr))
goto fail; goto fail;
@ -222,21 +225,17 @@ elf_core_file_p (abfd)
/* Process each program header. */ /* Process each program header. */
for (phindex = 0; phindex < i_ehdrp->e_phnum; ++phindex) for (phindex = 0; phindex < i_ehdrp->e_phnum; ++phindex)
{ if (! bfd_section_from_phdr (abfd, i_phdrp + phindex, (int) phindex))
if (! bfd_section_from_phdr (abfd, i_phdrp + phindex, (int) phindex)) goto fail;
goto fail;
}
/* Save the entry point from the ELF header. */ /* Save the entry point from the ELF header. */
bfd_get_start_address (abfd) = i_ehdrp->e_entry; bfd_get_start_address (abfd) = i_ehdrp->e_entry;
/* Let the backend double check the format and override global /* Let the backend double check the format and override global
information. */ information. */
if (ebd->elf_backend_object_p) if (ebd->elf_backend_object_p
{ && (! (*ebd->elf_backend_object_p) (abfd)))
if (! (*ebd->elf_backend_object_p) (abfd)) goto wrong;
goto wrong;
}
bfd_preserve_finish (abfd, &preserve); bfd_preserve_finish (abfd, &preserve);
return abfd->xvec; return abfd->xvec;