diff --git a/makefiles/nuttx/toolchain_gnu-arm-eabi.mk b/makefiles/nuttx/toolchain_gnu-arm-eabi.mk
index 0c6c5679f9..868c3d161e 100644
--- a/makefiles/nuttx/toolchain_gnu-arm-eabi.mk
+++ b/makefiles/nuttx/toolchain_gnu-arm-eabi.mk
@@ -147,7 +147,6 @@ ARCHWARNINGS		 = -Wall \
 			   -Wshadow \
 			   -Wfloat-equal \
 			   -Wpointer-arith \
-			   -Wlogical-op \
 			   -Wmissing-declarations \
 			   -Wpacked \
 			   -Wno-unused-parameter \
diff --git a/makefiles/posix-arm/toolchain_gnu-arm-linux-gnueabihf.mk b/makefiles/posix-arm/toolchain_gnu-arm-linux-gnueabihf.mk
index 2811512ecd..12ea6fc29d 100644
--- a/makefiles/posix-arm/toolchain_gnu-arm-linux-gnueabihf.mk
+++ b/makefiles/posix-arm/toolchain_gnu-arm-linux-gnueabihf.mk
@@ -157,8 +157,6 @@ ARCHWARNINGS		 = -Wall \
 			   -Werror=reorder \
 			   -Werror=uninitialized \
 			   -Werror=init-self \
-			   -Wno-error=logical-op \
-			   -Wlogical-op \
 			   -Wformat=1 \
 			   -Werror=unused-but-set-variable \
 			   -Wno-error=double-promotion \
diff --git a/makefiles/posix/toolchain_native.mk b/makefiles/posix/toolchain_native.mk
index 87e38ba349..c3a766d5ef 100644
--- a/makefiles/posix/toolchain_native.mk
+++ b/makefiles/posix/toolchain_native.mk
@@ -183,9 +183,8 @@ ARCHWARNINGS		 = -Wall \
 
 # Add compiler specific options
 ifeq ($(USE_GCC),1)
-ARCHDEFINES		+= -Wno-error=logical-op
+ARCHDEFINES		+=
 ARCHWARNINGS		+= -Wdouble-promotion \
-			   -Wlogical-op \
 			   -Wformat=1 \
 			   -Werror=unused-but-set-variable \
 			   -Werror=double-promotion