cheri: nptl: fix thread ID types for capabilities

diff --git a/sysdeps/nptl/bits/pthreadtypes.h b/sysdeps/nptl/bits/pthreadtypes.h
index 6f8907fe5427d7376bc6488d512ceda7b11317c7..706c2bb49559986f76d2563388dfe772a9b8c456 100644 (file)
--- 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 5653507e55a832ccc3251067b5e2b55ff2e62508..1efdf4b0efbe1fc016fa861a9187bfc1599eb7ad 100644 (file)
--- 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
 {