Merge branch 'dev' into edge

2018-04-30 13:08:24 -07:00
parent c7115a0671 92e716d93d
commit 740b0fbbf6
1 changed files with 1 additions and 0 deletions
--- a/make-linux.mk
+++ b/make-linux.mk
@@ -240,6 +240,7 @@ ifeq ($(ZT_ARCHITECTURE),3)
 	else
 		override CFLAGS+=-march=armv5 -mno-unaligned-access -marm
 		override CXXFLAGS+=-march=armv5 -mno-unaligned-access -marm
+		ZT_USE_ARM32_NEON_ASM_CRYPTO=0
 	endif
 endif