aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/CodeGen/DwarfWriter.cpp2
-rw-r--r--lib/CodeGen/Makefile3
2 files changed, 1 insertions, 4 deletions
diff --git a/lib/CodeGen/DwarfWriter.cpp b/lib/CodeGen/DwarfWriter.cpp
index e44328d232..40518eb209 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 62ef1ad727..a2ad0fd49c 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))