From 1952db5069944b56036b09a71109d822a08c9e35 Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Wed, 27 Aug 2014 20:01:24 -0400
Subject: [PATCH] Only enable SSE Salsa20 on x86 and x86_64 Linux

---
 make-linux.mk | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/make-linux.mk b/make-linux.mk
index ff2d9c24f..5de1fbb52 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)