From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Fri, 31 Dec 2021 16:15:34 +0000 (-0800)
Subject: Don't assign C versions of compare258 and longest_match if we don't use them.
X-Git-Tag: 2.1.0-beta1~459
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5cc4257c9de2c6b50b4238b9008e0fe4d11422c;p=thirdparty%2Fzlib-ng.git

Don't assign C versions of compare258 and longest_match if we don't use them.
---

diff --git a/functable.c b/functable.c
index da21a808b..c2e23f55e 100644
--- a/functable.c
+++ b/functable.c
@@ -555,8 +555,6 @@ Z_INTERNAL uint32_t crc32_stub(uint32_t crc, const unsigned char *buf, uint64_t
 
 Z_INTERNAL uint32_t compare258_stub(const unsigned char *src0, const unsigned char *src1) {
 
-    functable.compare258 = &compare258_c;
-
 #ifdef UNALIGNED_OK
 #  if defined(UNALIGNED64_OK) && defined(HAVE_BUILTIN_CTZLL)
     functable.compare258 = &compare258_unaligned_64;
@@ -573,6 +571,8 @@ Z_INTERNAL uint32_t compare258_stub(const unsigned char *src0, const unsigned ch
     if (x86_cpu_has_avx2)
         functable.compare258 = &compare258_unaligned_avx2;
 #  endif
+#else
+    functable.compare258 = &compare258_c;
 #endif
 
     return functable.compare258(src0, src1);
@@ -580,8 +580,6 @@ Z_INTERNAL uint32_t compare258_stub(const unsigned char *src0, const unsigned ch
 
 Z_INTERNAL uint32_t longest_match_stub(deflate_state *const s, Pos cur_match) {
 
-    functable.longest_match = &longest_match_c;
-
 #ifdef UNALIGNED_OK
 #  if defined(UNALIGNED64_OK) && defined(HAVE_BUILTIN_CTZLL)
     functable.longest_match = &longest_match_unaligned_64;
@@ -598,6 +596,8 @@ Z_INTERNAL uint32_t longest_match_stub(deflate_state *const s, Pos cur_match) {
     if (x86_cpu_has_avx2)
         functable.longest_match = &longest_match_unaligned_avx2;
 #  endif
+#else
+    functable.longest_match = &longest_match_c;
 #endif
 
     return functable.longest_match(s, cur_match);
@@ -605,8 +605,6 @@ Z_INTERNAL uint32_t longest_match_stub(deflate_state *const s, Pos cur_match) {
 
 Z_INTERNAL uint32_t longest_match_slow_stub(deflate_state *const s, Pos cur_match) {
 
-    functable.longest_match_slow = &longest_match_slow_c;
-
 #ifdef UNALIGNED_OK
 #  if defined(UNALIGNED64_OK) && defined(HAVE_BUILTIN_CTZLL)
     functable.longest_match_slow = &longest_match_slow_unaligned_64;
@@ -623,6 +621,8 @@ Z_INTERNAL uint32_t longest_match_slow_stub(deflate_state *const s, Pos cur_matc
     if (x86_cpu_has_avx2)
         functable.longest_match_slow = &longest_match_slow_unaligned_avx2;
 #  endif
+#else
+    functable.longest_match_slow = &longest_match_slow_c;
 #endif
 
     return functable.longest_match_slow(s, cur_match);