From 4684de6423ee48635c6d4fc3e990af38618aaf0f Mon Sep 17 00:00:00 2001 From: Ben Noordhuis 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. PR-URL: https://github.com/nodejs/node/pull/24270 Refs: https://github.com/nodejs/node/issues/23913 Reviewed-By: Daniel Bevenius Reviewed-By: Refael Ackermann Reviewed-By: James M Snell --- 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 f92791f946d..a1ecdc6d6f8 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 0df8e12bf3a..065e31fd9ca 100755 --- a/configure.py +++ b/configure.py @@ -1183,9 +1183,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 6b0770ebbc1..4a6b5568667 100644 --- a/deps/openssl/openssl.gyp +++ b/deps/openssl/openssl.gyp @@ -1,7 +1,4 @@ { - 'variables': { - 'openssl_no_asm%': 0, - }, 'targets': [ { 'target_name': 'openssl',