Skip to content

Commit

Permalink
aes-gcm-avx512.pl: Fix the clang version detection on Apple Oses
Browse files Browse the repository at this point in the history
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from #20519)

(cherry picked from commit 110dac5)
  • Loading branch information
t8m committed Mar 17, 2023
1 parent 6dfa998 commit 2dbddfa
Showing 1 changed file with 11 additions and 2 deletions.
13 changes: 11 additions & 2 deletions crypto/modes/asm/aes-gcm-avx512.pl
Expand Up @@ -59,8 +59,17 @@
$avx512vaes = ($1 == 2.13 && $2 >= 3) + ($1 >= 2.14);
}

if (!$avx512vaes && `$ENV{CC} -v 2>&1` =~ /((?:clang|LLVM) version|.*based on LLVM) ([0-9]+\.[0-9]+)/) {
$avx512vaes = ($2 >= 7.0);
if (!$avx512vaes && `$ENV{CC} -v 2>&1`
=~ /(Apple)?\s*((?:clang|LLVM) version|.*based on LLVM) ([0-9]+)\.([0-9]+)\.([0-9]+)?/) {
my $ver = $3 + $4/100.0 + $5/10000.0; # 3.1.0->3.01, 3.10.1->3.1001
if ($1) {
# Apple conditions, they use a different version series, see
# https://en.wikipedia.org/wiki/Xcode#Xcode_7.0_-_10.x_(since_Free_On-Device_Development)_2
# clang 7.0.0 is Apple clang 10.0.1
$avx512vaes = ($ver>=10.0001)
} else {
$avx512vaes = ($ver>=7.0);
}
}

open OUT, "| \"$^X\" \"$xlate\" $flavour \"$output\""
Expand Down

0 comments on commit 2dbddfa

Please sign in to comment.