From 807ed7883a12423270450776f015a7c2348c0913 Mon Sep 17 00:00:00 2001 From: Sam Roberts Date: Thu, 22 Nov 2018 11:47:07 -0800 Subject: deps: update archs files for OpenSSL-1.1.1a `cd deps/openssl/config; make` updates all archs dependant files. PR-URL: https://github.com/nodejs/node/pull/25381 Reviewed-By: Daniel Bevenius Reviewed-By: Shigeki Ohtsu --- .../archs/darwin-i386-cc/asm/openssl-cl.gypi | 23 ++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'deps/openssl/config/archs/darwin-i386-cc/asm/openssl-cl.gypi') diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/openssl-cl.gypi b/deps/openssl/config/archs/darwin-i386-cc/asm/openssl-cl.gypi index 25c8cd1248..442dd865b7 100644 --- a/deps/openssl/config/archs/darwin-i386-cc/asm/openssl-cl.gypi +++ b/deps/openssl/config/archs/darwin-i386-cc/asm/openssl-cl.gypi @@ -1,12 +1,10 @@ { 'variables': { 'openssl_defines_darwin-i386-cc': [ - 'DSO_DLFCN', - 'HAVE_DLFCN_H', 'NDEBUG', - 'OPENSSL_THREADS', - 'OPENSSL_NO_DYNAMIC_ENGINE', + 'L_ENDIAN', 'OPENSSL_PIC', + 'OPENSSL_CPUID_OBJ', 'OPENSSL_BN_ASM_PART_WORDS', 'OPENSSL_IA32_SSE2', 'OPENSSL_BN_ASM_MONT', @@ -26,14 +24,15 @@ 'POLY1305_ASM', ], 'openssl_cflags_darwin-i386-cc': [ - '-O3 -D_REENTRANT -arch i386 -DL_ENDIAN -fomit-frame-pointer', + '-Wa,--noexecstack', + '-O3 -fomit-frame-pointer', + '-arch i386', + '-O3 -fomit-frame-pointer', ], 'openssl_ex_libs_darwin-i386-cc': [ '', ], 'openssl_cli_srcs_darwin-i386-cc': [ - 'openssl/apps/app_rand.c', - 'openssl/apps/apps.c', 'openssl/apps/asn1pars.c', 'openssl/apps/ca.c', 'openssl/apps/ciphers.c', @@ -55,7 +54,6 @@ 'openssl/apps/nseq.c', 'openssl/apps/ocsp.c', 'openssl/apps/openssl.c', - 'openssl/apps/opt.c', 'openssl/apps/passwd.c', 'openssl/apps/pkcs12.c', 'openssl/apps/pkcs7.c', @@ -69,20 +67,25 @@ 'openssl/apps/req.c', 'openssl/apps/rsa.c', 'openssl/apps/rsautl.c', - 'openssl/apps/s_cb.c', 'openssl/apps/s_client.c', 'openssl/apps/s_server.c', - 'openssl/apps/s_socket.c', 'openssl/apps/s_time.c', 'openssl/apps/sess_id.c', 'openssl/apps/smime.c', 'openssl/apps/speed.c', 'openssl/apps/spkac.c', 'openssl/apps/srp.c', + 'openssl/apps/storeutl.c', 'openssl/apps/ts.c', 'openssl/apps/verify.c', 'openssl/apps/version.c', 'openssl/apps/x509.c', + 'openssl/apps/app_rand.c', + 'openssl/apps/apps.c', + 'openssl/apps/bf_prefix.c', + 'openssl/apps/opt.c', + 'openssl/apps/s_cb.c', + 'openssl/apps/s_socket.c', ], }, 'defines': ['<@(openssl_defines_darwin-i386-cc)'], -- cgit v1.2.3