summaryrefslogtreecommitdiff
path: root/inflate.c
diff options
context:
space:
mode:
authorNathan Moinvaziri <nathan@solidstatenetworks.com>2019-09-03 23:35:23 -0700
committerHans Kristian Rosbach <hk-github@circlestorm.org>2019-09-04 08:35:23 +0200
commitce0076688a7eff8c7991234f5024386cf9ac944c (patch)
tree16d6c508306eeb1e803bf468f7dbc72389ae1c81 /inflate.c
parent743def4c93635b7914534353b0dc0fd828f6dbfe (diff)
Changes to support compilation with MSVC ARM & ARM64 (#386)
* Merge aarch64 and arm cmake sections. * Updated MSVC compiler support for ARM and ARM64. * Moved detection for -mfpu=neon to where the flag is set to simplify add_intrinsics_option. * Only add ${ACLEFLAG} on aarch64 if not WITH_NEON. * Rename arch/x86/ctzl.h to fallback_builtins.h.
Diffstat (limited to 'inflate.c')
-rw-r--r--inflate.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/inflate.c b/inflate.c
index ed544ba..fae8847 100644
--- a/inflate.c
+++ b/inflate.c
@@ -132,7 +132,7 @@ int ZEXPORT PREFIX(inflateInit2_)(PREFIX3(stream) *strm, int windowBits, const c
#ifdef X86_CPUID
x86_check_features();
-#elif defined(__arm__) || defined(__aarch64__) || defined(_M_ARM)
+#elif defined(__arm__) || defined(__aarch64__) || defined(_M_ARM) || defined(_M_ARM64)
arm_check_features();
#endif