From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Thu, 7 May 2020 14:36:32 +0000 (-0700)
Subject: Remove support for DYNAMIC_CRC_TABLE which was broken.
X-Git-Tag: 1.9.9-b1~288
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f110451f76d3b0b4fca07b523883d03ad56f6b7;p=thirdparty%2Fzlib-ng.git

Remove support for DYNAMIC_CRC_TABLE which was broken.
---

diff --git a/functable.c b/functable.c
index 17cc81259..cb6fd2a96 100644
--- a/functable.c
+++ b/functable.c
@@ -48,11 +48,6 @@ extern uint32_t adler32_neon(uint32_t adler, const unsigned char *buf, size_t le
 /* CRC32 */
 ZLIB_INTERNAL uint32_t crc32_generic(uint32_t, const unsigned char *, uint64_t);
 
-#ifdef DYNAMIC_CRC_TABLE
-extern volatile int crc_table_empty;
-extern void make_crc_table(void);
-#endif
-
 #ifdef __ARM_FEATURE_CRC32
 extern uint32_t crc32_acle(uint32_t, const unsigned char *, uint64_t);
 #endif
@@ -201,10 +196,6 @@ ZLIB_INTERNAL uint32_t crc32_stub(uint32_t crc, const unsigned char *buf, uint64
            "crc32_z takes size_t but internally we have a uint64_t len");
     /* return a function pointer for optimized arches here after a capability test */
 
-#ifdef DYNAMIC_CRC_TABLE
-    if (crc_table_empty)
-        make_crc_table();
-#endif /* DYNAMIC_CRC_TABLE */
     cpu_check_features();
 
     if (sizeof(void *) == sizeof(ptrdiff_t)) {
diff --git a/zutil.c b/zutil.c
index 35cc236f7..197a2c541 100644
--- a/zutil.c
+++ b/zutil.c
@@ -69,9 +69,7 @@ unsigned long ZEXPORT PREFIX(zlibCompileFlags)(void) {
 #ifdef ZLIB_WINAPI
     flags += 1 << 10;
 #endif
-#ifdef DYNAMIC_CRC_TABLE
-    flags += 1 << 13;
-#endif
+    /* Bit 13 reserved for DYNAMIC_CRC_TABLE */
 #ifdef NO_GZCOMPRESS
     flags += 1L << 16;
 #endif