[binutils-gdb] LoongArch: Fix GOT allocation for TLS PCREL20 relocations

liu zhensong liuzhensong@sourceware.org
Fri Nov 13 07:33:58 GMT 2026


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

commit 5a1c88b169767f282bd232d066b37a87df310555
Author: zhaozhou <zhaozhou@loongson.cn>
Date:   Thu Nov 12 09:35:55 2026 +0800

    LoongArch: Fix GOT allocation for TLS PCREL20 relocations
    
    Record GOT references for R_LARCH_TLS_{LD,GD,DESC}_PCREL20_S2 in
    loongarch_elf_check_relocs, otherwise unallocated GOT entries will cause
    the link crash when reaching final relocation.
    
    PR ld/34809

Diff:
---
 bfd/elfnn-loongarch.c                              |  3 +
 ld/testsuite/ld-loongarch-elf/get-tls_var.c        | 38 +++++++++++
 ld/testsuite/ld-loongarch-elf/get-tls_var_pcaddi.c | 23 +++++++
 ld/testsuite/ld-loongarch-elf/ld-loongarch-elf.exp | 18 +++++
 ld/testsuite/ld-loongarch-elf/tls-got.out          |  1 +
 ld/testsuite/ld-loongarch-elf/tls-got.s            | 77 ++++++++++++++++++++++
 ld/testsuite/ld-loongarch-elf/tls-got_pcaddi.s     | 44 +++++++++++++
 7 files changed, 204 insertions(+)

diff --git a/bfd/elfnn-loongarch.c b/bfd/elfnn-loongarch.c
index beb7e0ace46..489a717bce6 100644
--- a/bfd/elfnn-loongarch.c
+++ b/bfd/elfnn-loongarch.c
@@ -1254,6 +1254,8 @@ loongarch_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
 	case R_LARCH_TLS_GD_PC_HI20:
 	case R_LARCH_TLS_GD_PCADD_HI20:
 	case R_LARCH_TLS_GD_HI20:
+	case R_LARCH_TLS_LD_PCREL20_S2:
+	case R_LARCH_TLS_GD_PCREL20_S2:
 	case R_LARCH_SOP_PUSH_TLS_GD:
 	  if (!loongarch_elf_record_tls_and_got_reference (abfd, info, h,
 							   r_symndx,
@@ -1293,6 +1295,7 @@ loongarch_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
 	case R_LARCH_TLS_DESC_PC_HI20:
 	case R_LARCH_TLS_DESC_PCADD_HI20:
 	case R_LARCH_TLS_DESC_HI20:
+	case R_LARCH_TLS_DESC_PCREL20_S2:
 	  if (!loongarch_elf_record_tls_and_got_reference (abfd, info, h,
 							   r_symndx,
 							   GOT_TLS_GDESC,
diff --git a/ld/testsuite/ld-loongarch-elf/get-tls_var.c b/ld/testsuite/ld-loongarch-elf/get-tls_var.c
new file mode 100644
index 00000000000..30103cd9075
--- /dev/null
+++ b/ld/testsuite/ld-loongarch-elf/get-tls_var.c
@@ -0,0 +1,38 @@
+#include <stdio.h>
+
+extern long *get_ld_pcaddi(void);
+extern long *get_ld(void);
+extern long *get_gd_pcaddi(void);
+extern long *get_gd(void);
+extern long *get_desc_pcaddi(void);
+extern long *get_desc(void);
+
+int main(void)
+{
+  long *p = get_ld_pcaddi();
+  if (*p != 100)
+    return 1;
+
+  p = get_ld();
+  if (*p != 100)
+    return 1;
+
+  p = get_gd_pcaddi();
+  if (*p != 100)
+    return 1;
+
+  p = get_gd();
+  if (*p != 100)
+    return 1;
+
+  p = get_desc_pcaddi();
+  if (*p != 100)
+    return 1;
+
+  p = get_desc();
+  if (*p != 100)
+    return 1;
+
+  puts("PASS");
+  return 0;
+}
diff --git a/ld/testsuite/ld-loongarch-elf/get-tls_var_pcaddi.c b/ld/testsuite/ld-loongarch-elf/get-tls_var_pcaddi.c
new file mode 100644
index 00000000000..646d47532e4
--- /dev/null
+++ b/ld/testsuite/ld-loongarch-elf/get-tls_var_pcaddi.c
@@ -0,0 +1,23 @@
+#include <stdio.h>
+
+extern long *get_ld_pcaddi(void);
+extern long *get_gd_pcaddi(void);
+extern long *get_desc_pcaddi(void);
+
+int main(void)
+{
+  long *p = get_ld_pcaddi();
+  if (*p != 100)
+    return 1;
+
+  p = get_gd_pcaddi();
+  if (*p != 100)
+    return 1;
+
+  p = get_desc_pcaddi();
+  if (*p != 100)
+    return 1;
+
+  puts("PASS");
+  return 0;
+}
diff --git a/ld/testsuite/ld-loongarch-elf/ld-loongarch-elf.exp b/ld/testsuite/ld-loongarch-elf/ld-loongarch-elf.exp
index e26774eddc5..b8e335bf777 100644
--- a/ld/testsuite/ld-loongarch-elf/ld-loongarch-elf.exp
+++ b/ld/testsuite/ld-loongarch-elf/ld-loongarch-elf.exp
@@ -147,6 +147,24 @@ if [istarget "loongarch64-*-*"] {
 	   ] \
       ]
 
+  run_ld_link_exec_tests [list \
+	[list \
+	    "get tls_var_pcaddi test" \
+	    "-mno-relax" \
+	    "" \
+	    { tls-got_pcaddi.s get-tls_var_pcaddi.c} \
+	    "tls-got_pcaddi" \
+	    "tls-got.out" \
+	] \
+	[list \
+	    "get tls_got test" \
+	    "-mno-relax" \
+	    "" \
+	    { tls-got.s get-tls_var.c} \
+	    "tls-got" \
+	    "tls-got.out" \
+	] \
+    ]
 
   run_ld_link_exec_tests [list \
 	[list \
diff --git a/ld/testsuite/ld-loongarch-elf/tls-got.out b/ld/testsuite/ld-loongarch-elf/tls-got.out
new file mode 100644
index 00000000000..7ef22e9a431
--- /dev/null
+++ b/ld/testsuite/ld-loongarch-elf/tls-got.out
@@ -0,0 +1 @@
+PASS
diff --git a/ld/testsuite/ld-loongarch-elf/tls-got.s b/ld/testsuite/ld-loongarch-elf/tls-got.s
new file mode 100644
index 00000000000..45bbc92dc15
--- /dev/null
+++ b/ld/testsuite/ld-loongarch-elf/tls-got.s
@@ -0,0 +1,77 @@
+.section .tdata,"awT",@progbits
+.globl tls_var
+.type tls_var,@tls_object
+tls_var:
+    .dword 100
+.size tls_var,.-tls_var
+
+.text
+.globl get_ld_pcaddi, get_ld, get_gd_pcaddi, get_gd, get_desc_pcaddi, get_desc
+.type get_ld_pcaddi,@function
+.type get_ld,@function
+.type get_gd_pcaddi,@function
+.type get_gd,@function
+.type get_desc_pcaddi,@function
+.type get_desc,@function
+
+get_ld_pcaddi:
+    addi.d $sp,$sp,-16
+    st.d $ra,$sp,8
+    pcaddi $a0, %ld_pcrel_20(tls_var)
+    bl %plt(__tls_get_addr)
+    ld.d $ra,$sp,8
+    addi.d $sp,$sp,16
+    jr $ra
+.size get_ld_pcaddi,.-get_ld_pcaddi
+
+get_ld:
+    addi.d $sp,$sp,-16
+    st.d $ra,$sp,8
+    la.tls.ld $a0, tls_var
+    bl %plt(__tls_get_addr)
+    ld.d $ra,$sp,8
+    addi.d $sp,$sp,16
+    jr $ra
+.size get_ld,.-get_ld
+
+get_gd_pcaddi:
+    addi.d $sp,$sp,-16
+    st.d $ra,$sp,8
+    pcaddi $a0, %gd_pcrel_20(tls_var)
+    bl %plt(__tls_get_addr)
+    ld.d $ra,$sp,8
+    addi.d $sp,$sp,16
+    jr $ra
+.size get_gd_pcaddi,.-get_gd_pcaddi
+
+get_gd:
+    addi.d $sp,$sp,-16
+    st.d $ra,$sp,8
+    la.tls.gd $a0, tls_var
+    bl %plt(__tls_get_addr)
+    ld.d $ra,$sp,8
+    addi.d $sp,$sp,16
+    jr $ra
+.size get_gd,.-get_gd
+
+get_desc_pcaddi:
+    addi.d $sp,$sp,-16
+    st.d $ra,$sp,8
+    pcaddi $a0, %desc_pcrel_20(tls_var)
+    ld.d   $ra, $a0, %desc_ld(tls_var)
+    jirl   $ra, $ra, %desc_call(tls_var)
+    add.d  $a0, $a0, $tp
+    ld.d $ra,$sp,8
+    addi.d $sp,$sp,16
+    jr $ra
+.size get_desc_pcaddi,.-get_desc_pcaddi
+
+get_desc:
+    addi.d $sp,$sp,-16
+    st.d $ra,$sp,8
+    la.tls.desc $a0, tls_var
+    add.d  $a0, $a0, $tp
+    ld.d $ra,$sp,8
+    addi.d $sp,$sp,16
+    jr $ra
+.size get_desc,.-get_desc
diff --git a/ld/testsuite/ld-loongarch-elf/tls-got_pcaddi.s b/ld/testsuite/ld-loongarch-elf/tls-got_pcaddi.s
new file mode 100644
index 00000000000..a9d7ad8c25f
--- /dev/null
+++ b/ld/testsuite/ld-loongarch-elf/tls-got_pcaddi.s
@@ -0,0 +1,44 @@
+.section .tdata,"awT",@progbits
+.globl tls_var
+.type tls_var,@tls_object
+tls_var:
+    .dword 100
+.size tls_var,.-tls_var
+
+.text
+.globl get_ld_pcaddi, get_gd_pcaddi, get_desc_pcaddi
+.type get_ld_pcaddi,@function
+.type get_gd_pcaddi,@function
+.type get_desc_pcaddi,@function
+
+get_ld_pcaddi:
+    addi.d $sp,$sp,-16
+    st.d $ra,$sp,8
+    pcaddi $a0, %ld_pcrel_20(tls_var)
+    bl %plt(__tls_get_addr)
+    ld.d $ra,$sp,8
+    addi.d $sp,$sp,16
+    jr $ra
+.size get_ld_pcaddi,.-get_ld_pcaddi
+
+get_gd_pcaddi:
+    addi.d $sp,$sp,-16
+    st.d $ra,$sp,8
+    pcaddi $a0, %gd_pcrel_20(tls_var)
+    bl %plt(__tls_get_addr)
+    ld.d $ra,$sp,8
+    addi.d $sp,$sp,16
+    jr $ra
+.size get_gd_pcaddi,.-get_gd_pcaddi
+
+get_desc_pcaddi:
+    addi.d $sp,$sp,-16
+    st.d $ra,$sp,8
+    pcaddi $a0, %desc_pcrel_20(tls_var)
+    ld.d   $ra, $a0, %desc_ld(tls_var)
+    jirl   $ra, $ra, %desc_call(tls_var)
+    add.d  $a0, $a0, $tp
+    ld.d $ra,$sp,8
+    addi.d $sp,$sp,16
+    jr $ra
+.size get_desc_pcaddi,.-get_desc_pcaddi


More information about the Binutils-cvs mailing list