From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by sourceware.org (Postfix) with ESMTP id 8C35F3858D28 for ; Thu, 25 Jan 2024 11:32:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8C35F3858D28 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=loongson.cn Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=loongson.cn ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 8C35F3858D28 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=114.242.206.163 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706182352; cv=none; b=SjAIMiZX2xWhONqBiwVOC/3kN9sAO9h2WxhpQWknkH2irfJhj/AvJe8UUpxAkfHKcIWhiHUOalVeUiOeiWBnrZMzlTUS03yZPLlYRdJhHUiHvNS51fZto/7xd3qfW5pVpuz2BGE8U7V6PdGidKLEU5Bs99qA9SK+u4cQ8CdyalE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706182352; c=relaxed/simple; bh=6NeOFbMSV7opgJD1lJrf1PMYEV0vds6LgOynrs93v4I=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=Yox03LNOSx0PdlRRcjQ2GKuaGvYi9xDL9BaXyIAUqSknRh27m1ak11EPnWb1bx6/wYlZ9z6n2yyXNB4tKTZItXYnaLy2HOArgn+b2d9YsKs7V+0ZOFl++ART9u50IEGKO72khS3yxnYpzsb1+n636DUKqhIuVbk2UvTfJjEHk9I= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from loongson.cn (unknown [10.2.6.5]) by gateway (Coremail) with SMTP id _____8DxdfHKRrJlLZcFAA--.20995S3; Thu, 25 Jan 2024 19:32:26 +0800 (CST) Received: from 5.5.5 (unknown [10.2.6.5]) by localhost.localdomain (Coremail) with SMTP id AQAAf8BxVMzJRrJl+msZAA--.50167S2; Thu, 25 Jan 2024 19:32:25 +0800 (CST) From: mengqinggang To: binutils@sourceware.org Cc: xuchenghua@loongson.cn, chenglulu@loongson.cn, liuzhensong@loongson.cn, cailulu@loongson.cn, xry111@xry111.site, i.swmail@xen0n.name, maskray@google.com, luweining@loongson.cn, wanglei@loongson.cn, hejinyang@loongson.cn, mengqinggang@loongson.cn Subject: [PATCH] LoongArch: ld: Add support for TLS LE symbol with addend Date: Thu, 25 Jan 2024 19:32:24 +0800 Message-Id: <20240125113224.2083508-1-mengqinggang@loongson.cn> X-Mailer: git-send-email 2.39.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID:AQAAf8BxVMzJRrJl+msZAA--.50167S2 X-CM-SenderInfo: 5phqw15lqjwttqj6z05rqj20fqof0/ X-Coremail-Antispam: 1Uk129KBj93XoWxuF4DCF1DJr48GF4ktry8tFc_yoW5Zr13p3 47ZrZ5KF1fJFnrWF9xC345Xrn8Wrs7GF1I9asxta1S9rsaqry8X3W0yrZxZF45X3yUXryr Xw10v345uFWDAwcCm3ZEXasCq-sJn29KB7ZKAUJUUUU5529EdanIXcx71UUUUU7KY7ZEXa sCq-sGcSsGvfJ3Ic02F40EFcxC0VAKzVAqx4xG6I80ebIjqfuFe4nvWSU5nxnvy29KBjDU 0xBIdaVrnRJUUUkFb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k26cxKx2 IYs7xG6rWj6s0DM7CIcVAFz4kK6r106r15M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48v e4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_JFI_Gr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI 0_Gr0_Cr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVCY1x0267AK xVW8Jr0_Cr1UM2AIxVAIcxkEcVAq07x20xvEncxIr21l57IF6xkI12xvs2x26I8E6xACxx 1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r126r1DMcIj6I8E87Iv 67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2 Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s02 6x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1q6r43MIIYrxkI7VAKI48JMIIF0x vE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE 42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6x kF7I0E14v26r1j6r4UYxBIdaVFxhVjvjDU0xZFpf9x07j1LvtUUUUU= X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00,GIT_PATCH_0,KAM_DMARC_STATUS,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE 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: Add support for TLS LE symbol with addend, such as: lu12i.w $t0, %le_hi20(a + 0x8) ori $t0, $t0, %le_lo12(a + 0x8) --- bfd/elfnn-loongarch.c | 5 ++--- .../ld-loongarch-elf/ld-loongarch-elf.exp | 1 + ld/testsuite/ld-loongarch-elf/tls-le.d | 14 ++++++++++++++ ld/testsuite/ld-loongarch-elf/tls-le.s | 18 ++++++++++++++++++ 4 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 ld/testsuite/ld-loongarch-elf/tls-le.d create mode 100644 ld/testsuite/ld-loongarch-elf/tls-le.s diff --git a/bfd/elfnn-loongarch.c b/bfd/elfnn-loongarch.c index b2caa5fc3e1..cf497762b94 100644 --- a/bfd/elfnn-loongarch.c +++ b/bfd/elfnn-loongarch.c @@ -3494,14 +3494,12 @@ loongarch_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info, relocation += rel->r_addend; RELOCATE_CALC_PC32_HI20 (relocation, pc); - break; case R_LARCH_TLS_LE_HI20_R: + relocation += rel->r_addend; relocation -= elf_hash_table (info)->tls_sec->vma; - RELOCATE_TLS_TP32_HI20 (relocation); - break; case R_LARCH_PCALA_LO12: @@ -3682,6 +3680,7 @@ loongarch_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info, case R_LARCH_TLS_LE64_HI12: BFD_ASSERT (resolved_local && elf_hash_table (info)->tls_sec); + relocation += rel->r_addend; relocation -= elf_hash_table (info)->tls_sec->vma; break; diff --git a/ld/testsuite/ld-loongarch-elf/ld-loongarch-elf.exp b/ld/testsuite/ld-loongarch-elf/ld-loongarch-elf.exp index 1b5994c7d84..3ae0d9df3b4 100644 --- a/ld/testsuite/ld-loongarch-elf/ld-loongarch-elf.exp +++ b/ld/testsuite/ld-loongarch-elf/ld-loongarch-elf.exp @@ -34,6 +34,7 @@ if [istarget "loongarch64-*-*"] { run_dump_test "local-ifunc-reloc" run_dump_test "anno-sym" run_dump_test "pcala64" + run_dump_test "tls-le" } if [istarget "loongarch32-*-*"] { diff --git a/ld/testsuite/ld-loongarch-elf/tls-le.d b/ld/testsuite/ld-loongarch-elf/tls-le.d new file mode 100644 index 00000000000..cbd6adb8b41 --- /dev/null +++ b/ld/testsuite/ld-loongarch-elf/tls-le.d @@ -0,0 +1,14 @@ +#ld: --no-relax +#objdump: -d + +.*:[ ]+file format .* + + +Disassembly of section .text: + +[ ]*00000001200000e8 <_start>: +[ ]+1200000e8:[ ]+14000004[ ]+lu12i.w[ ]+\$a0, 0 +[ ]+1200000ec:[ ]+03802085[ ]+ori[ ]+\$a1, \$a0, 0x8 +[ ]+1200000f0:[ ]+14000004[ ]+lu12i.w[ ]+\$a0, 0 +[ ]+1200000f4:[ ]+02c02085[ ]+addi.d[ ]+\$a1, \$a0, 8 +[ ]+1200000f8:[ ]+4c000020[ ]+ret diff --git a/ld/testsuite/ld-loongarch-elf/tls-le.s b/ld/testsuite/ld-loongarch-elf/tls-le.s new file mode 100644 index 00000000000..2e6a9de42ac --- /dev/null +++ b/ld/testsuite/ld-loongarch-elf/tls-le.s @@ -0,0 +1,18 @@ +# Support for TLS LE symbols with addend + .text + .globl a + .section .tdata,"awT",@progbits + .align 2 + .type a, @object + .size a, 4 +a: + .word 123 + + .text + .global _start +_start: + lu12i.w $r4,%le_hi20(a + 0x8) + ori $r5,$r4,%le_lo12(a + 0x8) + lu12i.w $r4,%le_hi20_r(a + 0x8) + addi.d $r5,$r4,%le_lo12_r(a + 0x8) + jr $ra -- 2.36.0