From 4282f94712ee7b86c36fc656f377d2ce78532f0c Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Sat, 18 Aug 2018 04:44:53 -0400
Subject: Disable X32 inline assembly (GH #686, PR #704)

Also use CRYPTOPP_DISABLE_XXX_ASM consistently. The pattern is needed for Clang which still can't compile Intel assembly language. Also see http://llvm.org/bugs/show_bug.cgi?id=24232.
---
 salsa.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'salsa.h')

diff --git a/salsa.h b/salsa.h
index 21b3202e..f86bb61b 100644
--- a/salsa.h
+++ b/salsa.h
@@ -9,9 +9,10 @@
 #include "strciphr.h"
 #include "secblock.h"
 
-// "Inline assembly operands don't work with .intel_syntax", http://llvm.org/bugs/show_bug.cgi?id=24232
+// Clang 3.3 integrated assembler crash on Linux. Clang 3.4 due to compiler
+// error with .intel_syntax, http://llvm.org/bugs/show_bug.cgi?id=24232
 #if CRYPTOPP_BOOL_X32 || defined(CRYPTOPP_DISABLE_INTEL_ASM)
-# define CRYPTOPP_DISABLE_SALSA_ASM
+# define CRYPTOPP_DISABLE_SALSA_ASM 1
 #endif
 
 NAMESPACE_BEGIN(CryptoPP)
-- 
cgit v1.2.1