From: Andreas Krebbel <krebbel@linux.vnet.ibm.com>
Date: Fri, 19 Sep 2014 10:44:54 +0000 (+0200)
Subject: S/390: Don't replace R_390_TLS_LE32/64 with R_390_TLS_TPOFF for PIE.
X-Git-Tag: upstream/2.25~310
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e00d879a2e9169759518dd419d19f1b3dcb6f709;p=platform%2Fupstream%2Flinaro-binutils.git

S/390: Don't replace R_390_TLS_LE32/64 with R_390_TLS_TPOFF for PIE.

bfd:

2014-09-19  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>

	* elf32-s390.c: Don't replace R_390_TLS_LE32 with R_390_TLS_TPOFF
	for PIE.
	* elf64-s390.c: Don't replace R_390_TLS_LE64 with R_390_TLS_TPOFF
	for PIE.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index b2e6140..12797b5 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2014-09-19  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>
+
+	* elf32-s390.c: Don't replace R_390_TLS_LE32 with R_390_TLS_TPOFF
+	for PIE.
+	* elf64-s390.c: Don't replace R_390_TLS_LE64 with R_390_TLS_TPOFF
+	for PIE.
+
 2014-09-18  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	PR gdb/17407
diff --git a/bfd/elf32-s390.c b/bfd/elf32-s390.c
index 11c726f..ebcb028 100644
--- a/bfd/elf32-s390.c
+++ b/bfd/elf32-s390.c
@@ -1250,6 +1250,12 @@ elf_s390_check_relocs (bfd *abfd,
 	  /* Fall through.  */
 
 	case R_390_TLS_LE32:
+	  /* For static linking and executables this reloc will be
+	     calculated at linktime otherwise a TLS_TPOFF runtime
+	     reloc will be generated.  */
+	  if (r_type == R_390_TLS_LE32 && info->pie)
+	    break;
+
 	  if (!info->shared)
 	    break;
 	  info->flags |= DF_STATIC_TLS;
@@ -3104,7 +3110,7 @@ elf_s390_relocate_section (bfd *output_bfd,
 	  break;
 
 	case R_390_TLS_LE32:
-	  if (info->shared)
+	  if (info->shared && !info->pie)
 	    {
 	      /* Linking a shared library with non-fpic code requires
 		 a R_390_TLS_TPOFF relocation.  */
diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c
index d7b2f08..b2f1aa5 100644
--- a/bfd/elf64-s390.c
+++ b/bfd/elf64-s390.c
@@ -1183,6 +1183,12 @@ elf_s390_check_relocs (bfd *abfd,
 	  /* Fall through */
 
 	case R_390_TLS_LE64:
+	  /* For static linking and executables this reloc will be
+	     calculated at linktime otherwise a TLS_TPOFF runtime
+	     reloc will be generated.  */
+	  if (r_type == R_390_TLS_LE64 && info->pie)
+	    break;
+
 	  if (!info->shared)
 	    break;
 	  info->flags |= DF_STATIC_TLS;
@@ -3074,7 +3080,7 @@ elf_s390_relocate_section (bfd *output_bfd,
 	  break;
 
 	case R_390_TLS_LE64:
-	  if (info->shared)
+	  if (info->shared && !info->pie)
 	    {
 	      /* Linking a shared library with non-fpic code requires
 		 a R_390_TLS_TPOFF relocation.  */