From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Sat, 8 Jan 2022 21:28:41 +0000 (-0800)
Subject: Remove unused COMPARE258 macro since longest_match only uses COMPARE256.
X-Git-Tag: 2.1.0-beta1~449
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2ef108051610dc435939ebabaedf36ffd053984;p=thirdparty%2Fzlib-ng.git

Remove unused COMPARE258 macro since longest_match only uses COMPARE256.
---

diff --git a/arch/x86/compare258_avx.c b/arch/x86/compare258_avx.c
index 3452127f5..4fafc4c6d 100644
--- a/arch/x86/compare258_avx.c
+++ b/arch/x86/compare258_avx.c
@@ -60,14 +60,12 @@ Z_INTERNAL uint32_t compare258_unaligned_avx2(const unsigned char *src0, const u
 
 #define LONGEST_MATCH       longest_match_unaligned_avx2
 #define COMPARE256          compare256_unaligned_avx2_static
-#define COMPARE258          compare258_unaligned_avx2_static
 
 #include "match_tpl.h"
 
 #define LONGEST_MATCH_SLOW
 #define LONGEST_MATCH       longest_match_slow_unaligned_avx2
 #define COMPARE256          compare256_unaligned_avx2_static
-#define COMPARE258          compare258_unaligned_avx2_static
 
 #include "match_tpl.h"
 
diff --git a/arch/x86/compare258_sse.c b/arch/x86/compare258_sse.c
index 1bea2e95b..f0accfd83 100644
--- a/arch/x86/compare258_sse.c
+++ b/arch/x86/compare258_sse.c
@@ -67,14 +67,12 @@ Z_INTERNAL uint32_t compare258_unaligned_sse4(const unsigned char *src0, const u
 
 #define LONGEST_MATCH       longest_match_unaligned_sse4
 #define COMPARE256          compare256_unaligned_sse4_static
-#define COMPARE258          compare258_unaligned_sse4_static
 
 #include "match_tpl.h"
 
 #define LONGEST_MATCH_SLOW
 #define LONGEST_MATCH       longest_match_slow_unaligned_sse4
 #define COMPARE256          compare256_unaligned_sse4_static
-#define COMPARE258          compare258_unaligned_sse4_static
 
 #include "match_tpl.h"
 
diff --git a/compare258.c b/compare258.c
index e6e63f249..8260f332b 100644
--- a/compare258.c
+++ b/compare258.c
@@ -59,14 +59,12 @@ Z_INTERNAL uint32_t compare258_c(const unsigned char *src0, const unsigned char
 
 #define LONGEST_MATCH       longest_match_c
 #define COMPARE256          compare256_c_static
-#define COMPARE258          compare258_c_static
 
 #include "match_tpl.h"
 
 #define LONGEST_MATCH_SLOW
 #define LONGEST_MATCH       longest_match_slow_c
 #define COMPARE256          compare256_c_static
-#define COMPARE258          compare258_c_staticc
 
 #include "match_tpl.h"
 
@@ -106,14 +104,12 @@ Z_INTERNAL uint32_t compare258_unaligned_16(const unsigned char *src0, const uns
 
 #define LONGEST_MATCH       longest_match_unaligned_16
 #define COMPARE256          compare256_unaligned_16_static
-#define COMPARE258          compare258_unaligned_16_static
 
 #include "match_tpl.h"
 
 #define LONGEST_MATCH_SLOW
 #define LONGEST_MATCH       longest_match_slow_unaligned_16
 #define COMPARE256          compare256_unaligned_16_static
-#define COMPARE258          compare258_unaligned_16_static
 
 #include "match_tpl.h"
 
@@ -153,14 +149,12 @@ Z_INTERNAL uint32_t compare258_unaligned_32(const unsigned char *src0, const uns
 
 #define LONGEST_MATCH       longest_match_unaligned_32
 #define COMPARE256          compare256_unaligned_32_static
-#define COMPARE258          compare258_unaligned_32_static
 
 #include "match_tpl.h"
 
 #define LONGEST_MATCH_SLOW
 #define LONGEST_MATCH       longest_match_slow_unaligned_32
 #define COMPARE256          compare256_unaligned_32_static
-#define COMPARE258          compare258_unaligned_32_static
 
 #include "match_tpl.h"
 
@@ -202,14 +196,12 @@ Z_INTERNAL uint32_t compare258_unaligned_64(const unsigned char *src0, const uns
 
 #define LONGEST_MATCH       longest_match_unaligned_64
 #define COMPARE256          compare256_unaligned_64_static
-#define COMPARE258          compare258_unaligned_64_static
 
 #include "match_tpl.h"
 
 #define LONGEST_MATCH_SLOW
 #define LONGEST_MATCH       longest_match_slow_unaligned_64
 #define COMPARE256          compare256_unaligned_64_static
-#define COMPARE258          compare258_unaligned_64_static
 
 #include "match_tpl.h"
 
diff --git a/match_tpl.h b/match_tpl.h
index e11abfbb7..75181bf85 100644
--- a/match_tpl.h
+++ b/match_tpl.h
@@ -288,4 +288,3 @@ break_matching:
 #undef LONGEST_MATCH_SLOW
 #undef LONGEST_MATCH
 #undef COMPARE256
-#undef COMPARE258