[binutils-gdb/binutils-2_39-branch] IBM zSystems: Fix offset relative to static TLS

[Stefan Schulze Frielinghaus]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=4e3ee240162d369f841829ad0bc11248e4faac70

commit 4e3ee240162d369f841829ad0bc11248e4faac70
Author: Stefan Schulze Frielinghaus <stefansf@linux.ibm.com>
Date:   Tue Jan 10 14:53:20 2023 +0100

    IBM zSystems: Fix offset relative to static TLS
    
    For local exec TLS relocations of the form foo@NTPOFF+x the addend was
    ignored.
    
    bfd/ChangeLog:
    
            * elf32-s390.c (elf_s390_relocate_section): Honor addend for
            R_390_TLS_LE32.
            * elf64-s390.c (elf_s390_relocate_section): Honor addend for
            R_390_TLS_LE64.
    
    ld/ChangeLog:
    
            * testsuite/ld-s390/reloctlsle-1.d: New test.
            * testsuite/ld-s390/reloctlsle-1.s: New test.
    
    (cherry picked from commit aefebe82dc89711384b85329daa48d04c1d3a45b)

Diff:
---
 bfd/elf32-s390.c                    |  4 ++--
 bfd/elf64-s390.c                    |  4 ++--
 ld/testsuite/ld-s390/reloctlsle-1.d |  6 ++++++
 ld/testsuite/ld-s390/reloctlsle-1.s | 14 ++++++++++++++
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/bfd/elf32-s390.c b/bfd/elf32-s390.c
index 45b4581f8a2..6f9f4cf0cf6 100644
--- a/bfd/elf32-s390.c
+++ b/bfd/elf32-s390.c
@@ -2706,7 +2706,7 @@ elf_s390_relocate_section (bfd *output_bfd,
 	      /* This relocation gets optimized away by the local exec
 		 access optimization.  */
 	      BFD_ASSERT (! unresolved_reloc);
-	      bfd_put_32 (output_bfd, -tpoff (info, relocation),
+	      bfd_put_32 (output_bfd, -tpoff (info, relocation) + rel->r_addend,
 			  contents + rel->r_offset);
 	      continue;
 	    }
@@ -2901,7 +2901,7 @@ elf_s390_relocate_section (bfd *output_bfd,
 	  else
 	    {
 	      BFD_ASSERT (! unresolved_reloc);
-	      bfd_put_32 (output_bfd, -tpoff (info, relocation),
+	      bfd_put_32 (output_bfd, -tpoff (info, relocation) + rel->r_addend,
 			  contents + rel->r_offset);
 	    }
 	  continue;
diff --git a/bfd/elf64-s390.c b/bfd/elf64-s390.c
index c1ed3d619d6..4530197a540 100644
--- a/bfd/elf64-s390.c
+++ b/bfd/elf64-s390.c
@@ -2714,7 +2714,7 @@ elf_s390_relocate_section (bfd *output_bfd,
 	      /* This relocation gets optimized away by the local exec
 		 access optimization.  */
 	      BFD_ASSERT (! unresolved_reloc);
-	      bfd_put_64 (output_bfd, -tpoff (info, relocation),
+	      bfd_put_64 (output_bfd, -tpoff (info, relocation) + rel->r_addend,
 			  contents + rel->r_offset);
 	      continue;
 	    }
@@ -2907,7 +2907,7 @@ elf_s390_relocate_section (bfd *output_bfd,
 	  else
 	    {
 	      BFD_ASSERT (! unresolved_reloc);
-	      bfd_put_64 (output_bfd, -tpoff (info, relocation),
+	      bfd_put_64 (output_bfd, -tpoff (info, relocation) + rel->r_addend,
 			  contents + rel->r_offset);
 	    }
 	  continue;
diff --git a/ld/testsuite/ld-s390/reloctlsle-1.d b/ld/testsuite/ld-s390/reloctlsle-1.d
new file mode 100644
index 00000000000..a24c3d60c25
--- /dev/null
+++ b/ld/testsuite/ld-s390/reloctlsle-1.d
@@ -0,0 +1,6 @@
+#as: -m64 -mzarch -march=z900
+#ld: -m elf64_s390 -static
+#readelf: -x .data
+
+Hex dump of section '.data':
+  0x[0-9a-f]+ ffffffff fffffff0 ffffffff fffffff8 ................
diff --git a/ld/testsuite/ld-s390/reloctlsle-1.s b/ld/testsuite/ld-s390/reloctlsle-1.s
new file mode 100644
index 00000000000..c8f351dd6e6
--- /dev/null
+++ b/ld/testsuite/ld-s390/reloctlsle-1.s
@@ -0,0 +1,14 @@
+	.text
+	.globl	_start
+_start:
+	larl	%r0,bar
+
+	.section .tbss,"awT",@nobits
+	.align	8
+foo:	.zero	8
+	.zero	8
+
+	.data
+	.align	8
+	.quad	foo@NTPOFF
+bar:	.quad	foo@NTPOFF+8