deps: update OpenSSL GYPI files to include ARM64 Windows

nodejs · Feb 8, 2019 · c697764 · c697764
1 parent 125b3c3
commit c697764
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 0 deletions.
diff --git a/deps/openssl/openssl-cl_asm.gypi b/deps/openssl/openssl-cl_asm.gypi
@@ -18,6 +18,8 @@
       'includes': ['config/archs/linux-armv4/asm/openssl-cl.gypi'],
     }, 'target_arch=="arm64" and OS=="linux"', {
       'includes': ['config/archs/linux-aarch64/asm/openssl-cl.gypi'],
+    }, 'target_arch=="arm64" and OS=="win"', {
+      'includes': ['config/archs/VC-WIN64-ARM/asm/openssl-cl.gypi'],
     }, 'target_arch=="ia32" and OS=="linux"', {
       'includes': ['config/archs/linux-elf/asm/openssl-cl.gypi'],
     }, 'target_arch=="ia32" and OS=="mac"', {

diff --git a/deps/openssl/openssl-cl_no_asm.gypi b/deps/openssl/openssl-cl_no_asm.gypi
@@ -18,6 +18,8 @@
       'includes': ['config/archs/linux-armv4/no-asm/openssl-cl.gypi'],
     }, 'target_arch=="arm64" and OS=="linux"', {
       'includes': ['config/archs/linux-aarch64/no-asm/openssl-cl.gypi'],
+    }, 'target_arch=="arm64" and OS=="win"', {
+      'includes': ['config/archs/VC-WIN64-ARM/no-asm/openssl-cl.gypi'],
     }, 'target_arch=="ia32" and OS=="linux"', {
       'includes': ['config/archs/linux-elf/no-asm/openssl-cl.gypi'],
     }, 'target_arch=="ia32" and OS=="mac"', {

diff --git a/deps/openssl/openssl_asm.gypi b/deps/openssl/openssl_asm.gypi
@@ -18,6 +18,23 @@
       'includes': ['config/archs/linux-armv4/asm/openssl.gypi'],
     }, 'target_arch=="arm64" and OS=="linux"', {
       'includes': ['config/archs/linux-aarch64/asm/openssl.gypi'],
+    }, 'target_arch=="arm64" and OS=="win"', {
+      'includes': ['config/archs/VC-WIN64-ARM/asm/openssl.gypi'],
+      'rules': [
+        {
+          'rule_name': 'Assemble',
+          'extension': 'asm',
+          'inputs': [],
+          'outputs': [
+            '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj',
+          ],
+          'action': [
+            'armasm64.exe',
+            '-o', '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj',
+            '<(RULE_INPUT_PATH)',
+          ],
+        }
+      ],
     }, 'target_arch=="ia32" and OS=="linux"', {
       'includes': ['config/archs/linux-elf/asm/openssl.gypi'],
     }, 'target_arch=="ia32" and OS=="mac"', {

diff --git a/deps/openssl/openssl_no_asm.gypi b/deps/openssl/openssl_no_asm.gypi
@@ -19,6 +19,8 @@
       'includes': ['config/archs/linux-armv4/no-asm/openssl.gypi'],
     }, 'target_arch=="arm64" and OS=="linux"', {
       'includes': ['config/archs/linux-aarch64/no-asm/openssl.gypi'],
+    }, 'target_arch=="arm64" and OS=="win"', {
+      'includes': ['config/archs/VC-WIN64-ARM/no-asm/openssl.gypi'],
     }, 'target_arch=="ia32" and OS=="linux"', {
       'includes': ['config/archs/linux-elf/no-asm/openssl.gypi'],
     }, 'target_arch=="ia32" and OS=="mac"', {