From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <nsz@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1944)
 id 9B6F23857363; Fri,  5 Aug 2022 19:34:44 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9B6F23857363
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Szabolcs Nagy <nsz@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc/arm/morello/main] cheri: nptl: fix thread ID types for
 capabilities
X-Act-Checkin: glibc
X-Git-Author: Szabolcs Nagy <szabolcs.nagy@arm.com>
X-Git-Refname: refs/heads/arm/morello/main
X-Git-Oldrev: c8f1fc9d94f9c311d382833c3393f12c1acb1991
X-Git-Newrev: b38585301de505f6d82f7be0dd8f6913c1bb8528
Message-Id: <20220805193444.9B6F23857363@sourceware.org>
Date: Fri,  5 Aug 2022 19:34:44 +0000 (GMT)
X-BeenThere: glibc-cvs@sourceware.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Glibc-cvs mailing list <glibc-cvs.sourceware.org>
List-Unsubscribe: <https://sourceware.org/mailman/options/glibc-cvs>,
 <mailto:glibc-cvs-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/glibc-cvs/>
List-Help: <mailto:glibc-cvs-request@sourceware.org?subject=help>
List-Subscribe: <https://sourceware.org/mailman/listinfo/glibc-cvs>,
 <mailto:glibc-cvs-request@sourceware.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Aug 2022 19:34:44 -0000

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=b38585301de505f6d82f7be0dd8f6913c1bb8528

commit b38585301de505f6d82f7be0dd8f6913c1bb8528
Author: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date:   Wed Jul 13 11:06:49 2022 +0100

    cheri: nptl: fix thread ID types for capabilities

Diff:
---
 sysdeps/nptl/bits/pthreadtypes.h        | 4 ++++
 sysdeps/nptl/bits/thread-shared-types.h | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/sysdeps/nptl/bits/pthreadtypes.h b/sysdeps/nptl/bits/pthreadtypes.h
index 6f8907fe54..706c2bb495 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 5653507e55..1efdf4b0ef 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
 {