From 93370db1fc76ad37bd53cfbeb948d1ded43d3b2a Mon Sep 17 00:00:00 2001
From: Tomas Mraz <tomas@openssl.org>
Date: Tue, 21 Mar 2023 15:31:15 +0100
Subject: [PATCH] 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)
---
 crypto/armcap.c | 2 ++
 1 file changed, 2 insertions(+)

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;
 
-- 
2.47.3