From a19e8ebe9f68d295719dbc7938d9560dab1ab6e5 Mon Sep 17 00:00:00 2001 From: Shigeki Ohtsu Date: Sun, 24 Feb 2019 02:47:25 +0900 Subject: deps: add ARM64 Windows support in openssl This adds ARM64 Windows support in the OpenSSL build system. Since OpenSSL's ARM64 Windows support does not have support for ASM-- that is, VC-WIN64-ARM inherits from VC-noCE-common which has no ASM files--`openssl_no_asm.gypi` is always used for building. This essentially forces the 'no-asm' Configure flag. PR-URL: https://github.com/nodejs/node/pull/26001 Fixes: https://github.com/nodejs/node/issues/25998 Reviewed-By: James M Snell Reviewed-By: Sam Roberts --- deps/openssl/openssl.gyp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'deps/openssl/openssl.gyp') diff --git a/deps/openssl/openssl.gyp b/deps/openssl/openssl.gyp index 5f53248756..60f6ee03a7 100644 --- a/deps/openssl/openssl.gyp +++ b/deps/openssl/openssl.gyp @@ -18,6 +18,9 @@ 'conditions': [ [ 'openssl_no_asm==1', { 'includes': ['./openssl_no_asm.gypi'], + }, 'target_arch=="arm64" and OS=="win"', { + # VC-WIN64-ARM inherits from VC-noCE-common that has no asms. + '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 @@ -37,10 +40,13 @@ 'dependencies': ['openssl'], 'includes': ['./openssl_common.gypi'], 'conditions': [ - ['openssl_no_asm==0', { - 'includes': ['./openssl-cl_asm.gypi'], - }, { + ['openssl_no_asm==1', { 'includes': ['./openssl-cl_no_asm.gypi'], + }, 'target_arch=="arm64" and OS=="win"', { + # VC-WIN64-ARM inherits from VC-noCE-common that has no asms. + 'includes': ['./openssl-cl_no_asm.gypi'], + }, { + 'includes': ['./openssl-cl_asm.gypi'], }], ], }, -- cgit v1.2.3