From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 4AC8A3853D7A; Wed, 23 Nov 2022 14:45:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4AC8A3853D7A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1669214733; bh=8bkyaUQ4+mxRBreT5Zw+BqRxSyqnCrZ1lGQLpHvOV48=; h=From:To:Subject:Date:From; b=gL+/11skXGE161WW3sdyRIe/7QCA2DvihISIDbd+toQFhLRKhpyzDb+n+C6vwEqIF ljkL6ajDR4MRRPzbn6g1VlvCfC2bDJhil7xNlgH0+EdrG+2RFjC6BwGVlZPd5kyV79 YF0GuaQqFiseTZJnrlorCwLHG374ffQXUT2Id6pA= 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: a5750ba400ec9a2561ac58700fc4ee76491b3984 X-Git-Newrev: 9bf00c58bc399042c097121ea5904df3d665128b Message-Id: <20221123144533.4AC8A3853D7A@sourceware.org> Date: Wed, 23 Nov 2022 14:45:33 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=9bf00c58bc399042c097121ea5904df3d665128b commit 9bf00c58bc399042c097121ea5904df3d665128b Author: Carlos Eduardo Seo Date: Wed Jun 9 15:23:23 2021 -0300 cheri: fix static linking TLS setup Use the per module RW capability to access the TLS initimage. The bounds are not restricted for now. 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..0701ec5acb 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 = (void *) dl_rx_ptr (main_map, phdr->p_vaddr); align = phdr->p_align; if (phdr->p_align > max_align) max_align = phdr->p_align;