From 1e0f180daa0ff8fbd38450cce26ccc11a17c430e Mon Sep 17 00:00:00 2001
From: spiralvoice <spiralvoice>
Date: Mon, 10 Mar 2014 16:33:21 +0000
Subject: [PATCH] patch #8351

---
 distrib/ChangeLog        | 1 +
 src/utils/lib/CryptoPP.h | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/distrib/ChangeLog b/distrib/ChangeLog
index e026f491..1c01f27f 100644
--- a/distrib/ChangeLog
+++ b/distrib/ChangeLog
@@ -15,6 +15,7 @@ ChangeLog
 =========
 
 2014/03/10:
+8351: CryptoPP: Fix FreeBSD build with clang on i386 (tijl)
 8350: CryptoPP: Fix compilation on armhf (ygrek)
 
 2014/02/23:
diff --git a/src/utils/lib/CryptoPP.h b/src/utils/lib/CryptoPP.h
index 900e7113..6c01a929 100644
--- a/src/utils/lib/CryptoPP.h
+++ b/src/utils/lib/CryptoPP.h
@@ -274,7 +274,7 @@ NAMESPACE_END
 // CodeWarrior defines _MSC_VER
 #if !defined(CRYPTOPP_DISABLE_X86ASM) && ((defined(_MSC_VER) && !defined(__MWERKS__) && defined(_M_IX86)) || (defined(__GNUC__) && defined(__i386__)))
 	// The x86 version of MacOSX fails when asm is enabled.
-	#if !defined(__i386__) || !defined(__APPLE__)
+	#if !defined(__APPLE__) && !defined(__clang__)
 		#define CRYPTOPP_X86ASM_AVAILABLE
 	#endif
 #endif
-- 
2.11.4.GIT