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.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 7a49fd1..7d13a35 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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