From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Thu, 24 Mar 2022 20:01:21 +0000 (-0700)
Subject: Fixed error with compare256_unaligned_avx2 undefined if unaligned access is disabled.
X-Git-Tag: 2.1.0-beta1~301
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10d6c17bf5f141c0a287254549b03db8486f7809;p=thirdparty%2Fzlib-ng.git

Fixed error with compare256_unaligned_avx2 undefined if unaligned access is disabled.
---

diff --git a/test/benchmarks/benchmark_compare256.cc b/test/benchmarks/benchmark_compare256.cc
index 09a4bbc2..bdfdd6bf 100644
--- a/test/benchmarks/benchmark_compare256.cc
+++ b/test/benchmarks/benchmark_compare256.cc
@@ -69,11 +69,10 @@ BENCHMARK_COMPARE256(unaligned_32, compare256_unaligned_32, 1);
 #if defined(UNALIGNED64_OK) && defined(HAVE_BUILTIN_CTZLL)
 BENCHMARK_COMPARE256(unaligned_64, compare256_unaligned_64, 1);
 #endif
-#endif
-
-#ifdef X86_SSE2
+#if defined(X86_SSE2) && defined(HAVE_BUILTIN_CTZ)
 BENCHMARK_COMPARE256(unaligned_sse2, compare256_unaligned_sse2, x86_cpu_has_sse2);
 #endif
 #if defined(X86_AVX2) && defined(HAVE_BUILTIN_CTZ)
 BENCHMARK_COMPARE256(unaligned_avx2, compare256_unaligned_avx2, x86_cpu_has_avx2);
 #endif
+#endif
diff --git a/test/test_compare256.cc b/test/test_compare256.cc
index 3f0673e2..2c2f3aaa 100644
--- a/test/test_compare256.cc
+++ b/test/test_compare256.cc
@@ -65,11 +65,10 @@ TEST_COMPARE256(unaligned_32, compare256_unaligned_32, 1)
 #if defined(UNALIGNED64_OK) && defined(HAVE_BUILTIN_CTZLL)
 TEST_COMPARE256(unaligned_64, compare256_unaligned_64, 1)
 #endif
-#endif
-
 #if defined(X86_SSE2) && defined(HAVE_BUILTIN_CTZ)
 TEST_COMPARE256(unaligned_sse2, compare256_unaligned_sse2, x86_cpu_has_sse2)
 #endif
 #if defined(X86_AVX2) && defined(HAVE_BUILTIN_CTZ)
 TEST_COMPARE256(unaligned_avx2, compare256_unaligned_avx2, x86_cpu_has_avx2)
 #endif
+#endif