summaryrefslogtreecommitdiff
path: root/deps/openssl/config/generate_gypi.pl
diff options
context:
space:
mode:
authorShigeki Ohtsu <ohtsu@ohtsu.org>2018-11-08 15:45:29 +0900
committerSam Roberts <vieuxtech@gmail.com>2019-01-22 13:33:37 -0800
commit576d0c620683057b69fc1167b409fa60b03af513 (patch)
treef0f1b21de618963fb0a797c7058e10ccff386de2 /deps/openssl/config/generate_gypi.pl
parent0d9a86c7cb3566b22becc656691282402f5026c0 (diff)
downloadandroid-node-v8-576d0c620683057b69fc1167b409fa60b03af513.tar.gz
android-node-v8-576d0c620683057b69fc1167b409fa60b03af513.tar.bz2
android-node-v8-576d0c620683057b69fc1167b409fa60b03af513.zip
deps: add only avx2 configs for OpenSSL-1.1.1
OpenSSL-1.1.1 has new support of AVX-512 but AVX-2 asm files still need to be generated for the older assembler support to keep backward compatibilities. PR-URL: https://github.com/nodejs/node/pull/25381 Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com> Reviewed-By: Shigeki Ohtsu <ohtsu@ohtsu.org>
Diffstat (limited to 'deps/openssl/config/generate_gypi.pl')
-rwxr-xr-xdeps/openssl/config/generate_gypi.pl6
1 files changed, 3 insertions, 3 deletions
diff --git a/deps/openssl/config/generate_gypi.pl b/deps/openssl/config/generate_gypi.pl
index 813bd28a86..4a0a649c7c 100755
--- a/deps/openssl/config/generate_gypi.pl
+++ b/deps/openssl/config/generate_gypi.pl
@@ -16,7 +16,7 @@ use configdata;
my $asm = $ARGV[0];
-unless ($asm eq "asm" or $asm eq "no-asm") {
+unless ($asm eq "asm" or $asm eq "asm_avx2" or $asm eq "no-asm") {
die "Error: $asm is invalid argument";
}
my $arch = $ARGV[1];
@@ -25,7 +25,7 @@ my $arch = $ARGV[1];
my $nasm_banner = `nasm -v`;
die "Error: nasm is not installed." if (!$nasm_banner);
-my $nasm_version_min = 2.11;
+my $nasm_version_min = 2.13.3;
my ($nasm_version) = ($nasm_banner =~/^NASM version ([0-9]\.[0-9][0-9])+/);
if ($nasm_version < $nasm_version_min) {
die "Error: nasm version $nasm_version is too old." .
@@ -33,7 +33,7 @@ if ($nasm_version < $nasm_version_min) {
}
# gas version check
-my $gas_version_min = 2.26;
+my $gas_version_min = 2.30;
my $gas_banner = `gcc -Wa,-v -c -o /dev/null -x assembler /dev/null 2>&1`;
my ($gas_version) = ($gas_banner =~/GNU assembler version ([2-9]\.[0-9]+)/);
if ($gas_version < $gas_version_min) {