summaryrefslogtreecommitdiff
path: root/blake2.cpp
diff options
context:
space:
mode:
authorJeffrey Walton <noloader@gmail.com>2016-06-15 05:02:28 -0400
committerJeffrey Walton <noloader@gmail.com>2016-06-15 05:02:28 -0400
commitb1df5736a7191eb14adb178cfff2c8ea3daf638e (patch)
treed18d41684bffd32728ca36838ed4576c2102e7d1 /blake2.cpp
parenta4f90454f8b8c385efedb60d27a22ed39ca60090 (diff)
downloadcryptopp-git-b1df5736a7191eb14adb178cfff2c8ea3daf638e.tar.gz
Merge 'solaris' dev branch into 'master'
Diffstat (limited to 'blake2.cpp')
-rw-r--r--blake2.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/blake2.cpp b/blake2.cpp
index d580647a..cacff623 100644
--- a/blake2.cpp
+++ b/blake2.cpp
@@ -22,6 +22,11 @@ NAMESPACE_BEGIN(CryptoPP)
# undef CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE
#endif
+// Testing shows Sun CC needs 12.4 for _mm_set_epi64x
+#if (__SUNPRO_CC <= 0x5130)
+# undef CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE
+#endif
+
// Visual Studio needs VS2008 (1500); no dependency on _mm_set_epi64x()
// http://msdn.microsoft.com/en-us/library/bb892950%28v=vs.90%29.aspx
#if defined(_MSC_VER) && (_MSC_VER < 1500)