diff options
author | Nick Clifton <nickc@redhat.com> | 2010-02-04 09:16:43 +0000 |
---|---|---|
committer | Nick Clifton <nickc@redhat.com> | 2010-02-04 09:16:43 +0000 |
commit | 4dfe6ac6feb4515960e05c7c4a428b54318c75a3 (patch) | |
tree | a7abb34e98ddf06506e83475dde75472851f83c0 /bfd/elf32-score7.c | |
parent | 11334b8260ff935cb9a6e98de0096048a662e48a (diff) | |
download | gdb-4dfe6ac6feb4515960e05c7c4a428b54318c75a3.zip gdb-4dfe6ac6feb4515960e05c7c4a428b54318c75a3.tar.gz gdb-4dfe6ac6feb4515960e05c7c4a428b54318c75a3.tar.bz2 |
* 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.
Diffstat (limited to 'bfd/elf32-score7.c')
-rw-r--r-- | bfd/elf32-score7.c | 74 |
1 files changed, 5 insertions, 69 deletions
diff --git a/bfd/elf32-score7.c b/bfd/elf32-score7.c index bb74f28..cd87ff3 100644 --- a/bfd/elf32-score7.c +++ b/bfd/elf32-score7.c @@ -1,5 +1,5 @@ /* 32-bit ELF support for S+core. - Copyright 2009 Free Software Foundation, Inc. + Copyright 2009, 2010 Free Software Foundation, Inc. Contributed by Brain.lin (brain.lin@sunplusct.com) Mei Ligang (ligang@sunnorth.com.cn) @@ -34,13 +34,6 @@ #include "elf32-score.h" -/* Score ELF linker hash table. */ -struct score_elf_link_hash_table -{ - /* The main hash table. */ - struct elf_link_hash_table root; -}; - /* The SCORE ELF linker needs additional information for each symbol in the global hash table. */ struct score_elf_link_hash_entry @@ -65,14 +58,10 @@ struct score_elf_link_hash_entry /* Traverse a score ELF linker hash table. */ #define score_elf_link_hash_traverse(table, func, info) \ (elf_link_hash_traverse \ - (&(table)->root, \ + ((table), \ (bfd_boolean (*) (struct elf_link_hash_entry *, void *)) (func), \ (info))) -/* Get the SCORE elf linker hash table from a link_info structure. */ -#define score_elf_hash_table(info) \ - ((struct score_elf_link_hash_table *) ((info)->hash)) - /* This structure is used to hold .got entries while estimating got sizes. */ struct score_got_entry { @@ -1020,10 +1009,9 @@ score_elf_sort_hash_table (struct bfd_link_info *info, too large offsets. */ - (g->next ? g->assigned_gotno : 0); hsd.max_non_got_dynindx = max_local; - score_elf_link_hash_traverse (((struct score_elf_link_hash_table *) - elf_hash_table (info)), - score_elf_sort_hash_table_f, - &hsd); + score_elf_link_hash_traverse (elf_hash_table (info), + score_elf_sort_hash_table_f, + &hsd); /* There should have been enough room in the symbol table to accommodate both the GOT and non-GOT symbols. */ @@ -1038,36 +1026,6 @@ score_elf_sort_hash_table (struct bfd_link_info *info, return TRUE; } -/* Create an entry in an score ELF linker hash table. */ - -static struct bfd_hash_entry * -score_elf_link_hash_newfunc (struct bfd_hash_entry *entry, - struct bfd_hash_table *table, - const char *string) -{ - struct score_elf_link_hash_entry *ret = (struct score_elf_link_hash_entry *) entry; - - /* Allocate the structure if it has not already been allocated by a subclass. */ - if (ret == NULL) - ret = bfd_hash_allocate (table, sizeof (struct score_elf_link_hash_entry)); - if (ret == NULL) - return (struct bfd_hash_entry *) ret; - - /* Call the allocation method of the superclass. */ - ret = ((struct score_elf_link_hash_entry *) - _bfd_elf_link_hash_newfunc ((struct bfd_hash_entry *) ret, table, string)); - - if (ret != NULL) - { - ret->possibly_dynamic_relocs = 0; - ret->readonly_reloc = FALSE; - ret->no_fn_stub = FALSE; - ret->forced_local = FALSE; - } - - return (struct bfd_hash_entry *) ret; -} - /* Returns the first relocation of type r_type found, beginning with RELOCATION. RELEND is one-past-the-end of the relocation table. */ @@ -3841,28 +3799,6 @@ s7_elf32_score_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED, bfd_reloc_code_rea return NULL; } -/* Create a score elf linker hash table. */ - -struct bfd_link_hash_table * -s7_elf32_score_link_hash_table_create (bfd *abfd) -{ - struct score_elf_link_hash_table *ret; - bfd_size_type amt = sizeof (struct score_elf_link_hash_table); - - ret = bfd_malloc (amt); - if (ret == NULL) - return NULL; - - if (!_bfd_elf_link_hash_table_init (&ret->root, abfd, score_elf_link_hash_newfunc, - sizeof (struct score_elf_link_hash_entry))) - { - free (ret); - return NULL; - } - - return &ret->root.root; -} - bfd_boolean s7_elf32_score_print_private_bfd_data (bfd *abfd, void * ptr) { |