Fix defines for PPC feature probes

Thanks to Bob Wilkinson for reporting at https://groups.google.com/d/msg/cryptopp-users/gPJOMOUMLhU/xHTxD8P-AgAJ
pull/566/head
Jeffrey Walton 2018-01-11 13:04:59 -05:00
parent 226516f590
commit 691e7af29a
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 6 additions and 6 deletions

View File

@ -125,7 +125,7 @@ bool CPU_ProbePower8()
{ {
#if defined(CRYPTOPP_NO_CPU_FEATURE_PROBES) #if defined(CRYPTOPP_NO_CPU_FEATURE_PROBES)
return false; return false;
#elif (CRYPTOPP_POWER8_AVAILABLE) #elif (CRYPTOPP_POWER7_AVAILABLE)
# if defined(CRYPTOPP_GNU_STYLE_INLINE_ASSEMBLY) # if defined(CRYPTOPP_GNU_STYLE_INLINE_ASSEMBLY)
// longjmp and clobber warnings. Volatile is required. // longjmp and clobber warnings. Volatile is required.
@ -157,14 +157,14 @@ bool CPU_ProbePower8()
# endif # endif
#else #else
return false; return false;
#endif // CRYPTOPP_ALTIVEC_AVAILABLE #endif // CRYPTOPP_POWER8_AVAILABLE
} }
bool CPU_ProbeAES() bool CPU_ProbeAES()
{ {
#if defined(CRYPTOPP_NO_CPU_FEATURE_PROBES) #if defined(CRYPTOPP_NO_CPU_FEATURE_PROBES)
return false; return false;
#elif (CRYPTOPP_POWER8_AES_AVAILABLE) #elif (CRYPTOPP_POWER8_AVAILABLE)
# if defined(CRYPTOPP_GNU_STYLE_INLINE_ASSEMBLY) # if defined(CRYPTOPP_GNU_STYLE_INLINE_ASSEMBLY)
// longjmp and clobber warnings. Volatile is required. // longjmp and clobber warnings. Volatile is required.
@ -213,7 +213,7 @@ bool CPU_ProbeSHA256()
{ {
#if defined(CRYPTOPP_NO_CPU_FEATURE_PROBES) #if defined(CRYPTOPP_NO_CPU_FEATURE_PROBES)
return false; return false;
#elif (CRYPTOPP_ALTIVEC_AVAILABLE) #elif (CRYPTOPP_POWER8_AVAILABLE)
# if defined(CRYPTOPP_GNU_STYLE_INLINE_ASSEMBLY) # if defined(CRYPTOPP_GNU_STYLE_INLINE_ASSEMBLY)
// longjmp and clobber warnings. Volatile is required. // longjmp and clobber warnings. Volatile is required.
@ -257,7 +257,7 @@ bool CPU_ProbeSHA512()
{ {
#if defined(CRYPTOPP_NO_CPU_FEATURE_PROBES) #if defined(CRYPTOPP_NO_CPU_FEATURE_PROBES)
return false; return false;
#elif (CRYPTOPP_ALTIVEC_AVAILABLE) #elif (CRYPTOPP_POWER8_AVAILABLE)
# if defined(CRYPTOPP_GNU_STYLE_INLINE_ASSEMBLY) # if defined(CRYPTOPP_GNU_STYLE_INLINE_ASSEMBLY)
// longjmp and clobber warnings. Volatile is required. // longjmp and clobber warnings. Volatile is required.
@ -294,7 +294,7 @@ bool CPU_ProbeSHA512()
# endif # endif
#else #else
return false; return false;
#endif // CRYPTOPP_ALTIVEC_AVAILABLE #endif // CRYPTOPP_POWER8_AVAILABLE
} }
# endif // CRYPTOPP_BOOL_PPC32 || CRYPTOPP_BOOL_PPC64 # endif // CRYPTOPP_BOOL_PPC32 || CRYPTOPP_BOOL_PPC64
NAMESPACE_END NAMESPACE_END