summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@zerotier.com>2018-09-14 08:05:39 -0700
committerGitHub <noreply@github.com>2018-09-14 08:05:39 -0700
commitef48d1126609a72eb1510457647ac005efefd614 (patch)
treed3be7ad7bb7411750e91b330a77039bf110e55aa /ext
parenta47559d9e3eb8f1d110b19ee785fdc346c1c5a9a (diff)
parentcffb992ae84723e7d7b230845cc2cf8e0acf67ab (diff)
downloadinfinitytier-ef48d1126609a72eb1510457647ac005efefd614.tar.gz
infinitytier-ef48d1126609a72eb1510457647ac005efefd614.zip
Merge pull request #848 from darkain/master
Fix compile on FreeBSD targeting ARMv6 (Raspberry Pi)
Diffstat (limited to 'ext')
-rw-r--r--ext/arm32-neon-salsa2012-asm/salsa2012.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/ext/arm32-neon-salsa2012-asm/salsa2012.h b/ext/arm32-neon-salsa2012-asm/salsa2012.h
index 95b247f2..262c9b9b 100644
--- a/ext/arm32-neon-salsa2012-asm/salsa2012.h
+++ b/ext/arm32-neon-salsa2012-asm/salsa2012.h
@@ -5,8 +5,10 @@
#include <sys/auxv.h>
#include <asm/hwcap.h>
#define zt_arm_has_neon() ((getauxval(AT_HWCAP) & HWCAP_NEON) != 0)
-#else
+#elif defined(__ARM_NEON__) || defined(__ARM_NEON)
#define zt_arm_has_neon() (true)
+#else
+#define zt_arm_has_neon() (false)
#endif
#ifdef __cplusplus