From nobody Wed Mar 30 17:26:10 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 979021A4C02D; Wed, 30 Mar 2022 17:26:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KTCyV3k18z4k1y; Wed, 30 Mar 2022 17:26:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648661170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CNjFgrry4LlxhSMIff/zEc3JIuDwErhkxf6QFkCK0/E=; b=GJyOskOPX3DiYooe35hT7iNBRldySQ9CvGAthw78gf9JsBhyTrOXuv6QCj2/5mu8FqRdaH 7Xi993W0JTFdbrImGhXAcK8d2hdgyiUJ0IoD6qjNHGOU8Qfrzj73/6TeCb62d8epb+vJRX KWVw0SsXbyNByEpj3jOb7mNIfhZcDym0U5cLpZgEVoQL7vg9BfaiET/DFhF3T/+7r1E7da Ey5YopoD/yfHPtHg1z6jvQmDS8uYOtdtrHuFc+5jre6RDzYdW/1P0JKi6bwAGUmq/d9slA bpn7jv/jDunntwBqHppHmFRbfe0XMQQOQ3e0tInaGVwiziWZiwJGwjeVGP5rcg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 602B41781D; Wed, 30 Mar 2022 17:26:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22UHQArI055731; Wed, 30 Mar 2022 17:26:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22UHQAI9055730; Wed, 30 Mar 2022 17:26:10 GMT (envelope-from git) Date: Wed, 30 Mar 2022 17:26:10 GMT Message-Id: <202203301726.22UHQAI9055730@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 8299f9a5c167 - main - compat32: add size CTASSERTs for non-amd64 cases List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8299f9a5c167618416c21acd8a9fdd188f400172 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648661170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CNjFgrry4LlxhSMIff/zEc3JIuDwErhkxf6QFkCK0/E=; b=akHgV7nxyAwoJCCSl3AkPPVtZLDu5RoSxvZefS7Xemug9U84zrlCMqiAkuqooeD32+WfHp qyvRu2WVIKWrg/efyb6Dst7KSIz6mvbBybZ/L9lb7Ytff9g8X8QXLxFiiPLaW6rZIdferP K3Hog1aaDux8B3FVytlfxox0gxpUd4rBz/kM5ZH3cF+D0xHXLjvKEYLDZpV1u0tK1yPgNO KyA8Te/xlU+BvuSe50yABhvrfkn9OxhRH77j1o8LmXhLTrYtaQoJpJbHko0AFndCQjSYQ7 9jmFKxUpsQJTgj8I6nC+h0Sn7oIxFbvoon45mGtUgmhfe//C9/IaE4sWaURgaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648661170; a=rsa-sha256; cv=none; b=X8NJ2f4k7QqWh6q+MT9qnRQ10mHKAFKVrRKu5c/C417tpaP6u6+VXBfRwbDx56vuM4ij4O wT3j+Q2gGkDR0sXzJJqQgSljtY+0d1IV/C+mnPNfnEYBpi1IkA4T0MDRAtS54r8jd1SZ24 AylGfX+m6R2hQJoHVZZu1wyhko+/5zeAC2WooCry5CFgrzflRQui+NI/didXC8ukYksjQf YTNKj5Ximp9EFZ4Ui5wvwXjgQ7VuttvXPBVklGAg341NtvLBl8l9OFq4wW9vYp92Y2nplC Qj8FqTWBuqTDEt1Mai1h9Pv5z9LOlHbf5ja3/XARCXUMb0fCCwjsIyMP6YXQ2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8299f9a5c167618416c21acd8a9fdd188f400172 commit 8299f9a5c167618416c21acd8a9fdd188f400172 Author: Ed Maste AuthorDate: 2022-03-30 15:23:06 +0000 Commit: Ed Maste 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);