[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  d3cdab17362b9ab0f1a0525b736c862937a9cd2f (commit)
      from  f218822871957a841acf63a3e39a7e8eecdd05b4 (commit)


- Log -----------------------------------------------------------------
commit d3cdab17362b9ab0f1a0525b736c862937a9cd2f
Author: Andy Polyakov <appro at openssl.org>
Date:   Wed Feb 24 20:07:06 2016 +0100

    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 at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/modes/asm/aesni-gcm-x86_64.pl | 2 +-
 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 53b961b..8f5026b 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 47a80eb..006215e 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/) &&