From owner-svn-src-all@freebsd.org  Wed Aug 26 17:04:34 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 B4BD83B33A1;
 Wed, 26 Aug 2020 17:04:34 +0000 (UTC)
 (envelope-from mjguzik@gmail.com)
Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com
 [IPv6:2a00:1450:4864:20::32c])
 (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (2048 bits) client-digest SHA256)
 (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4BcBzk39N0z4Jq8;
 Wed, 26 Aug 2020 17:04:34 +0000 (UTC)
 (envelope-from mjguzik@gmail.com)
Received: by mail-wm1-x32c.google.com with SMTP id w2so2268727wmi.1;
 Wed, 26 Aug 2020 10:04:34 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
 h=mime-version:in-reply-to:references:from:date:message-id:subject:to
 :cc; bh=VOFJKTTWHwEIws6WD+/o1HDeM/AMNWjMasLkA5XoMHo=;
 b=koCQG1ZO+g9PPn0kPUQ1I+Zg79MNEUUIxG4BxXQYOwuxH6aBP2xU8TOB7SWFZ6AkA4
 fSqbsyz0Yz/P1dQlKDkP8yC8yvXi0Z73tsx4PDX5gYwvqUXTEJh0CfUC+n94BpBR9wvx
 hanav/iMR6KwW0q12DedXMfiBbfMsHsTLePga+I5Y9cV9TBuqbtfw/+a+Nm2r/JsGyuN
 jAGymfw3RaRH4LQJUoqUIHhE+v/umE4U7+0FuuSXKO9AUVKzh331uGwPKjWUp/X9N9na
 kFtoaO4/umIXfiLLBISYtN0jWSLr+FOzI8LSsWwb4oCXQK6nyLn13q6Aqcj5khOKgO9S
 uFaw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:mime-version:in-reply-to:references:from:date
 :message-id:subject:to:cc;
 bh=VOFJKTTWHwEIws6WD+/o1HDeM/AMNWjMasLkA5XoMHo=;
 b=ceiBRAfDpXf6yAm1ezedK0rhYJhGUlaBO5tye1amWnjaeEGKKtvU02caTF8M69y9m1
 i8T0xY1rGJbh7/JIYk4ZTEeCpx5HVDrFSGt11hXdAcdUkBzeNl8MabUCAuk44ptajyWx
 ZYS5QduDvrr9Nyp1rsj6FUuMTwrUbNntj7Oqt9Ac0LIEiNrtDfhAUy0yHU4ht7030xcM
 TgZF1J3F3MtG8zGV2xICJ2OdT2nJp9ojjE68NEaWP7fVeZEjtTO6l1rVVtyAL+b48GDt
 WmDslqms2W0iJwF2fFEmdI8Yxsjr9n4hunIKEeqo7emjrd+7JESzYbKZHV+MJ7lsmmyF
 w3XQ==
X-Gm-Message-State: AOAM531cZlXXTm4CVNq47CIu2xr/MHUmpXa5kGNZV0rmh4q+QwsJV96k
 0Qsr5zprLr2MSgrMuIh+bMi+J9A4qJMrRiCbHoSBuAiS
X-Google-Smtp-Source: ABdhPJzlOtfoNcukJX3y+bXO7pDST0mdAEdHyetGz7zkNvAg0Js0qelALWYQC0M0uv/OfZLMo51UH5A6jqFTVukmqlg=
X-Received: by 2002:a05:600c:4150:: with SMTP id
 h16mr8170919wmm.127.1598461471633; 
 Wed, 26 Aug 2020 10:04:31 -0700 (PDT)
MIME-Version: 1.0
Received: by 2002:a5d:5347:0:0:0:0:0 with HTTP; Wed, 26 Aug 2020 10:04:30
 -0700 (PDT)
In-Reply-To: <202008261655.07QGtSZx096979@repo.freebsd.org>
References: <202008261655.07QGtSZx096979@repo.freebsd.org>
From: Mateusz Guzik <mjguzik@gmail.com>
Date: Wed, 26 Aug 2020 19:04:30 +0200
Message-ID: <CAGudoHGfUpzbmjmd1Q=pG7LyOM3uCKEhq+iF6-X_p_SLKbyfVA@mail.gmail.com>
Subject: Re: svn commit: r364822 - in head/crypto/openssl/crypto: aes/asm
 bn/asm chacha/asm ec/asm modes/asm poly1305/asm sha/asm
To: Jung-uk Kim <jkim@freebsd.org>
Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, 
 svn-src-head@freebsd.org
Content-Type: text/plain; charset="UTF-8"
X-Rspamd-Queue-Id: 4BcBzk39N0z4Jq8
X-Spamd-Bar: ----
Authentication-Results: mx1.freebsd.org;
	none
X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[];
 ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]
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 17:04:34 -0000

On 8/26/20, Jung-uk Kim <jkim@freebsd.org> wrote:
> 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.
>

What about other software checking in similar fashion? imo the right
fix is to stop mucking with the way clang reports itself

>   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);
>  }
>
>


-- 
Mateusz Guzik <mjguzik gmail.com>