diff --git a/lib/CodeGen/DwarfWriter.cpp b/lib/CodeGen/DwarfWriter.cpp
index e44328d232a..40518eb2093 100644
--- a/lib/CodeGen/DwarfWriter.cpp
+++ b/lib/CodeGen/DwarfWriter.cpp
@@ -688,7 +688,7 @@ public:
 
   /// Profile - Used to gather unique data for the value folding set.
   ///
-  virtual void DIEBlock::Profile(FoldingSetNodeID &ID) {
+  virtual void Profile(FoldingSetNodeID &ID) {
     ID.AddInteger(isBlock);
     DIE::Profile(ID);
   }
diff --git a/lib/CodeGen/Makefile b/lib/CodeGen/Makefile
index 62ef1ad727d..a2ad0fd49cf 100644
--- a/lib/CodeGen/Makefile
+++ b/lib/CodeGen/Makefile
@@ -13,6 +13,3 @@ PARALLEL_DIRS = SelectionDAG
 BUILD_ARCHIVE = 1
 
 include $(LEVEL)/Makefile.common
-
-CompileCommonOpts := $(filter-out -pedantic,$(CompileCommonOpts))
-CompileCommonOpts := $(filter-out -Wno-long-long,$(CompileCommonOpts))