From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id D1BB53852C61; Wed, 23 Nov 2022 14:49:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D1BB53852C61 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1669214971; bh=0l3ZM4yHmaFUX81+9JveX+4d3oo/rUcqFrXRsfQ4440=; h=From:To:Subject:Date:From; b=Y8dvpOHbYWEvjY3AQnABfXMJR1CPtIQUxAIkq95sOLn6Jssau1vIH3YUV45fqwB44 nxu9zvjUj+XmI4XpjQ6c6whQR1hAhNzQRr/CTcAA0k0F+8UZuOasHhYceVx+Ym3fJI D+GLdnovXzqrpSDtf8r1cnTA3g77Oo6qYtE8jDvs= 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: Fix sigevent ABI X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: abb1d6bb4114b95391d9e50de5bda4302bca950a X-Git-Newrev: 040bc860fe46e7f7c1e99de92565398656b6b5e9 Message-Id: <20221123144931.D1BB53852C61@sourceware.org> Date: Wed, 23 Nov 2022 14:49:31 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=040bc860fe46e7f7c1e99de92565398656b6b5e9 commit 040bc860fe46e7f7c1e99de92565398656b6b5e9 Author: Szabolcs Nagy Date: Thu Jun 16 15:37:31 2022 +0100 cheri: Fix sigevent ABI Adjust padding to accommodate pointer size and alignment increase. Diff: --- sysdeps/unix/sysv/linux/bits/types/sigevent_t.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sysdeps/unix/sysv/linux/bits/types/sigevent_t.h b/sysdeps/unix/sysv/linux/bits/types/sigevent_t.h index e8b28de7e3..ab0a6c0690 100644 --- a/sysdeps/unix/sysv/linux/bits/types/sigevent_t.h +++ b/sysdeps/unix/sysv/linux/bits/types/sigevent_t.h @@ -7,7 +7,11 @@ #define __SIGEV_MAX_SIZE 64 #if __WORDSIZE == 64 -# define __SIGEV_PAD_SIZE ((__SIGEV_MAX_SIZE / sizeof (int)) - 4) +# ifdef __CHERI_PURE_CAPABILITY__ +# define __SIGEV_PAD_SIZE ((__SIGEV_MAX_SIZE / sizeof (int)) - 8) +# else +# define __SIGEV_PAD_SIZE ((__SIGEV_MAX_SIZE / sizeof (int)) - 4) +# endif #else # define __SIGEV_PAD_SIZE ((__SIGEV_MAX_SIZE / sizeof (int)) - 3) #endif