From 56bac69b27a0ca3a229ee76bd404205410402f7b Mon Sep 17 00:00:00 2001 From: miod Date: Thu, 17 Apr 2014 20:18:57 +0000 Subject: [PATCH] No need to consider being compiled by NASM anymore. --- lib/libcrypto/sha/asm/sha1-586.pl | 4 ---- lib/libssl/src/crypto/sha/asm/sha1-586.pl | 4 ---- 2 files changed, 8 deletions(-) diff --git a/lib/libcrypto/sha/asm/sha1-586.pl b/lib/libcrypto/sha/asm/sha1-586.pl index 1084d227fe0..e7bb307795b 100644 --- a/lib/libcrypto/sha/asm/sha1-586.pl +++ b/lib/libcrypto/sha/asm/sha1-586.pl @@ -112,10 +112,6 @@ $ymm=1 if ($xmm && =~ /GNU assembler version ([2-9]\.[0-9]+)/ && $1>=2.19); # first version supporting AVX -$ymm=1 if ($xmm && !$ymm && $ARGV[0] eq "win32n" && - `nasm -v 2>&1` =~ /NASM version ([2-9]\.[0-9]+)/ && - $1>=2.03); # first version supporting AVX - &external_label("OPENSSL_ia32cap_P") if ($xmm); diff --git a/lib/libssl/src/crypto/sha/asm/sha1-586.pl b/lib/libssl/src/crypto/sha/asm/sha1-586.pl index 1084d227fe0..e7bb307795b 100644 --- a/lib/libssl/src/crypto/sha/asm/sha1-586.pl +++ b/lib/libssl/src/crypto/sha/asm/sha1-586.pl @@ -112,10 +112,6 @@ $ymm=1 if ($xmm && =~ /GNU assembler version ([2-9]\.[0-9]+)/ && $1>=2.19); # first version supporting AVX -$ymm=1 if ($xmm && !$ymm && $ARGV[0] eq "win32n" && - `nasm -v 2>&1` =~ /NASM version ([2-9]\.[0-9]+)/ && - $1>=2.03); # first version supporting AVX - &external_label("OPENSSL_ia32cap_P") if ($xmm); -- 2.20.1