From nobody Wed Jul 13 14:45:26 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 8266F1D01CE3; Wed, 13 Jul 2022 14:45:26 +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 4LjgQZ2pF9z3G8s; Wed, 13 Jul 2022 14:45:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657723526; 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=g6x5gWw+di4ueNlbDQRHFcjE2ZlOsX26wOr5hi3iB3Q=; b=UjrpKPumbpJ8lVjuel5Nfhs4w8VzEHuS0O6vInFJi/CUJVPyIHtUqemV1zEM45xtF4rg7G pecdIPJtZRk0wGrL4qtlVHWG4lPDSO0vkS79aMaaEicmoVMzqJEnb5le8G6YfpNKsFq26P 31tzoGTzF24EPaAo7os0e+9px5CE6ygu3mR6awqH96V7bFicysHvHofPATqMee3ts3rTVq 4DVnmGUHQF25OMnGH1EbJJuz5AGs9oI3BdIYHFYmLc6BkWRBmscNdo9kqabNAsndaxzpN9 oaa/WOb4KCEChA7hOHsd4Jx/5s55mi+YaO4qHbjnkOlU5g5SnHO+pUQuInoyug== 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 4LjgQZ1qttzRYw; Wed, 13 Jul 2022 14:45:26 +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 26DEjQpv089163; Wed, 13 Jul 2022 14:45:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26DEjQh2089162; Wed, 13 Jul 2022 14:45:26 GMT (envelope-from git) Date: Wed, 13 Jul 2022 14:45:26 GMT Message-Id: <202207131445.26DEjQh2089162@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: 4f79fef1a984 - stable/12 - 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/stable/12 X-Git-Reftype: branch X-Git-Commit: 4f79fef1a9849baea8f6c3b68bc9eacd25c25e16 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657723526; 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=g6x5gWw+di4ueNlbDQRHFcjE2ZlOsX26wOr5hi3iB3Q=; b=faROuOCYgS/HLAakCWvQT9P5um3fghhMiQhe5SULPZz4W/Jxwp7J6dyjmO9m28O+T2x0l9 eSa7wc0Fhp/laK4O5F43bXXQ3AonLY88upuSD3jGvSQMVc9RPRGKcM7K+0wpDL8ryixSkX QgEoyOPSCmmnbFyLOQzrZnEBRFAsuOsAhlaIp/jK0zWWoweDnSHfxErMnK9ZRxTyYNETuB edW85sH47JImqQXHADR6o29PHQfh9SRqVQXlCYtRYzFZt9oQUyHezudVbugc4DzV2KnGoU XhcSB4zTBIZy4lhFhocj7Rf9nDOgeSSB3wS88fjDluLNrXgSqzV4Dg4eY/e3yw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657723526; a=rsa-sha256; cv=none; b=SGYsCHon9Y+MYxbQHZoTc2t+ObfD5gV7i5X7wffaXCAOjaOkthJ4AsjTSLtnlmSgNNJMgF JxAOtqDEnCxIbGEVfJ6Xncxu5ozrUftmGn84lAqpb7F25XrR4D3+LzHS0duxIhFXnB/4rn 9NK27DFm5u5fPj3qYQte6l9QD6PzfU0RcwNZ+Gtn4HO079HQUKuy1m/2dg1ay8W4Bbsfxx gIM/D1LUftJ9B6C8Fls9kDSLcHQNlS/VKshYOZeWwjE4qH2nzpAci29DB+ikLJcurW4k7J ZbGaxurAA7RIcAtuZ8YF7LzRFWfiljzHge+3IUi/x5OnGKbac6vho+40i2vWwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=4f79fef1a9849baea8f6c3b68bc9eacd25c25e16 commit 4f79fef1a9849baea8f6c3b68bc9eacd25c25e16 Author: Dag-Erling Smørgrav AuthorDate: 2022-06-29 20:11:42 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2022-07-13 15:59:59 +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 fd82bb859fe0..658df6a0c862 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -624,15 +624,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 100e75094bda..9e3803fc299d 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