From: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date: Wed, 13 Jul 2022 10:06:49 +0000 (+0100)
Subject: cheri: nptl: fix thread ID types for capabilities
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b38585301de505f6d82f7be0dd8f6913c1bb8528;p=thirdparty%2Fglibc.git

cheri: nptl: fix thread ID types for capabilities
---

diff --git a/sysdeps/nptl/bits/pthreadtypes.h b/sysdeps/nptl/bits/pthreadtypes.h
index 6f8907fe542..706c2bb4955 100644
--- a/sysdeps/nptl/bits/pthreadtypes.h
+++ b/sysdeps/nptl/bits/pthreadtypes.h
@@ -24,7 +24,11 @@
 
 /* Thread identifiers.  The structure of the attribute type is not
    exposed on purpose.  */
+#ifdef __CHERI_PURE_CAPABILITY__
+typedef __uintcap_t pthread_t;
+#else
 typedef unsigned long int pthread_t;
+#endif
 
 
 /* Data structures for mutex handling.  The structure of the attribute
diff --git a/sysdeps/nptl/bits/thread-shared-types.h b/sysdeps/nptl/bits/thread-shared-types.h
index 5653507e55a..1efdf4b0efb 100644
--- a/sysdeps/nptl/bits/thread-shared-types.h
+++ b/sysdeps/nptl/bits/thread-shared-types.h
@@ -103,7 +103,11 @@ struct __pthread_cond_s
 };
 
 typedef unsigned int __tss_t;
+#ifdef __CHERI_PURE_CAPABILITY__
+typedef __uintcap_t __thrd_t;
+#else
 typedef unsigned long int __thrd_t;
+#endif
 
 typedef struct
 {