]> git.ipfire.org Git - thirdparty/zlib-ng.git/commitdiff
Allow ACLE to be enabled on all ARM architecture versions
authorCameron Cawley <ccawley2011@gmail.com>
Tue, 29 Aug 2023 02:48:56 +0000 (19:48 -0700)
committerHans Kristian Rosbach <hk-github@circlestorm.org>
Wed, 13 Sep 2023 09:55:01 +0000 (11:55 +0200)
CMakeLists.txt

index 1e4d82237fc24ce4984288f9f64fc252c93c1e31..cc42f1a33a0a3aefe904ec43084d76be2e1aabc0 100644 (file)
@@ -615,7 +615,7 @@ if(WITH_OPTIM)
         endif()
         list(APPEND ZLIB_ARCH_HDRS ${ARCHDIR}/arm_features.h)
         list(APPEND ZLIB_ARCH_SRCS ${ARCHDIR}/arm_features.c)
-        if(WITH_ACLE AND NOT "${ARCH}" MATCHES "armv[2-7]")
+        if(WITH_ACLE)
             check_acle_compiler_flag()
             if(HAVE_ACLE_FLAG)
                 add_definitions(-DARM_ACLE)
@@ -715,7 +715,7 @@ if(WITH_OPTIM)
                 add_definitions(-DRISCV_RVV)
                 list(APPEND ZLIB_ARCH_HDRS ${ARCHDIR}/riscv_features.h)
                 list(APPEND ZLIB_ARCH_SRCS ${ARCHDIR}/riscv_features.c)
-                # FIXME: we will not set compile flags for riscv_features.c when 
+                # FIXME: we will not set compile flags for riscv_features.c when
                 # the kernels update hwcap or hwprobe for riscv
                 set(RVV_SRCS ${ARCHDIR}/riscv_features.c ${ARCHDIR}/adler32_rvv.c ${ARCHDIR}/compare256_rvv.c ${ARCHDIR}/slide_hash_rvv.c)
                 list(APPEND ZLIB_ARCH_SRCS ${RVV_SRCS})