diff options
| author | Tomas Mraz <tomas@openssl.org> | 2023-03-15 17:46:29 +0100 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2023-03-17 11:25:29 +0100 |
| commit | e5dd732749f524e2a0aaa67f8d514d34863dd89f (patch) | |
| tree | bb474fe07df7397dd249dd293da40dd81e9cb0f8 /crypto/bn | |
| parent | 2dbddfab08ed5464f9408f6f870c727c89835e5a (diff) | |
| download | openssl-new-e5dd732749f524e2a0aaa67f8d514d34863dd89f.tar.gz | |
rsaz-*k-avx512.pl: fix wrong name of avx512 flag variable
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20519)
(cherry picked from commit d4765408c705f704f7cf33bd32bfb713061954a7)
Diffstat (limited to 'crypto/bn')
| -rw-r--r-- | crypto/bn/asm/rsaz-2k-avx512.pl | 4 | ||||
| -rw-r--r-- | crypto/bn/asm/rsaz-3k-avx512.pl | 4 | ||||
| -rw-r--r-- | crypto/bn/asm/rsaz-4k-avx512.pl | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/crypto/bn/asm/rsaz-2k-avx512.pl b/crypto/bn/asm/rsaz-2k-avx512.pl index 6c5ffc5398..1f7e21ec38 100644 --- a/crypto/bn/asm/rsaz-2k-avx512.pl +++ b/crypto/bn/asm/rsaz-2k-avx512.pl @@ -44,12 +44,12 @@ if (`$ENV{CC} -Wa,-v -c -o /dev/null -x assembler /dev/null 2>&1` $avx512ifma = ($1>=2.26); } -if (!$avx512 && $win64 && ($flavour =~ /nasm/ || $ENV{ASM} =~ /nasm/) && +if (!$avx512ifma && $win64 && ($flavour =~ /nasm/ || $ENV{ASM} =~ /nasm/) && `nasm -v 2>&1` =~ /NASM version ([2-9]\.[0-9]+)(?:\.([0-9]+))?/) { $avx512ifma = ($1==2.11 && $2>=8) + ($1>=2.12); } -if (!$avx512 && `$ENV{CC} -v 2>&1` +if (!$avx512ifma && `$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) { diff --git a/crypto/bn/asm/rsaz-3k-avx512.pl b/crypto/bn/asm/rsaz-3k-avx512.pl index df025a87f0..c2ec9073ae 100644 --- a/crypto/bn/asm/rsaz-3k-avx512.pl +++ b/crypto/bn/asm/rsaz-3k-avx512.pl @@ -43,12 +43,12 @@ if (`$ENV{CC} -Wa,-v -c -o /dev/null -x assembler /dev/null 2>&1` $avx512ifma = ($1>=2.26); } -if (!$avx512 && $win64 && ($flavour =~ /nasm/ || $ENV{ASM} =~ /nasm/) && +if (!$avx512ifma && $win64 && ($flavour =~ /nasm/ || $ENV{ASM} =~ /nasm/) && `nasm -v 2>&1` =~ /NASM version ([2-9]\.[0-9]+)(?:\.([0-9]+))?/) { $avx512ifma = ($1==2.11 && $2>=8) + ($1>=2.12); } -if (!$avx512 && `$ENV{CC} -v 2>&1` +if (!$avx512ifma && `$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) { diff --git a/crypto/bn/asm/rsaz-4k-avx512.pl b/crypto/bn/asm/rsaz-4k-avx512.pl index 53d327e765..aa1143b43b 100644 --- a/crypto/bn/asm/rsaz-4k-avx512.pl +++ b/crypto/bn/asm/rsaz-4k-avx512.pl @@ -43,12 +43,12 @@ if (`$ENV{CC} -Wa,-v -c -o /dev/null -x assembler /dev/null 2>&1` $avx512ifma = ($1>=2.26); } -if (!$avx512 && $win64 && ($flavour =~ /nasm/ || $ENV{ASM} =~ /nasm/) && +if (!$avx512ifma && $win64 && ($flavour =~ /nasm/ || $ENV{ASM} =~ /nasm/) && `nasm -v 2>&1` =~ /NASM version ([2-9]\.[0-9]+)(?:\.([0-9]+))?/) { $avx512ifma = ($1==2.11 && $2>=8) + ($1>=2.12); } -if (!$avx512 && `$ENV{CC} -v 2>&1` +if (!$avx512ifma && `$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) { |