From a2558c1a2b968225e496dcaddbccda875606229a Mon Sep 17 00:00:00 2001
From: Jefry <jefry.ted@vcube.co.jp>
Date: Wed, 26 Oct 2016 11:09:54 +0700
Subject: [PATCH] compile error fixes

---
 deps/cares/cares.gyp                              | 2 +-
 deps/openssl/asm/arm-void-gas/modes/ghash-armv4.S | 5 -----
 deps/openssl/openssl.gyp                          | 2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/deps/cares/cares.gyp b/deps/cares/cares.gyp
index 3f37437e037..fc634b7b4d9 100644
--- a/deps/cares/cares.gyp
+++ b/deps/cares/cares.gyp
@@ -115,7 +115,7 @@
         }],
         [ 'OS=="win"', {
           'include_dirs': [ 'config/win32' ],
-          'msvs_disabled_warnings': [4133],
+          'msvs_disabled_warnings': [4133, 4018],
           'sources': [
             'src/config-win32.h',
             'src/windows_port.c',
diff --git a/deps/openssl/asm/arm-void-gas/modes/ghash-armv4.S b/deps/openssl/asm/arm-void-gas/modes/ghash-armv4.S
index 6f699dbd870..c54f5149974 100644
--- a/deps/openssl/asm/arm-void-gas/modes/ghash-armv4.S
+++ b/deps/openssl/asm/arm-void-gas/modes/ghash-armv4.S
@@ -3,11 +3,6 @@
 .text
 .code	32
 
-#ifdef __clang__
-#define ldrplb	ldrbpl
-#define ldrneb	ldrbne
-#endif
-
 .type	rem_4bit,%object
 .align	5
 rem_4bit:
diff --git a/deps/openssl/openssl.gyp b/deps/openssl/openssl.gyp
index ef8b7401cbf..d5a0800c0e7 100644
--- a/deps/openssl/openssl.gyp
+++ b/deps/openssl/openssl.gyp
@@ -174,7 +174,7 @@
         ]
       }],
       ['is_clang==1 or gcc_version>=43', {
-        #'cflags': ['-Wno-error=unused-command-line-argument', '-Wno-error=parentheses-equality'],
+        'cflags': ['-Wno-error=unused-command-line-argument', '-Wno-error=parentheses-equality', '-no-integrated-as'],
       }],
       ['OS=="solaris"', {
         'defines': ['__EXTENSIONS__'],