[glibc/arm/morello/main] TODO: cheri: elf: turn back to addresses: l_map_end, l_text_end, l_relro_start

[glibc/arm/morello/main] TODO: cheri: elf: turn back to addresses: l_map_end, l_text_end, l_relro_start

[Szabolcs Nagy]

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=bfc66c9896bd903f0295dee436110895de28a29e

commit bfc66c9896bd903f0295dee436110895de28a29e
Author: Szabolcs Nagy <szabolcs.nagy@arm.com>
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;