mirror of
https://github.com/espressif/binutils-gdb.git
synced 2025-09-09 17:02:22 +08:00
* elf-bfd.h (emum elf_object_id): Rename to elf_target_id. Add
entries for other architectures. (struct elf_link_hash_table): Add hash_table_id field. (elf_hash_table_id): New accessor macro. * elflink.c (_bfd_elf_link_hash_table_init): Add target_id parameter. * elf-m10300.c (elf32_mn10300_hash_table): Check table id before returning cast pointer. (elf32_mn10300_link_hash_table_create): Identify new table as containing MN10300 extensions. (mn10300_elf_relax_section): Check pointer returned by elf32_mn10300_hash_table. * elf32-arm.c: Likewise, except using ARM extensions. * elf32-avr.c: Likewise, except using AVR extensions. * elf32-bfin.c: Likewise, except using BFIN extensions. * elf32-cris.c: Likewise, except using CRIS extensions. * elf32-frv.c: Likewise, except using FRV extensions. * elf32-hppa.c: Likewise, except using HPPA32 extensions. * elf32-i386.c: Likewise, except using I386 extensions. * elf32-lm32.c: Likewise, except using LM32 extensions. * elf32-m32r.c: Likewise, except using M32RM extensions. * elf32-m68hc11.c: Likewise, except using M68HC11 extensions. * elf32-m68hc1x.c: Likewise, except using M68HC11 extensions. * elf32-m68hc1x.h: Likewise, except using M68HC11 extensions. * elf32-m68k.c: Likewise, except using M68K extensions. * elf32-microblaze.c: Likewise, except using MICROBLAZE extensions. * elf32-ppc.c: Likewise, except using PPC32 extensions. * elf32-s390.c: Likewise, except using S390 extensions. * elf32-sh.c: Likewise, except using SH extensions. * elf32-spu.c: Likewise, except using SPU extensions. * elf32-xtensa.c: Likewise, except using XTENSA extensions. * elf64-alpha.c: Likewise, except using ALPHA extensions. * elf64-hppa.c: Likewise, except using HPPA64 extensions. * elf64-ppc.c: Likewise, except using PPC64 extensions. * elf64-s390.c: Likewise, except using S390 extensions. * elf64-x86-64.c: Likewise, except using X86_64 extensions. * elfxx-ia64.c: Likewise, except using IA64 extensions. * elfxx-mips.c: Likewise, except using MIPS extensions. * elfxx-sparc.c: Likewise, except using SPARC extensions. * elfxx-sparc.h: Likewise, except using SPARC extensions. * elf32-cr16.c (struct elf32_cr16_link_hash_table): Delete redundant structure. (elf32_cr16_hash_table): Delete unused macro. (elf32_cr16_link_hash_traverse): Delete unused macro. * elf32-score.c: Likewise. * elf32-score7.c: Likewise. * elf32-vax.c: Likewise. * elf64-sh64.c: Likewise. * emultempl/alphaelf.em: Update value expected from elf_object_id. * emultempl/hppaelf.em: Likewise. * emultempl/mipself.em: Likewise. * emultempl/ppc32elf.em: Likewise. * emultempl/ppc64elf.em: Likewise.
This commit is contained in:
@ -1,6 +1,6 @@
|
||||
/* AVR-specific support for 32-bit ELF
|
||||
Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
|
||||
Free Software Foundation, Inc.
|
||||
Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
|
||||
2010 Free Software Foundation, Inc.
|
||||
Contributed by Denis Chertykov <denisc@overta.ru>
|
||||
|
||||
This file is part of BFD, the Binary File Descriptor library.
|
||||
@ -38,7 +38,7 @@ static bfd_boolean debug_stubs = FALSE;
|
||||
|
||||
/* We use two hash tables to hold information for linking avr objects.
|
||||
|
||||
The first is the elf32_avr_link_hash_tablse which is derived from the
|
||||
The first is the elf32_avr_link_hash_table which is derived from the
|
||||
stanard ELF linker hash table. We use this as a place to attach the other
|
||||
hash table and some static information.
|
||||
|
||||
@ -104,8 +104,8 @@ struct elf32_avr_link_hash_table
|
||||
/* Various hash macros and functions. */
|
||||
#define avr_link_hash_table(p) \
|
||||
/* PR 3874: Check that we have an AVR style hash table before using it. */\
|
||||
((p)->hash->table.newfunc != elf32_avr_link_hash_newfunc ? NULL : \
|
||||
((struct elf32_avr_link_hash_table *) ((p)->hash)))
|
||||
(elf_hash_table_id ((struct elf_link_hash_table *) ((p)->hash)) \
|
||||
== AVR_ELF_DATA ? ((struct elf32_avr_link_hash_table *) ((p)->hash)) : NULL)
|
||||
|
||||
#define avr_stub_hash_entry(ent) \
|
||||
((struct elf32_avr_stub_hash_entry *)(ent))
|
||||
@ -617,7 +617,8 @@ elf32_avr_link_hash_table_create (bfd *abfd)
|
||||
|
||||
if (!_bfd_elf_link_hash_table_init (&htab->etab, abfd,
|
||||
elf32_avr_link_hash_newfunc,
|
||||
sizeof (struct elf_link_hash_entry)))
|
||||
sizeof (struct elf_link_hash_entry),
|
||||
AVR_ELF_DATA))
|
||||
{
|
||||
free (htab);
|
||||
return NULL;
|
||||
@ -1167,6 +1168,9 @@ elf32_avr_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
|
||||
Elf_Internal_Rela * relend;
|
||||
struct elf32_avr_link_hash_table * htab = avr_link_hash_table (info);
|
||||
|
||||
if (htab == NULL)
|
||||
return FALSE;
|
||||
|
||||
symtab_hdr = & elf_tdata (input_bfd)->symtab_hdr;
|
||||
sym_hashes = elf_sym_hashes (input_bfd);
|
||||
relend = relocs + input_section->reloc_count;
|
||||
@ -2563,7 +2567,7 @@ elf32_avr_setup_section_lists (bfd *output_bfd,
|
||||
asection *section;
|
||||
asection **input_list, **list;
|
||||
bfd_size_type amt;
|
||||
struct elf32_avr_link_hash_table *htab = avr_link_hash_table(info);
|
||||
struct elf32_avr_link_hash_table *htab = avr_link_hash_table (info);
|
||||
|
||||
if (htab == NULL || htab->no_stubs)
|
||||
return 0;
|
||||
|
Reference in New Issue
Block a user