]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
Allow Kernel to link in both legacy libkern/zlib and new sys/contrib/zlib,
authordelphij <delphij@FreeBSD.org>
Thu, 1 Aug 2019 06:35:33 +0000 (06:35 +0000)
committerdelphij <delphij@FreeBSD.org>
Thu, 1 Aug 2019 06:35:33 +0000 (06:35 +0000)
commit83948bcf4b04fc3040d20f67d3169241e0d03333
tree8acee00d6eeed9533a5e78d99524a1e23e39ef11
parent307d7334c5b430ffa3eb481ee4555caf4c08a1d4
Allow Kernel to link in both legacy libkern/zlib and new sys/contrib/zlib,
with an eventual goal to convert all legacl zlib callers to the new zlib
version:

 * Move generic zlib shims that are not specific to zlib 1.0.4 to
   sys/dev/zlib.
 * Connect new zlib (1.2.11) to the zlib kernel module, currently built
   with Z_SOLO.
 * Prefix the legacy zlib (1.0.4) with 'zlib104_' namespace.
 * Convert sys/opencrypto/cryptodeflate.c to use new zlib.
 * Remove bundled zlib 1.2.3 from ZFS and adapt it to new zlib and make
   it depend on the zlib module.
 * Fix Z_SOLO build of new zlib.

PR: 229763
Submitted by: Yoshihiro Ota <ota j email ne jp>
Reviewed by: markm (sys/dev/zlib/zlib_kmod.c)
Relnotes: yes
Differential Revision: https://reviews.freebsd.org/D19706
37 files changed:
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
sys/cddl/contrib/opensolaris/uts/common/zmod/adler32.c [deleted file]
sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.h [deleted file]
sys/cddl/contrib/opensolaris/uts/common/zmod/deflate.c [deleted file]
sys/cddl/contrib/opensolaris/uts/common/zmod/deflate.h [deleted file]
sys/cddl/contrib/opensolaris/uts/common/zmod/inffast.c [deleted file]
sys/cddl/contrib/opensolaris/uts/common/zmod/inffast.h [deleted file]
sys/cddl/contrib/opensolaris/uts/common/zmod/inffixed.h [deleted file]
sys/cddl/contrib/opensolaris/uts/common/zmod/inflate.c [deleted file]
sys/cddl/contrib/opensolaris/uts/common/zmod/inflate.h [deleted file]
sys/cddl/contrib/opensolaris/uts/common/zmod/inftrees.c [deleted file]
sys/cddl/contrib/opensolaris/uts/common/zmod/inftrees.h [deleted file]
sys/cddl/contrib/opensolaris/uts/common/zmod/opensolaris_crc32.c [deleted file]
sys/cddl/contrib/opensolaris/uts/common/zmod/trees.c [deleted file]
sys/cddl/contrib/opensolaris/uts/common/zmod/zconf.h [deleted file]
sys/cddl/contrib/opensolaris/uts/common/zmod/zlib.h [deleted file]
sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c
sys/cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c [deleted file]
sys/cddl/contrib/opensolaris/uts/common/zmod/zutil.c [deleted file]
sys/cddl/contrib/opensolaris/uts/common/zmod/zutil.h [deleted file]
sys/conf/NOTES
sys/conf/files
sys/conf/kern.pre.mk
sys/conf/kmod.mk
sys/contrib/zlib/deflate.c
sys/contrib/zlib/zconf.h
sys/contrib/zlib/zutil.h
sys/dev/zlib/zcalloc.c [new file with mode: 0644]
sys/dev/zlib/zcalloc.h [new file with mode: 0644]
sys/dev/zlib/zlib_mod.c [new file with mode: 0644]
sys/libkern/zlib.c
sys/modules/crypto/Makefile
sys/modules/zfs/Makefile
sys/modules/zlib/Makefile
sys/opencrypto/cryptodeflate.c
sys/opencrypto/deflate.h
sys/sys/zlib.h