diff options
| author | Fedor Indutny <fedor@indutny.com> | 2014-08-17 14:19:14 +0400 |
|---|---|---|
| committer | Fedor Indutny <fedor@indutny.com> | 2014-08-17 14:19:14 +0400 |
| commit | 181b8a5d3af2e14c50dd32e1f16bf553fd3c7050 (patch) | |
| tree | 7f9c9a485e62b668a3614f3c05330c3adfe0b16c | |
| parent | fd80a31e0697d6317ce8c2d289575399f4e06d21 (diff) | |
| download | node-new-181b8a5d3af2e14c50dd32e1f16bf553fd3c7050.tar.gz | |
gyp: preserve v8dbg syms on freebsd too
| -rw-r--r-- | deps/openssl/openssl.gyp | 5 | ||||
| -rw-r--r-- | deps/openssl/openssl/crypto/cryptlib.c | 6 | ||||
| -rw-r--r-- | deps/openssl/openssl/crypto/mem_clr.c | 3 | ||||
| -rw-r--r-- | node.gyp | 4 |
4 files changed, 13 insertions, 5 deletions
diff --git a/deps/openssl/openssl.gyp b/deps/openssl/openssl.gyp index b3ae004103..cc4a425d07 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 0b77d8b7d0..d16986da2c 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 add1f78020..bfb9c64b01 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 @@ -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', ], |