diff options
| author | Nathan Moinvaziri <nathan@solidstatenetworks.com> | 2019-09-03 23:35:23 -0700 |
|---|---|---|
| committer | Hans Kristian Rosbach <hk-github@circlestorm.org> | 2019-09-04 08:35:23 +0200 |
| commit | ce0076688a7eff8c7991234f5024386cf9ac944c (patch) | |
| tree | 16d6c508306eeb1e803bf468f7dbc72389ae1c81 /functable.c | |
| parent | 743def4c93635b7914534353b0dc0fd828f6dbfe (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 'functable.c')
| -rw-r--r-- | functable.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/functable.c b/functable.c index 587abfe..b3020e0 100644 --- a/functable.c +++ b/functable.c @@ -19,7 +19,7 @@ extern Pos insert_string_acle(deflate_state *const s, const Pos str, unsigned in /* fill_window */ #ifdef X86_SSE2 extern void fill_window_sse(deflate_state *s); -#elif defined(__arm__) || defined(__aarch64__) || defined(_M_ARM) +#elif defined(__arm__) || defined(__aarch64__) || defined(_M_ARM) || defined(_M_ARM64) extern void fill_window_arm(deflate_state *s); #endif @@ -81,7 +81,7 @@ ZLIB_INTERNAL void fill_window_stub(deflate_state *s) { if (x86_cpu_has_sse2) # endif functable.fill_window=&fill_window_sse; - #elif defined(__arm__) || defined(__aarch64__) || defined(_M_ARM) + #elif defined(__arm__) || defined(__aarch64__) || defined(_M_ARM) || defined(_M_ARM64) functable.fill_window=&fill_window_arm; #endif |