From: H.J. Lu <hjl.tools@gmail.com>
Date: Fri, 6 Oct 2017 07:11:41 +0000 (-0700)
Subject: x86: Add TLS_TRANSITION_IE_TO_LE_P
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=51537393bd939e79f6e9291629fb65a17e6f19da;p=binutils-gdb.git

x86: Add TLS_TRANSITION_IE_TO_LE_P

Add TLS_TRANSITION_IE_TO_LE_P which returns TRUE if TLS IE->LE transition
is OK.

	* elfxx-x86.h (TLS_TRANSITION_IE_TO_LE_P): New.
	* elf32-i386.c (elf_i386_tls_transition): Use it.
	* elf64-x86-64.c (elf_x86_64_tls_transition): Likewise.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 39232290154..9f267a2c967 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2017-10-06  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elfxx-x86.h (TLS_TRANSITION_IE_TO_LE_P): New.
+	* elf32-i386.c (elf_i386_tls_transition): Use it.
+	* elf64-x86-64.c (elf_x86_64_tls_transition): Likewise.
+
 2017-10-05  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* elf32-ppc.c (readonly_dynrelocs): Add a link_info argument.
diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
index d4adaf48dee..c4af6b2e02b 100644
--- a/bfd/elf32-i386.c
+++ b/bfd/elf32-i386.c
@@ -1105,10 +1105,7 @@ elf_i386_tls_transition (struct bfd_link_info *info, bfd *abfd,
 	{
 	  unsigned int new_to_type = to_type;
 
-	  if (bfd_link_executable (info)
-	      && h != NULL
-	      && h->dynindx == -1
-	      && (tls_type & GOT_TLS_IE))
+	  if (TLS_TRANSITION_IE_TO_LE_P (info, h, tls_type))
 	    new_to_type = R_386_TLS_LE_32;
 
 	  if (to_type == R_386_TLS_GD
diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
index 76343cab7bf..1bad4d2dff6 100644
--- a/bfd/elf64-x86-64.c
+++ b/bfd/elf64-x86-64.c
@@ -1281,10 +1281,7 @@ elf_x86_64_tls_transition (struct bfd_link_info *info, bfd *abfd,
 	{
 	  unsigned int new_to_type = to_type;
 
-	  if (bfd_link_executable (info)
-	      && h != NULL
-	      && h->dynindx == -1
-	      && tls_type == GOT_TLS_IE)
+	  if (TLS_TRANSITION_IE_TO_LE_P (info, h, tls_type))
 	    new_to_type = R_X86_64_TPOFF32;
 
 	  if (to_type == R_X86_64_TLSGD
diff --git a/bfd/elfxx-x86.h b/bfd/elfxx-x86.h
index 17aa10cd560..0525c9c0a2e 100644
--- a/bfd/elfxx-x86.h
+++ b/bfd/elfxx-x86.h
@@ -74,6 +74,13 @@
    && ((EH)->elf.root.u.def.section->owner->flags & DYNAMIC) != 0 \
    && ((EH)->elf.root.u.def.section->flags & SEC_CODE) == 0)
 
+/* TRUE if TLS IE->LE transition is OK.  */
+#define TLS_TRANSITION_IE_TO_LE_P(INFO, H, TLS_TYPE) \
+  (bfd_link_executable (INFO) \
+   && (H) != NULL \
+   && (H)->dynindx == -1 \
+   && (TLS_TYPE & GOT_TLS_IE))
+
 /* x86 ELF linker hash entry.  */
 
 struct elf_x86_link_hash_entry