summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2014-08-27 20:01:24 -0400
committerAdam Ierymenko <adam.ierymenko@gmail.com>2014-08-27 20:01:24 -0400
commit1952db5069944b56036b09a71109d822a08c9e35 (patch)
treeb66aaa1351b80284ee4bc8ebd18068a9e442ebab
parent6f8364ba591538cea6e96f1158a4919934180c31 (diff)
downloadinfinitytier-1952db5069944b56036b09a71109d822a08c9e35.tar.gz
infinitytier-1952db5069944b56036b09a71109d822a08c9e35.zip
Only enable SSE Salsa20 on x86 and x86_64 Linux
-rw-r--r--make-linux.mk22
1 files changed, 20 insertions, 2 deletions
diff --git a/make-linux.mk b/make-linux.mk
index ff2d9c24..5de1fbb5 100644
--- a/make-linux.mk
+++ b/make-linux.mk
@@ -6,8 +6,26 @@ INCLUDES=
DEFS=
LIBS=
-# Enable SSE-optimized Salsa20 in all modes
-DEFS+=-DZT_SALSA20_SSE
+# Enable SSE-optimized Salsa20 on x86 and x86_64 machines
+MACHINE=$(shell uname -m)
+ifeq ($(MACHINE),x86_64)
+ DEFS+=-DZT_SALSA20_SSE
+endif
+ifeq ($(MACHINE),amd64)
+ DEFS+=-DZT_SALSA20_SSE
+endif
+ifeq ($(MACHINE),i686)
+ DEFS+=-DZT_SALSA20_SSE
+endif
+ifeq ($(MACHINE),i586)
+ DEFS+=-DZT_SALSA20_SSE
+endif
+ifeq ($(MACHINE),i386)
+ DEFS+=-DZT_SALSA20_SSE
+endif
+ifeq ($(MACHINE),x86)
+ DEFS+=-DZT_SALSA20_SSE
+endif
# "make official" is a shortcut for this
ifeq ($(ZT_OFFICIAL_RELEASE),1)