From 1c76d805000bdf5320978a22754bb0c391f93819 Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Fri, 9 Nov 2018 11:55:37 +0100
Subject: [PATCH] build: disable openssl asm on arm64 for now

There is reason to believe the generated assembly isn't working
correctly so let's disable it for now pending further investigation.

Refs: https://github.com/nodejs/node/issues/23913
---
 common.gypi              | 7 ++++++-
 configure.py             | 4 +++-
 deps/openssl/openssl.gyp | 3 ---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/common.gypi b/common.gypi
index a7a4d214b9aa40..2b1a933818c2d3 100644
--- a/common.gypi
+++ b/common.gypi
@@ -27,7 +27,6 @@
 
     'clang%': 0,
 
-    'openssl_no_asm%': 0,
     'openssl_fips%': '',
 
     # Reset this number to 0 on major V8 upgrades.
@@ -52,6 +51,12 @@
     'icu_use_data_file_flag%': 0,
 
     'conditions': [
+      ['target_arch=="arm64"', {
+        # Disabled pending https://github.com/nodejs/node/issues/23913.
+        'openssl_no_asm%': 1,
+      }, {
+        'openssl_no_asm%': 0,
+      }],
       ['GENERATOR=="ninja"', {
         'obj_dir': '<(PRODUCT_DIR)/obj',
         'conditions': [
diff --git a/configure.py b/configure.py
index 05a7fbc4cc93a0..c4918166eb9795 100755
--- a/configure.py
+++ b/configure.py
@@ -1175,9 +1175,11 @@ def configure_openssl(o):
   variables = o['variables']
   variables['node_use_openssl'] = b(not options.without_ssl)
   variables['node_shared_openssl'] = b(options.shared_openssl)
-  variables['openssl_no_asm'] = 1 if options.openssl_no_asm else 0
   variables['openssl_fips'] = ''
 
+  if options.openssl_no_asm:
+    variables['openssl_no_asm'] = 1
+
   if options.without_ssl:
     def without_ssl_error(option):
       error('--without-ssl is incompatible with %s' % option)
diff --git a/deps/openssl/openssl.gyp b/deps/openssl/openssl.gyp
index 6b0770ebbc1b0e..4a6b55686679d4 100644
--- a/deps/openssl/openssl.gyp
+++ b/deps/openssl/openssl.gyp
@@ -1,7 +1,4 @@
 {
-  'variables': {
-    'openssl_no_asm%': 0,
-  },
   'targets': [
     {
       'target_name': 'openssl',