Diffusion FreeBSD src repository - subversion rS350496

Allow Kernel to link in both legacy libkern/zlib and new sys/contrib/zlib,
rS350496
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

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

Details

Provenance

Authored on

Reviewer

Differential Revision

D19706: Allow Kernel to link in both legacy libkern/zlib and new sys/contrib/zlib.

Parents

rS350495: MFC r350183, r350359

Branches

Unknown

Tags

Unknown

Event Timeline

delphij committed rS350496: Allow Kernel to link in both legacy libkern/zlib and new sys/contrib/zlib,.Aug 1 2019, 6:35 AM

delphij mentioned this in D19706: Allow Kernel to link in both legacy libkern/zlib and new sys/contrib/zlib..Aug 1 2019, 6:44 AM

delphij added an edge: D19706: Allow Kernel to link in both legacy libkern/zlib and new sys/contrib/zlib..Aug 6 2019, 1:32 PM

Changes (38)

Path

Size

head/

sys/

cddl/

contrib/

opensolaris/

uts/

common/

fs/

zfs/

zmod/

opensolaris_crc32.c

conf/

contrib/

zlib/

dev/

zlib/

	dev/	zlib/
		libkern/

	zlib_mod.c
	zlib.c

libkern/

modules/

crypto/

zfs/

zlib/

opencrypto/

cryptodeflate.c

sys/

rS350496

head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c

Loading...

head/sys/cddl/contrib/opensolaris/uts/common/zmod/adler32.c

Loading...

head/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.h

Loading...

head/sys/cddl/contrib/opensolaris/uts/common/zmod/deflate.c

Loading...

head/sys/cddl/contrib/opensolaris/uts/common/zmod/deflate.h

Loading...

head/sys/cddl/contrib/opensolaris/uts/common/zmod/inffast.c

Loading...

head/sys/cddl/contrib/opensolaris/uts/common/zmod/inffast.h

Loading...

head/sys/cddl/contrib/opensolaris/uts/common/zmod/inffixed.h

Loading...

head/sys/cddl/contrib/opensolaris/uts/common/zmod/inflate.c

Loading...

head/sys/cddl/contrib/opensolaris/uts/common/zmod/inflate.h

Loading...

head/sys/cddl/contrib/opensolaris/uts/common/zmod/inftrees.c

Loading...

head/sys/cddl/contrib/opensolaris/uts/common/zmod/inftrees.h

Loading...

head/sys/cddl/contrib/opensolaris/uts/common/zmod/opensolaris_crc32.c

Loading...

head/sys/cddl/contrib/opensolaris/uts/common/zmod/trees.c

Loading...

head/sys/cddl/contrib/opensolaris/uts/common/zmod/zconf.h

Loading...

head/sys/cddl/contrib/opensolaris/uts/common/zmod/zlib.h

Loading...

head/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c

Loading...

head/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c

Loading...

head/sys/cddl/contrib/opensolaris/uts/common/zmod/zutil.c

Loading...

head/sys/cddl/contrib/opensolaris/uts/common/zmod/zutil.h

Loading...

head/sys/conf/NOTES

Loading...

head/sys/conf/files

Loading...

head/sys/conf/kern.pre.mk

Loading...

head/sys/conf/kmod.mk

Loading...

head/sys/contrib/zlib/deflate.c

Loading...

head/sys/contrib/zlib/zconf.h

Loading...

head/sys/contrib/zlib/zutil.h

Loading...

head/sys/dev/zlib/

Loading...

head/sys/dev/zlib/zcalloc.c

Loading...

head/sys/dev/zlib/zcalloc.h

Loading...

head/sys/dev/zlib/zlib_mod.c

Loading...

head/sys/libkern/zlib.c

Loading...

head/sys/modules/crypto/Makefile

Loading...

head/sys/modules/zfs/Makefile

Loading...

head/sys/modules/zlib/Makefile

Loading...

head/sys/opencrypto/cryptodeflate.c

Loading...

head/sys/opencrypto/deflate.h

Loading...

head/sys/sys/zlib.h

Loading...