diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2016-07-10 20:40:45 -0400 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2016-07-10 20:40:45 -0400 |
| commit | 53e2147d8d28041166b00693c9f9c6b45653bb55 (patch) | |
| tree | 106a7996bbbb097fcc7a8ec9ccd00cec70148a3c /blake2.cpp | |
| parent | f8200af3ae18c564bfb260ee5ce52c6df74dee78 (diff) | |
| download | cryptopp-git-53e2147d8d28041166b00693c9f9c6b45653bb55.tar.gz | |
Fix compile under Sun Studio 12.3 and below with -xarch=aes defines
Diffstat (limited to 'blake2.cpp')
| -rw-r--r-- | blake2.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -22,6 +22,12 @@ NAMESPACE_BEGIN(CryptoPP) # 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)
+# undef CRYPTOPP_BOOL_SSE4_INTRINSICS_AVAILABLE
+#endif
+
// SunCC needs 12.4 for _mm_set_epi64x, _mm_blend_epi16, _mm_shuffle_epi16, etc
#if defined(__SUNPRO_CC) && (__SUNPRO_CC < 0x5130)
# undef CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE
@@ -32,12 +38,6 @@ NAMESPACE_BEGIN(CryptoPP) # include <tmmintrin.h> // _mm_shuffle_epi16
#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)
-# undef CRYPTOPP_BOOL_SSE4_INTRINSICS_AVAILABLE
-#endif
-
// Apple Clang 6.0/Clang 3.5 does not have SSSE3 intrinsics
// http://llvm.org/bugs/show_bug.cgi?id=20213
#if (defined(CRYPTOPP_APPLE_CLANG_VERSION) && (CRYPTOPP_APPLE_CLANG_VERSION <= 60000)) || (defined(CRYPTOPP_LLVM_CLANG_VERSION) && (CRYPTOPP_LLVM_CLANG_VERSION <= 30500))
|