From nobody Sat Jul 6 19:44:44 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 4WGgnn0DMLz5PnNY; Sat, 06 Jul 2024 19:44:45 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WGgnm6fvDz483k; Sat, 6 Jul 2024 19:44:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720295084; 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=8rnaGh+cYFGKhRz5+GwsZRNGSubj8lOUn5wx4Zk+efU=; b=h/rKaE9c/KRPx64mq/gy9z1JqBvCntK8DMhgnKSl8XItd39K4g/CoQfDPiY1QST7IJUtx+ 5sCOqKDCdHS8E1rngxNH0lm9aYPl9XNIFKxQxjeXppAQ7VuVugaPCUtGTcKHNFKI1JS9TN 8QPbhneFkNB0DUuyGx+lsp30kbda7zR6x65xjSYLtvzqLCn5aALtNuk800TWjzedGDbLam iI4ZXVwULSjWwEVYE3klRg6s7ggqHTuEHLoqkbxaSeTCoPQ9qoQDB0nFmX7QB/cJIJplTH MrdzG0i728Aoj0v8oeSt7LwFANjGVUezho5kYv+EVQ5mA6lXpc3VMMYWQCunWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720295084; a=rsa-sha256; cv=none; b=vt4osGdtfHE1uidX2jcvW/TtrAQQfuD8SYHxp19Bz7bZHDqvYAONHPcHjomng+t3KlToSr 2nRKPOLMA8oQzOF4SZlp0ee5xc8OJrV9tdacnM6iExx8y7JKeycL4JDmJAIBEDHPXJf8MK gOudOyxv8v6FlvRmQG0qLLqmaqVaB10WfU6Md0nBmpGJH5UKVxfJECjBGbofU8vyf8EgPS 6IgLA/E7EtOmsIJQIzACoZVXomi9xshUGz/ERIaqXeH1zsJbFYA/8xFYoASZKer/LBIJmf bkh+I6idadEJ357Mx6cmrMTvZEOP9Ij6K/m9c26moCvSVPkSTEjZt5BgmrRWqQ== 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=1720295084; 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=8rnaGh+cYFGKhRz5+GwsZRNGSubj8lOUn5wx4Zk+efU=; b=XjpdpzcVprrisPoPsXQ5lGUntuL+4nrVPzR68l8jXM8fp5OE+z/xWOAdBtQlLdo5oSh093 QH7BweCUAtVWXEiwLrz7UEt7xTkdbeXpREXCJel0HckFh+zAO7jxiMz2mATiPwBIgA2FC9 k+sQ60K1UfDJgmpT+kM10VPwfBnSygny7WPr3q3SiAS9Gf/UAkml8ALYg33ai2jAJ+cFTh +4+VboAkKWCBCzlmriFwg12LTCqjPYyHTTF93fe506LHkpb+LbdWs5E3ooQmGGfDMFpSPM 6lFwQc5bSylG/+matU8lglhSXbURw0aPS+uF//c98LwZNo2Qa0+0jJhfH2oawQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WGgnm687czsbG; Sat, 6 Jul 2024 19:44:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 466JiigI026413; Sat, 6 Jul 2024 19:44:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 466JiiQ3026410; Sat, 6 Jul 2024 19:44:44 GMT (envelope-from git) Date: Sat, 6 Jul 2024 19:44:44 GMT Message-Id: <202407061944.466JiiQ3026410@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 6677621bad00 - main - cdefs.h: Fallback to printf0 for __printf0like 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6677621bad00191dfec1b0a20ae1618b92745d9b Auto-Submitted: auto-generated 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