diff options
author | miod <> | 2014-04-17 20:18:57 +0000 |
---|---|---|
committer | miod <> | 2014-04-17 20:18:57 +0000 |
commit | a886610fe2a112a35a4ce4dec9e6f9cff3682029 (patch) | |
tree | 63d1f298dbce04fc22f9864e25a0714817585c02 | |
parent | e3fc9c40a3ddca5774c9d4f26e3cd8d2d76dfc34 (diff) | |
download | openbsd-a886610fe2a112a35a4ce4dec9e6f9cff3682029.tar.gz openbsd-a886610fe2a112a35a4ce4dec9e6f9cff3682029.tar.bz2 openbsd-a886610fe2a112a35a4ce4dec9e6f9cff3682029.zip |
No need to consider being compiled by NASM anymore.
-rw-r--r-- | src/lib/libcrypto/sha/asm/sha1-586.pl | 4 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/sha/asm/sha1-586.pl | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/src/lib/libcrypto/sha/asm/sha1-586.pl b/src/lib/libcrypto/sha/asm/sha1-586.pl index 1084d227fe..e7bb307795 100644 --- a/src/lib/libcrypto/sha/asm/sha1-586.pl +++ b/src/lib/libcrypto/sha/asm/sha1-586.pl | |||
@@ -112,10 +112,6 @@ $ymm=1 if ($xmm && | |||
112 | =~ /GNU assembler version ([2-9]\.[0-9]+)/ && | 112 | =~ /GNU assembler version ([2-9]\.[0-9]+)/ && |
113 | $1>=2.19); # first version supporting AVX | 113 | $1>=2.19); # first version supporting AVX |
114 | 114 | ||
115 | $ymm=1 if ($xmm && !$ymm && $ARGV[0] eq "win32n" && | ||
116 | `nasm -v 2>&1` =~ /NASM version ([2-9]\.[0-9]+)/ && | ||
117 | $1>=2.03); # first version supporting AVX | ||
118 | |||
119 | &external_label("OPENSSL_ia32cap_P") if ($xmm); | 115 | &external_label("OPENSSL_ia32cap_P") if ($xmm); |
120 | 116 | ||
121 | 117 | ||
diff --git a/src/lib/libssl/src/crypto/sha/asm/sha1-586.pl b/src/lib/libssl/src/crypto/sha/asm/sha1-586.pl index 1084d227fe..e7bb307795 100644 --- a/src/lib/libssl/src/crypto/sha/asm/sha1-586.pl +++ b/src/lib/libssl/src/crypto/sha/asm/sha1-586.pl | |||
@@ -112,10 +112,6 @@ $ymm=1 if ($xmm && | |||
112 | =~ /GNU assembler version ([2-9]\.[0-9]+)/ && | 112 | =~ /GNU assembler version ([2-9]\.[0-9]+)/ && |
113 | $1>=2.19); # first version supporting AVX | 113 | $1>=2.19); # first version supporting AVX |
114 | 114 | ||
115 | $ymm=1 if ($xmm && !$ymm && $ARGV[0] eq "win32n" && | ||
116 | `nasm -v 2>&1` =~ /NASM version ([2-9]\.[0-9]+)/ && | ||
117 | $1>=2.03); # first version supporting AVX | ||
118 | |||
119 | &external_label("OPENSSL_ia32cap_P") if ($xmm); | 115 | &external_label("OPENSSL_ia32cap_P") if ($xmm); |
120 | 116 | ||
121 | 117 | ||