From: Tom Cosgrove <tom.cosgrove@arm.com>
Date: Thu, 22 Jun 2023 02:31:47 +0000 (+0100)
Subject: Don't do SIGILL capability detection on Apple Silicon
X-Git-Tag: openssl-3.1.2~56
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50af7294e514a2aba19c5248a4ed612ba3ba4c1b;p=thirdparty%2Fopenssl.git

Don't do SIGILL capability detection on Apple Silicon

Fixes #20753

Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21261)
---

diff --git a/crypto/armcap.c b/crypto/armcap.c
index 71296786c3b..426812698de 100644
--- a/crypto/armcap.c
+++ b/crypto/armcap.c
@@ -362,7 +362,7 @@ void OPENSSL_cpuid_setup(void)
         }
 #  endif
     }
-#  ifdef __aarch64__
+#  if defined(__aarch64__) && !defined(__APPLE__)
     if (sigsetjmp(ill_jmp, 1) == 0) {
         _armv8_sve_probe();
         OPENSSL_armcap_P |= ARMV8_SVE;