diff options
| -rw-r--r-- | bfd/ChangeLog | 10 | ||||
| -rw-r--r-- | bfd/elf32-i386.c | 9 | ||||
| -rw-r--r-- | bfd/elf64-x86-64.c | 10 | ||||
| -rw-r--r-- | bfd/elfxx-x86.c | 22 | ||||
| -rw-r--r-- | bfd/elfxx-x86.h | 8 |
5 files changed, 23 insertions, 36 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index b3eae2e..06b9278 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,15 @@ 2017-09-09 H.J. Lu <hongjiu.lu@intel.com> + * elf32-i386.c (elf_i386_relocate_section): Update usage of + UNDEFINED_WEAK_RESOLVED_TO_ZERO. + (elf_i386_finish_dynamic_symbol): Likewise. + * elf64-x86-64.c (elf_x86_64_relocate_section): Likewise. + (elf_x86_64_finish_dynamic_symbol): Likewise. + * elfxx-x86.c (elf_x86_allocate_dynrelocs): Likewise. + (_bfd_x86_elf_fixup_symbol): Likewise. + +2017-09-09 H.J. Lu <hongjiu.lu@intel.com> + * elfxx-x86.c (_bfd_x86_elf_link_symbol_references_local): Don't check has_non_got_reloc. diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c index 0100662..4337ab0 100644 --- a/bfd/elf32-i386.c +++ b/bfd/elf32-i386.c @@ -2466,10 +2466,7 @@ do_ifunc_pointer: } resolved_to_zero = (eh != NULL - && UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, - I386_ELF_DATA, - eh->has_got_reloc, - eh)); + && UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, eh)); switch (r_type) { @@ -3623,9 +3620,7 @@ elf_i386_finish_dynamic_symbol (bfd *output_bfd, /* We keep PLT/GOT entries without dynamic PLT/GOT relocations for resolved undefined weak symbols in executable so that their references have value 0 at run-time. */ - local_undefweak = UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, I386_ELF_DATA, - eh->has_got_reloc, - eh); + local_undefweak = UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, eh); if (h->plt.offset != (bfd_vma) -1) { diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c index 4faa78b..4371a16 100644 --- a/bfd/elf64-x86-64.c +++ b/bfd/elf64-x86-64.c @@ -2766,10 +2766,7 @@ do_ifunc_pointer: } resolved_to_zero = (eh != NULL - && UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, - X86_64_ELF_DATA, - eh->has_got_reloc, - eh)); + && UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, eh)); /* When generating a shared object, the relocations handled here are copied into the output file to be resolved at run time. */ @@ -3985,10 +3982,7 @@ elf_x86_64_finish_dynamic_symbol (bfd *output_bfd, /* We keep PLT/GOT entries without dynamic PLT/GOT relocations for resolved undefined weak symbols in executable so that their references have value 0 at run-time. */ - local_undefweak = UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, - X86_64_ELF_DATA, - eh->has_got_reloc, - eh); + local_undefweak = UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, eh); if (h->plt.offset != (bfd_vma) -1) { diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c index 20b07f0..c41dbef 100644 --- a/bfd/elfxx-x86.c +++ b/bfd/elfxx-x86.c @@ -107,10 +107,7 @@ elf_x86_allocate_dynrelocs (struct elf_link_hash_entry *h, plt_entry_size = htab->plt.plt_entry_size; - resolved_to_zero = UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, - bed->target_id, - eh->has_got_reloc, - eh); + resolved_to_zero = UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, eh); /* Clear the reference count of function pointer relocations if symbol isn't a normal function. */ @@ -1446,19 +1443,12 @@ bfd_boolean _bfd_x86_elf_fixup_symbol (struct bfd_link_info *info, struct elf_link_hash_entry *h) { - if (h->dynindx != -1) + if (h->dynindx != -1 + && UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, elf_x86_hash_entry (h))) { - const struct elf_backend_data *bed - = get_elf_backend_data (info->output_bfd); - if (UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, - bed->target_id, - elf_x86_hash_entry (h)->has_got_reloc, - elf_x86_hash_entry (h))) - { - h->dynindx = -1; - _bfd_elf_strtab_delref (elf_hash_table (info)->dynstr, - h->dynstr_index); - } + h->dynindx = -1; + _bfd_elf_strtab_delref (elf_hash_table (info)->dynstr, + h->dynstr_index); } return TRUE; } diff --git a/bfd/elfxx-x86.h b/bfd/elfxx-x86.h index 57f7862..2aee350 100644 --- a/bfd/elfxx-x86.h +++ b/bfd/elfxx-x86.h @@ -56,14 +56,12 @@ 2. Has no GOT/PLT relocation. Local undefined weak symbol is always resolved to 0. */ -#define UNDEFINED_WEAK_RESOLVED_TO_ZERO(INFO, ID, GOT_RELOC, EH) \ +#define UNDEFINED_WEAK_RESOLVED_TO_ZERO(INFO, EH) \ ((EH)->elf.root.type == bfd_link_hash_undefweak \ && (SYMBOL_REFERENCES_LOCAL_P ((INFO), &(EH)->elf) \ || (bfd_link_executable (INFO) \ - && (elf_x86_hash_table ((INFO), (ID))->interp == NULL \ - || !(GOT_RELOC) \ - || (EH)->has_non_got_reloc \ - || !(INFO)->dynamic_undefined_weak)))) + && (!(EH)->has_got_reloc \ + || (EH)->has_non_got_reloc)))) /* Should copy relocation be generated for a symbol. Don't generate copy relocation against a protected symbol defined in a shared |