From: Rashmica Gupta <rashmica.g@gmail.com>
Date: Tue, 7 May 2019 02:42:59 +0000 (+1000)
Subject: crypto/ppccap.c: Fix which hwcap value used to check for HWCAP_ARCH_3_00
X-Git-Tag: openssl-3.0.0-alpha1~2077
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=99592c73e7167990082626a46ea9286c152f85fd;p=oweals%2Fopenssl.git

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)
---

diff --git a/crypto/ppccap.c b/crypto/ppccap.c
index 9601674041..0d5ab794bd 100644
--- a/crypto/ppccap.c
+++ b/crypto/ppccap.c
@@ -323,6 +323,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;
@@ -341,11 +342,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;
         }
     }