Fixed false positive HAVE_ARMV6_INTRIN value on old ARM platforms.

diff --git a/cmake/detect-intrinsics.cmake b/cmake/detect-intrinsics.cmake
index 81032cb6def690774edf16cc132022c38b3f8679..c0c7f192f5ff439ceeacb32dc75755f73a1add05 100644 (file)
--- a/cmake/detect-intrinsics.cmake
+++ b/cmake/detect-intrinsics.cmake
@@ -67,7 +67,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 a6ba5373b37ced60be1a1d061f9de9c95ef1a8f5..e9b63dae7fff5ccef21849341834fc49fb8ef7d0 100755 (executable)
--- a/configure
+++ b/configure
@@ -1228,7 +1228,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