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 1a9eeb69214f1e1861ba6f2a2b23c6ae10498016..45dbbe4d64192630fba33f33fef4bf5e4895b24a 100644 (file)
--- 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 c7e08aabbe1b299553f686b25d9b5630b739ea04..8766d2b7b10c642e080b8608094545886d32e29a 100644 (file)
--- 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;
     }