diff options
| author | Andy Polyakov <appro@openssl.org> | 2016-02-24 20:07:06 +0100 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2016-02-27 21:14:18 +0100 |
| commit | d3cdab17362b9ab0f1a0525b736c862937a9cd2f (patch) | |
| tree | 0eeab2c67343ba472cb8342fe7da07ed44e46945 /crypto/modes | |
| parent | chacha/asm/chacha-*.pl: fix typos in tail processing. (diff) | |
| download | openssl-d3cdab17362b9ab0f1a0525b736c862937a9cd2f.tar.xz openssl-d3cdab17362b9ab0f1a0525b736c862937a9cd2f.zip | |
modes/asm/ghash-x86_64.pl: refine GNU assembler version detection.
Even though AVX support was added in GAS 2.19 vpclmulqdq was apparently
added in 2.20.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto/modes')
| -rw-r--r-- | crypto/modes/asm/aesni-gcm-x86_64.pl | 2 | ||||
| -rw-r--r-- | crypto/modes/asm/ghash-x86_64.pl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crypto/modes/asm/aesni-gcm-x86_64.pl b/crypto/modes/asm/aesni-gcm-x86_64.pl index 53b961baf6..8f5026b3a4 100644 --- a/crypto/modes/asm/aesni-gcm-x86_64.pl +++ b/crypto/modes/asm/aesni-gcm-x86_64.pl @@ -44,7 +44,7 @@ die "can't locate x86_64-xlate.pl"; if (`$ENV{CC} -Wa,-v -c -o /dev/null -x assembler /dev/null 2>&1` =~ /GNU assembler version ([2-9]\.[0-9]+)/) { - $avx = ($1>=2.19) + ($1>=2.22); + $avx = ($1>=2.20) + ($1>=2.22); } if (!$avx && $win64 && ($flavour =~ /nasm/ || $ENV{ASM} =~ /nasm/) && diff --git a/crypto/modes/asm/ghash-x86_64.pl b/crypto/modes/asm/ghash-x86_64.pl index 47a80eb1ee..006215ecb1 100644 --- a/crypto/modes/asm/ghash-x86_64.pl +++ b/crypto/modes/asm/ghash-x86_64.pl @@ -93,7 +93,7 @@ die "can't locate x86_64-xlate.pl"; if (`$ENV{CC} -Wa,-v -c -o /dev/null -x assembler /dev/null 2>&1` =~ /GNU assembler version ([2-9]\.[0-9]+)/) { - $avx = ($1>=2.19) + ($1>=2.22); + $avx = ($1>=2.20) + ($1>=2.22); } if (!$avx && $win64 && ($flavour =~ /nasm/ || $ENV{ASM} =~ /nasm/) && |