diff --git a/libraries/AP_Arming/AP_Arming.cpp b/libraries/AP_Arming/AP_Arming.cpp
index c87d7bf005..9059488b7b 100644
--- a/libraries/AP_Arming/AP_Arming.cpp
+++ b/libraries/AP_Arming/AP_Arming.cpp
@@ -152,6 +152,11 @@ const AP_Param::GroupInfo AP_Arming::var_info[] = {
 extern AP_IOMCU iomcu;
 #endif
 
+#pragma GCC diagnostic push
+#if defined (__clang__)
+#pragma GCC diagnostic ignored "-Wbitwise-instead-of-logical"
+#endif
+
 AP_Arming::AP_Arming()
 {
     if (_singleton) {
@@ -1846,3 +1851,5 @@ AP_Arming &arming()
 }
 
 };
+
+#pragma GCC diagnostic pop