From nobody Fri Jul 29 18:47:32 2022 X-Original-To: dev-commits-src-all@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 4Lvc2Y193mz4Y1lL; Fri, 29 Jul 2022 18:47:33 +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 4Lvc2Y0QyMz3pv4; Fri, 29 Jul 2022 18:47:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659120453; 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=gHJ3mayYBItR+QZeiuKW4xsG+fHSPi081pHgfPE1KpI=; b=ttOqM16I/0TEL2F/6VsubAd60zBg4FCjBz62FiFH1XZjbyifGKG/x3N+SU7XnooCyeu32Z E9PM96Qny0n1pHpCraRLeDS7h4jXRR76oHUsB+BmALUdNNOpc8X2DcqmyHzCQc36fy50vc Xer3+P2y+EwkjJPCoXSFOzYNDBAHSCj0PhChAbb7EpzqMVB57cE7tVCSSZIGPnblMOVQMm Jw4zDvdyBY70CRq8FFNxS1YnZn8UeDAh4yw67FZdS3v8AJq/L18C+AFf6ukvWNYg8hzFvY LcRSrvIDwX9jPsdndVODrG9GACbaBfYvWlouM5Bi3RcPeErPc7QhGkOItlawHA== 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 4Lvc2X6cxmzlh3; Fri, 29 Jul 2022 18:47:32 +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 26TIlWth024248; Fri, 29 Jul 2022 18:47:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26TIlWjE024247; Fri, 29 Jul 2022 18:47:32 GMT (envelope-from git) Date: Fri, 29 Jul 2022 18:47:32 GMT Message-Id: <202207291847.26TIlWjE024247@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: d2ece325b6d3 - stable/13 - Suppress -Wstrict-prototypes for several zlib files List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d2ece325b6d314febc925b1bc443cb334dd25dc5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659120453; 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=gHJ3mayYBItR+QZeiuKW4xsG+fHSPi081pHgfPE1KpI=; b=SCdN2/e+35jIH7+VL/FnAjNkMPCxaLxdh3giiPiDdMauyo72URWuK64ElCM34wYsY7wgIM jQlnhkfeOVUzl36ZgH36mI0+tvuwLOt7TmVY6kWDtAbbakiSGO605tmdq6pL9bxoleT5+2 Y8EMs45yuw6ItRDmePBp7AwdwE7NKRcsRLhNJQmkkdz96XpKIEEE/2Z2cAehLyjgFyz1mg z/xTBH1z+TDtH12QhNd2MiuCkUwJalIWpRFLL6rtWgvCpeqhOMN/OJteWsycocLk13ODqb AW3HaPR0yvklD2/Sj7aa+YJyW3r/3U3fUFolYNwV6MuU+MQx6P01dGA3vfJkxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659120453; a=rsa-sha256; cv=none; b=gyXceEBfO+GPVGmmPcj3U+ft0jo7n7gUn9aPKxAG1qMGKWr43/ePcbdEnUzjz1tr3tFenS lIx11qHNCq8/joUg3bfhmYI8ecmBjsTZqGTy67H1nK8TuZrV0TCFeOUebW/5daOdQU26W8 vv6VKyrU84OV0g+Sdta2ZOvKJVaxb/0Gq1+zsJcQLRCpK6mGY1gmQr7nRrROm8gh6uXB4A Wu0ZRAaDq4TV+xi9s7QIyBkFi6Sl8wb/Yu2Vicmxrhi1YtoVawpw69Jx3S28500jU1pewC 1jOIaPsC6otA5L+g9DqQDUzjxluRmXUuuynshUWhUxY2EfbLbG9SnGtyqem8UA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=d2ece325b6d314febc925b1bc443cb334dd25dc5 commit d2ece325b6d314febc925b1bc443cb334dd25dc5 Author: Dimitry Andric AuthorDate: 2022-07-26 18:24:58 +0000 Commit: Dimitry Andric CommitDate: 2022-07-29 18:29:59 +0000 Suppress -Wstrict-prototypes for several zlib files Clang 15 is more strict about function definitions not matching declarations, and zlib has a lot of these, but since it is contributed code (and in K&R style to boot), suppress those warnings instead. MFC after: 3 days (cherry picked from commit e83ffec3af2e71cc64348d58481c87db9efbac92) --- sys/conf/files | 9 ++++++--- sys/conf/kern.mk | 3 +++ sys/modules/zlib/Makefile | 3 +++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index d84810bf4e4d..2af31ca3dc44 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -4134,7 +4134,8 @@ contrib/zlib/compress.c optional crypto | geom_uzip | \ mxge | ddb_ctf | gzio | zfs | zlib \ compile-with "${NORMAL_C} -Wno-cast-qual" contrib/zlib/crc32.c optional crypto | geom_uzip | \ - mxge | ddb_ctf | gzio | zfs | zlib + mxge | ddb_ctf | gzio | zfs | zlib \ + compile-with "${NORMAL_C} ${NO_WSTRICT_PROTOTYPES}" contrib/zlib/deflate.c optional crypto | geom_uzip | \ mxge | ddb_ctf | gzio | zfs | zlib \ compile-with "${NORMAL_C} -Wno-cast-qual" @@ -4145,12 +4146,14 @@ contrib/zlib/inflate.c optional crypto | geom_uzip | \ contrib/zlib/inftrees.c optional crypto | geom_uzip | \ mxge | ddb_ctf | gzio | zfs | zlib contrib/zlib/trees.c optional crypto | geom_uzip | \ - mxge | ddb_ctf | gzio | zfs | zlib + mxge | ddb_ctf | gzio | zfs | zlib \ + compile-with "${NORMAL_C} ${NO_WSTRICT_PROTOTYPES}" contrib/zlib/uncompr.c optional crypto | geom_uzip | \ mxge | ddb_ctf | gzio | zfs | zlib \ compile-with "${NORMAL_C} -Wno-cast-qual" contrib/zlib/zutil.c optional crypto | geom_uzip | \ - mxge | ddb_ctf | gzio | zfs | zlib + mxge | ddb_ctf | gzio | zfs | zlib \ + compile-with "${NORMAL_C} ${NO_WSTRICT_PROTOTYPES}" dev/zlib/zlib_mod.c optional crypto | geom_uzip | \ mxge | ddb_ctf | gzio | zfs | zlib dev/zlib/zcalloc.c optional crypto | geom_uzip | \ diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk index be396d0c3706..13cf41f05a24 100644 --- a/sys/conf/kern.mk +++ b/sys/conf/kern.mk @@ -31,6 +31,9 @@ NO_WMISLEADING_INDENTATION= -Wno-misleading-indentation .if ${COMPILER_VERSION} >= 140000 NO_WBITWISE_INSTEAD_OF_LOGICAL= -Wno-bitwise-instead-of-logical .endif +.if ${COMPILER_VERSION} >= 150000 +NO_WSTRICT_PROTOTYPES= -Wno-strict-prototypes +.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 # some incentive to fix them eventually. diff --git a/sys/modules/zlib/Makefile b/sys/modules/zlib/Makefile index b5f1e552c465..6391255e512b 100644 --- a/sys/modules/zlib/Makefile +++ b/sys/modules/zlib/Makefile @@ -21,5 +21,8 @@ SRCS+= zutil.c CWARNFLAGS.compress.c+=-Wno-cast-qual # compress:49 CWARNFLAGS.deflate.c+=-Wno-cast-qual # deflate.c:415 CWARNFLAGS.uncompr.c+=-Wno-cast-qual # uncompr:49 +CWARNFLAGS.crc32.c+=${NO_WSTRICT_PROTOTYPES} # crc32.c:586 +CWARNFLAGS.trees.c+=${NO_WSTRICT_PROTOTYPES} # trees.c:232 +CWARNFLAGS.zutil.c+=${NO_WSTRICT_PROTOTYPES} # zutil.c:27,32 .include