From: H.J. Lu <hjl.tools@gmail.com>
Date: Wed, 15 Jan 2014 00:40:13 +0000 (-0800)
Subject: Revert the last change
X-Git-Tag: gdb-7.8-branchpoint~1517
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c3ce498cbd79fb40e31e5d5b5298e6976d4cdbb1;p=thirdparty%2Fbinutils-gdb.git

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 7a49fd1685c..7d13a35271a 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+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
diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
index d7f59e5e254..4d391e13c7d 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 999011bf591..edee8ecefd5 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