summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Henry <josephjah@gmail.com>2018-10-03 15:40:16 -0700
committerJoseph Henry <josephjah@gmail.com>2018-10-03 15:40:16 -0700
commit7c0331997a972cca58f8da3d3e7da9ba10b29b6a (patch)
tree9ee4211e0d077fcfee428f43b9408dfd9c9e1e83
parent1da1409db248c495a057ac940869e02610aa6d76 (diff)
downloadinfinitytier-7c0331997a972cca58f8da3d3e7da9ba10b29b6a.tar.gz
infinitytier-7c0331997a972cca58f8da3d3e7da9ba10b29b6a.zip
Ticket #739 - Fixed what appears to be a copy-paste error for machine type detection in linux makefile, added line for armv7hl
-rw-r--r--make-linux.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/make-linux.mk b/make-linux.mk
index 78ea98de..66a6376a 100644
--- a/make-linux.mk
+++ b/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