From: Cameron Cawley <ccawley2011@gmail.com>
Date: Sun, 22 Dec 2024 13:43:30 +0000 (+0000)
Subject: Improved setting of OPTIMAL_CMP on ARM
X-Git-Tag: 2.2.3~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc90e7b3fc57497b315e03fcd3b8465022a08855;p=thirdparty%2Fzlib-ng.git

Improved setting of OPTIMAL_CMP on ARM
---

diff --git a/zbuild.h b/zbuild.h
index c48b860a5..623ff7f79 100644
--- a/zbuild.h
+++ b/zbuild.h
@@ -249,17 +249,21 @@
       defined(__i686__) || defined(_X86_) || defined(_M_IX86)
 #  define OPTIMAL_CMP 32
 #elif defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC)
-#  if (defined(__GNUC__) && defined(__ARM_FEATURE_UNALIGNED)) || !defined(__GNUC__)
+#  if defined(__ARM_FEATURE_UNALIGNED) || defined(_WIN32)
 #    define OPTIMAL_CMP 64
+#  else
+#    define OPTIMAL_CMP 8
 #  endif
-#elif defined(__arm__) || (_M_ARM >= 7)
-#  if (defined(__GNUC__) && defined(__ARM_FEATURE_UNALIGNED)) || !defined(__GNUC__)
+#elif defined(__arm__) || defined(_M_ARM)
+#  if defined(__ARM_FEATURE_UNALIGNED) || defined(_WIN32)
 #    define OPTIMAL_CMP 32
+#  else
+#    define OPTIMAL_CMP 8
 #  endif
 #elif defined(__powerpc64__) || defined(__ppc64__)
-#    define OPTIMAL_CMP 64 
+#  define OPTIMAL_CMP 64
 #elif defined(__powerpc__) || defined(__ppc__) || defined(__PPC__)
-#    define OPTIMAL_CMP 32
+#  define OPTIMAL_CMP 32
 #endif
 #if defined(NO_UNALIGNED)
 #  undef OPTIMAL_CMP