Module Name: src
Committed By: tls
Date: Sat Aug 9 07:45:03 UTC 2014
Modified Files:
src/sys/lib/libkern [tls-earlyentropy]: Makefile.libkern libkern.h
Log Message:
(Temporarily) disable LZF in libkern -- it introduces a dependency from
src/sys to src/external which I'll need to fix by moving the LZF sources.
To generate a diff of this commit:
cvs rdiff -u -r1.32.2.2 -r1.32.2.3 src/sys/lib/libkern/Makefile.libkern
cvs rdiff -u -r1.113.2.1 -r1.113.2.2 src/sys/lib/libkern/libkern.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/lib/libkern/Makefile.libkern
diff -u src/sys/lib/libkern/Makefile.libkern:1.32.2.2 src/sys/lib/libkern/Makefile.libkern:1.32.2.3
--- src/sys/lib/libkern/Makefile.libkern:1.32.2.2 Thu Jul 17 14:03:33 2014
+++ src/sys/lib/libkern/Makefile.libkern Sat Aug 9 07:45:03 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.libkern,v 1.32.2.2 2014/07/17 14:03:33 tls Exp $
+# $NetBSD: Makefile.libkern,v 1.32.2.3 2014/08/09 07:45:03 tls Exp $
#
# Variable definitions for libkern.
@@ -94,8 +94,8 @@ SRCS+= explicit_memset.c consttime_memeq
SRCS+= cdbr.c
SRCS+= mi_vector_hash.c
-.PATH: ${NETBSDSRCDIR}/external/bsd/liblzf/dist
-SRCS+= lzf_c.c lzf_d.c
+#.PATH: ${NETBSDSRCDIR}/external/bsd/liblzf/dist
+#SRCS+= lzf_c.c lzf_d.c
# Files to clean up
CLEANFILES+= lib${LIB}.o lib${LIB}.po
Index: src/sys/lib/libkern/libkern.h
diff -u src/sys/lib/libkern/libkern.h:1.113.2.1 src/sys/lib/libkern/libkern.h:1.113.2.2
--- src/sys/lib/libkern/libkern.h:1.113.2.1 Mon Apr 7 01:10:55 2014
+++ src/sys/lib/libkern/libkern.h Sat Aug 9 07:45:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: libkern.h,v 1.113.2.1 2014/04/07 01:10:55 tls Exp $ */
+/* $NetBSD: libkern.h,v 1.113.2.2 2014/08/09 07:45:03 tls Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -380,6 +380,7 @@ unsigned int popcount64(uint64_t) __cons
void *explicit_memset(void *, int, size_t);
int consttime_memequal(const void *, const void *, size_t);
+#ifdef notyet
/*
* LZF hashtable/state size: on uncompressible data and on a system with
* a sufficiently large d-cache, a larger table produces a considerable
@@ -396,5 +397,6 @@ unsigned int lzf_compress_r (const void
unsigned int, LZF_STATE);
unsigned int lzf_decompress (const void *const, unsigned int, void *,
unsigned int);
+#endif
#endif /* !_LIB_LIBKERN_LIBKERN_H_ */
