diff options
| author | Shigeki Ohtsu <ohtsu@ohtsu.org> | 2018-11-08 15:45:29 +0900 |
|---|---|---|
| committer | Sam Roberts <vieuxtech@gmail.com> | 2019-01-22 13:33:37 -0800 |
| commit | 576d0c620683057b69fc1167b409fa60b03af513 (patch) | |
| tree | f0f1b21de618963fb0a797c7058e10ccff386de2 /deps/openssl/openssl.gyp | |
| parent | 0d9a86c7cb3566b22becc656691282402f5026c0 (diff) | |
| download | android-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/openssl.gyp')
| -rw-r--r-- | deps/openssl/openssl.gyp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/deps/openssl/openssl.gyp b/deps/openssl/openssl.gyp index 4a6b556866..5f53248756 100644 --- a/deps/openssl/openssl.gyp +++ b/deps/openssl/openssl.gyp @@ -1,4 +1,9 @@ { + 'variables': { + 'gas_version%': 0, + 'llvm_version%': 0, + 'nasm_version%': 0, + }, 'targets': [ { 'target_name': 'openssl', @@ -11,10 +16,15 @@ 'OPENSSL_NO_HW', ], 'conditions': [ - [ 'openssl_no_asm==0', { + [ 'openssl_no_asm==1', { + 'includes': ['./openssl_no_asm.gypi'], + }, 'gas_version >= "2.26" or nasm_version >= "2.11.8"', { + # Require AVX512IFMA supported. See + # https://www.openssl.org/docs/man1.1.1/man3/OPENSSL_ia32cap.html + # Currently crypto/poly1305/asm/poly1305-x86_64.pl requires AVX512IFMA. 'includes': ['./openssl_asm.gypi'], }, { - 'includes': ['./openssl_no_asm.gypi'], + 'includes': ['./openssl_asm_avx2.gypi'], }], ], 'direct_dependent_settings': { |