From 18954b29a1b49c9ffbfef925fdac4a23194ef82d Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Tue, 10 Nov 2015 04:26:55 -0800 Subject: [PATCH] Handle x86 VTINHERIT/VTENTRY relocs when deleting relocations * elf32-i386.c (elf_i386_relocate_section): Handle VTINHERIT and VTENTRY relocations when deleting relocations. * elf64-x86-64.c (elf_x86_64_relocate_section): Likewise. --- bfd/ChangeLog | 6 ++++++ bfd/elf32-i386.c | 6 +++++- bfd/elf64-x86-64.c | 6 +++++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 8dbe72b9374..b74641343bc 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2015-11-10 H.J. Lu + + * elf32-i386.c (elf_i386_relocate_section): Handle VTINHERIT + and VTENTRY relocations when deleting relocations. + * elf64-x86-64.c (elf_x86_64_relocate_section): Likewise. + 2015-11-10 H.J. Lu * elf32-i386.c (elf_i386_relocate_section): Properly move diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c index ee45ed161a5..1df7244f621 100644 --- a/bfd/elf32-i386.c +++ b/bfd/elf32-i386.c @@ -3647,7 +3647,11 @@ elf_i386_relocate_section (bfd *output_bfd, r_type = ELF32_R_TYPE (rel->r_info); if (r_type == R_386_GNU_VTINHERIT || r_type == R_386_GNU_VTENTRY) - continue; + { + if (wrel != rel) + *wrel = *rel; + continue; + } if ((indx = r_type) >= R_386_standard && ((indx = r_type - R_386_ext_offset) - R_386_standard diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c index dfa12769ef7..8e003627993 100644 --- a/bfd/elf64-x86-64.c +++ b/bfd/elf64-x86-64.c @@ -3904,7 +3904,11 @@ elf_x86_64_relocate_section (bfd *output_bfd, r_type = ELF32_R_TYPE (rel->r_info); if (r_type == (int) R_X86_64_GNU_VTINHERIT || r_type == (int) R_X86_64_GNU_VTENTRY) - continue; + { + if (wrel != rel) + *wrel = *rel; + continue; + } if (r_type >= (int) R_X86_64_standard) { -- 2.30.2