From bcab203d31b2dd7e0b35abda34c42c278217bcf6 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Sat, 6 Jun 2020 17:40:47 -0700 Subject: [PATCH] Remove is_vxworks from _bfd_sparc_elf_link_hash_table Replace is_vxworks with elf.target_os == is_vxworks. * elfxx-sparc.c (_bfd_sparc_elf_size_dynamic_sections): Updated. * elfxx-sparc.h (_bfd_sparc_elf_link_hash_table): Remove is_vxworks. --- bfd/ChangeLog | 6 ++++++ bfd/elfxx-sparc.c | 2 +- bfd/elfxx-sparc.h | 3 --- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 0fb6637a762..12123edc3e2 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2020-06-06 H.J. Lu + + * elfxx-sparc.c (_bfd_sparc_elf_size_dynamic_sections): Updated. + * elfxx-sparc.h (_bfd_sparc_elf_link_hash_table): Remove + is_vxworks. + 2020-06-06 H.J. Lu * elf-bfd.h (elf_target_os): New. diff --git a/bfd/elfxx-sparc.c b/bfd/elfxx-sparc.c index eca44c9b5f9..4dcdd1793eb 100644 --- a/bfd/elfxx-sparc.c +++ b/bfd/elfxx-sparc.c @@ -2678,7 +2678,7 @@ _bfd_sparc_elf_size_dynamic_sections (bfd *output_bfd, eht->dynsymcount++; } } - if (htab->is_vxworks + if (htab->elf.target_os == is_vxworks && !elf_vxworks_add_dynamic_entries (output_bfd, info)) return FALSE; } diff --git a/bfd/elfxx-sparc.h b/bfd/elfxx-sparc.h index 45e5542a251..40822458619 100644 --- a/bfd/elfxx-sparc.h +++ b/bfd/elfxx-sparc.h @@ -62,9 +62,6 @@ struct _bfd_sparc_elf_link_hash_table htab_t loc_hash_table; void *loc_hash_memory; - /* True if the target system is VxWorks. */ - int is_vxworks; - /* The (unloaded but important) .rela.plt.unloaded section, for VxWorks. */ asection *srelplt2; -- 2.30.2