Revert "gyp: preserve v8dbg syms on freebsd too"

This reverts commit 181b8a5d3af2e14c50dd32e1f16bf553fd3c7050.

diff --git a/deps/openssl/openssl.gyp b/deps/openssl/openssl.gyp
index cc4a425..b3ae004 100644 (file)
--- 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 d16986d..0b77d8b 100644 (file)
--- 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 bfb9c64..add1f78 100644 (file)
--- 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

diff --git a/node.gyp b/node.gyp
index fbf0292..33c4f0e 100644 (file)
--- a/node.gyp
+++ b/node.gyp
@@ -162,7 +162,7 @@
                 ],
               },
               'conditions': [
-                ['OS in "linux freebsd"', {
+                ['OS=="linux"', {
                   'ldflags': [
                     '-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': [
               '-Wl,--whole-archive <(V8_BASE) -Wl,--no-whole-archive',
             ],