Fix POWER8 compile when -DCRYPTOPP_DISABLE_ALTIVEC

pull/748/head
Jeffrey Walton 2018-11-22 22:23:44 -05:00
parent 3efc7752e4
commit 2b5bea7b12
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
3 changed files with 3 additions and 3 deletions

View File

@ -42,7 +42,7 @@ bool CPU_ProbePower7()
{ {
#if defined(CRYPTOPP_NO_CPU_FEATURE_PROBES) #if defined(CRYPTOPP_NO_CPU_FEATURE_PROBES)
return false; return false;
#elif (_ARCH_PWR7) #elif (_ARCH_PWR7) && defined(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.

View File

@ -42,7 +42,7 @@ bool CPU_ProbePower8()
{ {
#if defined(CRYPTOPP_NO_CPU_FEATURE_PROBES) #if defined(CRYPTOPP_NO_CPU_FEATURE_PROBES)
return false; return false;
#elif (_ARCH_PWR8) #elif (_ARCH_PWR8) && defined(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.

View File

@ -45,7 +45,7 @@ bool CPU_ProbeAltivec()
{ {
#if defined(CRYPTOPP_NO_CPU_FEATURE_PROBES) #if defined(CRYPTOPP_NO_CPU_FEATURE_PROBES)
return false; return false;
#elif (CRYPTOPP_ALTIVEC_AVAILABLE) #elif (_ARCH_PWR3) && (CRYPTOPP_ALTIVEC_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.