From 4dfe6ac6feb4515960e05c7c4a428b54318c75a3 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Thu, 4 Feb 2010 09:16:43 +0000 Subject: * 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. --- bfd/elf32-cr16.c | 71 ++++++++++---------------------------------------------- 1 file changed, 12 insertions(+), 59 deletions(-) (limited to 'bfd/elf32-cr16.c') diff --git a/bfd/elf32-cr16.c b/bfd/elf32-cr16.c index 84d9550..354cbd9 100644 --- a/bfd/elf32-cr16.c +++ b/bfd/elf32-cr16.c @@ -32,7 +32,8 @@ linking with -Bsymbolic. We store the information in a field extending the regular ELF linker hash table. */ -struct elf32_cr16_link_hash_entry { +struct elf32_cr16_link_hash_entry +{ /* The basic elf link hash table entry. */ struct elf_link_hash_entry root; @@ -66,35 +67,6 @@ struct elf32_cr16_link_hash_entry { bfd_vma value; }; -/* We derive a hash table from the main elf linker hash table so - we can store state variables and a secondary hash table without - resorting to global variables. */ -struct elf32_cr16_link_hash_table { - /* The main hash table. */ - struct elf_link_hash_table root; - - /* A hash table for static functions. We could derive a new hash table - instead of using the full elf32_cr16_link_hash_table if we wanted - to save some memory. */ - struct elf32_cr16_link_hash_table *static_hash_table; - - /* Random linker state flags. */ -#define CR16_HASH_ENTRIES_INITIALIZED 0x1 - char flags; -}; - -/* For CR16 linker hash table. */ - -/* Get the CR16 ELF linker hash table from a link_info structure. */ - -#define elf32_cr16_hash_table(p) \ - ((struct elf32_cr16_link_hash_table *) ((p)->hash)) - -#define elf32_cr16_link_hash_traverse(table, func, info) \ - (elf_link_hash_traverse \ - (&(table)->root, \ - (bfd_boolean (*) ((struct elf_link_hash_entry *, void *))) (func), (info))) - /* cr16_reloc_map array maps BFD relocation enum into a CRGAS relocation type. */ struct cr16_reloc_map @@ -1700,40 +1672,23 @@ elf32_cr16_link_hash_newfunc (struct bfd_hash_entry *entry, static struct bfd_link_hash_table * elf32_cr16_link_hash_table_create (bfd *abfd) { - struct elf32_cr16_link_hash_table *ret; - bfd_size_type amt = sizeof (struct elf32_cr16_link_hash_table); + struct elf_link_hash_table *ret; + bfd_size_type amt = sizeof (struct elf_link_hash_table); - ret = (struct elf32_cr16_link_hash_table *) bfd_malloc (amt); - if (ret == (struct elf32_cr16_link_hash_table *) NULL) + ret = (struct elf_link_hash_table *) bfd_malloc (amt); + if (ret == (struct elf_link_hash_table *) NULL) return NULL; - if (!_bfd_elf_link_hash_table_init (&ret->root, abfd, + if (!_bfd_elf_link_hash_table_init (ret, abfd, elf32_cr16_link_hash_newfunc, - sizeof (struct elf32_cr16_link_hash_entry))) - { - free (ret); - return NULL; - } - - ret->flags = 0; - amt = sizeof (struct elf_link_hash_table); - ret->static_hash_table - = (struct elf32_cr16_link_hash_table *) bfd_malloc (amt); - if (ret->static_hash_table == NULL) + sizeof (struct elf32_cr16_link_hash_entry), + GENERIC_ELF_DATA)) { free (ret); return NULL; } - if (!_bfd_elf_link_hash_table_init (&ret->static_hash_table->root, abfd, - elf32_cr16_link_hash_newfunc, - sizeof (struct elf32_cr16_link_hash_entry))) - { - free (ret->static_hash_table); - free (ret); - return NULL; - } - return &ret->root.root; + return &ret->root; } /* Free an cr16 ELF linker hash table. */ @@ -1741,12 +1696,10 @@ elf32_cr16_link_hash_table_create (bfd *abfd) static void elf32_cr16_link_hash_table_free (struct bfd_link_hash_table *hash) { - struct elf32_cr16_link_hash_table *ret - = (struct elf32_cr16_link_hash_table *) hash; + struct elf_link_hash_table *ret + = (struct elf_link_hash_table *) hash; _bfd_generic_link_hash_table_free - ((struct bfd_link_hash_table *) ret->static_hash_table); - _bfd_generic_link_hash_table_free ((struct bfd_link_hash_table *) ret); } -- cgit v1.1