diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2018-11-22 22:23:44 -0500 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2018-11-22 22:23:44 -0500 |
| commit | 2b5bea7b126072b27e7e04a00e46f9f99e9c0e08 (patch) | |
| tree | 1ea62cb3e5875a541143ca78557f315360ffb30d | |
| parent | 3efc7752e408d1cd48d4eada32d75b9f464ae635 (diff) | |
| download | cryptopp-git-2b5bea7b126072b27e7e04a00e46f9f99e9c0e08.tar.gz | |
Fix POWER8 compile when -DCRYPTOPP_DISABLE_ALTIVEC
| -rw-r--r-- | ppc_power7.cpp | 2 | ||||
| -rw-r--r-- | ppc_power8.cpp | 2 | ||||
| -rw-r--r-- | ppc_simd.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ppc_power7.cpp b/ppc_power7.cpp index f4fe5865..070abc7b 100644 --- a/ppc_power7.cpp +++ b/ppc_power7.cpp @@ -42,7 +42,7 @@ bool CPU_ProbePower7() {
#if defined(CRYPTOPP_NO_CPU_FEATURE_PROBES)
return false;
-#elif (_ARCH_PWR7)
+#elif (_ARCH_PWR7) && defined(CRYPTOPP_POWER7_AVAILABLE)
# if defined(CRYPTOPP_GNU_STYLE_INLINE_ASSEMBLY)
// longjmp and clobber warnings. Volatile is required.
diff --git a/ppc_power8.cpp b/ppc_power8.cpp index 3b9c2581..f93db533 100644 --- a/ppc_power8.cpp +++ b/ppc_power8.cpp @@ -42,7 +42,7 @@ bool CPU_ProbePower8() {
#if defined(CRYPTOPP_NO_CPU_FEATURE_PROBES)
return false;
-#elif (_ARCH_PWR8)
+#elif (_ARCH_PWR8) && defined(CRYPTOPP_POWER8_AVAILABLE)
# if defined(CRYPTOPP_GNU_STYLE_INLINE_ASSEMBLY)
// longjmp and clobber warnings. Volatile is required.
diff --git a/ppc_simd.cpp b/ppc_simd.cpp index 7fcbedca..07d435fd 100644 --- a/ppc_simd.cpp +++ b/ppc_simd.cpp @@ -45,7 +45,7 @@ bool CPU_ProbeAltivec() {
#if defined(CRYPTOPP_NO_CPU_FEATURE_PROBES)
return false;
-#elif (CRYPTOPP_ALTIVEC_AVAILABLE)
+#elif (_ARCH_PWR3) && (CRYPTOPP_ALTIVEC_AVAILABLE)
# if defined(CRYPTOPP_GNU_STYLE_INLINE_ASSEMBLY)
// longjmp and clobber warnings. Volatile is required.
|