espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-23 19:50:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

* elf-bfd.h (enum elf_object_id): Add HPPA_ELF_TDATA.

Browse Source 
* elf.c (bfd_elf_allocate_object): Don't check for already allocated
	tdata.
	* elf32-hppa.c (elf32_hppa_mkobject): New function.
	(bfd_elf32_mkobject): Define.
	* elf32-ppc.c (is_ppc_elf_target): Delete.  Replace all uses with..
	(is_ppc_elf): ..this new macro.
	* elf64-ppc.c (is_ppc64_elf_target): Delete.  Replace all uses with..
	(is_ppc64_elf): ..this new macro.
This commit is contained in:
Alan Modra
2008-02-15 08:27:19 +00:00
parent b1f2bf012a
commit 0c8d6e5c6d
6 changed files with 55 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bfd/ChangeLog
View File

@ -1,3 +1,15 @@
2008-02-15 Alan Modra <amodra@bigpond.net.au>
* elf-bfd.h (enum elf_object_id): Add HPPA_ELF_TDATA.
* elf.c (bfd_elf_allocate_object): Don't check for already allocated
tdata.
* elf32-hppa.c (elf32_hppa_mkobject): New function.
(bfd_elf32_mkobject): Define.
* elf32-ppc.c (is_ppc_elf_target): Delete. Replace all uses with..
(is_ppc_elf): ..this new macro.
* elf64-ppc.c (is_ppc64_elf_target): Delete. Replace all uses with..
(is_ppc64_elf): ..this new macro.
2008-02-15 Alan Modra <amodra@bigpond.net.au> 2008-02-15 Alan Modra <amodra@bigpond.net.au>
* elflink.c: Replace all accesses to hash->creator field with * elflink.c: Replace all accesses to hash->creator field with

1
bfd/elf-bfd.h
View File

@ -1401,6 +1401,7 @@ enum elf_object_id
{ {
ALPHA_ELF_TDATA = 1, ALPHA_ELF_TDATA = 1,
ARM_ELF_TDATA, ARM_ELF_TDATA,
HPPA_ELF_TDATA,
I386_ELF_TDATA, I386_ELF_TDATA,
PPC32_ELF_TDATA, PPC32_ELF_TDATA,
PPC64_ELF_TDATA, PPC64_ELF_TDATA,

10
bfd/elf.c
View File

@ -226,17 +226,13 @@ bfd_elf_gnu_hash (const char *namearg)
return h & 0xffffffff; return h & 0xffffffff;
} }
/* If ABFD does not already have an allocated tdata field then create /* Create a tdata field OBJECT_SIZE bytes in length, zeroed out and with
one, OBJECT_SIZE bytes is length, zeroed out and with the object_id the object_id field of an elf_obj_tdata field set to OBJECT_ID. */
field of an elf_obj_tdata field set to OBJECT_ID. */
bfd_boolean bfd_boolean
bfd_elf_allocate_object (bfd * abfd, bfd_elf_allocate_object (bfd *abfd,
size_t object_size, size_t object_size,
enum elf_object_id object_id) enum elf_object_id object_id)
{ {
if (abfd->tdata.any != NULL)
return TRUE;
BFD_ASSERT (object_size >= sizeof (struct elf_obj_tdata)); BFD_ASSERT (object_size >= sizeof (struct elf_obj_tdata));
abfd->tdata.any = bfd_zalloc (abfd, object_size); abfd->tdata.any = bfd_zalloc (abfd, object_size);
if (abfd->tdata.any == NULL) if (abfd->tdata.any == NULL)

10
bfd/elf32-hppa.c
View File

@ -334,6 +334,15 @@ struct elf32_hppa_link_hash_table
#define eh_name(eh) \ #define eh_name(eh) \
(eh ? eh->root.root.string : "<undef>") (eh ? eh->root.root.string : "<undef>")
/* Override the generic function because we want to mark our BFDs. */
static bfd_boolean
elf32_hppa_mkobject (bfd *abfd)
{
return bfd_elf_allocate_object (abfd, sizeof (struct elf_obj_tdata),
HPPA_ELF_TDATA);
}
/* Assorted hash table functions. */ /* Assorted hash table functions. */
/* Initialize an entry in the stub hash table. */ /* Initialize an entry in the stub hash table. */
@ -4607,6 +4616,7 @@ elf32_hppa_elf_get_symbol_type (Elf_Internal_Sym *elf_sym, int type)
#define elf_info_to_howto_rel elf_hppa_info_to_howto_rel #define elf_info_to_howto_rel elf_hppa_info_to_howto_rel
/* Stuff for the BFD linker. */ /* Stuff for the BFD linker. */
#define bfd_elf32_mkobject elf32_hppa_mkobject
#define bfd_elf32_bfd_final_link elf32_hppa_final_link #define bfd_elf32_bfd_final_link elf32_hppa_final_link
#define bfd_elf32_bfd_link_hash_table_create elf32_hppa_link_hash_table_create #define bfd_elf32_bfd_link_hash_table_create elf32_hppa_link_hash_table_create
#define bfd_elf32_bfd_link_hash_table_free elf32_hppa_link_hash_table_free #define bfd_elf32_bfd_link_hash_table_free elf32_hppa_link_hash_table_free

35
bfd/elf32-ppc.c
View File

@ -1736,6 +1736,10 @@ struct ppc_elf_obj_tdata
#define elf_local_ptr_offsets(bfd) \ #define elf_local_ptr_offsets(bfd) \
(ppc_elf_tdata (bfd)->linker_section_pointers) (ppc_elf_tdata (bfd)->linker_section_pointers)
#define is_ppc_elf(bfd) \
(bfd_get_flavour (bfd) == bfd_target_elf_flavour \
&& elf_object_id (bfd) == PPC32_ELF_TDATA)
/* Override the generic function because we store some extras. */ /* Override the generic function because we store some extras. */
static bfd_boolean static bfd_boolean
@ -2743,20 +2747,6 @@ ppc_elf_copy_indirect_symbol (struct bfd_link_info *info,
} }
} }
/* Return 1 if target is one of ours. */
static bfd_boolean
is_ppc_elf_target (const struct bfd_target *targ)
{
extern const bfd_target bfd_elf32_powerpc_vec;
extern const bfd_target bfd_elf32_powerpc_vxworks_vec;
extern const bfd_target bfd_elf32_powerpcle_vec;
return (targ == &bfd_elf32_powerpc_vec
|| targ == &bfd_elf32_powerpc_vxworks_vec
|| targ == &bfd_elf32_powerpcle_vec);
}
/* Hook called by the linker routine which adds symbols from an object /* Hook called by the linker routine which adds symbols from an object
file. We use it to put .comm items in .sbss, and not .bss. */ file. We use it to put .comm items in .sbss, and not .bss. */
@ -2771,8 +2761,8 @@ ppc_elf_add_symbol_hook (bfd *abfd,
{ {
if (sym->st_shndx == SHN_COMMON if (sym->st_shndx == SHN_COMMON
&& !info->relocatable && !info->relocatable
&& sym->st_size <= elf_gp_size (abfd) && is_ppc_elf (info->output_bfd)
&& is_ppc_elf_target (info->output_bfd->xvec)) && sym->st_size <= elf_gp_size (abfd))
{ {
/* Common symbols less than or equal to -G nn bytes are automatically /* Common symbols less than or equal to -G nn bytes are automatically
put into .sbss. */ put into .sbss. */
@ -2889,7 +2879,7 @@ elf_create_pointer_linker_section (bfd *abfd,
} }
else else
{ {
BFD_ASSERT (is_ppc_elf_target (abfd->xvec)); BFD_ASSERT (is_ppc_elf (abfd));
/* Allocation of a pointer to a local symbol. */ /* Allocation of a pointer to a local symbol. */
elf_linker_section_pointers_t **ptr = elf_local_ptr_offsets (abfd); elf_linker_section_pointers_t **ptr = elf_local_ptr_offsets (abfd);
@ -3055,7 +3045,7 @@ ppc_elf_check_relocs (bfd *abfd,
sec, abfd); sec, abfd);
#endif #endif
BFD_ASSERT (is_ppc_elf_target (abfd->xvec)); BFD_ASSERT (is_ppc_elf (abfd));
/* Initialize howto table if not already done. */ /* Initialize howto table if not already done. */
if (!ppc_elf_howto_table[R_PPC_ADDR32]) if (!ppc_elf_howto_table[R_PPC_ADDR32])
@ -3711,8 +3701,7 @@ ppc_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
flagword new_flags; flagword new_flags;
bfd_boolean error; bfd_boolean error;
if (!is_ppc_elf_target (ibfd->xvec) if (!is_ppc_elf (ibfd) || !is_ppc_elf (obfd))
|| !is_ppc_elf_target (obfd->xvec))
return TRUE; return TRUE;
/* Check if we have the same endianess. */ /* Check if we have the same endianess. */
@ -3825,7 +3814,7 @@ ppc_elf_select_plt_layout (bfd *output_bfd ATTRIBUTE_UNUSED,
if (plt_type == PLT_UNSET) if (plt_type == PLT_UNSET)
plt_type = PLT_OLD; plt_type = PLT_OLD;
for (ibfd = info->input_bfds; ibfd; ibfd = ibfd->link_next) for (ibfd = info->input_bfds; ibfd; ibfd = ibfd->link_next)
if (is_ppc_elf_target (ibfd->xvec)) if (is_ppc_elf (ibfd))
{ {
if (ppc_elf_tdata (ibfd)->has_rel16) if (ppc_elf_tdata (ibfd)->has_rel16)
plt_type = PLT_NEW; plt_type = PLT_NEW;
@ -4916,7 +4905,7 @@ ppc_elf_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
bfd_size_type locsymcount; bfd_size_type locsymcount;
Elf_Internal_Shdr *symtab_hdr; Elf_Internal_Shdr *symtab_hdr;
if (!is_ppc_elf_target (ibfd->xvec)) if (!is_ppc_elf (ibfd))
continue; continue;
for (s = ibfd->sections; s != NULL; s = s->next) for (s = ibfd->sections; s != NULL; s = s->next)
@ -5675,7 +5664,7 @@ elf_finish_pointer_linker_section (bfd *input_bfd,
/* Handle local symbol. */ /* Handle local symbol. */
unsigned long r_symndx = ELF32_R_SYM (rel->r_info); unsigned long r_symndx = ELF32_R_SYM (rel->r_info);
BFD_ASSERT (is_ppc_elf_target (input_bfd->xvec)); BFD_ASSERT (is_ppc_elf (input_bfd));
BFD_ASSERT (elf_local_ptr_offsets (input_bfd) != NULL); BFD_ASSERT (elf_local_ptr_offsets (input_bfd) != NULL);
linker_section_ptr = elf_local_ptr_offsets (input_bfd)[r_symndx]; linker_section_ptr = elf_local_ptr_offsets (input_bfd)[r_symndx];
} }

39
bfd/elf64-ppc.c
View File

@ -2425,6 +2425,10 @@ struct ppc64_elf_obj_tdata
#define ppc64_tlsld_got(bfd) \ #define ppc64_tlsld_got(bfd) \
(&ppc64_elf_tdata (bfd)->tlsld_got) (&ppc64_elf_tdata (bfd)->tlsld_got)
#define is_ppc64_elf(bfd) \
(bfd_get_flavour (bfd) == bfd_target_elf_flavour \
&& elf_object_id (bfd) == PPC64_ELF_TDATA)
/* Override the generic function because we store some extras. */ /* Override the generic function because we store some extras. */
static bfd_boolean static bfd_boolean
@ -2434,17 +2438,6 @@ ppc64_elf_mkobject (bfd *abfd)
PPC64_ELF_TDATA); PPC64_ELF_TDATA);
} }
/* Return 1 if target is one of ours. */
static bfd_boolean
is_ppc64_elf_target (const struct bfd_target *targ)
{
extern const bfd_target bfd_elf64_powerpc_vec;
extern const bfd_target bfd_elf64_powerpcle_vec;
return targ == &bfd_elf64_powerpc_vec || targ == &bfd_elf64_powerpcle_vec;
}
/* Fix bad default arch selected for a 64 bit input bfd when the /* Fix bad default arch selected for a 64 bit input bfd when the
default is 32 bit. */ default is 32 bit. */
@ -3882,7 +3875,7 @@ create_got_section (bfd *abfd, struct bfd_link_info *info)
flagword flags; flagword flags;
struct ppc_link_hash_table *htab = ppc_hash_table (info); struct ppc_link_hash_table *htab = ppc_hash_table (info);
if (! is_ppc64_elf_target (abfd->xvec)) if (!is_ppc64_elf (abfd))
return FALSE; return FALSE;
if (!htab->got) if (!htab->got)
@ -4275,10 +4268,10 @@ ppc64_elf_check_directives (bfd *ibfd, struct bfd_link_info *info)
struct ppc_link_hash_entry **p, *eh; struct ppc_link_hash_entry **p, *eh;
htab = ppc_hash_table (info); htab = ppc_hash_table (info);
if (!is_ppc64_elf_target (info->output_bfd->xvec)) if (!is_ppc64_elf (info->output_bfd))
return TRUE; return TRUE;
if (is_ppc64_elf_target (ibfd->xvec)) if (is_ppc64_elf (ibfd))
{ {
p = &htab->dot_syms; p = &htab->dot_syms;
while ((eh = *p) != NULL) while ((eh = *p) != NULL)
@ -4422,7 +4415,7 @@ ppc64_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
if ((sec->flags & SEC_ALLOC) == 0) if ((sec->flags & SEC_ALLOC) == 0)
return TRUE; return TRUE;
BFD_ASSERT (is_ppc64_elf_target (abfd->xvec)); BFD_ASSERT (is_ppc64_elf (abfd));
htab = ppc_hash_table (info); htab = ppc_hash_table (info);
symtab_hdr = &elf_symtab_hdr (abfd); symtab_hdr = &elf_symtab_hdr (abfd);
@ -4988,7 +4981,7 @@ opd_entry_value (asection *opd_sec,
return val; return val;
} }
BFD_ASSERT (is_ppc64_elf_target (opd_bfd->xvec)); BFD_ASSERT (is_ppc64_elf (opd_bfd));
relocs = ppc64_elf_tdata (opd_bfd)->opd_relocs; relocs = ppc64_elf_tdata (opd_bfd)->opd_relocs;
if (relocs == NULL) if (relocs == NULL)
@ -7749,7 +7742,7 @@ allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
continue; continue;
} }
if (! is_ppc64_elf_target (gent->owner->xvec)) if (!is_ppc64_elf (gent->owner))
continue; continue;
s = ppc64_elf_tdata (gent->owner)->got; s = ppc64_elf_tdata (gent->owner)->got;
@ -7929,7 +7922,7 @@ ppc64_elf_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
Elf_Internal_Shdr *symtab_hdr; Elf_Internal_Shdr *symtab_hdr;
asection *srel; asection *srel;
if (!is_ppc64_elf_target (ibfd->xvec)) if (!is_ppc64_elf (ibfd))
continue; continue;
for (s = ibfd->sections; s != NULL; s = s->next) for (s = ibfd->sections; s != NULL; s = s->next)
@ -8006,7 +7999,7 @@ ppc64_elf_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next) for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
{ {
if (!is_ppc64_elf_target (ibfd->xvec)) if (!is_ppc64_elf (ibfd))
continue; continue;
if (ppc64_tlsld_got (ibfd)->refcount > 0) if (ppc64_tlsld_got (ibfd)->refcount > 0)
@ -8093,7 +8086,7 @@ ppc64_elf_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED,
for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next) for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
{ {
if (!is_ppc64_elf_target (ibfd->xvec)) if (!is_ppc64_elf (ibfd))
continue; continue;
s = ppc64_elf_tdata (ibfd)->got; s = ppc64_elf_tdata (ibfd)->got;
@ -9310,7 +9303,7 @@ ppc64_elf_size_stubs (bfd *output_bfd,
asection *section; asection *section;
Elf_Internal_Sym *local_syms = NULL; Elf_Internal_Sym *local_syms = NULL;
if (!is_ppc64_elf_target (input_bfd->xvec)) if (!is_ppc64_elf (input_bfd))
continue; continue;
/* We'll need the symbol table in a second. */ /* We'll need the symbol table in a second. */
@ -9961,7 +9954,7 @@ ppc64_elf_relocate_section (bfd *output_bfd,
if (input_section->owner == htab->stub_bfd) if (input_section->owner == htab->stub_bfd)
return TRUE; return TRUE;
BFD_ASSERT (is_ppc64_elf_target (input_bfd->xvec)); BFD_ASSERT (is_ppc64_elf (input_bfd));
local_got_ents = elf_local_got_ents (input_bfd); local_got_ents = elf_local_got_ents (input_bfd);
TOCstart = elf_gp (output_bfd); TOCstart = elf_gp (output_bfd);
@ -11597,7 +11590,7 @@ ppc64_elf_finish_dynamic_sections (bfd *output_bfd,
{ {
asection *s; asection *s;
if (!is_ppc64_elf_target (dynobj->xvec)) if (!is_ppc64_elf (dynobj))
continue; continue;
s = ppc64_elf_tdata (dynobj)->got; s = ppc64_elf_tdata (dynobj)->got;