Date: Sat, 29 Nov 2025 10:26:58 +0000 From: Nuno Teixeira <eduardo@freebsd.org> To: =?UTF-8?Q?Dag=2DErling_Sm=C3=B8rgrav?= <des@freebsd.org> Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 19728f31ae42 - main - sys/_types.h: Unbreak gcc build Message-ID: <CAFDf7U%2BfDh_g=MovF6MRJ4LvgZCXHd363faH-U8JoXQ3gLiAOA@mail.gmail.com> In-Reply-To: <6929fcae.2962d.8015a0f@gitrepo.freebsd.org> References: <6929fcae.2962d.8015a0f@gitrepo.freebsd.org>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --]
Hello,
I'm at main-n282229-687ab0dc54a9: Fri Nov 28 and gcc build still fails:
/usr/include/sys/_types.h:164:46: error: missing binary operator before
token "("
164 | #if !defined(__has_feature) || !__has_feature(capabilities)
| ^
gmake[3]: *** [Makefile:501: _trampoline.o] Error 1
Cheers,
Dag-Erling Smørgrav <des@freebsd.org> escreveu (sexta, 28/11/2025 à(s)
19:49):
> The branch main has been updated by des:
>
> URL:
> https://cgit.FreeBSD.org/src/commit/?id=19728f31ae421f40e2b0b0c775f4eedd7f927be0
>
> commit 19728f31ae421f40e2b0b0c775f4eedd7f927be0
> Author: Dag-Erling Smørgrav <des@FreeBSD.org>
> AuthorDate: 2025-11-28 19:47:04 +0000
> Commit: Dag-Erling Smørgrav <des@FreeBSD.org>
> CommitDate: 2025-11-28 19:47:22 +0000
>
> sys/_types.h: Unbreak gcc build
>
> We can't assume that <sys/cdefs.h> is in scope.
>
> Fixes: 85ab981a8e4e ("sys/_types.h: define fallback
> __(u)intcap_t")
> Reviewed by: olce, imp, emaste
> Differential Revision: https://reviews.freebsd.org/D53980
> ---
> sys/sys/_types.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/sys/sys/_types.h b/sys/sys/_types.h
> index e368f44f950e..f3c80957af34 100644
> --- a/sys/sys/_types.h
> +++ b/sys/sys/_types.h
> @@ -161,7 +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 */
>
> -#if !__has_feature(capabilities)
> +#if !defined(__has_feature) || !__has_feature(capabilities)
> /*
> * 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
>
>
--
Nuno Teixeira
FreeBSD UNIX: <eduardo@FreeBSD.org> Web: https://FreeBSD.org
[-- Attachment #2 --]
<div dir="ltr"><div><div><div>Hello,<br><br></div>I'm at main-n282229-687ab0dc54a9: Fri Nov 28 and gcc build still fails:<br><br></div>/usr/include/sys/_types.h:164:46: error: missing binary operator before token "("<br> 164 | #if !defined(__has_feature) || !__has_feature(capabilities)<br> | ^<br>gmake[3]: *** [Makefile:501: _trampoline.o] Error 1<br><br></div>Cheers,</div><br><div class="gmail_quote gmail_quote_container"><div dir="ltr" class="gmail_attr">Dag-Erling Smørgrav <<a href="mailto:des@freebsd.org">des@freebsd.org</a>> escreveu (sexta, 28/11/2025 à(s) 19:49):<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">The branch main has been updated by des:<br>
<br>
URL: <a href="https://cgit.FreeBSD.org/src/commit/?id=19728f31ae421f40e2b0b0c775f4eedd7f927be0" rel="noreferrer" target="_blank">https://cgit.FreeBSD.org/src/commit/?id=19728f31ae421f40e2b0b0c775f4eedd7f927be0</a><br>;
<br>
commit 19728f31ae421f40e2b0b0c775f4eedd7f927be0<br>
Author: Dag-Erling Smørgrav <des@FreeBSD.org><br>
AuthorDate: 2025-11-28 19:47:04 +0000<br>
Commit: Dag-Erling Smørgrav <des@FreeBSD.org><br>
CommitDate: 2025-11-28 19:47:22 +0000<br>
<br>
sys/_types.h: Unbreak gcc build<br>
<br>
We can't assume that <sys/cdefs.h> is in scope.<br>
<br>
Fixes: 85ab981a8e4e ("sys/_types.h: define fallback __(u)intcap_t")<br>
Reviewed by: olce, imp, emaste<br>
Differential Revision: <a href="https://reviews.freebsd.org/D53980" rel="noreferrer" target="_blank">https://reviews.freebsd.org/D53980</a><br>;
---<br>
sys/sys/_types.h | 2 +-<br>
1 file changed, 1 insertion(+), 1 deletion(-)<br>
<br>
diff --git a/sys/sys/_types.h b/sys/sys/_types.h<br>
index e368f44f950e..f3c80957af34 100644<br>
--- a/sys/sys/_types.h<br>
+++ b/sys/sys/_types.h<br>
@@ -161,7 +161,7 @@ typedef int __cpulevel_t; /* level parameter for cpuset. */<br>
typedef int __cpusetid_t; /* cpuset identifier. */<br>
typedef __int64_t __daddr_t; /* bwrite(3), FIOBMAP2, etc */<br>
<br>
-#if !__has_feature(capabilities)<br>
+#if !defined(__has_feature) || !__has_feature(capabilities)<br>
/*<br>
* On non-CHERI systems, define __(u)intcap_t to __(u)intptr_t so that<br>
* hybrid-C code which needs to be explicitly aware of capabilities can<br>
<br>
</blockquote></div><div><br clear="all"></div><br><span class="gmail_signature_prefix">-- </span><br><div dir="ltr" class="gmail_signature"><div dir="ltr"><div><font color="#888888">Nuno Teixeira</font></div><div><div><font color="#888888">
FreeBSD UNIX: <eduardo@FreeBSD.org> Web: <a href="https://FreeBSD.org" rel="noreferrer" target="_blank">https://FreeBSD.org</a><br></font></div></div></div></div>;
help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAFDf7U%2BfDh_g=MovF6MRJ4LvgZCXHd363faH-U8JoXQ3gLiAOA>