]> git.ipfire.org Git - thirdparty/binutils-gdb.git/commitdiff
LoongArch: Use more appropriate assertions for the relocation of TLS LE binutils-2_43-branch
authorLulu Cai <cailulu@loongson.cn>
Mon, 24 Nov 2025 10:03:47 +0000 (18:03 +0800)
committercailulu <cailulu@loongson.cn>
Tue, 25 Nov 2025 01:55:37 +0000 (09:55 +0800)
PR ld/33427

Patches introduced in the GCC mainline:

commit 8cad8f94b450be9b73d07bdeef7fa1778d3f2b96
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Fri Sep 5 15:40:51 2025 -0700

    c: Update TLS model after processing a TLS variable

    Set a tentative TLS model in grokvardecl and update TLS mode with
    the default TLS access model after a TLS variable has been fully
    processed if the default TLS access model is stronger,

triggered a linker error when building glibc using build-many-glibcs.py.

See: https://sourceware.org/pipermail/binutils/2025-September/144225.html

This fix uses more appropriate assertions.

(cherry picked from commit 87961e47c3666d0527b8ce60e56617e63db0a6c4)

bfd/elfnn-loongarch.c
ld/testsuite/ld-loongarch-elf/ld-loongarch-elf.exp
ld/testsuite/ld-loongarch-elf/undefweak_le.s [new file with mode: 0644]

index 610713a9d7ebf17e6ee4070733a56c8cc1f1c836..5015b438144808744f2296734e732edf73a34c21 100644 (file)
@@ -4237,7 +4237,7 @@ loongarch_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
        case R_LARCH_TLS_LE_LO12_R:
        case R_LARCH_TLS_LE64_LO20:
        case R_LARCH_TLS_LE64_HI12:
-         BFD_ASSERT (resolved_local && elf_hash_table (info)->tls_sec);
+         BFD_ASSERT (bfd_link_executable (info));
 
          relocation += rel->r_addend;
          relocation = tlsoff (info, relocation);
index 09c4c9fd5b2cb22b5b4729df5b863624f6a0dec3..845609048cfe821d46d0a99a4ec0c8eb9dedac9d 100644 (file)
@@ -118,6 +118,18 @@ if [istarget "loongarch64-*-*"] {
              "abi1_max_imm" \
          ] \
       ]
+
+  run_ld_link_tests \
+      [list \
+         [list \
+             "undefind weak with tls le" \
+             "" "-e0" \
+             "" \
+             {undefweak_le.s} \
+             {} \
+             "undefweak_le" \
+         ] \
+      ]
 }
 
 if [istarget "loongarch64-*-*"] {
diff --git a/ld/testsuite/ld-loongarch-elf/undefweak_le.s b/ld/testsuite/ld-loongarch-elf/undefweak_le.s
new file mode 100644 (file)
index 0000000..6e73018
--- /dev/null
@@ -0,0 +1,7 @@
+_start:
+       lu12i.w $t0,%le_hi20_r(undefweak_le)
+       add.d   $t0,$t0,$tp,%le_add_r(undefweak_le)
+       ld.d    $t0,$t0,%le_lo12_r(undefweak_le)
+
+       .weak   undefweak_le
+       .hidden undefweak_le