From 181b8a5d3af2e14c50dd32e1f16bf553fd3c7050 Mon Sep 17 00:00:00 2001 From: Fedor Indutny Date: Sun, 17 Aug 2014 14:19:14 +0400 Subject: [PATCH] gyp: preserve v8dbg syms on freebsd too --- deps/openssl/openssl.gyp | 5 ++++- deps/openssl/openssl/crypto/cryptlib.c | 6 ++++-- deps/openssl/openssl/crypto/mem_clr.c | 3 +++ node.gyp | 4 ++-- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/deps/openssl/openssl.gyp b/deps/openssl/openssl.gyp index b3ae004..cc4a425 100644 --- a/deps/openssl/openssl.gyp +++ b/deps/openssl/openssl.gyp @@ -939,7 +939,10 @@ ], }], ['target_arch=="arm"', { - 'sources': ['openssl/crypto/armcap.c'], + 'sources': [ + 'openssl/crypto/armcap.c', + 'openssl/crypto/armv4cpuid.S', + ], }], ], 'include_dirs': [ diff --git a/deps/openssl/openssl/crypto/cryptlib.c b/deps/openssl/openssl/crypto/cryptlib.c index 0b77d8b..d16986d 100644 --- a/deps/openssl/openssl/crypto/cryptlib.c +++ b/deps/openssl/openssl/crypto/cryptlib.c @@ -661,9 +661,11 @@ const char *CRYPTO_get_lock_name(int type) return(sk_OPENSSL_STRING_value(app_locks,type-CRYPTO_NUM_LOCKS)); } -#if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \ +#if !defined(_ARM_ARCH__) && \ + (defined(__i386) || defined(__i386__) || defined(_M_IX86) || \ defined(__INTEL__) || \ - defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64) + defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || \ + defined(_M_X64)) unsigned int OPENSSL_ia32cap_P[2]; unsigned long *OPENSSL_ia32cap_loc(void) diff --git a/deps/openssl/openssl/crypto/mem_clr.c b/deps/openssl/openssl/crypto/mem_clr.c index add1f78..bfb9c64 100644 --- a/deps/openssl/openssl/crypto/mem_clr.c +++ b/deps/openssl/openssl/crypto/mem_clr.c @@ -61,6 +61,8 @@ unsigned char cleanse_ctr = 0; +#if !defined(_ARM_ARCH__) + void OPENSSL_cleanse(void *ptr, size_t len) { unsigned char *p = ptr; @@ -75,3 +77,4 @@ void OPENSSL_cleanse(void *ptr, size_t len) ctr += (63 + (size_t)p); cleanse_ctr = (unsigned char)ctr; } +#endif diff --git a/node.gyp b/node.gyp index 33c4f0e..fbf0292 100644 --- a/node.gyp +++ b/node.gyp @@ -162,7 +162,7 @@ ], }, 'conditions': [ - ['OS=="linux"', { + ['OS in "linux freebsd"', { 'ldflags': [ '-Wl,--whole-archive <(PRODUCT_DIR)/libopenssl.a -Wl,--no-whole-archive', ], @@ -318,7 +318,7 @@ ], }], [ - 'OS=="linux" and node_shared_v8=="false"', { + 'OS in "linux freebsd" and node_shared_v8=="false"', { 'ldflags': [ '-Wl,--whole-archive <(V8_BASE) -Wl,--no-whole-archive', ], -- 2.7.4