From: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date: Thu, 7 Apr 2022 12:18:48 +0000 (+0100)
Subject: TODO(incomplete): cheri: rtld: more elfptr_t in linkmap struct
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51fe1e15ed;p=thirdparty%2Fglibc.git

TODO(incomplete): cheri: rtld: more elfptr_t in linkmap struct

TODO: requires follwup patches to make sure all usage of the fields
preserve capabilities.
---

diff --git a/include/link.h b/include/link.h
index a3e4a7fc700..9ab07a281a7 100644
--- a/include/link.h
+++ b/include/link.h
@@ -253,9 +253,9 @@ struct link_map
 
     /* Start and finish of memory map for this object.  l_map_start
        need not be the same as l_addr.  */
-    ElfW(Addr) l_map_start, l_map_end;
+    elfptr_t l_map_start, l_map_end;
     /* End of the executable part of the mapping.  */
-    ElfW(Addr) l_text_end;
+    elfptr_t l_text_end;
 
     /* Default array for 'l_scope'.  */
     struct r_scope_elem *l_scope_mem[4];
@@ -344,7 +344,7 @@ struct link_map
 
     /* Information used to change permission after the relocations are
        done.  */
-    ElfW(Addr) l_relro_addr;
+    elfptr_t l_relro_addr;
     size_t l_relro_size;
 
     unsigned long long int l_serial;