gyp: preserve v8dbg syms on freebsd too
authorFedor Indutny <fedor@indutny.com>
Sun, 17 Aug 2014 10:19:14 +0000 (14:19 +0400)
committerFedor Indutny <fedor@indutny.com>
Sun, 17 Aug 2014 10:19:14 +0000 (14:19 +0400)
deps/openssl/openssl.gyp
deps/openssl/openssl/crypto/cryptlib.c
deps/openssl/openssl/crypto/mem_clr.c
node.gyp

index b3ae004..cc4a425 100644 (file)
           ],
         }],
         ['target_arch=="arm"', {
-          'sources': ['openssl/crypto/armcap.c'],
+          'sources': [
+            'openssl/crypto/armcap.c',
+            'openssl/crypto/armv4cpuid.S',
+          ],
         }],
       ],
       'include_dirs': [
index 0b77d8b..d16986d 100644 (file)
@@ -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)
index add1f78..bfb9c64 100644 (file)
@@ -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
index 33c4f0e..fbf0292 100644 (file)
--- a/node.gyp
+++ b/node.gyp
                 ],
               },
               'conditions': [
-                ['OS=="linux"', {
+                ['OS in "linux freebsd"', {
                   'ldflags': [
                     '-Wl,--whole-archive <(PRODUCT_DIR)/libopenssl.a -Wl,--no-whole-archive',
                   ],
           ],
         }],
         [
-          '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',
             ],