From nobody Tue Dec 30 01:36:10 2025 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 4dgFzc6ZFyz6MdNY; Tue, 30 Dec 2025 01:36:12 +0000 (UTC) (envelope-from markj@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dgFzc5wFSz3Jmr; Tue, 30 Dec 2025 01:36:12 +0000 (UTC) (envelope-from markj@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767058572; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=tHngZTcYScJyktyL0Om+OU1jx58ibU9XQEUyVpNJkr0=; b=RYL/jkvBxV9pTOaI7X9hXzlweU2iY0w165BNgFUzg7BbfgJxvMZw3PqcGh57XU4GDrRg7f 6hJcVrP6yNZUz28cTiuK8MUSfCj45seTlkjBH5THIYVL8FR9+jMMduX+oCNA1RZ8MIzcRI xqlku/XdveVto5QsauhVhN6WZ92uk54il1VenlgduZG0UPEAGpD2D9Q4Q+ipbZf+zK8rxk nTLw8qfJpR7HCVaxN6y+pql+C6OkEHB4I5SkkSl20aA2DSPFPdaQxWFFWYkL9lvWCn8763 7qOaTs0YekRomu2xNNCaf7y/RKVxRO+269XbuCWAdVoctMRGYZDtwC12bIrZCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767058572; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=tHngZTcYScJyktyL0Om+OU1jx58ibU9XQEUyVpNJkr0=; b=mPW2jBnutNYPz6vMqkQR0rEKDVxHfMtNFDfUikRvAjiyZ9AwMlX6MWxekKXgNR+ZGqROER m7ty6W/T+Cqg887hmJJ1hgdyA6fEbyl5kTHa4cq80STjhp86savWpSi2DCATm1ww6Gczsf diivyDFb/ia3n0UKQN11JF9HR1dniFkGFd0X4uksQK1mgUKPIM4ZX6NBbYu9HFrdk1XIGw INlYintBNOp8wM8Y7i1TWQNAFEHvLQqVv9bjJUvFV4ZaKLI1alIWyWyQeNsLlXWqGQ+GgE 4tApVUe8UpTLvgnt3fxIaNtho/B7I3CbgyF8mVO/GjkrzH2d711j6HzI/HB3XQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767058572; a=rsa-sha256; cv=none; b=eMI/P7ASANf7HiF7yUi1QqXqU57cCVv1WP0pbypQU7gsh7gkLwp5y8Finlfh1NrbBAy8zY fIGPRnsBetukMbG8J31Mc8NVxn1C88PS2ngYckYt8ZEOJ1S8E9L7mT5X1GgZnvvAY5PaN4 UZULATCBPgzw+l4y43e7W47GdNut6hPsJobR+R8gyoHvAvXXVzibTyu1dNYXGle4t9a4RF RCen7Cre+bmKWxdslal0uhwr1XZhYJAdBLx6kz1R9ST2i0P1rQBOV0fRdgRzYvajdGP/rt PVrzxfihgPjwCCUkGTzr3KkJ95MH9Mhi9r95QoP4Jc0CeUWNsa3QfzCkM5ZskA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from nuc (192-0-220-237.cpe.teksavvy.com [192.0.220.237]) (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) (Authenticated sender: markj) by smtp.freebsd.org (Postfix) with ESMTPSA id 4dgFzc3ZsGzskR; Tue, 30 Dec 2025 01:36:12 +0000 (UTC) (envelope-from markj@freebsd.org) Date: Mon, 29 Dec 2025 20:36:10 -0500 From: Mark Johnston To: Dimitry Andric Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org Subject: Re: git: 2ade7285253f - stable/14 - tools.build: add sys/cdefs.h to SYSINCS, since lots of other headers use it Message-ID: References: <69527170.31d92.5af51114@gitrepo.freebsd.org> 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=us-ascii Content-Disposition: inline In-Reply-To: On Tue, Dec 30, 2025 at 02:06:27AM +0100, Dimitry Andric wrote: > On 29 Dec 2025, at 22:21, Dimitry Andric wrote: > > > > On 29 Dec 2025, at 21:58, Mark Johnston wrote: > >> > >> On Mon, Dec 29, 2025 at 12:17:52PM +0000, Dimitry Andric wrote: > >>> The branch stable/14 has been updated by dim: > >>> > >>> URL: https://cgit.FreeBSD.org/src/commit/?id=2ade7285253fc5dfe0adfc51f7bd342b9293f253 > >>> > >>> commit 2ade7285253fc5dfe0adfc51f7bd342b9293f253 > >>> Author: Dimitry Andric > >>> AuthorDate: 2025-12-26 15:26:13 +0000 > >>> Commit: Dimitry Andric > >>> CommitDate: 2025-12-29 12:16:00 +0000 > >>> > >>> tools.build: add sys/cdefs.h to SYSINCS, since lots of other headers use it > >>> > >>> This is needed to let the legacy stage compile against newer versions of > >>> sys/font.h, which transitively includes sys/cdefs.h, and requires the > >>> new __nonstring macro from it. > >>> > >>> Fixes: e2c93ed09f25 > >>> MFC after: 3 days > >>> > >>> (cherry picked from commit 1c9ff80f06350fa44b7e50ce09ad665ab0082abb) > >> > >> Hi Dimitry, > >> > >> After this commit, I can't build stable/14 on main (commit 88b04633c29e > >> to be exact) anymore. Here's the output from a buildworld, it fails > >> pretty much immediately: > >> https://reviews.freebsd.org/P683 > >> > >> The same seems to be true on stable/13, but not on stable/15. > > > > Hmm, this turns out to be a bit deeper rabbit hole than I anticipated. The cdefs.h header on stable/14 and stable/13 are quite behind the one on main and stable/15. This causes issues like the above, when __noexcept, __deprecated1 and others are not defined during the legacy stage, and it picks up _some_ headers from the host system, and others from the location installed by tools/build/Makefile. > > > > I think I will rollback the MFCs for now, until I can figure out a solution. Ideally we would not have to copy cdefs.h for this bootstrap part, but that leads to other issues. > > As an alternative solution, I have MFC'd support for __noexcept, __deprecated, and __deprecated1 to stable/14 and stable/13, with a small additional patch to stable/13. I believe both branches should now build fine on main. This seems to work, thank you!