From add5f777decf9257f46c98dc2aacedb52a3d65e6 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Thu, 4 Jun 2020 09:56:25 -0700 Subject: [PATCH] x86: Remove target_id from elf_x86_link_hash_table Since target_id in elf_x86_link_hash_table is the same as hash_table_id in elf_link_hash_table, we can use elf.hash_table_id instead of target_id. * elfxx-x86.h (elf_x86_link_hash_table): Remove target_id. (is_x86_elf): Check elf.hash_table_id instead of target_id. * elfxx-x86.c (_bfd_x86_elf_link_hash_table_create): Updated. --- bfd/ChangeLog | 6 ++++++ bfd/elfxx-x86.c | 1 - bfd/elfxx-x86.h | 3 +-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 13a3ed180b5..fb87353fe15 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2020-06-04 H.J. Lu + + * elfxx-x86.h (elf_x86_link_hash_table): Remove target_id. + (is_x86_elf): Check elf.hash_table_id instead of target_id. + * elfxx-x86.c (_bfd_x86_elf_link_hash_table_create): Updated. + 2020-06-04 H.J. Lu PR ld/26080 diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c index 035b5c5c64c..d796292562b 100644 --- a/bfd/elfxx-x86.c +++ b/bfd/elfxx-x86.c @@ -762,7 +762,6 @@ _bfd_x86_elf_link_hash_table_create (bfd *abfd) ret->tls_get_addr = "___tls_get_addr"; } } - ret->target_id = bed->target_id; ret->target_os = get_elf_x86_backend_data (abfd)->target_os; ret->loc_hash_table = htab_try_create (1024, diff --git a/bfd/elfxx-x86.h b/bfd/elfxx-x86.h index c717cd16e56..de4e78f443e 100644 --- a/bfd/elfxx-x86.h +++ b/bfd/elfxx-x86.h @@ -531,7 +531,6 @@ struct elf_x86_link_hash_table bfd_vma (*r_info) (bfd_vma, bfd_vma); bfd_vma (*r_sym) (bfd_vma); bfd_boolean (*is_reloc_section) (const char *); - enum elf_target_id target_id; enum elf_x86_target_os target_os; unsigned int sizeof_reloc; unsigned int dt_reloc; @@ -629,7 +628,7 @@ struct elf_x86_plt #define is_x86_elf(bfd, htab) \ (bfd_get_flavour (bfd) == bfd_target_elf_flavour \ && elf_tdata (bfd) != NULL \ - && elf_object_id (bfd) == (htab)->target_id) + && elf_object_id (bfd) == (htab)->elf.hash_table_id) extern bfd_boolean _bfd_x86_elf_mkobject (bfd *); -- 2.30.2