diff options
| author | Fedor Indutny <fedor@indutny.com> | 2014-08-18 17:57:26 +0400 |
|---|---|---|
| committer | Fedor Indutny <fedor@indutny.com> | 2014-08-18 17:57:26 +0400 |
| commit | ffd0116eda9f48eacc1ce8772c5a85516871a2f9 (patch) | |
| tree | 84ad86dbed0c709fb44ddcd12fa73e891acc1c83 /deps | |
| parent | 181b8a5d3af2e14c50dd32e1f16bf553fd3c7050 (diff) | |
| download | android-node-v8-ffd0116eda9f48eacc1ce8772c5a85516871a2f9.tar.gz android-node-v8-ffd0116eda9f48eacc1ce8772c5a85516871a2f9.tar.bz2 android-node-v8-ffd0116eda9f48eacc1ce8772c5a85516871a2f9.zip | |
Revert "gyp: preserve v8dbg syms on freebsd too"
This reverts commit 181b8a5d3af2e14c50dd32e1f16bf553fd3c7050.
Diffstat (limited to 'deps')
| -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 |
3 files changed, 3 insertions, 11 deletions
diff --git a/deps/openssl/openssl.gyp b/deps/openssl/openssl.gyp index cc4a425d07..b3ae004103 100644 --- a/deps/openssl/openssl.gyp +++ b/deps/openssl/openssl.gyp @@ -939,10 +939,7 @@ ], }], ['target_arch=="arm"', { - 'sources': [ - 'openssl/crypto/armcap.c', - 'openssl/crypto/armv4cpuid.S', - ], + 'sources': ['openssl/crypto/armcap.c'], }], ], 'include_dirs': [ diff --git a/deps/openssl/openssl/crypto/cryptlib.c b/deps/openssl/openssl/crypto/cryptlib.c index d16986da2c..0b77d8b7d0 100644 --- a/deps/openssl/openssl/crypto/cryptlib.c +++ b/deps/openssl/openssl/crypto/cryptlib.c @@ -661,11 +661,9 @@ const char *CRYPTO_get_lock_name(int type) return(sk_OPENSSL_STRING_value(app_locks,type-CRYPTO_NUM_LOCKS)); } -#if !defined(_ARM_ARCH__) && \ - (defined(__i386) || defined(__i386__) || defined(_M_IX86) || \ +#if 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 bfb9c64b01..add1f78020 100644 --- a/deps/openssl/openssl/crypto/mem_clr.c +++ b/deps/openssl/openssl/crypto/mem_clr.c @@ -61,8 +61,6 @@ unsigned char cleanse_ctr = 0; -#if !defined(_ARM_ARCH__) - void OPENSSL_cleanse(void *ptr, size_t len) { unsigned char *p = ptr; @@ -77,4 +75,3 @@ void OPENSSL_cleanse(void *ptr, size_t len) ctr += (63 + (size_t)p); cleanse_ctr = (unsigned char)ctr; } -#endif |