From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id F25AA384B82F; Wed, 26 Oct 2022 15:17:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F25AA384B82F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666797454; bh=Wds+TzZsjQ+WJ71A1XfyoIYiSd7jRf9dtBCvJzTeAgk=; h=From:To:Subject:Date:From; b=YqSePYuKQAmaNDYqoilLngxEV6suRkTyotvHkD0WYli3PseW+KehaBU5LkEFYWHVj aGlh6o4QzVJqY/ZXFYn0Si/Y0cVaUBI//v9TxVESD5LNkjVRnIPlPb0hYpk6IeQqVm SN0NJjcrnAHN0H3VB38myFiCN1E+5Z4OAfQs3hEk= 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: 724ebdd00021b08b3746006839786453c616b6ea X-Git-Newrev: c7b27043ec55a11224568a6e240d307ac0355cf4 Message-Id: <20221026151734.F25AA384B82F@sourceware.org> Date: Wed, 26 Oct 2022 15:17:27 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=c7b27043ec55a11224568a6e240d307ac0355cf4 commit c7b27043ec55a11224568a6e240d307ac0355cf4 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 */