From 5f645a6d4a13f65c5faac594fd0013ec93661415 Mon Sep 17 00:00:00 2001
From: delphij <delphij@FreeBSD.org>
Date: Thu, 8 Aug 2019 07:27:49 +0000
Subject: [PATCH] Convert DDB_CTF to use newer version of ZLIB.

PR:		229763
Submitted by:	Yoshihiro Ota <ota j email ne jp>
Differential Revision:	https://reviews.freebsd.org/D21176
---
 sys/kern/kern_ctf.c     | 18 +-----------------
 sys/kern/link_elf.c     |  4 ----
 sys/kern/link_elf_obj.c |  2 +-
 3 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/sys/kern/kern_ctf.c b/sys/kern/kern_ctf.c
index 74ec15400cf..2d0232ca8db 100644
--- a/sys/kern/kern_ctf.c
+++ b/sys/kern/kern_ctf.c
@@ -40,21 +40,7 @@
 #define CTF_HDR_STRLEN_U32	8
 
 #ifdef DDB_CTF
-static void *
-z_alloc(void *nil, u_int items, u_int size)
-{
-	void *ptr;
-
-	ptr = malloc(items * size, M_TEMP, M_NOWAIT);
-	return ptr;
-}
-
-static void
-z_free(void *nil, void *ptr)
-{
-	free(ptr, M_TEMP);
-}
-
+#include <contrib/zlib/zlib.h>
 #endif
 
 static int
@@ -269,8 +255,6 @@ link_elf_ctf_get(linker_file_t lf, linker_ctf_t *lc)
 
 		/* Initialise the zlib structure. */
 		bzero(&zs, sizeof(zs));
-		zs.zalloc = z_alloc;
-		zs.zfree = z_free;
 
 		if (inflateInit(&zs) != Z_OK) {
 			error = EIO;
diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c
index 800c0d685bc..8d07dd5bbb7 100644
--- a/sys/kern/link_elf.c
+++ b/sys/kern/link_elf.c
@@ -67,10 +67,6 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/link_elf.h>
 
-#ifdef DDB_CTF
-#include <sys/zlib.h>
-#endif
-
 #include "linker_if.h"
 
 #define MAXSEGS 4
diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c
index 0346a8b2fdc..55c2f7de387 100644
--- a/sys/kern/link_elf_obj.c
+++ b/sys/kern/link_elf_obj.c
@@ -62,7 +62,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/link_elf.h>
 
 #ifdef DDB_CTF
-#include <sys/zlib.h>
+#include <contrib/zlib/zlib.h>
 #endif
 
 #include "linker_if.h"
-- 
2.45.0