From nobody Sat Apr 25 16:32:33 2026 X-Original-To: dev-commits-src-branches@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 4g2wNK4Clnz6bmK1 for ; Sat, 25 Apr 2026 16:32:33 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g2wNK2Fqsz472K for ; Sat, 25 Apr 2026 16:32:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777134753; 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=qnqVuz6OuIayqviNO3umYoGuyF2JafFgtjKFz2TC9EQ=; b=ijaPxWVNXcEypvjzkH7KbsCESPSehS3LQMi/eHevLbKZ4RIa2Vpni604y+KXvpsBR+aGkx x/i+VwXiiteq+obWhV/M4fzxYMrxo+jx+AcVrVLufmofzxnI8D3YEzRgPxr3IGRXjEPSGk PimKZqRav776RlJqjBLQOFG9+w8SIHvoLLoQddNjfwOicc0hLYFjPvil2IzDguv3n1uzu2 ShqQV0xzDvYhw2/iB5zm4FRjOSfkBidnhCTIylonBtZrGuk7iy3VD0so0oSK3+YwkJkxAb DSDOxM06sYKu8DITfQqlgLkh/2Mix8dWxmOF2k6TU+PzNc1bYix5gnoXGGKgrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777134753; a=rsa-sha256; cv=none; b=H7yjQVwUiZWQ569pX1gGPCKWx16pLdarmQ3gkOKL6LnD3/mTFugY9PqS8xy3wXEjyUH6QI fPvKsKMqqsOy5n99r+ozIqCeVXg/vhNlM0+eDu3Z8MC4tPKGYruzX+PUAkvRjncxK95QKp SdltCwH7QGKvVHxX+gBO0GZjr7tSNUzYzAYOfjeZTq3xuGfKvV9HauM/dpRHZNanowo/2D BL7OR6UXOmJxbySsJchcD9OVy5awWwdwyyJDMd00ZeurDvYhJ4e9n9ej1ruoBlqcsJhqfE l/1xNOSK+q8DoRudP1xKdKWlbZ+4bciyihAaBVRaAl1QOtEJBEusbUWFcfpLkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777134753; 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=qnqVuz6OuIayqviNO3umYoGuyF2JafFgtjKFz2TC9EQ=; b=ywpsjhjF4MQTZgb2yfjbU5bvdxbVhWZPmsjSmzT/5Ioh1uyTW5D9ftBKgWYf2gziUNxrgj DjQ7NoLbx9ml8w7n2LOm6YP0ufeh2YVGbHoK19cfQoAa+pEqhs7nIi3AEVe7HIQfP2Qmyk EyKFhzZqtkQ69op5/q918zVjBlEwtrDFiZrD+ucu8bSHNSunzT3zjDyP1wWROypTWB4+JU YwYTA+HRAaB7gQ5ZMbbIpgwHO13/VfKLkO1vXdbDgeTQ7Nc6T4cpllus1aGZPEYTPAR+xg acnWY4ME3ZQeX4SOD3oXFJGupp0zn99SBta+d6Ud8+nrVR68CeI7Aj8WpQJ5Jg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2wNK1n03zhnG for ; Sat, 25 Apr 2026 16:32:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45160 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 25 Apr 2026 16:32:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 7be895e50035 - stable/14 - libnetbsd: import `__CTASSERT(..)` macros List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7be895e5003534e51efe37cc63a359219099bf4a Auto-Submitted: auto-generated Date: Sat, 25 Apr 2026 16:32:33 +0000 Message-Id: <69ececa1.45160.4641cbd7@gitrepo.freebsd.org> The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=7be895e5003534e51efe37cc63a359219099bf4a commit 7be895e5003534e51efe37cc63a359219099bf4a Author: Enji Cooper AuthorDate: 2026-02-20 20:24:46 +0000 Commit: Enji Cooper CommitDate: 2026-04-25 16:32:25 +0000 libnetbsd: import `__CTASSERT(..)` macros These compile-time assert macros are similar to `Static_assert` on FreeBSD. These macros are in use in newer versions of `contrib/netbsd-tests`. Obtained from: https://github.com/NetBSD/src (c26cc77b3a0b26b95a2) MFC after: 1 week (cherry picked from commit d1f1402dff63dd163d4ba4ac65f7f2ffd00c5e08) --- lib/libnetbsd/sys/cdefs.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/lib/libnetbsd/sys/cdefs.h b/lib/libnetbsd/sys/cdefs.h index d0e06e46d241..e4ff4a516519 100644 --- a/lib/libnetbsd/sys/cdefs.h +++ b/lib/libnetbsd/sys/cdefs.h @@ -54,6 +54,22 @@ #define ___STRING(x) __STRING(x) #define ___CONCAT(x,y) __CONCAT(x,y) +/* + * Compile Time Assertion. + */ +#ifdef __COUNTER__ +#define __CTASSERT(x) __CTASSERT0(x, __ctassert, __COUNTER__) +#else +#define __CTASSERT(x) __CTASSERT99(x, __INCLUDE_LEVEL__, __LINE__) +#define __CTASSERT99(x, a, b) __CTASSERT0(x, __CONCAT(__ctassert,a), \ + __CONCAT(_,b)) +#endif +#define __CTASSERT0(x, y, z) __CTASSERT1(x, y, z) +#define __CTASSERT1(x, y, z) \ + struct y ## z ## _struct { \ + unsigned int y ## z : /*CONSTCOND*/(x) ? 1 : -1; \ + } + /* * The following macro is used to remove const cast-away warnings * from gcc -Wcast-qual; it should be used with caution because it