1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "gyp: preserve v8dbg syms on freebsd too"

Browse Source 
This reverts commit 181b8a5d3af2e14c50dd32e1f16bf553fd3c7050.
This commit is contained in:
Fedor Indutny 2014-08-18 17:57:26 +04:00
parent 181b8a5d3a
commit ffd0116eda
4 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
deps/openssl/openssl.gyp vendored
View File

@ -939,10 +939,7 @@
], ],
}], }],
['target_arch=="arm"', { ['target_arch=="arm"', {
'sources': [ 'sources': ['openssl/crypto/armcap.c'],
'openssl/crypto/armcap.c',
'openssl/crypto/armv4cpuid.S',
],
}], }],
], ],
'include_dirs': [ 'include_dirs': [

6
deps/openssl/openssl/crypto/cryptlib.c vendored
View File

@ -661,11 +661,9 @@ const char *CRYPTO_get_lock_name(int type)
return(sk_OPENSSL_STRING_value(app_locks,type-CRYPTO_NUM_LOCKS)); return(sk_OPENSSL_STRING_value(app_locks,type-CRYPTO_NUM_LOCKS));
} }
#if !defined(_ARM_ARCH__) && \ #if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
(defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
defined(__INTEL__) || \ defined(__INTEL__) || \
defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || \ defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64)
defined(_M_X64))
unsigned int OPENSSL_ia32cap_P[2]; unsigned int OPENSSL_ia32cap_P[2];
unsigned long *OPENSSL_ia32cap_loc(void) unsigned long *OPENSSL_ia32cap_loc(void)

3
deps/openssl/openssl/crypto/mem_clr.c vendored
View File

@ -61,8 +61,6 @@
unsigned char cleanse_ctr = 0; unsigned char cleanse_ctr = 0;
#if !defined(_ARM_ARCH__)
void OPENSSL_cleanse(void *ptr, size_t len) void OPENSSL_cleanse(void *ptr, size_t len)
{ {
unsigned char *p = ptr; unsigned char *p = ptr;
@ -77,4 +75,3 @@ void OPENSSL_cleanse(void *ptr, size_t len)
ctr += (63 + (size_t)p); ctr += (63 + (size_t)p);
cleanse_ctr = (unsigned char)ctr; cleanse_ctr = (unsigned char)ctr;
} }
#endif

4
node.gyp
View File

@ -162,7 +162,7 @@
], ],
}, },
'conditions': [ 'conditions': [
['OS in "linux freebsd"', { ['OS=="linux"', {
'ldflags': [ 'ldflags': [
'-Wl,--whole-archive <(PRODUCT_DIR)/libopenssl.a -Wl,--no-whole-archive', '-Wl,--whole-archive <(PRODUCT_DIR)/libopenssl.a -Wl,--no-whole-archive',
], ],
@ -318,7 +318,7 @@
], ],
}], }],
[ [
'OS in "linux freebsd" and node_shared_v8=="false"', { 'OS=="linux" and node_shared_v8=="false"', {
'ldflags': [ 'ldflags': [
'-Wl,--whole-archive <(V8_BASE) -Wl,--no-whole-archive', '-Wl,--whole-archive <(V8_BASE) -Wl,--no-whole-archive',
], ],