Merge branch 'dev' of http://git.int.zerotier.com/zerotier/ZeroTierOne into dev

make-linux.mk

@@ -195,10 +195,10 @@ ifeq ($(CC_MACH),armv7l)
 	override DEFS+=-DZT_NO_TYPE_PUNNING
 	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
 endif
-ifeq ($(CC_MACH),armv7l)
-        ZT_ARCHITECTURE=3
+ifeq ($(CC_MACH),armv7hl)
+	ZT_ARCHITECTURE=3
 	override DEFS+=-DZT_NO_TYPE_PUNNING
-	ZT_USE_ARM32_NEON_ASM_SALSA2012=1
+	ZT_USE_ARM32_NEON_ASM_CRYPTO=1
 endif
 ifeq ($(CC_MACH),arm64)
 	ZT_ARCHITECTURE=4