From a6fd92b0578c5d2172799d7f38ddbda1bd87ea03 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Fri, 6 Apr 2018 05:06:08 -0700 Subject: [PATCH] x86-64: Don't mask out R_X86_64_converted_reloc_bit R_X86_64_converted_reloc_bit is set in elf_x86_64_convert_load_reloc which is called from elf_x86_64_check_relocs. Since it is used only internally by linker, there is no need to mask it out in elf_x86_64_info_to_howto. * elf64-x86-64.c (elf_x86_64_info_to_howto): Don't mask out R_X86_64_converted_reloc_bit. --- bfd/ChangeLog | 5 +++++ bfd/elf64-x86-64.c | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 58ec0ce83e5..a8eaebb9af0 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2018-04-06 H.J. Lu + + * elf64-x86-64.c (elf_x86_64_info_to_howto): Don't mask out + R_X86_64_converted_reloc_bit. + 2018-04-05 H.J. Lu PR gas/22318 diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c index fcc82363735..25723797ba5 100644 --- a/bfd/elf64-x86-64.c +++ b/bfd/elf64-x86-64.c @@ -344,9 +344,6 @@ elf_x86_64_info_to_howto (bfd *abfd, arelent *cache_ptr, unsigned r_type; r_type = ELF32_R_TYPE (dst->r_info); - if (r_type != (unsigned int) R_X86_64_GNU_VTINHERIT - && r_type != (unsigned int) R_X86_64_GNU_VTENTRY) - r_type &= ~R_X86_64_converted_reloc_bit; cache_ptr->howto = elf_x86_64_rtype_to_howto (abfd, r_type); if (cache_ptr->howto == NULL) return FALSE; -- 2.30.2