From 91b8d85f4cca9b128e59abda541aa9b5d67d7ad1 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Mon, 13 Nov 2017 19:10:15 -0500 Subject: [PATCH] Fix SunCC compile with -xarch=sse2 Fix copy/paste messages in cryptest.sh --- TestScripts/cryptest.sh | 4 ++-- cpu.cpp | 5 +++++ cryptest.sh | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/TestScripts/cryptest.sh b/TestScripts/cryptest.sh index 672bb76d..36038edd 100755 --- a/TestScripts/cryptest.sh +++ b/TestScripts/cryptest.sh @@ -2767,7 +2767,7 @@ if [[ "$HAVE_CXX14" -ne "0" ]]; then echo "Testing: Release, c++14" | tee -a "$TEST_RESULTS" echo - TEST_LIST+=("Debug, c++14") + TEST_LIST+=("Release, c++14") "$MAKE" clean > /dev/null 2>&1 rm -f adhoc.cpp > /dev/null 2>&1 @@ -2828,7 +2828,7 @@ if [[ "$HAVE_GNU14" -ne "0" ]]; then echo "Testing: Release, gnu++14" | tee -a "$TEST_RESULTS" echo - TEST_LIST+=("Debug, gnu++14") + TEST_LIST+=("Release, gnu++14") "$MAKE" clean > /dev/null 2>&1 rm -f adhoc.cpp > /dev/null 2>&1 diff --git a/cpu.cpp b/cpu.cpp index 5a7b5ca6..1d023297 100644 --- a/cpu.cpp +++ b/cpu.cpp @@ -48,6 +48,11 @@ unsigned long int getauxval(unsigned long int) { return 0; } # include #endif +// Needed by SunCC and MSVC +#if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64) +# include +#endif + NAMESPACE_BEGIN(CryptoPP) #ifndef CRYPTOPP_MS_STYLE_INLINE_ASSEMBLY diff --git a/cryptest.sh b/cryptest.sh index 672bb76d..36038edd 100755 --- a/cryptest.sh +++ b/cryptest.sh @@ -2767,7 +2767,7 @@ if [[ "$HAVE_CXX14" -ne "0" ]]; then echo "Testing: Release, c++14" | tee -a "$TEST_RESULTS" echo - TEST_LIST+=("Debug, c++14") + TEST_LIST+=("Release, c++14") "$MAKE" clean > /dev/null 2>&1 rm -f adhoc.cpp > /dev/null 2>&1 @@ -2828,7 +2828,7 @@ if [[ "$HAVE_GNU14" -ne "0" ]]; then echo "Testing: Release, gnu++14" | tee -a "$TEST_RESULTS" echo - TEST_LIST+=("Debug, gnu++14") + TEST_LIST+=("Release, gnu++14") "$MAKE" clean > /dev/null 2>&1 rm -f adhoc.cpp > /dev/null 2>&1