From: Alexander Smorkalov <alexander.smorkalov@xperience.ai>
Date: Tue, 10 Sep 2024 14:07:09 +0000 (+0300)
Subject: Fixed false positive HAVE_ARMV6_INTRIN value on old ARM platforms.
X-Git-Tag: 2.2.2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4549279dbff600fb4541c95409f96dec80384547;p=thirdparty%2Fzlib-ng.git

Fixed false positive HAVE_ARMV6_INTRIN value on old ARM platforms.
---

diff --git a/cmake/detect-intrinsics.cmake b/cmake/detect-intrinsics.cmake
index d2a59123..1906f215 100644
--- a/cmake/detect-intrinsics.cmake
+++ b/cmake/detect-intrinsics.cmake
@@ -66,7 +66,7 @@ macro(check_armv6_compiler_flag)
             return __uqsub16(a, b);
         #endif
         }
-        int main(void) { return 0; }"
+        int main(void) { return f(1,2); }"
         HAVE_ARMV6_INTRIN
     )
     set(CMAKE_REQUIRED_FLAGS)
diff --git a/configure b/configure
index 8e693fe7..83736bd3 100755
--- a/configure
+++ b/configure
@@ -1243,7 +1243,7 @@ EOF
 unsigned int f(unsigned int a, unsigned int b) {
     return __uqsub16(a, b);
 }
-int main(void) { return 0; }
+int main(void) { return f(1, 2); }
 EOF
     if try ${CC} ${CFLAGS} ${armv6flag} $test.c; then
         echo "Checking for ARMv6 intrinsics ... Yes." | tee -a configure.log