From nobody Wed Jun 29 20:29:04 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 3A871866BFA; Wed, 29 Jun 2022 20:29:05 +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 4LYCjY12zWz4qVn; Wed, 29 Jun 2022 20:29:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656534545; 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=px1dbXeUStxGMQRtp1BV7KWbT2r6mKuLaVr/66rf0Hc=; b=SPcMyuZVBQah73+tiFIKlVbl0kRr3cwcr183EWFqOcJk1oJWvJKe2tWXaIiJtmGKXhbVHw yAN923FW6WnBeDINxXDaAgsGy8zu9bRF0bqdri3gxE4zT+LIT/Egj2kfvedLDJKV/GdST5 r3EVQBHh7y8j6WEy6yElmaj3jDGaMNJpquY0vo0pOzz90PV/OVjYgLrv/M19pNuw7bwcFH T/Bwpb3TKoPGFQoxNmjcskCdwBz+fQTXadktCxUGPpYI+xc4H+Z+S5GKxgNoE8bux0sWag epgfxg98N2ETr2FtchY22bG23Rug+vYWoPHzeW+isLgWY8nJEfH9NrtJ9tDZtw== 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 F3AAD18A11; Wed, 29 Jun 2022 20:29:04 +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 25TKT4kD001735; Wed, 29 Jun 2022 20:29:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25TKT4UD001734; Wed, 29 Jun 2022 20:29:04 GMT (envelope-from git) Date: Wed, 29 Jun 2022 20:29:04 GMT Message-Id: <202206292029.25TKT4UD001734@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: 038405f32f71 - main - Enable CRC64 checksums in xz. 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 038405f32f71ad8ba0280ae066417f986ede79db Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656534545; 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=px1dbXeUStxGMQRtp1BV7KWbT2r6mKuLaVr/66rf0Hc=; b=HGS80VCBTjcTF6v2xJja5n5FrbarG6gD9ev1PsSbEBIc/q0V/QQcM5uxYp5DcreCZAnH24 0JVDhbfXxql8kb0dcpBXKjvd6zmKQLL5i+c1YonKWnsRH9ySGfJXJ/OOtnjKUN5YgwCUUe /z5NsXAe+Zd3dBUhSVDTQafkuIJFcIJJJU9cnq0f2L15vIsgUN15thLSSzYWriyqAHnyP1 J+rxdLeA02XmUUsDaeGqVfB1sb72o/1eiy/6Rm6p4YVQ95o1XuKmQGJWm4X7CP0UcPJWz0 rjG0hJoC1WrwK191y4lnBBLwKbOtO7A5twCt/sbtVymmRVAgqhy9Bm5gUdL++A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656534545; a=rsa-sha256; cv=none; b=w+BYp28Ve4YTtUxnhWqBdNUWFL+CjIQ+7vGvPCRhGv6hjsESTP5eXpyIAR8QcSLxrnwEzQ 9kc0rMsGNwlI4DtbtLAcgSEqTVmmNnvCR3+FCpi35hPW2yjDf+AdPp/ldEG5eypvjZdjHI 4RRplP90J1mREmdT3HWL9Zc+t6vDlOQ+Q4DQ7+pRUYuz083RLiF5OAkjcUXd2wqmY+JNka mRFCR/3vWEN6zaLQejbPMAYY/h/FVmzGWOpcwQtaxHgBG0Ue7IRS2fo9kS2Yg+97nqNat+ jmWxyQ5nuFtS5cshFsPbhrfmoD25HDZMA/Bv2k5c7T//XQcrHBVDYzrkDELsyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=038405f32f71ad8ba0280ae066417f986ede79db commit 038405f32f71ad8ba0280ae066417f986ede79db Author: Dag-Erling Smørgrav AuthorDate: 2022-06-29 20:11:42 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2022-06-29 20:25:52 +0000 Enable CRC64 checksums in xz. Reviewed by: imp Sponsored by: Juniper Networks, Inc. Sponsored by: Klara, Inc. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D35668 --- 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 f28a6244da80..a0b828f92cb7 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -677,15 +677,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