From: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date: Wed, 13 Jul 2022 11:22:10 +0000 (+0100)
Subject: aarch64: morello: nptl: fix pthread types for 128 bit pointers
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0700f7a6c8dab64d57b941167c95bd9b6591997;p=thirdparty%2Fglibc.git

aarch64: morello: nptl: fix pthread types for 128 bit pointers
---

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 */