x86: Add GENERATE_RELATIVE_RELOC_P

Add GENERATE_RELATIVE_RELOC_P which returns TRUE if dynamic relative
relocation should be generated.

	* elfxx-x86.h (GENERATE_RELATIVE_RELOC_P): New.
	* elf32-i386.c (elf_i386_relocate_section): Use it.
	* elf64-x86-64.c (elf_x86_64_relocate_section): Likewise.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index b43cdfac9b0d47738637572446073983918db7c8..afd14b87400e26e6af6d3d323cd6b099747d59f7 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2017-10-06  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * elfxx-x86.h (GENERATE_RELATIVE_RELOC_P): New.
+       * elf32-i386.c (elf_i386_relocate_section): Use it.
+       * elf64-x86-64.c (elf_x86_64_relocate_section): Likewise.
+
 2017-10-06  H.J. Lu  <hongjiu.lu@intel.com>
 
        * elfxx-x86.h (RESOLVED_LOCALLY_P): New.

diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
index 25d349ce004516b93551e149ba7f0fb52321853f..198732cec3e80950e5e840f8291930e7a7d6f6d4 100644 (file)
--- a/bfd/elf32-i386.c
+++ b/bfd/elf32-i386.c
@@ -2531,10 +2531,7 @@ r_386_got32:
                                  htab->elf.sgot->contents + off);
                      h->got.offset |= 1;
 
-                     if (h->dynindx == -1
-                         && !h->forced_local
-                         && h->root.type != bfd_link_hash_undefweak
-                         && bfd_link_pic (info))
+                     if (GENERATE_RELATIVE_RELOC_P (info, h))
                        {
                          /* PR ld/21402: If this symbol isn't dynamic
                             in PIC, generate R_386_RELATIVE here.  */

diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
index 5a9e3fd6140c2c7f736686d4dc2435502fcb18c3..d443551b44517c05593f50b8a8acc0fd41415815 100644 (file)
--- a/bfd/elf64-x86-64.c
+++ b/bfd/elf64-x86-64.c
@@ -2797,10 +2797,7 @@ do_ifunc_pointer:
                         as -1 | 1 still is -1.  */
                      h->got.offset |= 1;
 
-                     if (h->dynindx == -1
-                         && !h->forced_local
-                         && h->root.type != bfd_link_hash_undefweak
-                         && bfd_link_pic (info))
+                     if (GENERATE_RELATIVE_RELOC_P (info, h))
                        {
                          /* If this symbol isn't dynamic in PIC,
                             generate R_X86_64_RELATIVE here.  */

diff --git a/bfd/elfxx-x86.h b/bfd/elfxx-x86.h
index 317c86ea756d4b19652d151fba53c236454b939d..02a388a36847aa6ca35ddfaed1bbd5326443788c 100644 (file)
--- a/bfd/elfxx-x86.h
+++ b/bfd/elfxx-x86.h
@@ -124,6 +124,18 @@
        || (ELF_ST_VISIBILITY ((H)->other) \
           && (H)->root.type == bfd_link_hash_undefweak))
 
+/* TRUE if relative relocation should be generated.  GOT reference to
+   global symbol in PIC will lead to dynamic symbol.  It becomes a
+   problem when "time" or "times" is defined as a variable in an
+   executable, clashing with functions of the same name in libc.  If a
+   symbol isn't undefined weak symbol, don't make it dynamic in PIC and
+   generate relative relocation.  */
+#define GENERATE_RELATIVE_RELOC_P(INFO, H) \
+  ((H)->dynindx == -1 \
+   && !(H)->forced_local \
+   && (H)->root.type != bfd_link_hash_undefweak \
+   && bfd_link_pic (INFO))
+
 /* TRUE if TLS IE->LE transition is OK.  */
 #define TLS_TRANSITION_IE_TO_LE_P(INFO, H, TLS_TYPE) \
   (bfd_link_executable (INFO) \