diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2016-04-11 19:41:37 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2016-04-11 19:41:52 -0700 |
| commit | 2df3368d851b653880c2e3312c99eb8adf89f3db (patch) | |
| tree | edbac9980b980c6c5bc58b15de92312e73d2f2d4 /bfd/elf-ifunc.c | |
| parent | b545ef977bd39f4351172ab73f5d7cc2508944ec (diff) | |
| download | binutils-gdb-2df3368d851b653880c2e3312c99eb8adf89f3db.tar.gz | |
Properly handle dynamic reloc against normal symbol
We shouldn't issue an error for read-only segment with dynamic IFUNC
relocations when dynamic relocations are against normal symbols.
bfd/
PR ld/19939
* elf-bfd.h (_bfd_elf_allocate_ifunc_dyn_relocs): Add a pointer
to bfd_boolean.
* elf-ifunc.c (_bfd_elf_allocate_ifunc_dyn_relocs): Updated.
Set *readonly_dynrelocs_against_ifunc_p to TRUE if dynamic reloc
applies to read-only section.
* elf32-i386.c (elf_i386_link_hash_table): Add
readonly_dynrelocs_against_ifunc.
(elf_i386_allocate_dynrelocs): Updated.
(elf_i386_size_dynamic_sections): Issue an error for read-only
segment with dynamic IFUNC relocations only if
readonly_dynrelocs_against_ifunc is TRUE.
* elf64-x86-64.c (elf_x86_64_link_hash_table): Add
readonly_dynrelocs_against_ifunc.
(elf_x86_64_allocate_dynrelocs): Updated.
(elf_x86_64_size_dynamic_sections): Issue an error for read-only
segment with dynamic IFUNC relocations only if
readonly_dynrelocs_against_ifunc is TRUE.
* elfnn-aarch64.c (elfNN_aarch64_allocate_ifunc_dynrelocs):
Updated.
ld/
PR ld/19939
* testsuite/ld-i386/i386.exp: Run PR ld/19939 tests.
* testsuite/ld-x86-64/x86-64.exp: Likewise.
* testsuite/ld-i386/pr19939.s: New file.
* testsuite/ld-i386/pr19939a.d: Likewise.
* testsuite/ld-i386/pr19939b.d: Likewise.
* testsuite/ld-x86-64/pr19939.s: Likewise.
* testsuite/ld-x86-64/pr19939a.d: Likewise.
* testsuite/ld-x86-64/pr19939b.d: Likewise.
Diffstat (limited to 'bfd/elf-ifunc.c')
| -rw-r--r-- | bfd/elf-ifunc.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/bfd/elf-ifunc.c b/bfd/elf-ifunc.c index 1368a8e124b..1377fedfd35 100644 --- a/bfd/elf-ifunc.c +++ b/bfd/elf-ifunc.c @@ -110,6 +110,7 @@ bfd_boolean _bfd_elf_allocate_ifunc_dyn_relocs (struct bfd_link_info *info, struct elf_link_hash_entry *h, struct elf_dyn_relocs **head, + bfd_boolean *readonly_dynrelocs_against_ifunc_p, unsigned int plt_entry_size, unsigned int plt_header_size, unsigned int got_entry_size) @@ -119,6 +120,7 @@ _bfd_elf_allocate_ifunc_dyn_relocs (struct bfd_link_info *info, unsigned int sizeof_reloc; const struct elf_backend_data *bed; struct elf_link_hash_table *htab; + bfd_boolean readonly_dynrelocs_against_ifunc; /* When a shared library references a STT_GNU_IFUNC symbol defined in executable, the address of the resolved function may be used. @@ -224,6 +226,8 @@ keep: || !h->non_got_ref) *head = NULL; + readonly_dynrelocs_against_ifunc = FALSE; + /* Finally, allocate space. */ p = *head; if (p != NULL) @@ -231,6 +235,12 @@ keep: bfd_size_type count = 0; do { + if (!readonly_dynrelocs_against_ifunc) + { + asection *s = p->sec->output_section; + if (s != NULL && (s->flags & SEC_READONLY) != 0) + readonly_dynrelocs_against_ifunc = TRUE; + } count += p->count; p = p->next; } @@ -238,6 +248,9 @@ keep: htab->irelifunc->size += count * sizeof_reloc; } + if (readonly_dynrelocs_against_ifunc_p) + *readonly_dynrelocs_against_ifunc_p = readonly_dynrelocs_against_ifunc; + /* For STT_GNU_IFUNC symbol, .got.plt has the real function address and .got has the PLT entry adddress. We will load the GOT entry with the PLT entry in finish_dynamic_symbol if it is used. For |