From: H.J. Lu <hjl.tools@gmail.com>
Date: Tue, 10 Nov 2015 07:49:02 +0000 (-0800)
Subject: Properly move kept relocations when deleting relocations
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2d5da47320d6d22a58b793801999ba33c43c758f;p=binutils-gdb.git

Properly move kept relocations when deleting relocations

	* elf32-i386.c (elf_i386_relocate_section): Properly move
	kept relocations when deleting relocations.
	* elf64-x86-64.c (elf_x86_64_relocate_section): Likewise.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index d7000cbf03a..8dbe72b9374 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2015-11-10  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-i386.c (elf_i386_relocate_section): Properly move
+	kept relocations when deleting relocations.
+	* elf64-x86-64.c (elf_x86_64_relocate_section): Likewise.
+
 2015-11-09  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* elf32-i386.c (elf_i386_relocate_section): Use read and write
diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
index 6c353e9af84..ee45ed161a5 100644
--- a/bfd/elf32-i386.c
+++ b/bfd/elf32-i386.c
@@ -3791,7 +3791,11 @@ elf_i386_relocate_section (bfd *output_bfd,
 	}
 
       if (bfd_link_relocatable (info))
-	continue;
+	{
+	  if (wrel != rel)
+	    *wrel = *rel;
+	  continue;
+	}
 
       /* Since STT_GNU_IFUNC symbol must go through PLT, we handle
 	 it here if it is defined in a non-shared object.  */
diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
index 8e62d3d6aa6..dfa12769ef7 100644
--- a/bfd/elf64-x86-64.c
+++ b/bfd/elf64-x86-64.c
@@ -3980,7 +3980,11 @@ elf_x86_64_relocate_section (bfd *output_bfd,
 	}
 
       if (bfd_link_relocatable (info))
-	continue;
+	{
+	  if (wrel != rel)
+	    *wrel = *rel;
+	  continue;
+	}
 
       if (rel->r_addend == 0 && !ABI_64_P (output_bfd))
 	{