Don't update reloc count if there are any non pc-relative relocs

	PR ld/16428
	* elf32-i386.c (elf_i386_allocate_dynrelocs): Don't update reloc
	count if there are any non pc-relative relocs.
	* elf64-x86-64.c (elf_x86_64_allocate_dynrelocs): Likewise.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index a8f1f9477f2c224fef8b3b6e356961b667302d1d..7a49fd1685caf887fd773f434742dfb621b2b641 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+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.
+       * elf64-x86-64.c (elf_x86_64_allocate_dynrelocs): Likewise.
+
 2014-01-14  Michael Hudson-Doyle  <michael.hudson@linaro.org>
            Kugan Vivekanandarajah  <kugan.vivekanandarajah@linaro.org>
 

diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
index 4d391e13c7d7fa504fc3b996582efd1f6bcbc993..d7f59e5e2545a75b3653f82b205f950cc3a52d06 100644 (file)
--- a/bfd/elf32-i386.c
+++ b/bfd/elf32-i386.c
@@ -2368,8 +2368,13 @@ elf_i386_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
 
          for (pp = &eh->dyn_relocs; (p = *pp) != NULL; )
            {
-             p->count -= p->pc_count;
-             p->pc_count = 0;
+             /* 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;
+               }
              if (p->count == 0)
                *pp = p->next;
              else

diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
index edee8ecefd50e98d87d58746e5f9a9509fadfc64..999011bf59110130a1852d8849437f93c415f792 100644 (file)
--- a/bfd/elf64-x86-64.c
+++ b/bfd/elf64-x86-64.c
@@ -2463,8 +2463,13 @@ elf_x86_64_allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf)
 
          for (pp = &eh->dyn_relocs; (p = *pp) != NULL; )
            {
-             p->count -= p->pc_count;
-             p->pc_count = 0;
+             /* 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;
+               }
              if (p->count == 0)
                *pp = p->next;
              else