summaryrefslogtreecommitdiff
path: root/indra/llmath/llsimdmath.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llmath/llsimdmath.h')
-rw-r--r--indra/llmath/llsimdmath.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llmath/llsimdmath.h b/indra/llmath/llsimdmath.h
index 592bb124c2..b9e86614f8 100644
--- a/indra/llmath/llsimdmath.h
+++ b/indra/llmath/llsimdmath.h
@@ -35,7 +35,7 @@
// because some versions of VS complain about '__SSE2__'
//#if ( ( LL_DARWIN || LL_LINUX ) && !(__SSE2__) ) || ( LL_WINDOWS && ( _M_IX86_FP < 2 && ADDRESS_SIZE == 32 ) )
#if ( ( LL_DARWIN || LL_LINUX ) )
- #if !(__SSE2__)
+ #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 ) )
@@ -46,8 +46,12 @@
#include <stdint.h>
#endif
+#if defined(__i386__) || defined(__x86_64__)
#include <xmmintrin.h>
#include <emmintrin.h>
+#else
+#include <sse2neon.h>
+#endif
#include "llmemory.h"
#include "llsimdtypes.h"