diff --git a/lib/CodeGen/Makefile b/lib/CodeGen/Makefile
index 744f8e937b9..e77a53a337d 100644
--- a/lib/CodeGen/Makefile
+++ b/lib/CodeGen/Makefile
@@ -12,3 +12,6 @@ LIBRARYNAME = LLVMCodeGen
 PARALLEL_DIRS = SelectionDAG
 
 include $(LEVEL)/Makefile.common
+
+CompileCommonOpts := $(filter-out -pedantic,$(CompileCommonOpts))
+CompileCommonOpts := $(filter-out -Wno-long-long,$(CompileCommonOpts))