From 13f422778ff5307dad1f66d25a1d211bb8f76a8b Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 24 Feb 2016 05:42:27 -0800 Subject: [PATCH] Set plt_got.offset to (bfd_vma) -1 Since plt_got.offset may be updated in x86 allocate_dynrelocs, set plt_got.offset to (bfd_vma) -1 when setting needs_plt to 0. * elf32-i386.c (elf_i386_allocate_dynrelocs): Set plt_got.offset to (bfd_vma) -1 when setting needs_plt to 0. * elf64-x86-64.c (elf_x86_64_allocate_dynrelocs): Likewise. --- bfd/ChangeLog | 6 ++++++ bfd/elf32-i386.c | 2 ++ bfd/elf64-x86-64.c | 2 ++ 3 files changed, 10 insertions(+) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 0ed70b4151..e48f76bdb5 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2016-02-24 H.J. Lu + + * elf32-i386.c (elf_i386_allocate_dynrelocs): Set plt_got.offset + to (bfd_vma) -1 when setting needs_plt to 0. + * elf64-x86-64.c (elf_x86_64_allocate_dynrelocs): Likewise. + 2016-02-23 H.J. Lu * elflink.c (bfd_elf_record_link_assignment): Check for shared diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c index a8951d8d58..f6c9c65749 100644 --- a/bfd/elf32-i386.c +++ b/bfd/elf32-i386.c @@ -2490,12 +2490,14 @@ elf_i386_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf) } else { + eh->plt_got.offset = (bfd_vma) -1; h->plt.offset = (bfd_vma) -1; h->needs_plt = 0; } } else { + eh->plt_got.offset = (bfd_vma) -1; h->plt.offset = (bfd_vma) -1; h->needs_plt = 0; } diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c index 8ea478d4bb..7debc1e6c1 100644 --- a/bfd/elf64-x86-64.c +++ b/bfd/elf64-x86-64.c @@ -2723,12 +2723,14 @@ elf_x86_64_allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf) } else { + eh->plt_got.offset = (bfd_vma) -1; h->plt.offset = (bfd_vma) -1; h->needs_plt = 0; } } else { + eh->plt_got.offset = (bfd_vma) -1; h->plt.offset = (bfd_vma) -1; h->needs_plt = 0; } -- 2.34.1