From: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date: Thu, 16 Jun 2022 14:37:31 +0000 (+0100)
Subject: cheri: Fix sigevent ABI
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82187c0633092f7b4f55ec93ab651dec84fe1413;p=thirdparty%2Fglibc.git

cheri: Fix sigevent ABI

Adjust padding to accommodate pointer size and alignment increase.
---

diff --git a/sysdeps/unix/sysv/linux/bits/types/sigevent_t.h b/sysdeps/unix/sysv/linux/bits/types/sigevent_t.h
index e8b28de7e3f..ab0a6c0690d 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