From: Carlos Eduardo Seo <carlos.seo@arm.com>
Date: Wed, 9 Jun 2021 18:23:23 +0000 (-0300)
Subject: cheri: fix static linking TLS setup
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4275aff6b80dac108ee47eb3be1bb96134d014db;p=thirdparty%2Fglibc.git

cheri: fix static linking TLS setup

Use l_addr provenance for TLS initimage.
---

diff --git a/csu/libc-tls.c b/csu/libc-tls.c
index 0a216c55028..b3d146472d0 100644
--- a/csu/libc-tls.c
+++ b/csu/libc-tls.c
@@ -125,7 +125,7 @@ __libc_setup_tls (void)
 	  /* Remember the values we need.  */
 	  memsz = phdr->p_memsz;
 	  filesz = phdr->p_filesz;
-	  initimage = (void *) phdr->p_vaddr + main_map->l_addr;
+	  initimage = phdr->p_vaddr + (void *) main_map->l_addr;
 	  align = phdr->p_align;
 	  if (phdr->p_align > max_align)
 	    max_align = phdr->p_align;