Skip to content

Commit

Permalink
build: disable openssl asm on arm64 for now
Browse files Browse the repository at this point in the history
There is reason to believe the generated assembly isn't working
correctly so let's disable it for now pending further investigation.

PR-URL: nodejs#24270
Refs: nodejs#23913
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
bnoordhuis authored and danbev committed Nov 12, 2018
1 parent a8847aa commit 4684de6
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
7 changes: 6 additions & 1 deletion common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@

'clang%': 0,

'openssl_no_asm%': 0,
'openssl_fips%': '',

# Reset this number to 0 on major V8 upgrades.
Expand All @@ -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': [
Expand Down
4 changes: 3 additions & 1 deletion configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 0 additions & 3 deletions deps/openssl/openssl.gyp
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
{
'variables': {
'openssl_no_asm%': 0,
},
'targets': [
{
'target_name': 'openssl',
Expand Down

0 comments on commit 4684de6

Please sign in to comment.