From nobody Tue Jul 26 19:25:18 2022 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 4Lsn1W27v7z4Ww3L; Tue, 26 Jul 2022 19:25:19 +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 4Lsn1W1Jdrz3xsN; Tue, 26 Jul 2022 19:25:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658863519; 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=Xb2mrduRhopZOOW2HWEuyxBMwpSIQzUmwt1AJE+WMMA=; b=kcYCS7+a+pT7PwSNaKM5eo7JfCE8Smr0R409BwicK1EhGG7DfMRCe4kfa3gPhoZnX/ZayV OdB0hd8yUnvIKtkA0VbM0TjtFd6dgLFNzgoA3fpDOAYl9JjDGV85VAjcmCiFh8egj0R7sr 3EKHgMU1JzRxBH+CKuWa8GiA0pSatw7dwvG4UkDDBDtMGsVxIB1KGxT7sfCBDb0EmZBI2t 6MFHkOSq9oWMGe9zUT1NmP/D5tDrODrZl6neXuzll+EDWPqhvtNM9guOeA4WKcXAqRKT9V aeh9GXMjcqQLQB43PR+dfd+AQhLQjuBMSGXr2ta4dAWqig9e7oTmAKaUaavnmA== 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 4Lsn1W0FppzpYM; Tue, 26 Jul 2022 19:25:19 +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 26QJPI12019582; Tue, 26 Jul 2022 19:25:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26QJPIJB019581; Tue, 26 Jul 2022 19:25:18 GMT (envelope-from git) Date: Tue, 26 Jul 2022 19:25:18 GMT Message-Id: <202207261925.26QJPIJB019581@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: e83ffec3af2e - main - Suppress -Wstrict-prototypes for several zlib files 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e83ffec3af2e71cc64348d58481c87db9efbac92 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658863519; 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=Xb2mrduRhopZOOW2HWEuyxBMwpSIQzUmwt1AJE+WMMA=; b=Ke48WEpQKmJgaSb9ll1mRn4R9T8wNatFd1E9QZ5hLc29wpLgR54S39xTDS9cwTRug3p3SH eqfER1F9l15+UKgzVrMXjFUGPNjKD1RZZJhMgza1z5fh4LVv7m3+arFwTCbZqJTZqDhXK6 NRkWmQPtwawuJiwv0HEWcI2eklHv+jobVNybwTcO51tzNOtCpMiUP7G1MdxGxCC6LnjFX4 UyP5MRRJKpiGKpElCFMaNPtq+IGYOt7rwuN4r/bhK3hdekQM6x9D0Gjns8K2EROGTNz79i 55TQCcB0UCN3f/lW1fBKQWDeiw6X9Wm0hOaCI9hc7Ze1H6LaccFifX2E4MraEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658863519; a=rsa-sha256; cv=none; b=MZ3H4dG+n3cNA0ozpUuPRCnJB/KOEVYN5ugt/UlaTKC/81EIBHv/W9EY8Vzo0FRVLM48ci igTlVLd56u6oehPCIK/yba2guGWEhD6WWVYVy88ZS/XyMIXTaBGyUKvEiIBXb5hkfSb+iV HDhVpkfLpfJ3h8D/Y5kcdn4FFUxys24kEJPbTX9wBvSS7VMSi8bl4eRM/aUlLGUGQ4JbwY ojmN7MmvXkqVIbhBnlBSVhH3K+mQlkxnngexN9rfqcQxJUWDBWcYzTYm3Pp7egGgu5TCKK vHR3ZF7L2JNLJwVNy8E/GvtBMyZ62He2l2T0vkW655/pTXcm7JMAUWkwXlahxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=e83ffec3af2e71cc64348d58481c87db9efbac92 commit e83ffec3af2e71cc64348d58481c87db9efbac92 Author: Dimitry Andric AuthorDate: 2022-07-26 18:24:58 +0000 Commit: Dimitry Andric CommitDate: 2022-07-26 19:25:08 +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 --- 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 b934bf5124b2..c1d91886ff05 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -4086,7 +4086,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" @@ -4097,12 +4098,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 b86149ab4618..4e33db93dafe 100644 --- a/sys/conf/kern.mk +++ b/sys/conf/kern.mk @@ -34,6 +34,9 @@ NO_WUNUSED_BUT_SET_VARIABLE= -Wno-unused-but-set-variable .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