diff options
Diffstat (limited to 'indra/llmath/llsimdmath.h')
| -rw-r--r-- | indra/llmath/llsimdmath.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/indra/llmath/llsimdmath.h b/indra/llmath/llsimdmath.h index b27b034cf3..440561e589 100644 --- a/indra/llmath/llsimdmath.h +++ b/indra/llmath/llsimdmath.h @@ -31,10 +31,8 @@ #error "Please include llmath.h before this file." #endif -// the check for this error case must be split into multiple parts -// because some versions of VS complain about '__SSE2__' #if ( ( LL_DARWIN || LL_LINUX ) ) - #if !(__SSE2__) && !(__arm64__) && !(__aarch64__) + #if !(__SSE2__ || __ARM_NEON) #error SSE2 not enabled. LLVector4a and related class will not compile. #endif #elif ( LL_WINDOWS && ( _M_IX86_FP < 2 && ADDRESS_SIZE == 32 ) ) @@ -45,11 +43,11 @@ #include <stdint.h> #endif -#if defined(__arm64__) || defined(__aarch64__) -#include "sse2neon.h" -#else +#if defined(__i386__) || defined(__x86_64__) || _M_X64 #include <xmmintrin.h> #include <emmintrin.h> +#else +#include <sse2neon.h> #endif #include "llmemory.h" |