From ffbedcefc5d2b436f5e85345ccd57e4615761b42 Mon Sep 17 00:00:00 2001 From: Wyatt O'Day Date: Wed, 30 Aug 2017 16:42:36 -0400 Subject: [PATCH] Fix build on FreeBSD 10.3 x86 with clang++ 3.4.1. (#483) * Fix build on FreeBSD 10.3 x86 with clang++ v. 3.4.1. The x64 build (also clang++ 3.4.1) doesn't require CRYPTOPP_DISABLE_SHA_ASM. It seems to be a bug specific to the x86 version of clang++. * 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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sha.cpp b/sha.cpp index 9311736f..114b1b76 100644 --- a/sha.cpp +++ b/sha.cpp @@ -43,7 +43,8 @@ // 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) +// 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 < 30500) # define CRYPTOPP_DISABLE_SHA_ASM #endif