From bfc66c9896bd903f0295dee436110895de28a29e Mon Sep 17 00:00:00 2001 From: Szabolcs Nagy Date: Tue, 23 Aug 2022 16:37:25 +0100 Subject: [PATCH] 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 --- include/link.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/link.h b/include/link.h index 9ab07a281a7..e70d3b2d758 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; -- 2.47.2