From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by sourceware.org (Postfix) with ESMTPS id 93E273858005 for ; Tue, 10 Jan 2023 13:37:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 93E273858005 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linux.ibm.com Received: from pps.filterd (m0127361.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 30ACcVLf007433 for ; Tue, 10 Jan 2023 13:37:25 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding; s=pp1; bh=4XSaaZbLbrz0+bHUIi/UwhhZVtiB+zD2mJ17OYajM3A=; b=cn91WVJBwi8buhiGiFsRUwpKo5CvqQZI3cTz6hAefeyrrwNFHbrAdoqkRqWQ49bzzKMQ s2sIJ0iF8DGMcDmH0117kkyLVfoAnlLottYzcLjjsn2hMRR7NbYrJY6xwGSEWx/bKVpd LWvf9e7+L/IbdzJV2F6pPTQjfxSZpmxU/sTXieLL5VSIYC23QgktMU/FL/WgHBz+DwMT pk0VvgG4y3nh3+TKP4jS7snrEKzv+zO83hVxRl9OZD4iKZr++m1WjcDDj3rlvPy/u6T5 AMNwQNnR+bNODGLPX75/TWiQeeA0GGq9F4V4qd2JyvAAWjk0rYK58zYb0Ii11oBQqcVS xA== Received: from ppma03ams.nl.ibm.com (62.31.33a9.ip4.static.sl-reverse.com [169.51.49.98]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3n15rk53y4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 10 Jan 2023 13:37:24 +0000 Received: from pps.filterd (ppma03ams.nl.ibm.com [127.0.0.1]) by ppma03ams.nl.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 30A89VJh024687 for ; Tue, 10 Jan 2023 13:37:23 GMT Received: from smtprelay07.fra02v.mail.ibm.com ([9.218.2.229]) by ppma03ams.nl.ibm.com (PPS) with ESMTPS id 3my0c6mwk8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 10 Jan 2023 13:37:22 +0000 Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay07.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 30ADbJ4453150086 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 10 Jan 2023 13:37:19 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 41EC920040; Tue, 10 Jan 2023 13:37:19 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2B82C20049; Tue, 10 Jan 2023 13:37:19 +0000 (GMT) Received: from t8345026.lnxne.boe (unknown [9.152.108.100]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTPS; Tue, 10 Jan 2023 13:37:19 +0000 (GMT) From: Stefan Schulze Frielinghaus To: krebbel@linux.ibm.com, binutils@sourceware.org Cc: Stefan Schulze Frielinghaus Subject: [PATCH] IBM zSystems: Fix offset relative to static TLS Date: Tue, 10 Jan 2023 14:35:35 +0100 Message-Id: <20230110133534.5295-1-stefansf@linux.ibm.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: dYbMp66jB60eXtRGptoE7bcoRxK51rDJ X-Proofpoint-GUID: dYbMp66jB60eXtRGptoE7bcoRxK51rDJ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.923,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2023-01-10_04,2023-01-10_03,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 mlxscore=0 lowpriorityscore=0 malwarescore=0 phishscore=0 suspectscore=0 mlxlogscore=999 priorityscore=1501 clxscore=1015 impostorscore=0 spamscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2301100084 X-Spam-Status: No, score=-8.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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 diff --git a/bfd/elf32-s390.c b/bfd/elf32-s390.c index 061307d6c3b..9496b1472d6 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 5279660f8f5..bcf59032c41 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 -- 2.38.1