From 63bee6f1550d7b8a2a270d644c5f8514adcf5b29 Mon Sep 17 00:00:00 2001 From: Szabolcs Nagy Date: Wed, 13 Jul 2022 12:22:10 +0100 Subject: [PATCH] aarch64: morello: nptl: fix pthread types for 128 bit pointers --- 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 668fd9c8fd8..f1e4bda9dec 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 */ -- 2.47.2