diff --git a/BaseTools/Source/C/VfrCompile/Pccts/antlr/antlr.c b/BaseTools/Source/C/VfrCompile/Pccts/antlr/antlr.c
index d0185b8fb5..8088b3c257 100644
--- a/BaseTools/Source/C/VfrCompile/Pccts/antlr/antlr.c
+++ b/BaseTools/Source/C/VfrCompile/Pccts/antlr/antlr.c
@@ -41,6 +41,7 @@ ANTLR_INFO
 #pragma warn -aus  /* unused assignment of 'xxx' */
 #endif
 
+#pragma clang diagnostic ignored "-Wparentheses-equality"
 
 #ifdef __USE_PROTOS
 static void chkToken(char *, char *, char *, int);
diff --git a/BaseTools/Source/C/VfrCompile/Pccts/antlr/antlr.g b/BaseTools/Source/C/VfrCompile/Pccts/antlr/antlr.g
index e6eda6010c..e01728a102 100644
--- a/BaseTools/Source/C/VfrCompile/Pccts/antlr/antlr.g
+++ b/BaseTools/Source/C/VfrCompile/Pccts/antlr/antlr.g
@@ -53,6 +53,7 @@
 #pragma warn -aus  /* unused assignment of 'xxx' */
 #endif
 
+#pragma clang diagnostic ignored "-Wparentheses-equality"
 
 #ifdef __USE_PROTOS
 static void chkToken(char *, char *, char *, int);
diff --git a/BaseTools/Source/C/VfrCompile/Pccts/dlg/dlg_p.c b/BaseTools/Source/C/VfrCompile/Pccts/dlg/dlg_p.c
index af07c27eeb..51f79759fb 100644
--- a/BaseTools/Source/C/VfrCompile/Pccts/dlg/dlg_p.c
+++ b/BaseTools/Source/C/VfrCompile/Pccts/dlg/dlg_p.c
@@ -39,6 +39,8 @@ Fix for Borland C++ 4.x & 5.x compiling with ALL warnings enabled
 #pragma warn -aus  /* unused assignment of 'xxx' */
 #endif
 
+#pragma clang diagnostic ignored "-Wparentheses-equality"
+
 int	action_no = 0;	   /* keep track of actions outputted */
 int	nfa_allocated = 0; /* keeps track of number of nfa nodes */
 nfa_node **nfa_array = NULL;/* root of binary tree that stores nfa array */
diff --git a/BaseTools/Source/C/VfrCompile/Pccts/dlg/dlg_p.g b/BaseTools/Source/C/VfrCompile/Pccts/dlg/dlg_p.g
index 58ca110693..0e3fe6d9d7 100644
--- a/BaseTools/Source/C/VfrCompile/Pccts/dlg/dlg_p.g
+++ b/BaseTools/Source/C/VfrCompile/Pccts/dlg/dlg_p.g
@@ -42,7 +42,9 @@
 #pragma warn -aus  /* unused assignment of 'xxx' */
 #endif
 
-int	action_no = 0;	   /* keep track of actions outputed */
+#pragma clang diagnostic ignored "-Wparentheses-equality"
+
+int	action_no = 0;	   /* keep track of actions outputted */
 int	nfa_allocated = 0; /* keeps track of number of nfa nodes */
 nfa_node **nfa_array = NULL;/* root of binary tree that stores nfa array */
 nfa_node nfa_model_node;   /* model to initialize new nodes */