From 6c78aaa7e327cbff1670b6793015e055656a8c77 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Sat, 9 Jul 2016 06:24:11 -0400 Subject: [PATCH] Cleared "assertion failed in function pr_post_process_node() @ preopt.c" under Sun Studio 12.5 (Issue 220) --- cryptest.sh | 4 ++-- gcm.cpp | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/cryptest.sh b/cryptest.sh index 9dfc8e3e..3e359db2 100755 --- a/cryptest.sh +++ b/cryptest.sh @@ -367,8 +367,8 @@ if [[ (-z "$HAVE_X32") ]]; then fi fi -# ARMv7a/Aarch32 (may run on Aarch64) -if [[ (-z "$HAVE_ARMV7A") ]]; then +# ARMv7a/Aarch32 (may run on Aarch64). SunCC reports Illegal Option and returns +if [[ (-z "$HAVE_ARMV7A") && ("$SUN_COMPILER" -eq "0") ]]; then HAVE_ARMV7A=0 "$CXX" -DCRYPTOPP_ADHOC_MAIN -march=armv7a adhoc.cpp -o "$TMP/adhoc.exe" > /dev/null 2>&1 if [[ "$?" -eq "0" ]]; then diff --git a/gcm.cpp b/gcm.cpp index fd6731f0..fc6f96b9 100644 --- a/gcm.cpp +++ b/gcm.cpp @@ -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"