Skip to content

Commit 6aecde5

Browse files
authored
Fix: Windows does not define __ARM_NEON (#363)
* Windows does not define __ARM_NEON However, Windows requires NEON to work, so assume it is there if build with MSVC * Clarify NEON availability in MSVC targeting arm64 * Fix Formatting
1 parent c5fc491 commit 6aecde5

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

include/cpu_features_macros.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -234,13 +234,14 @@
234234

235235
#endif // defined(CPU_FEATURES_ARCH_X86)
236236

237-
#if defined(CPU_FEATURES_ARCH_ANY_ARM)
238-
#if defined(__ARM_NEON)
237+
// Note: MSVC targeting ARM does not define `__ARM_NEON` but Windows on ARM
238+
// requires it. In that case we force NEON detection.
239+
#if defined(__ARM_NEON) || \
240+
(defined(CPU_FEATURES_COMPILER_MSC) && defined(CPU_FEATURES_ARCH_ANY_ARM))
239241
#define CPU_FEATURES_COMPILED_ANY_ARM_NEON 1
240242
#else
241243
#define CPU_FEATURES_COMPILED_ANY_ARM_NEON 0
242-
#endif // defined(__ARM_NEON)
243-
#endif // defined(CPU_FEATURES_ARCH_ANY_ARM)
244+
#endif
244245

245246
#if defined(CPU_FEATURES_ARCH_MIPS)
246247
#if defined(__mips_msa)

0 commit comments

Comments
 (0)