{chacha|poly1305}/asm/*-x64.pl: harmonize clang version detection.

[openssl.git] / crypto / chacha / asm / chacha-x86.pl

diff --git a/crypto/chacha/asm/chacha-x86.pl b/crypto/chacha/asm/chacha-x86.pl
index 61b328612b7cf147380b65e0ffa6002cb7dba9b1..8508346e85a488cce7c8490bc232ce1ea4a4f55e 100755 (executable)
--- a/crypto/chacha/asm/chacha-x86.pl
+++ b/crypto/chacha/asm/chacha-x86.pl
@@ -28,6 +28,7 @@
 # Westmere     9.50/+45%       3.35
 # Sandy Bridge 10.5/+47%       3.20
 # Haswell      8.15/+50%       2.83
+# Skylake      7.53/+22%       2.75
 # Silvermont   17.4/+36%       8.35
 # Goldmont     13.4/+40%       4.36
 # Sledgehammer 10.2/+54%
@@ -42,7 +43,7 @@ require "x86asm.pl";
 $output=pop;
 open STDOUT,">$output";
 
-&asm_init($ARGV[0],"chacha-x86.pl",$ARGV[$#ARGV] eq "386");
+&asm_init($ARGV[0],$ARGV[$#ARGV] eq "386");
 
 $xmm=$ymm=0;
 for (@ARGV) { $xmm=1 if (/-DOPENSSL_IA32_SSE2/); }
@@ -61,7 +62,7 @@ $ymm=1 if ($xmm && !$ymm && $ARGV[0] eq "win32" &&
                $1>=10);        # first version supporting AVX
 
 $ymm=1 if ($xmm && !$ymm &&
-               `$ENV{CC} -v 2>&1` =~ /(^clang version|based on LLVM) ([3-9]\.[0-9]+)/ &&
+               `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([3-9]\.[0-9]+)/ &&
                $2>=3.0);       # first version supporting AVX
 
 $a="eax";