From: Tomas Mraz <tomas@openssl.org>
Date: Tue, 21 Mar 2023 14:31:15 +0000 (+0100)
Subject: Avoid duplication of OPENSSL_armcap_P on 32bit ARM
X-Git-Tag: openssl-3.2.0-alpha1~1097
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93370db1fc76ad37bd53cfbeb948d1ded43d3b2a;p=thirdparty%2Fopenssl.git

Avoid duplication of OPENSSL_armcap_P on 32bit ARM

Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20558)
---

diff --git a/crypto/armcap.c b/crypto/armcap.c
index 03bc659bdbd..f61579ac049 100644
--- a/crypto/armcap.c
+++ b/crypto/armcap.c
@@ -25,7 +25,9 @@
 #endif
 #include "arm_arch.h"
 
+#ifdef __aarch64__
 unsigned int OPENSSL_armcap_P = 0;
+#endif
 unsigned int OPENSSL_arm_midr = 0;
 unsigned int OPENSSL_armv8_rsa_neonized = 0;