From: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date: Thu, 20 Oct 2022 11:33:20 +0000 (+0100)
Subject: cheri: Introduce elfptr_t int type that can hold pointers
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9c082706ea28d45f94f8c7ec46e15ec615a2e66;p=thirdparty%2Fglibc.git

cheri: Introduce elfptr_t int type that can hold pointers

Use elfptr_t when ElfW(Addr) represents a runtime pointer (may be
dereferenced or pointers may be derived from it).
---

diff --git a/elf/link.h b/elf/link.h
index 88b1ad7fd01..c0f255ae18a 100644
--- 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.  */