summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorRashmica Gupta <rashmica.g@gmail.com>2019-05-07 12:42:59 +1000
committerPauli <paul.dale@oracle.com>2019-05-09 14:20:44 +1000
commit4f4d37dacec205066b369b93aa5bacb0553f68d1 (patch)
treebd1babdd87bdb20eb2aca21c27668e895232c68b /crypto
parentb48e3be947ddc5da6b5a86db8341081c72b9a4ee (diff)
crypto/ppccap.c: Fix which hwcap value used to check for HWCAP_ARCH_3_00
CLA: trivial Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Paul Dale <paul.dale@oracle.com> (Merged from https://github.com/openssl/openssl/pull/8889) (cherry picked from commit 99592c73e7167990082626a46ea9286c152f85fd)
Diffstat (limited to 'crypto')
-rw-r--r--crypto/ppccap.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/crypto/ppccap.c b/crypto/ppccap.c
index afb9e31b00..a59485207b 100644
--- a/crypto/ppccap.c
+++ b/crypto/ppccap.c
@@ -314,6 +314,7 @@ void OPENSSL_cpuid_setup(void)
#ifdef OSSL_IMPLEMENT_GETAUXVAL
{
unsigned long hwcap = getauxval(HWCAP);
+ unsigned long hwcap2 = getauxval(HWCAP2);
if (hwcap & HWCAP_FPU) {
OPENSSL_ppccap_P |= PPC_FPU;
@@ -332,11 +333,11 @@ void OPENSSL_cpuid_setup(void)
if (hwcap & HWCAP_ALTIVEC) {
OPENSSL_ppccap_P |= PPC_ALTIVEC;
- if ((hwcap & HWCAP_VSX) && (getauxval(HWCAP2) & HWCAP_VEC_CRYPTO))
+ if ((hwcap & HWCAP_VSX) && (hwcap2 & HWCAP_VEC_CRYPTO))
OPENSSL_ppccap_P |= PPC_CRYPTO207;
}
- if (hwcap & HWCAP_ARCH_3_00) {
+ if (hwcap2 & HWCAP_ARCH_3_00) {
OPENSSL_ppccap_P |= PPC_MADD300;
}
}