From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id C13033858C2D; Fri, 5 Aug 2022 19:33:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C13033858C2D Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Szabolcs Nagy To: glibc-cvs@sourceware.org Subject: [glibc/arm/morello/main] cheri: fix static linking TLS setup X-Act-Checkin: glibc X-Git-Author: Carlos Eduardo Seo X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: cb79f5073a957fb4804538fad25d6656343f2ef3 X-Git-Newrev: 4275aff6b80dac108ee47eb3be1bb96134d014db Message-Id: <20220805193343.C13033858C2D@sourceware.org> Date: Fri, 5 Aug 2022 19:33:43 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Aug 2022 19:33:43 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=4275aff6b80dac108ee47eb3be1bb96134d014db commit 4275aff6b80dac108ee47eb3be1bb96134d014db Author: Carlos Eduardo Seo Date: Wed Jun 9 15:23:23 2021 -0300 cheri: fix static linking TLS setup Use l_addr provenance for TLS initimage. Diff: --- csu/libc-tls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/csu/libc-tls.c b/csu/libc-tls.c index 0a216c5502..b3d146472d 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;