]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Don't do SIGILL capability detection on Apple Silicon
authorTom Cosgrove <tom.cosgrove@arm.com>
Thu, 22 Jun 2023 02:31:47 +0000 (03:31 +0100)
committerPauli <pauli@openssl.org>
Sun, 25 Jun 2023 21:59:25 +0000 (07:59 +1000)
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)

crypto/armcap.c

index 71296786c3b8e4c5df04a6069e962155e1e867fb..426812698de9747c18109a9c5f49f4338029e877 100644 (file)
@@ -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;