summaryrefslogtreecommitdiff
path: root/vmac.h
diff options
context:
space:
mode:
authorJeffrey Walton <noloader@gmail.com>2018-08-18 04:44:53 -0400
committerGitHub <noreply@github.com>2018-08-18 04:44:53 -0400
commit4282f94712ee7b86c36fc656f377d2ce78532f0c (patch)
tree6057c2539f6c7b3fd9daa6a83d1a6de5e8018392 /vmac.h
parent06cf2ede9e043b4c25eb3521cf67fcebb41b7629 (diff)
downloadcryptopp-git-4282f94712ee7b86c36fc656f377d2ce78532f0c.tar.gz
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.
Diffstat (limited to 'vmac.h')
-rw-r--r--vmac.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/vmac.h b/vmac.h
index dce5ffb9..bb29ce35 100644
--- a/vmac.h
+++ b/vmac.h
@@ -11,10 +11,10 @@
#include "iterhash.h"
#include "seckey.h"
-// Clang 3.3 integrated assembler crash on Linux
-// http://github.com/weidai11/cryptopp/issues/264
-#if (defined(CRYPTOPP_LLVM_CLANG_VERSION) && (CRYPTOPP_LLVM_CLANG_VERSION < 30400)) || CRYPTOPP_BOOL_X32
-# define CRYPTOPP_DISABLE_VMAC_ASM
+// 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_VMAC_ASM 1
#endif
NAMESPACE_BEGIN(CryptoPP)