From nobody Tue Feb 8 20:46:51 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 5A98219B0846; Tue, 8 Feb 2022 20:46:51 +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 4JtZn724VSz3ljr; Tue, 8 Feb 2022 20:46:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644353211; 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=DKMXpyI+wiNAGr6HuwoyDP4O4KMP2hODmeDL4k2kE6w=; b=F38glj0wn9rpW2snupjqgOkRGij31W4jTw597GZfOie7pxRcYlKf6PPi/yd+4+t0Z1VfAI xZBe/Q3BvijCAm4DWardNoI8fpM5L64YgUyavO4Be7ETUhIzWzdmF1/k2yvI3B9WhFVUib UQUw8CNbgU1aesOsX+LYvAIT6yLd4xk3Qnc7VJHM08TbQqhf3JwmrkzaSLDWKfHPfobXQQ HdKjZhHbxDopXZy2QYXgJDUuw+PoWcdLlYFbu4OduhzpLR7OgSXJALbNJEmb2LCnJOHeq2 hZA0d6cAfCrUy7wEZ2g1+buSF5HVpiZ2FxCAYI2B20FYf2bo8rjZTZD3Mrs7sw== 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 2787F20484; Tue, 8 Feb 2022 20:46:51 +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 218KkpA2063161; Tue, 8 Feb 2022 20:46:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 218KkpC7063160; Tue, 8 Feb 2022 20:46:51 GMT (envelope-from git) Date: Tue, 8 Feb 2022 20:46:51 GMT Message-Id: <202202082046.218KkpC7063160@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: 5f2aca839400 - main - Disable clang 14 warning about bitwise operators in zstd 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: 5f2aca83940097d7d23b4137073fb601f8e74232 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644353211; 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=DKMXpyI+wiNAGr6HuwoyDP4O4KMP2hODmeDL4k2kE6w=; b=apIHQnZ4YyhMW+UPXiFC+Kh2/WmnGRVqWZAWbUwBVs+fLjQ7lZ1nagO8Th14OLXZzQSgjA DjegnWE5Ac6C7+nP10BaTzNuXF6EOR5bj7xx46JSaqHwtn7LhGFGSMnFAbwo+tb2dkAh9i VedyjOwLewNMdZL4lKryHHVAe7rkEd4lTbudqW7z63hiGlY1Zwn7W99Grw5u9sA16JWZop Vv8/OzaQFs2SYQDsLV/snDPraQ1FowfkPkZYqkCzS99dzsa4Rnsc6Xcp1xOU85WtzQMPIs nLJXw15TBEwb2SwFKM7n3Q4PxwX+E4kwb27hat8JpjT9GEqWoCP4zV0fyF5e2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644353211; a=rsa-sha256; cv=none; b=HQpG+B36uudN5cm47Aur9muPLDNpqOg9xe62mNLLXaQVMU9cBtWurXMxm7At+fpVFqXzt5 1Fjpr4LspJDmj0Ahh/CAnAAmypbyzQoYmkoRKZxzfaunGpw2lm2/AO7M2C6pnNp9u3huN1 R4Puzu8G78ntNu99b4D2s51ead8tFufaGs7QpgtUkfelfx9lRtEKQH+FCQdT+9zqiNpBn5 tihXMcvp1UXo3y3S3MRQmuhMx9DjcniG2C1xwZfeG+/2oecsMwuL5iHNLQfVrw0BAOzYUD n25r1tLZJn9KW/ftsyYKUads+IxTQPc3Dj/8sJajzzYkGpqL+xmMo2PpirqRcA== 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=5f2aca83940097d7d23b4137073fb601f8e74232 commit 5f2aca83940097d7d23b4137073fb601f8e74232 Author: Dimitry Andric AuthorDate: 2022-02-08 20:46:03 +0000 Commit: Dimitry Andric CommitDate: 2022-02-08 20:46:08 +0000 Disable clang 14 warning about bitwise operators in zstd Parts of zstd, used in openzfs and other places, trigger a new clang 14 -Werror warning: ``` sys/contrib/zstd/lib/decompress/huf_decompress.c:889:25: error: use of bitwise '&' with boolean operands [-Werror,-Wbitwise-instead-of-logical] (BIT_reloadDStreamFast(&bitD1) == BIT_DStream_unfinished) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ``` While the warning is benign, it should ideally be fixed upstream and then vendor-imported, but for now silence it selectively. MFC after: 3 days --- cddl/lib/libzpool/Makefile | 1 + lib/libzstd/Makefile | 2 ++ share/mk/bsd.sys.mk | 3 +++ sys/conf/files | 2 +- sys/conf/kern.mk | 3 +++ sys/modules/zfs/Makefile | 1 + 6 files changed, 11 insertions(+), 1 deletion(-) diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile index 1c15cc265d48..cbd485a4dd6b 100644 --- a/cddl/lib/libzpool/Makefile +++ b/cddl/lib/libzpool/Makefile @@ -264,5 +264,6 @@ CFLAGS+= -g -DDEBUG=1 CFLAGS.zfs_zstd.c= -Wno-cast-qual -Wno-pointer-arith CFLAGS.zstd.c+= -fno-tree-vectorize +CFLAGS.zstd.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} .include diff --git a/lib/libzstd/Makefile b/lib/libzstd/Makefile index 5f7cd8248d88..e4f034f288a2 100644 --- a/lib/libzstd/Makefile +++ b/lib/libzstd/Makefile @@ -49,6 +49,8 @@ ZSTDDIR= ${SRCTOP}/sys/contrib/zstd .include +CFLAGS.huf_decompress.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} + # https://github.com/facebook/zstd/commit/812e8f2a [zstd 1.4.1] # "Note that [GCC] autovectorization still does not do a good job on the # optimized version, so it's turned off via attribute and flag. I found diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index 13be4c1442fc..1673ae8c449a 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -111,6 +111,9 @@ CWARNFLAGS.clang+= -Wno-array-bounds ${COMPILER_TYPE} == "gcc") CWARNFLAGS+= -Wno-misleading-indentation .endif # NO_WMISLEADING_INDENTATION +.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 140000 +NO_WBITWISE_INSTEAD_OF_LOGICAL= -Wno-bitwise-instead-of-logical +.endif .endif # WARNS .if defined(FORMAT_AUDIT) diff --git a/sys/conf/files b/sys/conf/files index 148bd9f4f7b4..f002598d1c3d 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -702,7 +702,7 @@ contrib/zstd/lib/decompress/zstd_decompress.c optional zstdio compile-with ${ZST # See comment in sys/conf/kern.pre.mk contrib/zstd/lib/decompress/zstd_decompress_block.c optional zstdio \ compile-with "${ZSTD_C} ${ZSTD_DECOMPRESS_BLOCK_FLAGS}" -contrib/zstd/lib/decompress/huf_decompress.c optional zstdio compile-with ${ZSTD_C} +contrib/zstd/lib/decompress/huf_decompress.c optional zstdio compile-with "${ZSTD_C} ${NO_WBITWISE_INSTEAD_OF_LOGICAL}" # Blake 2 contrib/libb2/blake2b-ref.c optional crypto | !random_loadable random_fenestrasx \ compile-with "${NORMAL_C} -I$S/crypto/blake2 -Wno-cast-qual -DSUFFIX=_ref -Wno-unused-function" diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk index b009d64324da..4c497623bf7c 100644 --- a/sys/conf/kern.mk +++ b/sys/conf/kern.mk @@ -28,6 +28,9 @@ NO_WTAUTOLOGICAL_POINTER_COMPARE= -Wno-tautological-pointer-compare .if ${COMPILER_VERSION} >= 100000 NO_WMISLEADING_INDENTATION= -Wno-misleading-indentation .endif +.if ${COMPILER_VERSION} >= 140000 +NO_WBITWISE_INSTEAD_OF_LOGICAL= -Wno-bitwise-instead-of-logical +.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/zfs/Makefile b/sys/modules/zfs/Makefile index b83a9a985fe2..d27e631b85fe 100644 --- a/sys/modules/zfs/Makefile +++ b/sys/modules/zfs/Makefile @@ -346,3 +346,4 @@ CFLAGS.zstd.c= -U__BMI__ -fno-tree-vectorize .if ${MACHINE_CPUARCH} == "aarch64" CFLAGS.zstd.c+= -include ${SRCDIR}/zstd/include/aarch64_compat.h .endif +CFLAGS.zstd.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL}