From nobody Mon Jul 11 20:25:01 2022 X-Original-To: dev-commits-src-branches@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 8030217FE0F9; Mon, 11 Jul 2022 20:25:02 +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 4Lhb3L18Szz3pqj; Mon, 11 Jul 2022 20:25:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657571102; 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=viE9AULtIDebUqs4Nck8a5OZywIw26W3XCm+Ba7x8xU=; b=uA3Qc0spbTq6zt9DZHksU7irTJRieUH3RB0j9eD9gOdwqjoacTQGl+qdHG2g6yrAi/aHId oB+XAP5SyqjiCq9PhWkjEqyS1leBIKYzlDzny0j11vccz+xcACSKVQtHn1hN4YFqNa+oyn ReWnrGVGIOW7jqLKcsXjwl6++TQacSarBpraz7urAm4jcbTX5vbhc13GxVtNIPzZ63Os86 ocCcaCLaVJ0PZ/JDRlS+BQKZ6uBkEvqBEOpY6hHdeA6bpyH7QnHKkuTY2/ZS29PZkJrU06 lwwbqe0QDfc7RfvbWWMr4J+lSf8nSxNv0PpVDoGf3doEQa9xPmq+eto9oa+H4w== 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 4Lhb3L05KFzGwq; Mon, 11 Jul 2022 20:25:02 +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 26BKP1uF044002; Mon, 11 Jul 2022 20:25:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26BKP17S044001; Mon, 11 Jul 2022 20:25:01 GMT (envelope-from git) Date: Mon, 11 Jul 2022 20:25:01 GMT Message-Id: <202207112025.26BKP17S044001@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: f639aeb3fd3e - stable/13 - Enable CRC64 checksums in xz. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f639aeb3fd3e40dff4e475a27498ae6db2387a14 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657571102; 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=viE9AULtIDebUqs4Nck8a5OZywIw26W3XCm+Ba7x8xU=; b=xCCd5kZA+cQzscX2ujE6K/xKkUmrHTo7tccIuHlgZXZgMlSg9rBMKPv2WpEBzjl/8q/DGN kAQYNJ1vRayF2iVGZNM9hkMemzAxdSFNzZM7gvdFyJDDeRkQS0rrUGi1Vdw2e5N8IpM11I waWl6b+KqANJn/Xcynx9bgRJEMTRnQBJ3+ptFakRd4rRlFIeLVny6TyxyCUnVc59LIsC0/ LhntkdAvo2YuVXZvEzh1c0iBVz4Uob7OGmGyeA7n2bdlyc8TAQ+M107GcVWEYOqAbJjuAS m5Nj7MdvQrKIE/7LqD5ywzxx0lRjScBQBsDEeT5o7slt/Rh1p3ddMM4fAa0laQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657571102; a=rsa-sha256; cv=none; b=hFDhdJ3qtJJ63FeNGOkE9CaJKNgXXHyzmALZud5ouRAjHGfbaKcm2+Hl55gOarVUCPbYfq AU1L1C9qj9ip2RDYRN2sWhQtLFDaPD3Abmdo3z6hz3ZXDV6HpQUEZrYEj9SHYWBQUuo6Y5 sQaT96zyRu9YUCA8ssys80VE7GVworwYdlX4qCx8K4KteAqTbb7sqGJDvVibaiUAtqAM0/ q2K0/z4dMgz8Xzl+4wyIEyKiVHVxgNhFjXVGm28drxEmRyFbyF3TCHdQjurpTFD7G72HSz CxrPII+tWyR5oJ1YPEaDqWFLDMugxXEUuSxxDfLZ7XsPeLTvKKrQ/CHjIEJnpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f639aeb3fd3e40dff4e475a27498ae6db2387a14 commit f639aeb3fd3e40dff4e475a27498ae6db2387a14 Author: Dag-Erling Smørgrav AuthorDate: 2022-06-29 20:11:42 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2022-07-11 21:43:34 +0000 Enable CRC64 checksums in xz. Reviewed by: imp Sponsored by: Juniper Networks, Inc. Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D35668 (cherry picked from commit 038405f32f71ad8ba0280ae066417f986ede79db) --- sys/conf/files | 12 +++++++----- sys/modules/xz/Makefile | 2 ++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 1a729bf84c96..580428d3ad1c 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -693,15 +693,17 @@ contrib/ngatm/netnatm/sig/sig_verify.c optional ngatm_uni \ compile-with "${NORMAL_C} -I$S/contrib/ngatm" # xz dev/xz/xz_mod.c optional xz \ - compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/" + compile-with "${NORMAL_C} -DXZ_USE_CRC64 -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/" contrib/xz-embedded/linux/lib/xz/xz_crc32.c optional xz \ - compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/" + compile-with "${NORMAL_C} -DXZ_USE_CRC64 -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/" +contrib/xz-embedded/linux/lib/xz/xz_crc64.c optional xz \ + compile-with "${NORMAL_C} -DXZ_USE_CRC64 -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/" contrib/xz-embedded/linux/lib/xz/xz_dec_bcj.c optional xz \ - compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/" + compile-with "${NORMAL_C} -DXZ_USE_CRC64 -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/" contrib/xz-embedded/linux/lib/xz/xz_dec_lzma2.c optional xz \ - compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/" + compile-with "${NORMAL_C} -DXZ_USE_CRC64 -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/" contrib/xz-embedded/linux/lib/xz/xz_dec_stream.c optional xz \ - compile-with "${NORMAL_C} -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/" + compile-with "${NORMAL_C} -DXZ_USE_CRC64 -I$S/contrib/xz-embedded/freebsd/ -I$S/contrib/xz-embedded/linux/lib/xz/ -I$S/contrib/xz-embedded/linux/include/linux/" # Zstd contrib/zstd/lib/freebsd/zstd_kmalloc.c optional zstdio compile-with ${ZSTD_C} contrib/zstd/lib/common/zstd_common.c optional zstdio compile-with ${ZSTD_C} diff --git a/sys/modules/xz/Makefile b/sys/modules/xz/Makefile index c93abcae43f3..45d2a991b2e1 100644 --- a/sys/modules/xz/Makefile +++ b/sys/modules/xz/Makefile @@ -7,12 +7,14 @@ KMOD= xz SRCS= \ xz_crc32.c \ + xz_crc64.c \ xz_dec_bcj.c \ xz_dec_lzma2.c \ xz_dec_stream.c \ xz_mod.c CFLAGS+= \ + -DXZ_USE_CRC64 \ -I${SRCTOP}/sys/contrib/xz-embedded/freebsd \ -I${SRCTOP}/sys/contrib/xz-embedded/linux/lib/xz \ -I${SRCTOP}/sys/contrib/xz-embedded/linux/include/linux