projects
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1d5e108
)
ec/asm/ecp_nistz256-avx2.pl: harmonize clang version detection.
author
Andy Polyakov
<appro@openssl.org>
Sat, 16 Jun 2018 14:25:40 +0000
(16:25 +0200)
committer
Andy Polyakov
<appro@openssl.org>
Mon, 18 Jun 2018 18:03:08 +0000
(20:03 +0200)
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6499)
(cherry picked from commit
575045f59fc393abc9d49604d82ccd17c82925fa
)
crypto/ec/asm/ecp_nistz256-avx2.pl
patch
|
blob
|
history
diff --git
a/crypto/ec/asm/ecp_nistz256-avx2.pl
b/crypto/ec/asm/ecp_nistz256-avx2.pl
index 3bdd2cf13f01059931eae454fb72c1dc5d56ddd8..c5a1f0b79e03e8e9d28fe1e4038cf64f283d53ab 100755
(executable)
--- a/
crypto/ec/asm/ecp_nistz256-avx2.pl
+++ b/
crypto/ec/asm/ecp_nistz256-avx2.pl
@@
-67,7
+67,7
@@
if (!$addx && $win64 && ($flavour =~ /masm/ || $ENV{ASM} =~ /ml64/) &&
$addx = ($1>=12);
}
-if (!$addx && `$ENV{CC} -v 2>&1` =~ /(
^clang
version|based on LLVM) ([3-9])\.([0-9]+)/) {
+if (!$addx && `$ENV{CC} -v 2>&1` =~ /(
(?:^clang|LLVM)
version|based on LLVM) ([3-9])\.([0-9]+)/) {
my $ver = $2 + $3/100.0; # 3.1->3.01, 3.10->3.10
$avx = ($ver>=3.0) + ($ver>=3.01);
$addx = ($ver>=3.03);