From nobody Fri Jan 9 14:42:47 2026 X-Original-To: dev-commits-src-all@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 4dnkyb73Bkz62bvj for ; Fri, 09 Jan 2026 14:42:47 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dnkyb5SWpz3d33 for ; Fri, 09 Jan 2026 14:42:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767969767; 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=h3grexg6j0gs42vaLGYmW2aGXq+Kwic60zlRxYroNSg=; b=nadwrEFo64o4H4tHAkuuLe7+KxyKX39NswKpepiJkDbE4iBrOEhFFtq4qEHgN5N3Zw+vRp B+/qlRJ7LGpqfIcyG1rsQC8jiKpZFUpArC/oUhSppGDTq+gPwch1ErCb9fSSGaUpm8ZV7j llq0yXK0Nlyp9zGnT3yU+HUdZ7YqueYiBeNr4Mq5UPHTeYLX7sYjf/CNwyesU6Vr/7YWDO EC6qp024D74lB9wBgUlqvQJ+VjBhNrsro7nQmK9bvXxIRGZIzN1F4o0+gx9O9elG/p/tdD 8++Px/W08iwCY+Lg9Rp70CZ8GgOhM8yXUnjW1msF/Cypau45H1WU/DdOfCmCFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767969767; 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=h3grexg6j0gs42vaLGYmW2aGXq+Kwic60zlRxYroNSg=; b=mflOrz/N2P/pTHL95OjLF3DeJGwWVjxZB44G8E6m6FCy6emv50OdT2qDuyybBzMz/n8WdH YsSeURuwvky7zx02/aAOIW57HYzi8YJzWqlnZrItkBu3tlDSGOv/wxwU4bXy7fOx5amRHd RJhdMEa9EOWQ1KG/GHK9ksxxx0Apl9DONv4tFaGw1E8Im00l34bKMOybvs1IphuzG49by2 KkSFiqiMczfrX+thoqj/L8SgJvQyl57OjB/Ar4sYDO+olv4MotVU0QpWB2GDpwgdQ3su1G uH/LHqcVXwDx3owV66xxB1qPwt9Skb8UeI8BXcrqgUE1n5qAKbxU5yzh0JNciA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767969767; a=rsa-sha256; cv=none; b=d0l26427xZ2n9lqA4Zx6P0HhylkonyrwdLmaA3JHy1pmP9vcOZFqpcyPMIz7udA9zn4UKc 7Na4lkll9QBxyAr6C8izRwaCEzDlZiJq0QxOyKUho9c8hINmDmxpkNYbhK+U49WDTIScDA 06XyVu4RSNmvAJoBb2mTXpx/BGMsibLbVBZSC1riXTMsQAaUuAsNXybiujFnVqqoNWxtX5 nV4SEM845DB0kf4jVM+jVZOxvkFMZWGjKbWErUVyLeOlXnY3+JmCW6A/N6s41cjiJqXw1n INwYsMTRG2e8TMBsKtFJVHSojfSS2tUM5xmz8zYLgiagsiIYNOdtDH8tkabWgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dnkyb53tGz1RHV for ; Fri, 09 Jan 2026 14:42:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id e5b9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 09 Jan 2026 14:42:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 0a64d16cef17 - main - sys/_types.h: avoid use of __has_feature() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0a64d16cef172bd3c809a8dc9035cd7d981b2951 Auto-Submitted: auto-generated Date: Fri, 09 Jan 2026 14:42:47 +0000 Message-Id: <696113e7.e5b9.76306219@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=0a64d16cef172bd3c809a8dc9035cd7d981b2951 commit 0a64d16cef172bd3c809a8dc9035cd7d981b2951 Author: Brooks Davis AuthorDate: 2026-01-09 14:41:21 +0000 Commit: Brooks Davis CommitDate: 2026-01-09 14:42:00 +0000 sys/_types.h: avoid use of __has_feature() Only fairly recent GCC versions support and sys/_types.h must work with quite old compilers and without sys/cdef.h being included. The prior workaround works fine, but we can have the same effect with compiler macro definitions. In this specific case, compilers that define the __intcap_t builtin type will define __SIZEOF_INTCAP__. This reverts commit 029a09f18032353a9ae874590b879322efc6e53a This reverts commit 19728f31ae421f40e2b0b0c775f4eedd7f927be0 Reviewed by: imp, des, kib, emaste Effort: CHERI upstreaming Fixes: 85ab981a8e4e ("sys/_types.h: define fallback __(u)intcap_t") Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D54009 --- sys/sys/_types.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/sys/_types.h b/sys/sys/_types.h index 2e622090e81d..a2ee83a862da 100644 --- a/sys/sys/_types.h +++ b/sys/sys/_types.h @@ -161,10 +161,7 @@ typedef int __cpulevel_t; /* level parameter for cpuset. */ typedef int __cpusetid_t; /* cpuset identifier. */ typedef __int64_t __daddr_t; /* bwrite(3), FIOBMAP2, etc */ -#ifndef __has_feature -#define __has_feature(x) 0 -#endif -#if !__has_feature(capabilities) +#ifndef __SIZEOF_INTCAP__ /* * On non-CHERI systems, define __(u)intcap_t to __(u)intptr_t so that * hybrid-C code which needs to be explicitly aware of capabilities can