From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Fri, 26 Jan 2024 01:18:26 +0000 (-0800)
Subject: Simplify architecture #ifdef in test_crc32.cc.
X-Git-Tag: 2.2.0~113
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0417cd24f94263ca6d385eb064e20b7b0af7a8f7;p=thirdparty%2Fzlib-ng.git

Simplify architecture #ifdef in test_crc32.cc.
---

diff --git a/test/test_crc32.cc b/test/test_crc32.cc
index dcf7d48f..0cdc3179 100644
--- a/test/test_crc32.cc
+++ b/test/test_crc32.cc
@@ -210,15 +210,16 @@ TEST_CRC32(braid, PREFIX(crc32_braid), 1)
 
 #ifdef ARM_ACLE
 TEST_CRC32(acle, crc32_acle, test_cpu_features.arm.has_crc32)
-#elif defined(POWER8_VSX_CRC32)
+#endif
+#ifdef POWER8_VSX_CRC32
 TEST_CRC32(power8, crc32_power8, test_cpu_features.power.has_arch_2_07)
-#elif defined(S390_CRC32_VX)
+#endif
+#ifdef S390_CRC32_VX
 TEST_CRC32(vx, crc32_s390_vx, test_cpu_features.s390.has_vx)
-#elif defined(X86_FEATURES)
-#  ifdef X86_PCLMULQDQ_CRC
+#endif
+#ifdef X86_PCLMULQDQ_CRC
 TEST_CRC32(pclmulqdq, crc32_pclmulqdq, test_cpu_features.x86.has_pclmulqdq)
-#  endif
-#  ifdef X86_VPCLMULQDQ_CRC
+#endif
+#ifdef X86_VPCLMULQDQ_CRC
 TEST_CRC32(vpclmulqdq, crc32_vpclmulqdq, (test_cpu_features.x86.has_pclmulqdq && test_cpu_features.x86.has_avx512 && test_cpu_features.x86.has_vpclmulqdq))
-#  endif
 #endif