[binutils-gdb] LoongArch: Add dtpoff calculation function

liu & zhensong liuzhensong@sourceware.org
Wed Mar 6 06:47:39 GMT 2024


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

commit d5de762be734940049f1fc77d7b7bad2ee5f06f7
Author: Lulu Cai <cailulu@loongson.cn>
Date:   Fri Feb 23 16:28:22 2024 +0800

    LoongArch: Add dtpoff calculation function
    
    When tls_sec is NULL, we should not access the virtual address
    of tls_sec.

Diff:
---
 bfd/elfnn-loongarch.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/bfd/elfnn-loongarch.c b/bfd/elfnn-loongarch.c
index 3cec041c442..ee99fd7b2f8 100644
--- a/bfd/elfnn-loongarch.c
+++ b/bfd/elfnn-loongarch.c
@@ -2550,6 +2550,16 @@ loongarch_reloc_is_fatal (struct bfd_link_info *info,
   })
 
 
+static bfd_vma
+tls_dtpoff_base (struct bfd_link_info *info)
+{
+  /* If tls_sec is NULL, we should have signalled an error already.  */
+  if (elf_hash_table (info)->tls_sec == NULL)
+    return 0;
+  return elf_hash_table (info)->tls_sec->vma;
+}
+
+
 static int
 loongarch_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
 				bfd *input_bfd, asection *input_section,
@@ -3708,7 +3718,7 @@ loongarch_elf_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
 		  rela.r_offset = sec_addr (got) + got_off + desc_off;
 		  rela.r_addend = 0;
 		  if (indx == 0)
-		    rela.r_addend = relocation - elf_hash_table (info)->tls_sec->vma;
+		    rela.r_addend = relocation - tls_dtpoff_base (info);
 
 		  rela.r_info = ELFNN_R_INFO (indx, R_LARCH_TLS_DESCNN);
 		  loongarch_elf_append_rela (output_bfd, relgot, &rela);


More information about the Binutils-cvs mailing list