diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2016-07-09 06:24:11 -0400 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2016-07-09 06:24:11 -0400 |
| commit | 6c78aaa7e327cbff1670b6793015e055656a8c77 (patch) | |
| tree | c9fd4a5edd2150bf32bf1ec360d012993139067a /gcm.cpp | |
| parent | 54fc79ec6a5f2b4453337d2b46a8489fe61097df (diff) | |
| download | cryptopp-git-6c78aaa7e327cbff1670b6793015e055656a8c77.tar.gz | |
Cleared "assertion failed in function pr_post_process_node() @ preopt.c" under Sun Studio 12.5 (Issue 220)
Diffstat (limited to 'gcm.cpp')
| -rw-r--r-- | gcm.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -12,15 +12,19 @@ #ifndef CRYPTOPP_IMPORTS
#ifndef CRYPTOPP_GENERATE_X64_MASM
-// Clang 3.3 integrated assembler crash on Linux
-#if (defined(CRYPTOPP_LLVM_CLANG_VERSION) && (CRYPTOPP_LLVM_CLANG_VERSION < 30400)) || defined(CRYPTOPP_CLANG_INTEGRATED_ASSEMBLER)
+// Clang 3.3 integrated assembler crash on Linux. MacPorts GCC compile error. SunCC crash under Sun Studio 12.5
+#if (defined(CRYPTOPP_LLVM_CLANG_VERSION) && (CRYPTOPP_LLVM_CLANG_VERSION < 30400)) || defined(CRYPTOPP_CLANG_INTEGRATED_ASSEMBLER) || (__SUNPRO_CC == 0x5140)
# undef CRYPTOPP_X86_ASM_AVAILABLE
# undef CRYPTOPP_X32_ASM_AVAILABLE
# undef CRYPTOPP_X64_ASM_AVAILABLE
# undef CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE
# undef CRYPTOPP_BOOL_SSSE3_ASM_AVAILABLE
+# undef CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE
+# undef CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE
# define CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE 0
# define CRYPTOPP_BOOL_SSSE3_ASM_AVAILABLE 0
+# define CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE 0
+# define CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE 0
#endif
#include "gcm.h"
|
