From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 4EBEF385152B; Thu, 27 Oct 2022 13:55:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4EBEF385152B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666878953; bh=V1BrbAfC7NsBlsE8xrFpNI+UGWWaUXU5rAqCYNlusuE=; h=From:To:Subject:Date:From; b=kW0TorblkSSizR0lqOhorN5zwM938s2Z0f5E/tYj1bcf4S8TYyMRanz1UUvO50MA4 gXZw9+6oXn5vnxx9lw+EYo4XpzIHzP0KAWUozpNSe3Dxaby7zwIrBVF2nvC0jLOAJE HxrbsG1ABwgLDtYhTWgc3vWBgyHCcmuLlnpn7evE= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Szabolcs Nagy 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 X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: 96ac67a64b4eb14473ea1e06aa665a903052b643 X-Git-Newrev: 280d809f68aaa725bc3d2e1724c42d83e951248f Message-Id: <20221027135553.4EBEF385152B@sourceware.org> Date: Thu, 27 Oct 2022 13:55:52 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=280d809f68aaa725bc3d2e1724c42d83e951248f commit 280d809f68aaa725bc3d2e1724c42d83e951248f Author: Szabolcs Nagy 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 {