cheri: elf: make l_addr a capability

l_addr should be a capability on Morello. This is synchronized with the
same variable in gdb.

Use elfptr_t when ElfW(Addr) represents a runtime pointer that may be
dereferenced.

diff --git a/elf/link.h b/elf/link.h
index 88b1ad7fd014a6eef38cd6a42a271f18fedcad76..c0f255ae18a8a8fef72c562e002d0308cfd40b8d 100644 (file)
--- a/elf/link.h
+++ b/elf/link.h
@@ -34,6 +34,12 @@
 #include <bits/elfclass.h>             /* Defines __ELF_NATIVE_CLASS.  */
 #include <bits/link.h>
 
+#ifdef __CHERI_PURE_CAPABILITY__
+typedef uintptr_t elfptr_t;
+#else
+typedef ElfW(Addr) elfptr_t;
+#endif
+
 /* The legacy rendezvous structure used by the run-time dynamic linker to
    communicate details of shared object loading to the debugger.  */
 

diff --git a/include/link.h b/include/link.h
index 0ac82d7c774f0975bbc9eaae4792e881eab67aeb..a3e4a7fc700b9bc7500753cdea9b52a13f37f7f8 100644 (file)
--- a/include/link.h
+++ b/include/link.h
@@ -83,6 +83,7 @@ struct r_search_path_struct
 extern struct r_search_path_struct __rtld_search_dirs attribute_hidden;
 extern struct r_search_path_struct __rtld_env_path_list attribute_hidden;
 
+
 /* Structure describing a loaded shared object.  The `l_next' and `l_prev'
    members form a chain of all the shared objects loaded at startup.
 
@@ -96,9 +97,9 @@ struct link_map
   {
     /* These first few members are part of the protocol with the debugger.
        This is the same format used in SVR4.  */
-
-    ElfW(Addr) l_addr;         /* Difference between the address in the ELF
+    elfptr_t l_addr;           /* Difference between the address in the ELF
                                   file and the addresses in memory.  */
+
     char *l_name;              /* Absolute file name object was found in.  */
     ElfW(Dyn) *l_ld;           /* Dynamic section of the shared object.  */
     struct link_map *l_next, *l_prev; /* Chain of loaded objects.  */