From nobody Mon Feb 13 19:51:54 2023 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 4PFw2z0nxlz3pvV7; Mon, 13 Feb 2023 19:51:55 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PFw2z0J1dz4CcG; Mon, 13 Feb 2023 19:51:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676317915; 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=bkwDRcigsCYQeHzffEAaf9LExWIqbzOhc1XfjuLjGc8=; b=Xur+pPeVvvdtIiseEAuFqKlXhqiHu8BRe8dNGpRHAfjaSHMGWOE21kjvJanhAr+ZyMzru9 r4cRqytFEPx58lI2/sN4iLatMtGwGjf46+/t9riZgRAXesZBz5lTAx6YsyK6eBLWHAShEM 16QMWb7AXwwXBDVO4MhHp229SBYrD1h3Xlh71+qkHMQhQLY1q/QwYLswybAuU6k9VxkSDC CmXlC6YFoDpeyeTiBAVRGQU3S/vuoreHBuKRdagzusd3yTXavPtYDuwuQJZAQB6CArJuKs T5TqrPl0jTveGJKJK6AJKi1EaVuAODmxUEpCvTVbb5lg4tEwTsZN9umy2ruP4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676317915; 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=bkwDRcigsCYQeHzffEAaf9LExWIqbzOhc1XfjuLjGc8=; b=GRgDGTbRkiSaWOqCteAs0uWr2SUgYN1pQownR9Hy9ZaP+7ePFHcydHesqDEdgIfm1KUu2Z tDGYAWne2NW1i/V19LgZT1q7WRxjl8LvKc4HqDDedRlmXXpCOh1aoUbrTfpcHKkU9XC7D/ E+ekHXJNY7+3iUWUZi3JXg9yhaJoJCUSlHBZtlrBkEL4SA13C8ggBQXdXWPFN18iFIeiCT tVoQD3JzQpeRSfOPisfZ/rZrLfztaoZVmAHPH8W6rQUZam+oLC9q8bvuB3Pbot0xlCDxuy r251r9bavkTmjGRViHqZKifzD7TWyxSme9QCv9AlwTEe0yjeGuSLVQ/oNx9kfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676317915; a=rsa-sha256; cv=none; b=lQcQ7Ub1pUMUd2ltyckhUFjBx/9SpJm3YZDer39JeGb3N2gLW/MpXmus5naARYh2cwz1KI 9AXJtXoLtfbLekHi8egbvcZyn6nYs8JEpdGtzy9r4HZadYG5rNyqk40j28f0XPLEz8uPOl gx0u8LG1maNKfPdRWXvqrX74whQGFmt9ainu5lM33ZhRko6gRHFZ+vVoNfom4zyeHbGVIH 9ByynXzpVNTPOmHLKBbZE4U3zTzwGQuipTVDpIxfRjqvWkpwyi697HLUYaWhFpaDWZxCej hNwLLAIy/HfLblz6EETZv9Uef66vPvjipKiPy0SF7KSrorJ+9WF0rc+ntK4cag== 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 4PFw2y6VBPzW9r; Mon, 13 Feb 2023 19:51:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31DJpsFr051988; Mon, 13 Feb 2023 19:51:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31DJpspq051987; Mon, 13 Feb 2023 19:51:54 GMT (envelope-from git) Date: Mon, 13 Feb 2023 19:51:54 GMT Message-Id: <202302131951.31DJpspq051987@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: 1a1f7b7df7dd - main - zlib: Add proper NO_WSTRICT_PROTYPES too 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 1a1f7b7df7dd7c0638b6425dab4d1aea06441168 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1a1f7b7df7dd7c0638b6425dab4d1aea06441168 commit 1a1f7b7df7dd7c0638b6425dab4d1aea06441168 Author: Warner Losh AuthorDate: 2023-02-13 19:00:50 +0000 Commit: Warner Losh CommitDate: 2023-02-13 19:50:56 +0000 zlib: Add proper NO_WSTRICT_PROTYPES too Also move NO_WDEPRECATED_NON_PROTOTYPE to a better place... Sponsored by: Netflix Noticed by: jhb Fixes: b9f235ba3178 --- sys/conf/kern.mk | 2 +- sys/conf/kern.pre.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk index 2668b7e5296e..74c47479ab9e 100644 --- a/sys/conf/kern.mk +++ b/sys/conf/kern.mk @@ -36,6 +36,7 @@ NO_WBITWISE_INSTEAD_OF_LOGICAL= -Wno-bitwise-instead-of-logical .endif .if ${COMPILER_VERSION} >= 150000 NO_WSTRICT_PROTOTYPES= -Wno-strict-prototypes +NO_WDEPRECATED_NON_PROTOTYPE= -Wno-deprecated-non-prototype .endif # Several other warnings which might be useful in some cases, but not severe # enough to error out the whole kernel build. Display them anyway, so there is @@ -53,7 +54,6 @@ CWARNEXTRA+= -Wno-error=array-parameter CWARNEXTRA+= -Wno-error=deprecated-non-prototype CWARNEXTRA+= -Wno-error=strict-prototypes CWARNEXTRA+= -Wno-error=unused-but-set-variable -NO_WDEPRECATED_NON_PROTOTYPE=-Wno-deprecated-non-prototype .endif .endif # clang diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index 1a94709eaded..e347f9fb9903 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -280,7 +280,7 @@ DTRACE_S= ${CC} -c ${DTRACE_ASM_CFLAGS} ${WERROR} ${.IMPSRC} # zlib code supports systems that are quite old, but will fix this issue once C2x gets radified. # see https://github.com/madler/zlib/issues/633 for details -ZLIB_CFLAGS= -Wno-cast-qual ${NO_WDEPRECATED_NON_PROTOTYPE} -Wno-strict-prototypes +ZLIB_CFLAGS= -Wno-cast-qual ${NO_WDEPRECATED_NON_PROTOTYPE} ${NO_WSTRICT_PROTOTYPES} ZLIB_C= ${CC} -c ${CFLAGS} ${WERROR} ${ZLIB_CFLAGS} ${.IMPSRC} # Special flags for managing the compat compiles for DTrace/FBT