From nobody Sat Jul 06 21:56:15 2024 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 4WGkjY24x2z5Q3sx; Sat, 06 Jul 2024 21:56:17 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WGkjY1CDTz4MJZ; Sat, 6 Jul 2024 21:56:17 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720302977; 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: in-reply-to:in-reply-to:references:references; bh=0cNBNMkcNRZaZgY9aNFdPN5Ylh1GLaAAFC0k+cb8yao=; b=uURUKF8PJ4wK1m9H/jNwi1WY9DqB07KVZlZa7k+IHVttQjx3/4P2NxzJgAOeLlU8uuQecW k5coCk3P3/3J+Dt+RfWPCeYSMPescIrYJBMuIQnQ5B0KXw/SALmWeARmP2jGKZYNaZA9Gh QMYpW1x6kerF+vYxqqRRhUVh7AjWSCJFhXdTMFsO0BsL7CDpdTVQcy7CTHlI8HjAi/tl+3 Q6oPJzZg+y27/mz2282DU5D9BJDZFe6MFwOUM9LVBkWuwx4GHe2RHtjZZKEedRsOM/1CAn cQiEn5ASUnODMPdPtOpm+aZKvccRVwz1yXvc+5TRLD+duz8Jw5dykNuPGcPOcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720302977; a=rsa-sha256; cv=none; b=j+FbEjWi60ehHwlmGhQsDL7xiUgsQKOOCi+WtxZcZr2GM/DRr/OXUzHrgfecSgUxSjQ068 UU8ZdL1nDpNKS3u0o+4tzk9P9cGXLJgmFbt+C5sehj0d48LA3y6coMlKIiuzr4leVDA/0i 09MewDBB9A/iG0gSY3VGdq5gDXRbNLlwF9oAN9tEQ3lCsLJDgX4Ifl9hQxkNWghGKNu72O lwnW7Xrb/mRcmy8w5h7LKXgfy/fCQmTsSJrSlzej1rCSWJDJATS3rfgoWIVhUfXwP+bzVd IGWaB2JtvEknC5d9+4mNMqfEknoAr343BiFx0LqxX7LUF5YucJEgsbjpNeLfCA== 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=1720302977; 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: in-reply-to:in-reply-to:references:references; bh=0cNBNMkcNRZaZgY9aNFdPN5Ylh1GLaAAFC0k+cb8yao=; b=OPjwv/MmZsOOG2esA6HcsQWQdlgmrbla6FfJcWyzEz3a3W22rxLIik7zy7sXEUOuw/kAcv 7g1Z50Vfpjue2BKpyuTI3gSkCiZw9uNDfkH/KoPhQ1qH3j5cbe18X/7JZJhwZsnlT38t/B 6sd5yPjb0KTneMjpizIyt0UB5NM5lw833cXxGZgAtkTSwutSFyk+VF2JbIfzA0P5ECEzcE 8bc+YrrIXHb+vAXWyo0ZoGVxL5VN01mMq6s9h3MfbUH6xqEmKpIX1lsWVHOANYLnNH0zQU 3Xy8k9jdApiUPNhEKgK+Bl04a7x3AjNYzYeu71r1I21aoeue1nXQNqMgGDI54Q== Received: from [IPV6:2601:5c0:4200:b830:7973:4abc:b518:de1] (unknown [IPv6:2601:5c0:4200:b830:7973:4abc:b518:de1]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4WGkjX6PMzz11dT; Sat, 6 Jul 2024 21:56:16 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: Date: Sat, 6 Jul 2024 17:56:15 -0400 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 6677621bad00 - main - cdefs.h: Fallback to printf0 for __printf0like Content-Language: en-US To: Warner Losh , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202407061944.466JiiQ3026410@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202407061944.466JiiQ3026410@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 7/6/24 15:44, Warner Losh wrote: > The branch main has been updated by imp: > > URL: https://cgit.FreeBSD.org/src/commit/?id=6677621bad00191dfec1b0a20ae1618b92745d9b > > commit 6677621bad00191dfec1b0a20ae1618b92745d9b > Author: Warner Losh > AuthorDate: 2024-07-06 19:42:37 +0000 > Commit: Warner Losh > CommitDate: 2024-07-06 19:45:03 +0000 > > cdefs.h: Fallback to printf0 for __printf0like > > For some reason, my tests were fine with this like it was, but CI for > gcc12 and gcc13 is complaining. Revert to the old form until that can be > worked out why the mismatch. > > Fixes: 0b82dac337e7 > Sponsored by: Netflix > --- > sys/sys/cdefs.h | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h > index 6b861b1903f6..a56839d57c7a 100644 > --- a/sys/sys/cdefs.h > +++ b/sys/sys/cdefs.h > @@ -356,9 +356,12 @@ > * Clang has always had printf and printf0 as aliases. gcc 11.0 now follows > * clang. So now this is an alias for __printflike, or nothing. In the future > * _Nullable or _Nonnull will replace this. > + * XXX Except that doesn't work, so for now revert to printf0 for clang and > + * the FreeBSD gcc until I can work this out. > */ > -#if defined(__clang__) || __GNUC_PREREQ__(11, 0) > -#define __printf0like(fmtarg, firstvararg) __printflike(fmtarg, firstvararg) > +#if defined(__clang__) || (defined(__GNUC__) && defined (__FreeBSD_cc_version)) > +#define __printf0like(fmtarg, firstvararg) \ > + __attribute__((__format__ (__printf0__, fmtarg, firstvararg))) > #else > #define __printf0like(fmtarg, firstvararg) > #endif It's because my patch for devel/freebsd-gcc{12,13} is kind of wrong. I had a mismerge when updating the printf0 patch from gcc9 to gcc12 that ended up re-adding the warn on NULL. I need to update the ports to remove that part of the patch. I will probably leave printf0 working for now in the ports just as an alias for regular printf to give us some transition time. -- John Baldwin