Showing with 3 additions and 11 deletions.

+1 −4 deps/openssl/openssl.gyp

+2 −4 deps/openssl/openssl/crypto/cryptlib.c

+0 −3 deps/openssl/openssl/crypto/mem_clr.c
diff --git 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
@@ -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
@@ -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