From ff38b4cc55dade4c9970cac2149a946d5dc0adc7 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Fri, 6 Oct 2017 00:50:12 -0700 Subject: [PATCH] x86: Add VERIFY_COPY_RELOC Add VERIFY_COPY_RELOC to verify that symbol supports copy relocation. * elfxx-x86.h (VERIFY_COPY_RELOC): New. * elf32-i386.c (elf_i386_finish_dynamic_symbol): Use it. * elf64-x86-64.c (elf_x86_64_finish_dynamic_symbol): Likewise. --- bfd/ChangeLog | 6 ++++++ bfd/elf32-i386.c | 8 +------- bfd/elf64-x86-64.c | 8 +------- bfd/elfxx-x86.h | 9 +++++++++ 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 2ad9e423f0c..982d29daabf 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2017-10-06 H.J. Lu + + * elfxx-x86.h (VERIFY_COPY_RELOC): New. + * elf32-i386.c (elf_i386_finish_dynamic_symbol): Use it. + * elf64-x86-64.c (elf_x86_64_finish_dynamic_symbol): Likewise. + 2017-10-06 H.J. Lu * elfxx-x86.h (VERIFY_PLT_ENTRY): New. diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c index 822fe4f9dc4..5fbcd6040e5 100644 --- a/bfd/elf32-i386.c +++ b/bfd/elf32-i386.c @@ -3908,13 +3908,7 @@ do_glob_dat: asection *s; /* This symbol needs a copy reloc. Set it up. */ - - if (h->dynindx == -1 - || (h->root.type != bfd_link_hash_defined - && h->root.type != bfd_link_hash_defweak) - || htab->elf.srelbss == NULL - || htab->elf.sreldynrelro == NULL) - abort (); + VERIFY_COPY_RELOC (h, htab) rel.r_offset = (h->root.u.def.value + h->root.u.def.section->output_section->vma diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c index 1fb0a2deaf1..c4cf7ae5e4a 100644 --- a/bfd/elf64-x86-64.c +++ b/bfd/elf64-x86-64.c @@ -4253,13 +4253,7 @@ do_glob_dat: asection *s; /* This symbol needs a copy reloc. Set it up. */ - - if (h->dynindx == -1 - || (h->root.type != bfd_link_hash_defined - && h->root.type != bfd_link_hash_defweak) - || htab->elf.srelbss == NULL - || htab->elf.sreldynrelro == NULL) - abort (); + VERIFY_COPY_RELOC (h, htab) rela.r_offset = (h->root.u.def.value + h->root.u.def.section->output_section->vma diff --git a/bfd/elfxx-x86.h b/bfd/elfxx-x86.h index b81e1455398..ca270ded0a5 100644 --- a/bfd/elfxx-x86.h +++ b/bfd/elfxx-x86.h @@ -208,6 +208,15 @@ || (RELPLT) == NULL) \ abort (); +/* Verify that the symbol supports copy relocation. */ +#define VERIFY_COPY_RELOC(H, HTAB) \ + if ((H)->dynindx == -1 \ + || ((H)->root.type != bfd_link_hash_defined \ + && (H)->root.type != bfd_link_hash_defweak) \ + || (HTAB)->elf.srelbss == NULL \ + || (HTAB)->elf.sreldynrelro == NULL) \ + abort (); + /* x86 ELF linker hash entry. */ struct elf_x86_link_hash_entry -- 2.30.2