From 736f27295d89222567f90a97fef28e6af164bb89 Mon Sep 17 00:00:00 2001 From: Wyatt O'Day Date: Wed, 30 Aug 2017 16:42:05 -0400 Subject: [PATCH] Based on suggestion from @noloader, don't split x86/x64 clang++ version detection. Just wait until clang++ is consistently working in both x86/x64. --- sha.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sha.cpp b/sha.cpp index 8d26651d..114b1b76 100644 --- a/sha.cpp +++ b/sha.cpp @@ -44,7 +44,7 @@ // Clang 3.3 integrated assembler crash on Linux // http://github.com/weidai11/cryptopp/issues/264 // Clang 3.4.1 (x86) crash on FreeBSD 10.3. Clang 3.4.1 (x64) works fine. -#if defined(CRYPTOPP_LLVM_CLANG_VERSION) && ((CRYPTOPP_LLVM_CLANG_VERSION < 30400) || CRYPTOPP_BOOL_X86 && (CRYPTOPP_LLVM_CLANG_VERSION < 30500)) +#if defined(CRYPTOPP_LLVM_CLANG_VERSION) && (CRYPTOPP_LLVM_CLANG_VERSION < 30500) # define CRYPTOPP_DISABLE_SHA_ASM #endif