Don't attempt ARMv6 detection on AARCH64.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 58ed3a1a5585342bf6cfb3f75b65d580dccb8c7e..8bcfaf7ea23e4e20665dcb7c956d4daef8a0a3e3 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -102,7 +102,7 @@ set_property(CACHE WITH_SANITIZER PROPERTY STRINGS "Memory" "Address" "Undefined
 if(BASEARCH_ARM_FOUND)
     option(WITH_ACLE "Build with ACLE" ON)
     option(WITH_NEON "Build with NEON intrinsics" ON)
-    option(WITH_ARMV6 "Build with ARMv6 SIMD" ON)
+    cmake_dependent_option(WITH_ARMV6 "Build with ARMv6 SIMD" ON "NOT ARCH STREQUAL \"aarch64\"" OFF)
 elseif(BASEARCH_PPC_FOUND)
     option(WITH_ALTIVEC "Build with AltiVec (VMX) optimisations for PowerPC" ON)
     option(WITH_POWER8 "Build with optimisations for POWER8" ON)

diff --git a/configure b/configure
index e0187be0922d396c16b755ae2713d3f4ea8e4ef8..20fb91aeb0799df3b551d8e92c633ce396b58898 100755 (executable)
--- a/configure
+++ b/configure
@@ -1588,12 +1588,13 @@ case "${ARCH}" in
 
     # ARM specific optimizations
     arm* | aarch64)
-      case "${ARCH}" in
+        case "${ARCH}" in
             arm*)
                 [ ! -z $CROSS_PREFIX ] && QEMU_ARCH=arm
             ;;
             aarch64)
                 [ ! -z $CROSS_PREFIX ] && QEMU_ARCH=aarch64
+                buildarmv6=0
             ;;
         esac