diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2014-01-14 16:40:13 -0800 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2014-01-14 16:40:51 -0800 |
| commit | c3ce498cbd79fb40e31e5d5b5298e6976d4cdbb1 (patch) | |
| tree | a6d6d4e9f8c95025e1af2828a4390517ab1e5d48 | |
| parent | 499de2f6ba09214fb2dd7575f844b6d0003403df (diff) | |
| download | gdb-c3ce498cbd79fb40e31e5d5b5298e6976d4cdbb1.zip gdb-c3ce498cbd79fb40e31e5d5b5298e6976d4cdbb1.tar.gz gdb-c3ce498cbd79fb40e31e5d5b5298e6976d4cdbb1.tar.bz2 | |
Revert the last change
* elf32-i386.c (elf_i386_allocate_dynrelocs): Revert the last
change.
* elf64-x86-64.c (elf_x86_64_allocate_dynrelocs): Likewise.
| -rw-r--r-- | bfd/ChangeLog | 6 | ||||
| -rw-r--r-- | bfd/elf32-i386.c | 9 | ||||
| -rw-r--r-- | bfd/elf64-x86-64.c | 9 |
3 files changed, 10 insertions, 14 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 7a49fd1..7d13a35 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,11 @@ 2014-01-14 H.J. Lu <hongjiu.lu@intel.com> + * elf32-i386.c (elf_i386_allocate_dynrelocs): Revert the last + change. + * elf64-x86-64.c (elf_x86_64_allocate_dynrelocs): Likewise. + +2014-01-14 H.J. Lu <hongjiu.lu@intel.com> + PR ld/16428 * elf32-i386.c (elf_i386_allocate_dynrelocs): Don't update reloc count if there are any non pc-relative relocs. diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c index d7f59e5..4d391e1 100644 --- a/bfd/elf32-i386.c +++ b/bfd/elf32-i386.c @@ -2368,13 +2368,8 @@ elf_i386_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf) for (pp = &eh->dyn_relocs; (p = *pp) != NULL; ) { - /* Don't update reloc count if there are any non - pc-relative relocs. */ - if (!h->pointer_equality_needed) - { - p->count -= p->pc_count; - p->pc_count = 0; - } + p->count -= p->pc_count; + p->pc_count = 0; if (p->count == 0) *pp = p->next; else diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c index 999011b..edee8ec 100644 --- a/bfd/elf64-x86-64.c +++ b/bfd/elf64-x86-64.c @@ -2463,13 +2463,8 @@ elf_x86_64_allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf) for (pp = &eh->dyn_relocs; (p = *pp) != NULL; ) { - /* Don't update reloc count if there are any non - pc-relative relocs. */ - if (!h->pointer_equality_needed) - { - p->count -= p->pc_count; - p->pc_count = 0; - } + p->count -= p->pc_count; + p->pc_count = 0; if (p->count == 0) *pp = p->next; else |