Fixed false positive HAVE_ARMV6_INTRIN value on old ARM platforms.

diff --git a/cmake/detect-intrinsics.cmake b/cmake/detect-intrinsics.cmake
index d2a591234b4e44cefe7fc4c2233a8a5b33cbdd9c..1906f21547b5c439bb3915ee6806c74a8aa9d622 100644 (file)
--- 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 8e693fe7b8c3e5c643156d7c4d43c45e23b1f18c..83736bd383aa620836c6c26ca7b9c5c20b2e51d5 100755 (executable)
--- 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