Skip to content

Commit 418e839

Browse files
author
Shigeki Ohtsu
committed
deps: update openssl.gyp/gypi for openssl-1.0.2a
Update gyp sources for openssl-1.0.2a. The source list was extracted from Makefiles in `deps/openssl/openssl/{crypto/ssl/engines}`. Defines are created by referring the table in `deps/openssl/doc/openssl_define_list.pdf` that was derived from Makefile entries and outputs of `deps/openssl/openssl/Configure TABLE`. Renamed the variable of openssl_sources_arm_elf_gas to openssl_sources_arm_void_gas to be consistent with PERLASM_SCHEME. This also includes arm64 support. Fixes: #589 PR-URL: #1389 Reviewed-By: Fedor Indutny <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]>
1 parent 02f12ab commit 418e839

File tree

2 files changed

+119
-39
lines changed

2 files changed

+119
-39
lines changed

deps/openssl/openssl.gyp

+4-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
'conditions': [
3131
['target_arch=="arm"', {
3232
'defines': ['<@(openssl_defines_asm)'],
33-
'sources': ['<@(openssl_sources_arm_elf_gas)'],
33+
'sources': ['<@(openssl_sources_arm_void_gas)'],
3434
}, 'target_arch=="ia32" and OS=="mac"', {
3535
'defines': [
3636
'<@(openssl_defines_asm)',
@@ -69,6 +69,9 @@
6969
'<@(openssl_defines_x64_elf)',
7070
],
7171
'sources': ['<@(openssl_sources_x64_elf_gas)'],
72+
}, 'target_arch=="arm64"', {
73+
'defines': ['<@(openssl_defines_arm64)',],
74+
'sources': ['<@(openssl_sources_arm64_linux64_gas)'],
7275
}, {
7376
# Other architectures don't use assembly.
7477
'defines': ['OPENSSL_NO_ASM'],

0 commit comments

Comments
 (0)