From: H.J. Lu <hjl.tools@gmail.com>
Date: Fri, 20 May 2016 16:36:48 +0000 (-0700)
Subject: Don't check R_386_GOT32 when setting need_convert_load
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=52bf37dd91e5dd983ed20d1329293d077fe71e41;p=binutils-gdb.git

Don't check R_386_GOT32 when setting need_convert_load

Since we no longer convert R_386_GOT32, don't check R_386_GOT32 when
setting need_convert_load.

	* elf32-i386.c (elf_i386_check_relocs): Don't check R_386_GOT32
	when setting need_convert_load.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 1a9eeb69214..45dbbe4d641 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2016-05-20  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf32-i386.c (elf_i386_check_relocs): Don't check R_386_GOT32
+	when setting need_convert_load.
+
 2016-05-20  Maciej W. Rozycki  <macro@imgtec.com>
 
 	* elfxx-mips.c (mips_elf_read_rel_addend): Adjust the addend for
diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
index c7e08aabbe1..8766d2b7b10 100644
--- a/bfd/elf32-i386.c
+++ b/bfd/elf32-i386.c
@@ -2256,7 +2256,7 @@ do_size:
 	    goto error_return;
 	}
 
-      if ((r_type == R_386_GOT32 || r_type == R_386_GOT32X)
+      if (r_type == R_386_GOT32X
 	  && (h == NULL || h->type != STT_GNU_IFUNC))
 	sec->need_convert_load = 1;
     }