The branch main has been updated by des:
URL:
https://cgit.FreeBSD.org/src/commit/?id=038405f32f71ad8ba0280ae066417f986ede79db
commit 038405f32f71ad8ba0280ae066417f986ede79db
Author: Dag-Erling Smørgrav <d...@freebsd.org>
AuthorDate: 2022-06-29 20:11:42 +0000
Commit: Dag-Erling Smørgrav <d...@freebsd.org>
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
