From: Cameron Cawley <ccawley2011@gmail.com>
Date: Thu, 29 Sep 2022 20:45:39 +0000 (+0100)
Subject: Simplify feature checks in neon_intrins.h
X-Git-Tag: 2.1.0-beta1~150
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8736aa54a8a5cc0150dae016985d2002080f51f;p=thirdparty%2Fzlib-ng.git

Simplify feature checks in neon_intrins.h
---

diff --git a/arch/arm/neon_intrins.h b/arch/arm/neon_intrins.h
index 5885779ee..be6680067 100644
--- a/arch/arm/neon_intrins.h
+++ b/arch/arm/neon_intrins.h
@@ -24,10 +24,9 @@
     out.val[3] = vqsubq_u16(a.val[3], b); \
 } while (0)
 
-/* Have to check for hard float ABI on GCC/clang, but not
- * on MSVC (we don't compile for the soft float ABI on windows)
- */
-#if !defined(ARM_NEON_HASLD4) && (defined(__ARM_FP) || defined(_MSC_VER))
+#endif
+
+#if !defined(ARM_NEON_HASLD4) && (defined(ARM_NEON_ADLER32) || defined(ARM_NEON_SLIDEHASH))
 
 static inline uint16x8x4_t vld1q_u16_x4(uint16_t *a) {
     uint16x8x4_t ret = (uint16x8x4_t) {{
@@ -53,7 +52,6 @@ static inline void vst1q_u16_x4(uint16_t *p, uint16x8x4_t a) {
     vst1q_u16(p + 16, a.val[2]);
     vst1q_u16(p + 24, a.val[3]);
 }
-#endif // HASLD4 check and hard float
-#endif // ARM_NEON_SLIDEHASH
+#endif // HASLD4 check
 
 #endif // include guard ARM_NEON_INTRINS_H