From owner-svn-src-all@freebsd.org  Wed Aug 26 16:55:33 2020
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9898F3B2A55;
 Wed, 26 Aug 2020 16:55:33 +0000 (UTC)
 (envelope-from jkim@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4BcBnK3xBZz4JD0;
 Wed, 26 Aug 2020 16:55:33 +0000 (UTC)
 (envelope-from jkim@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 51FDA161B4;
 Wed, 26 Aug 2020 16:55:33 +0000 (UTC)
 (envelope-from jkim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07QGtXq6097015;
 Wed, 26 Aug 2020 16:55:33 GMT (envelope-from jkim@FreeBSD.org)
Received: (from jkim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07QGtSZx096979;
 Wed, 26 Aug 2020 16:55:28 GMT (envelope-from jkim@FreeBSD.org)
Message-Id: <202008261655.07QGtSZx096979@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jkim set sender to
 jkim@FreeBSD.org using -f
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Wed, 26 Aug 2020 16:55:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r364822 - in head/crypto/openssl/crypto: aes/asm bn/asm
 chacha/asm ec/asm modes/asm poly1305/asm sha/asm
X-SVN-Group: head
X-SVN-Commit-Author: jkim
X-SVN-Commit-Paths: in head/crypto/openssl/crypto: aes/asm bn/asm chacha/asm
 ec/asm modes/asm poly1305/asm sha/asm
X-SVN-Commit-Revision: 364822
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Aug 2020 16:55:33 -0000

Author: jkim
Date: Wed Aug 26 16:55:28 2020
New Revision: 364822
URL: https://svnweb.freebsd.org/changeset/base/364822

Log:
  Fix Clang version detection.
  
  We prepend "FreeBSD" to Clang version string.  This broke compiler test for
  AVX instruction support.
  
  Reported by:	jhb

Modified:
  head/crypto/openssl/crypto/aes/asm/aesni-mb-x86_64.pl
  head/crypto/openssl/crypto/aes/asm/aesni-sha1-x86_64.pl
  head/crypto/openssl/crypto/aes/asm/aesni-sha256-x86_64.pl
  head/crypto/openssl/crypto/bn/asm/rsaz-avx2.pl
  head/crypto/openssl/crypto/bn/asm/rsaz-x86_64.pl
  head/crypto/openssl/crypto/bn/asm/x86_64-mont.pl
  head/crypto/openssl/crypto/bn/asm/x86_64-mont5.pl
  head/crypto/openssl/crypto/chacha/asm/chacha-x86.pl
  head/crypto/openssl/crypto/chacha/asm/chacha-x86_64.pl
  head/crypto/openssl/crypto/ec/asm/ecp_nistz256-avx2.pl
  head/crypto/openssl/crypto/ec/asm/ecp_nistz256-x86_64.pl
  head/crypto/openssl/crypto/ec/asm/x25519-x86_64.pl
  head/crypto/openssl/crypto/modes/asm/aesni-gcm-x86_64.pl
  head/crypto/openssl/crypto/modes/asm/ghash-x86_64.pl
  head/crypto/openssl/crypto/poly1305/asm/poly1305-x86.pl
  head/crypto/openssl/crypto/poly1305/asm/poly1305-x86_64.pl
  head/crypto/openssl/crypto/sha/asm/sha1-586.pl
  head/crypto/openssl/crypto/sha/asm/sha1-mb-x86_64.pl
  head/crypto/openssl/crypto/sha/asm/sha1-x86_64.pl
  head/crypto/openssl/crypto/sha/asm/sha256-586.pl
  head/crypto/openssl/crypto/sha/asm/sha256-mb-x86_64.pl
  head/crypto/openssl/crypto/sha/asm/sha512-x86_64.pl

Modified: head/crypto/openssl/crypto/aes/asm/aesni-mb-x86_64.pl
==============================================================================
--- head/crypto/openssl/crypto/aes/asm/aesni-mb-x86_64.pl	Wed Aug 26 15:43:44 2020	(r364821)
+++ head/crypto/openssl/crypto/aes/asm/aesni-mb-x86_64.pl	Wed Aug 26 16:55:28 2020	(r364822)
@@ -70,7 +70,7 @@ if (!$avx && $win64 && ($flavour =~ /masm/ || $ENV{ASM
 	$avx = ($1>=10) + ($1>=11);
 }
 
-if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|.*based on LLVM) ([0-9]+\.[0-9]+)/) {
+if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:clang|LLVM) version|.*based on LLVM) ([0-9]+\.[0-9]+)/) {
 	$avx = ($2>=3.0) + ($2>3.0);
 }
 

Modified: head/crypto/openssl/crypto/aes/asm/aesni-sha1-x86_64.pl
==============================================================================
--- head/crypto/openssl/crypto/aes/asm/aesni-sha1-x86_64.pl	Wed Aug 26 15:43:44 2020	(r364821)
+++ head/crypto/openssl/crypto/aes/asm/aesni-sha1-x86_64.pl	Wed Aug 26 16:55:28 2020	(r364822)
@@ -108,7 +108,7 @@ $avx=1 if (!$avx && $win64 && ($flavour =~ /nasm/ || $
 $avx=1 if (!$avx && $win64 && ($flavour =~ /masm/ || $ENV{ASM} =~ /ml64/) &&
 	   `ml64 2>&1` =~ /Version ([0-9]+)\./ &&
 	   $1>=10);
-$avx=1 if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|.*based on LLVM) ([0-9]+\.[0-9]+)/ && $2>=3.0);
+$avx=1 if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:clang|LLVM) version|.*based on LLVM) ([0-9]+\.[0-9]+)/ && $2>=3.0);
 
 $shaext=1;	### set to zero if compiling for 1.0.1
 

Modified: head/crypto/openssl/crypto/aes/asm/aesni-sha256-x86_64.pl
==============================================================================
--- head/crypto/openssl/crypto/aes/asm/aesni-sha256-x86_64.pl	Wed Aug 26 15:43:44 2020	(r364821)
+++ head/crypto/openssl/crypto/aes/asm/aesni-sha256-x86_64.pl	Wed Aug 26 16:55:28 2020	(r364822)
@@ -70,7 +70,7 @@ if (!$avx && $win64 && ($flavour =~ /masm/ || $ENV{ASM
 	$avx = ($1>=10) + ($1>=12);
 }
 
-if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|.*based on LLVM) ([0-9]+\.[0-9]+)/) {
+if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:clang|LLVM) version|.*based on LLVM) ([0-9]+\.[0-9]+)/) {
 	$avx = ($2>=3.0) + ($2>3.0);
 }
 

Modified: head/crypto/openssl/crypto/bn/asm/rsaz-avx2.pl
==============================================================================
--- head/crypto/openssl/crypto/bn/asm/rsaz-avx2.pl	Wed Aug 26 15:43:44 2020	(r364821)
+++ head/crypto/openssl/crypto/bn/asm/rsaz-avx2.pl	Wed Aug 26 16:55:28 2020	(r364822)
@@ -66,7 +66,7 @@ if (!$avx && $win64 && ($flavour =~ /masm/ || $ENV{ASM
 	$addx = ($1>=11);
 }
 
-if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([0-9]+)\.([0-9]+)/) {
+if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:clang|LLVM) version|based on LLVM) ([0-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);

Modified: head/crypto/openssl/crypto/bn/asm/rsaz-x86_64.pl
==============================================================================
--- head/crypto/openssl/crypto/bn/asm/rsaz-x86_64.pl	Wed Aug 26 15:43:44 2020	(r364821)
+++ head/crypto/openssl/crypto/bn/asm/rsaz-x86_64.pl	Wed Aug 26 16:55:28 2020	(r364822)
@@ -81,7 +81,7 @@ if (!$addx && $win64 && ($flavour =~ /masm/ || $ENV{AS
 	$addx = ($1>=12);
 }
 
-if (!$addx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|.*based on LLVM) ([0-9]+)\.([0-9]+)/) {
+if (!$addx && `$ENV{CC} -v 2>&1` =~ /((?:clang|LLVM) version|.*based on LLVM) ([0-9]+)\.([0-9]+)/) {
 	my $ver = $2 + $3/100.0;	# 3.1->3.01, 3.10->3.10
 	$addx = ($ver>=3.03);
 }

Modified: head/crypto/openssl/crypto/bn/asm/x86_64-mont.pl
==============================================================================
--- head/crypto/openssl/crypto/bn/asm/x86_64-mont.pl	Wed Aug 26 15:43:44 2020	(r364821)
+++ head/crypto/openssl/crypto/bn/asm/x86_64-mont.pl	Wed Aug 26 16:55:28 2020	(r364822)
@@ -75,7 +75,7 @@ if (!$addx && $win64 && ($flavour =~ /masm/ || $ENV{AS
 	$addx = ($1>=12);
 }
 
-if (!$addx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|.*based on LLVM) ([0-9]+)\.([0-9]+)/) {
+if (!$addx && `$ENV{CC} -v 2>&1` =~ /((?:clang|LLVM) version|.*based on LLVM) ([0-9]+)\.([0-9]+)/) {
 	my $ver = $2 + $3/100.0;	# 3.1->3.01, 3.10->3.10
 	$addx = ($ver>=3.03);
 }

Modified: head/crypto/openssl/crypto/bn/asm/x86_64-mont5.pl
==============================================================================
--- head/crypto/openssl/crypto/bn/asm/x86_64-mont5.pl	Wed Aug 26 15:43:44 2020	(r364821)
+++ head/crypto/openssl/crypto/bn/asm/x86_64-mont5.pl	Wed Aug 26 16:55:28 2020	(r364822)
@@ -60,7 +60,7 @@ if (!$addx && $win64 && ($flavour =~ /masm/ || $ENV{AS
 	$addx = ($1>=12);
 }
 
-if (!$addx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|.*based on LLVM) ([0-9]+)\.([0-9]+)/) {
+if (!$addx && `$ENV{CC} -v 2>&1` =~ /((?:clang|LLVM) version|.*based on LLVM) ([0-9]+)\.([0-9]+)/) {
 	my $ver = $2 + $3/100.0;	# 3.1->3.01, 3.10->3.10
 	$addx = ($ver>=3.03);
 }

Modified: head/crypto/openssl/crypto/chacha/asm/chacha-x86.pl
==============================================================================
--- head/crypto/openssl/crypto/chacha/asm/chacha-x86.pl	Wed Aug 26 15:43:44 2020	(r364821)
+++ head/crypto/openssl/crypto/chacha/asm/chacha-x86.pl	Wed Aug 26 16:55:28 2020	(r364822)
@@ -62,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|LLVM) version|based on LLVM) ([0-9]+\.[0-9]+)/ &&
+		`$ENV{CC} -v 2>&1` =~ /((?:clang|LLVM) version|based on LLVM) ([0-9]+\.[0-9]+)/ &&
 		$2>=3.0);	# first version supporting AVX
 
 $a="eax";

Modified: head/crypto/openssl/crypto/chacha/asm/chacha-x86_64.pl
==============================================================================
--- head/crypto/openssl/crypto/chacha/asm/chacha-x86_64.pl	Wed Aug 26 15:43:44 2020	(r364821)
+++ head/crypto/openssl/crypto/chacha/asm/chacha-x86_64.pl	Wed Aug 26 16:55:28 2020	(r364822)
@@ -85,7 +85,7 @@ if (!$avx && $win64 && ($flavour =~ /masm/ || $ENV{ASM
 	$avx = ($1>=10) + ($1>=11);
 }
 
-if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|.*based on LLVM) ([0-9]+\.[0-9]+)/) {
+if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:clang|LLVM) version|.*based on LLVM) ([0-9]+\.[0-9]+)/) {
 	$avx = ($2>=3.0) + ($2>3.0);
 }
 

Modified: head/crypto/openssl/crypto/ec/asm/ecp_nistz256-avx2.pl
==============================================================================
--- head/crypto/openssl/crypto/ec/asm/ecp_nistz256-avx2.pl	Wed Aug 26 15:43:44 2020	(r364821)
+++ head/crypto/openssl/crypto/ec/asm/ecp_nistz256-avx2.pl	Wed Aug 26 16:55:28 2020	(r364822)
@@ -47,7 +47,7 @@ if (!$addx && $win64 && ($flavour =~ /masm/ || $ENV{AS
 	$addx = ($1>=12);
 }
 
-if (!$addx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([0-9]+)\.([0-9]+)/) {
+if (!$addx && `$ENV{CC} -v 2>&1` =~ /((?:clang|LLVM) version|based on LLVM) ([0-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);

Modified: head/crypto/openssl/crypto/ec/asm/ecp_nistz256-x86_64.pl
==============================================================================
--- head/crypto/openssl/crypto/ec/asm/ecp_nistz256-x86_64.pl	Wed Aug 26 15:43:44 2020	(r364821)
+++ head/crypto/openssl/crypto/ec/asm/ecp_nistz256-x86_64.pl	Wed Aug 26 16:55:28 2020	(r364822)
@@ -72,7 +72,7 @@ if (!$addx && $win64 && ($flavour =~ /masm/ || $ENV{AS
 	$addx = ($1>=12);
 }
 
-if (!$addx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|.*based on LLVM) ([0-9]+)\.([0-9]+)/) {
+if (!$addx && `$ENV{CC} -v 2>&1` =~ /((?:clang|LLVM) version|.*based on LLVM) ([0-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);

Modified: head/crypto/openssl/crypto/ec/asm/x25519-x86_64.pl
==============================================================================
--- head/crypto/openssl/crypto/ec/asm/x25519-x86_64.pl	Wed Aug 26 15:43:44 2020	(r364821)
+++ head/crypto/openssl/crypto/ec/asm/x25519-x86_64.pl	Wed Aug 26 16:55:28 2020	(r364822)
@@ -90,7 +90,7 @@ if (!$addx && $win64 && ($flavour =~ /masm/ || $ENV{AS
 	$addx = ($1>=12);
 }
 
-if (!$addx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|.*based on LLVM) ([0-9]+)\.([0-9]+)/) {
+if (!$addx && `$ENV{CC} -v 2>&1` =~ /((?:clang|LLVM) version|.*based on LLVM) ([0-9]+)\.([0-9]+)/) {
 	my $ver = $2 + $3/100.0;	# 3.1->3.01, 3.10->3.10
 	$addx = ($ver>=3.03);
 }

Modified: head/crypto/openssl/crypto/modes/asm/aesni-gcm-x86_64.pl
==============================================================================
--- head/crypto/openssl/crypto/modes/asm/aesni-gcm-x86_64.pl	Wed Aug 26 15:43:44 2020	(r364821)
+++ head/crypto/openssl/crypto/modes/asm/aesni-gcm-x86_64.pl	Wed Aug 26 16:55:28 2020	(r364822)
@@ -66,7 +66,7 @@ if (!$avx && $win64 && ($flavour =~ /masm/ || $ENV{ASM
 	$avx = ($1>=10) + ($1>=11);
 }
 
-if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|.*based on LLVM) ([0-9]+\.[0-9]+)/) {
+if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:clang|LLVM) version|.*based on LLVM) ([0-9]+\.[0-9]+)/) {
 	$avx = ($2>=3.0) + ($2>3.0);
 }
 

Modified: head/crypto/openssl/crypto/modes/asm/ghash-x86_64.pl
==============================================================================
--- head/crypto/openssl/crypto/modes/asm/ghash-x86_64.pl	Wed Aug 26 15:43:44 2020	(r364821)
+++ head/crypto/openssl/crypto/modes/asm/ghash-x86_64.pl	Wed Aug 26 16:55:28 2020	(r364822)
@@ -116,7 +116,7 @@ if (!$avx && $win64 && ($flavour =~ /masm/ || $ENV{ASM
 	$avx = ($1>=10) + ($1>=11);
 }
 
-if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|.*based on LLVM) ([0-9]+\.[0-9]+)/) {
+if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:clang|LLVM) version|.*based on LLVM) ([0-9]+\.[0-9]+)/) {
 	$avx = ($2>=3.0) + ($2>3.0);
 }
 

Modified: head/crypto/openssl/crypto/poly1305/asm/poly1305-x86.pl
==============================================================================
--- head/crypto/openssl/crypto/poly1305/asm/poly1305-x86.pl	Wed Aug 26 15:43:44 2020	(r364821)
+++ head/crypto/openssl/crypto/poly1305/asm/poly1305-x86.pl	Wed Aug 26 16:55:28 2020	(r364822)
@@ -71,7 +71,7 @@ if ($sse2) {
 	$avx = ($1>=2.09) + ($1>=2.10);
 	}
 
-	if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([0-9]+\.[0-9]+)/) {
+	if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:clang|LLVM) version|based on LLVM) ([0-9]+\.[0-9]+)/) {
 		$avx = ($2>=3.0) + ($2>3.0);
 	}
 }

Modified: head/crypto/openssl/crypto/poly1305/asm/poly1305-x86_64.pl
==============================================================================
--- head/crypto/openssl/crypto/poly1305/asm/poly1305-x86_64.pl	Wed Aug 26 15:43:44 2020	(r364821)
+++ head/crypto/openssl/crypto/poly1305/asm/poly1305-x86_64.pl	Wed Aug 26 16:55:28 2020	(r364822)
@@ -90,7 +90,7 @@ if (!$avx && $win64 && ($flavour =~ /masm/ || $ENV{ASM
 	$avx = ($1>=10) + ($1>=12);
 }
 
-if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|.*based on LLVM) ([0-9]+\.[0-9]+)/) {
+if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:clang|LLVM) version|.*based on LLVM) ([0-9]+\.[0-9]+)/) {
 	$avx = ($2>=3.0) + ($2>3.0);
 }
 

Modified: head/crypto/openssl/crypto/sha/asm/sha1-586.pl
==============================================================================
--- head/crypto/openssl/crypto/sha/asm/sha1-586.pl	Wed Aug 26 15:43:44 2020	(r364821)
+++ head/crypto/openssl/crypto/sha/asm/sha1-586.pl	Wed Aug 26 16:55:28 2020	(r364822)
@@ -144,7 +144,7 @@ $ymm=1 if ($xmm && !$ymm && $ARGV[0] eq "win32" &&
 		`ml 2>&1` =~ /Version ([0-9]+)\./ &&
 		$1>=10);	# first version supporting AVX
 
-$ymm=1 if ($xmm && !$ymm && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([0-9]+\.[0-9]+)/ &&
+$ymm=1 if ($xmm && !$ymm && `$ENV{CC} -v 2>&1` =~ /((?:clang|LLVM) version|based on LLVM) ([0-9]+\.[0-9]+)/ &&
 		$2>=3.0);	# first version supporting AVX
 
 $shaext=$xmm;	### set to zero if compiling for 1.0.1

Modified: head/crypto/openssl/crypto/sha/asm/sha1-mb-x86_64.pl
==============================================================================
--- head/crypto/openssl/crypto/sha/asm/sha1-mb-x86_64.pl	Wed Aug 26 15:43:44 2020	(r364821)
+++ head/crypto/openssl/crypto/sha/asm/sha1-mb-x86_64.pl	Wed Aug 26 16:55:28 2020	(r364822)
@@ -66,7 +66,7 @@ if (!$avx && $win64 && ($flavour =~ /masm/ || $ENV{ASM
 	$avx = ($1>=10) + ($1>=11);
 }
 
-if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|.*based on LLVM) ([0-9]+\.[0-9]+)/) {
+if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:clang|LLVM) version|.*based on LLVM) ([0-9]+\.[0-9]+)/) {
 	$avx = ($2>=3.0) + ($2>3.0);
 }
 

Modified: head/crypto/openssl/crypto/sha/asm/sha1-x86_64.pl
==============================================================================
--- head/crypto/openssl/crypto/sha/asm/sha1-x86_64.pl	Wed Aug 26 15:43:44 2020	(r364821)
+++ head/crypto/openssl/crypto/sha/asm/sha1-x86_64.pl	Wed Aug 26 16:55:28 2020	(r364822)
@@ -119,7 +119,7 @@ if (!$avx && $win64 && ($flavour =~ /masm/ || $ENV{ASM
 	$avx = ($1>=10) + ($1>=11);
 }
 
-if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|.*based on LLVM) ([0-9]+\.[0-9]+)/) {
+if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:clang|LLVM) version|.*based on LLVM) ([0-9]+\.[0-9]+)/) {
 	$avx = ($2>=3.0) + ($2>3.0);
 }
 

Modified: head/crypto/openssl/crypto/sha/asm/sha256-586.pl
==============================================================================
--- head/crypto/openssl/crypto/sha/asm/sha256-586.pl	Wed Aug 26 15:43:44 2020	(r364821)
+++ head/crypto/openssl/crypto/sha/asm/sha256-586.pl	Wed Aug 26 16:55:28 2020	(r364822)
@@ -96,7 +96,7 @@ if ($xmm && !$avx && $ARGV[0] eq "win32" &&
 	$avx = ($1>=10) + ($1>=11);
 }
 
-if ($xmm && !$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|based on LLVM) ([0-9]+\.[0-9]+)/) {
+if ($xmm && !$avx && `$ENV{CC} -v 2>&1` =~ /((?:clang|LLVM) version|based on LLVM) ([0-9]+\.[0-9]+)/) {
 	$avx = ($2>=3.0) + ($2>3.0);
 }
 

Modified: head/crypto/openssl/crypto/sha/asm/sha256-mb-x86_64.pl
==============================================================================
--- head/crypto/openssl/crypto/sha/asm/sha256-mb-x86_64.pl	Wed Aug 26 15:43:44 2020	(r364821)
+++ head/crypto/openssl/crypto/sha/asm/sha256-mb-x86_64.pl	Wed Aug 26 16:55:28 2020	(r364822)
@@ -67,7 +67,7 @@ if (!$avx && $win64 && ($flavour =~ /masm/ || $ENV{ASM
 	$avx = ($1>=10) + ($1>=11);
 }
 
-if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|.*based on LLVM) ([0-9]+\.[0-9]+)/) {
+if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:clang|LLVM) version|.*based on LLVM) ([0-9]+\.[0-9]+)/) {
 	$avx = ($2>=3.0) + ($2>3.0);
 }
 

Modified: head/crypto/openssl/crypto/sha/asm/sha512-x86_64.pl
==============================================================================
--- head/crypto/openssl/crypto/sha/asm/sha512-x86_64.pl	Wed Aug 26 15:43:44 2020	(r364821)
+++ head/crypto/openssl/crypto/sha/asm/sha512-x86_64.pl	Wed Aug 26 16:55:28 2020	(r364822)
@@ -135,7 +135,7 @@ if (!$avx && $win64 && ($flavour =~ /masm/ || $ENV{ASM
 	$avx = ($1>=10) + ($1>=11);
 }
 
-if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:^clang|LLVM) version|.*based on LLVM) ([0-9]+\.[0-9]+)/) {
+if (!$avx && `$ENV{CC} -v 2>&1` =~ /((?:clang|LLVM) version|.*based on LLVM) ([0-9]+\.[0-9]+)/) {
 	$avx = ($2>=3.0) + ($2>3.0);
 }