IBM zSystems: Fix offset relative to static TLS
Checks
Commit Message
For local exec TLS relocations of the form foo@NTPOFF+x the addend was
ignored.
Build and tested on s390x. Ok for mainline and branches 2.{39,40}?
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.
---
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(-)
create mode 100644 ld/testsuite/ld-s390/reloctlsle-1.d
create mode 100644 ld/testsuite/ld-s390/reloctlsle-1.s
Comments
On 1/10/23 14:35, Stefan Schulze Frielinghaus wrote:
> For local exec TLS relocations of the form foo@NTPOFF+x the addend was
> ignored.
>
> Build and tested on s390x. Ok for mainline and branches 2.{39,40}?
>
> 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.
Ok for mainline and release branches. Thanks!
Andreas
@@ -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;
@@ -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;
new file mode 100644
@@ -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 ................
new file mode 100644
@@ -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