From 6551c20005dd904f14aeb40199152e60c4664f45 Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Tue, 18 Apr 2017 08:57:32 -0700
Subject: Enable x64 ASM Salsa20/12 on Linux.

---
 make-linux.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/make-linux.mk b/make-linux.mk
index 956953b5..487d5542 100644
--- a/make-linux.mk
+++ b/make-linux.mk
@@ -83,9 +83,11 @@ CC_MACH=$(shell $(CC) -dumpmachine | cut -d '-' -f 1)
 ZT_ARCHITECTURE=0
 ifeq ($(CC_MACH),x86_64)
         ZT_ARCHITECTURE=2
+	ZT_USE_X64_ASM_SALSA2012=1
 endif
 ifeq ($(CC_MACH),amd64)
         ZT_ARCHITECTURE=2
+	ZT_USE_X64_ASM_SALSA2012=1
 endif
 ifeq ($(CC_MACH),i386)
         ZT_ARCHITECTURE=1
@@ -130,6 +132,12 @@ ifeq ($(ZT_ARCHITECTURE),4)
 	override DEFS+=-DZT_NO_TYPE_PUNNING
 endif
 
+# Use X64 ASM Salsa20/12 on X86_64 target
+ifeq ($(ZT_USE_X64_ASM_SALSA2012),1)
+	override DEFS+=-DZT_USE_X64_ASM_SALSA2012
+	override OBJS+=ext/x64-salsa2012-asm/salsa2012.o
+endif
+
 # Static builds, which are currently done for a number of Linux targets
 ifeq ($(ZT_STATIC),1)
 	override LDFLAGS+=-static
-- 
cgit v1.2.3