From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id BAC3F38582BE; Fri, 5 Aug 2022 19:34:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BAC3F38582BE 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] aarch64: morello: nptl: fix pthread types for 128 bit pointers X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: f29dda01e00043ed2767192c0b12de708256e2f8 X-Git-Newrev: 63bee6f1550d7b8a2a270d644c5f8514adcf5b29 Message-Id: <20220805193454.BAC3F38582BE@sourceware.org> Date: Fri, 5 Aug 2022 19:34:54 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Aug 2022 19:34:54 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=63bee6f1550d7b8a2a270d644c5f8514adcf5b29 commit 63bee6f1550d7b8a2a270d644c5f8514adcf5b29 Author: Szabolcs Nagy Date: Wed Jul 13 12:22:10 2022 +0100 aarch64: morello: nptl: fix pthread types for 128 bit pointers Diff: --- sysdeps/aarch64/nptl/bits/pthreadtypes-arch.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/sysdeps/aarch64/nptl/bits/pthreadtypes-arch.h b/sysdeps/aarch64/nptl/bits/pthreadtypes-arch.h index 668fd9c8fd..f1e4bda9de 100644 --- a/sysdeps/aarch64/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/aarch64/nptl/bits/pthreadtypes-arch.h @@ -29,6 +29,16 @@ # define __SIZEOF_PTHREAD_RWLOCK_T 48 # define __SIZEOF_PTHREAD_BARRIER_T 20 # define __SIZEOF_PTHREAD_BARRIERATTR_T 4 +# define __LOCK_ALIGNMENT +#elif defined __CHERI_PURE_CAPABILITY__ +# define __SIZEOF_PTHREAD_ATTR_T 112 +# define __SIZEOF_PTHREAD_MUTEX_T 64 +# define __SIZEOF_PTHREAD_MUTEXATTR_T 8 +# define __SIZEOF_PTHREAD_CONDATTR_T 8 +# define __SIZEOF_PTHREAD_RWLOCK_T 56 +# define __SIZEOF_PTHREAD_BARRIER_T 32 +# define __SIZEOF_PTHREAD_BARRIERATTR_T 8 +# define __LOCK_ALIGNMENT __attribute__ ((__aligned__(16))) #else # define __SIZEOF_PTHREAD_ATTR_T 64 # define __SIZEOF_PTHREAD_MUTEX_T 48 @@ -37,11 +47,11 @@ # define __SIZEOF_PTHREAD_RWLOCK_T 56 # define __SIZEOF_PTHREAD_BARRIER_T 32 # define __SIZEOF_PTHREAD_BARRIERATTR_T 8 +# define __LOCK_ALIGNMENT #endif #define __SIZEOF_PTHREAD_COND_T 48 #define __SIZEOF_PTHREAD_RWLOCKATTR_T 8 -#define __LOCK_ALIGNMENT #define __ONCE_ALIGNMENT #endif /* bits/pthreadtypes.h */