From: H.J. Lu <hjl.tools@gmail.com>
Date: Tue, 14 Oct 2014 15:03:32 +0000 (-0700)
Subject: Convert mov to lea only if r_offset >= 2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5697705ac6eafb3e3f9dd3ba253231a4d51a1fa4;p=binutils-gdb.git

Convert mov to lea only if r_offset >= 2

	* elf32-i386.c (elf_i386_convert_mov_to_lea): Skip if relocation
	offset is less than 2.
	* elf64-x86-64.c (elf_x86_64_convert_mov_to_lea): Likewise.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index f9e81d3ef55..780cfabbf75 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2014-10-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-i386.c (elf_i386_convert_mov_to_lea): Skip if relocation
+	offset is less than 2.
+	* elf64-x86-64.c (elf_x86_64_convert_mov_to_lea): Likewise.
+
 2014-10-14  Alan Modra  <amodra@gmail.com>
 
 	PR 17453
diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
index afa21b5b6e0..dddd9dccf48 100644
--- a/bfd/elf32-i386.c
+++ b/bfd/elf32-i386.c
@@ -2580,6 +2580,7 @@ elf_i386_convert_mov_to_lea (bfd *abfd, asection *sec,
 
 	  /* STT_GNU_IFUNC must keep R_386_GOT32 relocation.  */
 	  if (ELF_ST_TYPE (isym->st_info) != STT_GNU_IFUNC
+	      && irel->r_offset >= 2
 	      && bfd_get_8 (input_bfd,
 			    contents + irel->r_offset - 2) == 0x8b)
 	    {
@@ -2609,6 +2610,7 @@ elf_i386_convert_mov_to_lea (bfd *abfd, asection *sec,
 	  && h->type != STT_GNU_IFUNC
 	  && h != htab->elf.hdynamic
 	  && SYMBOL_REFERENCES_LOCAL (link_info, h)
+	  && irel->r_offset >= 2
 	  && bfd_get_8 (input_bfd,
 			contents + irel->r_offset - 2) == 0x8b)
 	{
diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
index 9d18a545a9f..38c837a7604 100644
--- a/bfd/elf64-x86-64.c
+++ b/bfd/elf64-x86-64.c
@@ -2824,6 +2824,7 @@ elf_x86_64_convert_mov_to_lea (bfd *abfd, asection *sec,
 
 	  /* STT_GNU_IFUNC must keep R_X86_64_GOTPCREL relocation.  */
 	  if (ELF_ST_TYPE (isym->st_info) != STT_GNU_IFUNC
+	      && irel->r_offset >= 2
 	      && bfd_get_8 (input_bfd,
 			    contents + irel->r_offset - 2) == 0x8b)
 	    {
@@ -2854,6 +2855,7 @@ elf_x86_64_convert_mov_to_lea (bfd *abfd, asection *sec,
 	  && h->type != STT_GNU_IFUNC
 	  && h != htab->elf.hdynamic
 	  && SYMBOL_REFERENCES_LOCAL (link_info, h)
+	  && irel->r_offset >= 2
 	  && bfd_get_8 (input_bfd,
 			contents + irel->r_offset - 2) == 0x8b)
 	{