git: 8299f9a5c167 - main - compat32: add size CTASSERTs for non-amd64 cases
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 30 Mar 2022 17:26:10 UTC
The branch main has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=8299f9a5c167618416c21acd8a9fdd188f400172
commit 8299f9a5c167618416c21acd8a9fdd188f400172
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2022-03-30 15:23:06 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2022-03-30 17:25:25 +0000
compat32: add size CTASSERTs for non-amd64 cases
Reviewed by: markj
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D34712
---
sys/compat/freebsd32/freebsd32_misc.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c
index 2b20170bfd2f..7be1dd8602a0 100644
--- a/sys/compat/freebsd32/freebsd32_misc.c
+++ b/sys/compat/freebsd32/freebsd32_misc.c
@@ -156,10 +156,17 @@ CTASSERT(sizeof(struct timeval32) == 8);
CTASSERT(sizeof(struct timespec32) == 8);
CTASSERT(sizeof(struct itimerval32) == 16);
CTASSERT(sizeof(struct bintime32) == 12);
+#else
+CTASSERT(sizeof(struct timeval32) == 16);
+CTASSERT(sizeof(struct timespec32) == 16);
+CTASSERT(sizeof(struct itimerval32) == 32);
+CTASSERT(sizeof(struct bintime32) == 16);
#endif
CTASSERT(sizeof(struct ostatfs32) == 256);
#ifdef __amd64__
CTASSERT(sizeof(struct rusage32) == 72);
+#else
+CTASSERT(sizeof(struct rusage32) == 88);
#endif
CTASSERT(sizeof(struct sigaltstack32) == 12);
#ifdef __amd64__
@@ -172,6 +179,9 @@ CTASSERT(sizeof(struct msghdr32) == 28);
#ifdef __amd64__
CTASSERT(sizeof(struct stat32) == 208);
CTASSERT(sizeof(struct freebsd11_stat32) == 96);
+#else
+CTASSERT(sizeof(struct stat32) == 224);
+CTASSERT(sizeof(struct freebsd11_stat32) == 120);
#endif
CTASSERT(sizeof(struct sigaction32) == 24);