diff options
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 946b4e7..f6a56f0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -277,7 +277,7 @@ endif() # Set architecture alignment requirements if(WITH_UNALIGNED) - if(BASEARCH_ARM_FOUND OR (BASEARCH_PPC_FOUND AND "${ARCH}" MATCHES "powerpc64le") OR BASEARCH_X86_FOUND) + if((BASEARCH_ARM_FOUND AND NOT "${ARCH}" MATCHES "armv[2-7]") OR (BASEARCH_PPC_FOUND AND "${ARCH}" MATCHES "powerpc64le") OR BASEARCH_X86_FOUND) if(NOT DEFINED UNALIGNED_OK) set(UNALIGNED_OK TRUE) endif() @@ -288,7 +288,9 @@ if(WITH_UNALIGNED) endif() if(BASEARCH_ARM_FOUND) if(NOT DEFINED UNALIGNED64_OK) - if("${ARCH}" MATCHES "(arm(v[8-9])?|aarch64)") + if("${ARCH}" MATCHES "armv[2-7]") + set(UNALIGNED64_OK FALSE) + elseif("${ARCH}" MATCHES "(arm(v[8-9])?|aarch64)") set(UNALIGNED64_OK TRUE) endif() endif() @@ -721,7 +723,7 @@ if(WITH_OPTIM) endif() list(APPEND ZLIB_ARCH_HDRS ${ARCHDIR}/arm.h) list(APPEND ZLIB_ARCH_SRCS ${ARCHDIR}/armfeature.c) - if(WITH_ACLE AND NOT MSVC) + if(WITH_ACLE AND NOT MSVC AND NOT "${ARCH}" MATCHES "armv[2-7]") add_definitions(-DARM_ACLE_CRC_HASH) set(ACLE_SRCS ${ARCHDIR}/crc32_acle.c ${ARCHDIR}/insert_string_acle.c) set_property(SOURCE ${ACLE_SRCS} PROPERTY COMPILE_FLAGS "${ACLEFLAG} ${NOLTOFLAG}") |