summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorShigeki Ohtsu <ohtsu@ohtsu.org>2018-04-23 21:26:28 +0900
committerJames M Snell <jasnell@gmail.com>2018-04-23 11:43:18 -0700
commit3bcd8576fcb800077c922233da251a2299b66923 (patch)
tree79c8a8bc489676b26eb7d85c18842783b354ae88 /configure
parentde96899f239f4b5cda5a597f70d871a95e6f9ac3 (diff)
downloadandroid-node-v8-3bcd8576fcb800077c922233da251a2299b66923.tar.gz
android-node-v8-3bcd8576fcb800077c922233da251a2299b66923.tar.bz2
android-node-v8-3bcd8576fcb800077c922233da251a2299b66923.zip
build: limit assembler version check on x86
The current openssl checks assembler version only x86_64 or ia32 target arch for use of AES-NI, AVX and AVX2. This requires --openssl-no-asm option during configure when an older assembler version is found only on x86_64 or ia32. PR-URL: https://github.com/nodejs/node/pull/20226 Fixes: https://github.com/nodejs/node/issues/19944 Refs: https://github.com/nodejs/node/pull/20217 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com> Reviewed-By: Myles Borins <myles.borins@gmail.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure4
1 files changed, 3 insertions, 1 deletions
diff --git a/configure b/configure
index 0294e3a131..c1170f9a13 100755
--- a/configure
+++ b/configure
@@ -1106,6 +1106,8 @@ def configure_openssl(o):
o['defines'] += ['NODE_WITHOUT_NODE_OPTIONS']
if not options.shared_openssl and not options.openssl_no_asm:
+ is_x86 = 'x64' in variables['target_arch'] or 'ia32' in variables['target_arch']
+
# supported asm compiler for AVX2. See https://github.com/openssl/openssl/
# blob/OpenSSL_1_1_0-stable/crypto/modes/asm/aesni-gcm-x86_64.pl#L52-L69
openssl110_asm_supported = \
@@ -1114,7 +1116,7 @@ def configure_openssl(o):
('llvm_version' in variables and float(variables['llvm_version']) >= 3.3) or \
('nasm_version' in variables and float(variables['nasm_version']) >= 2.10)
- if not openssl110_asm_supported:
+ if is_x86 and not openssl110_asm_supported:
error('''Did not find a new enough assembler, install one or build with
--openssl-no-asm.
Please refer to BUILDING.md''')