From nobody Mon Jul 22 14:00:54 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 4WSMPg42ffz5Qyhw; Mon, 22 Jul 2024 14:00:55 +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 4WSMPg3Qcvz51wJ; Mon, 22 Jul 2024 14:00:55 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721656855; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=orPlCVsO3nrvz16tu1PXpxsfoskUF6iAFfwwyfWqav0=; b=Pzl4OApQrVXZ5Hmq2oDuVYZIn/qvOuHbgYB0Ee9CrE0KTLAqaJPc1mONRJMk6TJ+LRfho5 Am0tuTAtwy154gEE5tN13K6ZTvaFd4S72oncEzsDdN5dQtACU4k4WLYhA3I0gCGHFNxo89 U6Rk4TzsIJeLDDpTBhilP0YdEH/PYjifkdqPM6gS0uBDWopOOK2JkcbXU4HpHxEiirW0T0 p81yVDdWOgYenTPaLFapfAIHrtb5xT8JLFCRx8s8p4EAalDO4fqNlU7hhBP/uC2+hb93uO gsDYQ4oD59VhPQHtI0tGr5VYtBLRPg4NM/uRZIquQuHnGkrJDnzYRUYvIlzP/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721656855; a=rsa-sha256; cv=none; b=Mehkz+xjmkRw8RH9DLUfx54Q/i4wGSmzBin2xrfJ8AeCpFdhkXLu9oIGNQ9rlUt/eyezVc icgJjzTfU34q0t00SBR1HhAazJqRfVHa1TmrZ4i6rCEq3O0srQuMEJTE8NZjyhIRZRBhEQ 4JjKrxppPSE1dVxu4J5k8Jxz7reuAqPnLUuRvDRR99+5xKCuOevWXjz3z6GJCVr0GqCG2I XB7ufSs59lIoA4RtlzryIYeXsbYj9jgcTYk0loJs5y0QgjKaKO/c4FMhr27B/i5pNMtEgF sjDn4Pd3OHbQYaqq1Fsr+WIhU6k5rVkO/pDL2a355qoR7jkrrwCkLs6R1t1BGQ== 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=1721656855; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=orPlCVsO3nrvz16tu1PXpxsfoskUF6iAFfwwyfWqav0=; b=g7D7EE6f4ZeB2IfC0Dxjm0WjeKjy8TYDfNrVZg/wIhpKmKw/vqpV7h0aZOIWHCr6jtcf6x tMhXtIGEVvTRPLqiClu+Dl7B4hziqG+BFCed00E3ARtNzpyzjPBHcRXr7nsRQOVV00Bt9Z CBkVn7V2u8pssvJUoeDW3rzMkca6TQt8V61jOzBwmNs/hTnWTRKY+hXyXN9SsP5ehXt4un ITegsWAfP2j3AceG9KQ1bgb7gl5sH2CmJ6mXIwCQsLcFkF8eU+lssfZYDKDLn6KsGQNdZe 3AEYwoHqOEbsIdKAqpnOfFO0/BJE0ps2HFNBZwzHHRi+5xozuPz1brx9tB1qDg== Received: from [IPV6:2601:5c0:4200:b830:d405:43d2:f72c:28bf] (unknown [IPv6:2601:5c0:4200:b830:d405:43d2:f72c:28bf]) (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 4WSMPg1KDjzbRy; Mon, 22 Jul 2024 14:00:55 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: Date: Mon, 22 Jul 2024 10:00:54 -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 Cc: 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: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 7/19/24 17:20, Warner Losh wrote: > On Wed, Jul 10, 2024 at 12:19 PM John Baldwin wrote: > >> On 7/6/24 17:56, John Baldwin wrote: >>> 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. >> >> FYI, I have merged this fix to the ports, but not sure how we want to >> manage doing >> the patch to cdefs.h. I kind of think we should apply the change to >> cdefs.h in >> main in another week or so. I'm less certain of what to do for stable >> branches. >> > > I hadn't planned on merging this to stable branches. Is that your concern? Yes, just if we wanted to merge the printf0 change in sys/cdefs.h to stable branches. I think it's fine to fix cdefs.h in main now. -- John Baldwin