From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 90BFA385084D; Wed, 12 Oct 2022 14:16:20 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 90BFA385084D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1665584180; bh=pdi9aPX/MsUjg2uw6TmQtDeXNEXwqyO5BrbozWxUMLU=; h=From:To:Subject:Date:From; b=JzeF5ErSWN11AMYVKn2I26dyYxrWWqwmBg2WE8PDR3vtj2v/mMroP/QtibRe8tNDs jXni2PsM6CY6nK4tUl1CWtZhVia5m2b5B0zQxr6W9zHltfhEk51Ia1oe4ICoxh01M+ hVIfccMFLp3hiBRzc705/e+BVSoCl6k9vCyCHNaw= 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] TODO: cheri: elf: turn back to addresses: l_map_end, l_text_end, l_relro_start X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: 284e4f17554381cac5f9b90cf85a1f3fc7fce6f3 X-Git-Newrev: bfc66c9896bd903f0295dee436110895de28a29e Message-Id: <20221012141620.90BFA385084D@sourceware.org> Date: Wed, 12 Oct 2022 14:16:20 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=bfc66c9896bd903f0295dee436110895de28a29e commit bfc66c9896bd903f0295dee436110895de28a29e Author: Szabolcs Nagy Date: Tue Aug 23 16:37:25 2022 +0100 TODO: cheri: elf: turn back to addresses: l_map_end, l_text_end, l_relro_start TODO: squash into 51fe1e15ed TODO(incomplete): cheri: rtld: more elfptr_t in linkmap struct Diff: --- include/link.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/link.h b/include/link.h index 9ab07a281a..e70d3b2d75 100644 --- a/include/link.h +++ b/include/link.h @@ -253,9 +253,10 @@ struct link_map /* Start and finish of memory map for this object. l_map_start need not be the same as l_addr. */ - elfptr_t l_map_start, l_map_end; + elfptr_t l_map_start; + ElfW(Addr) l_map_end; /* End of the executable part of the mapping. */ - elfptr_t l_text_end; + ElfW(Addr) l_text_end; /* Default array for 'l_scope'. */ struct r_scope_elem *l_scope_mem[4]; @@ -344,7 +345,7 @@ struct link_map /* Information used to change permission after the relocations are done. */ - elfptr_t l_relro_addr; + ElfW(Addr) l_relro_addr; size_t l_relro_size; unsigned long long int l_serial;