aboutsummaryrefslogtreecommitdiff
path: root/deps/openssl/config/dso_conf_no-asm.h
diff options
context:
space:
mode:
authorShigeki Ohtsu <ohtsu@ohtsu.org>2019-02-24 02:47:25 +0900
committerRuben Bridgewater <ruben@bridgewater.de>2019-04-04 15:11:44 +0200
commita19e8ebe9f68d295719dbc7938d9560dab1ab6e5 (patch)
tree83377b59380e4fd0f2e46ebf5fd7cc6a79a9590a /deps/openssl/config/dso_conf_no-asm.h
parent4f094c0ae60beb8a3eb569a6a2d8c608bff1dbeb (diff)
downloadandroid-node-v8-a19e8ebe9f68d295719dbc7938d9560dab1ab6e5.tar.gz
android-node-v8-a19e8ebe9f68d295719dbc7938d9560dab1ab6e5.tar.bz2
android-node-v8-a19e8ebe9f68d295719dbc7938d9560dab1ab6e5.zip
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 <jasnell@gmail.com> Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
Diffstat (limited to 'deps/openssl/config/dso_conf_no-asm.h')
-rw-r--r--deps/openssl/config/dso_conf_no-asm.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/deps/openssl/config/dso_conf_no-asm.h b/deps/openssl/config/dso_conf_no-asm.h
index 9d0e3e0e1c..c3507ce3d2 100644
--- a/deps/openssl/config/dso_conf_no-asm.h
+++ b/deps/openssl/config/dso_conf_no-asm.h
@@ -21,6 +21,8 @@
# include "./archs/VC-WIN32/no-asm/crypto/include/internal/dso_conf.h"
#elif defined(_WIN32) && defined(_M_X64)
# include "./archs/VC-WIN64A/no-asm/crypto/include/internal/dso_conf.h"
+#elif defined(_WIN32) && defined(_M_ARM64)
+# include "./archs/VC-WIN64-ARM/no-asm/crypto/include/internal/dso_conf.h"
#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__i386__)
# include "./archs/BSD-x86/no-asm/crypto/include/internal/dso_conf.h"
#elif (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__x86_64__)