summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--llvm/Makefile.rules3
-rw-r--r--llvm/lib/System/Makefile3
-rw-r--r--llvm/lib/Target/CBackend/Makefile1
-rw-r--r--llvm/projects/Stacker/lib/runtime/Makefile3
-rw-r--r--llvm/projects/sample/lib/sample/Makefile2
-rw-r--r--llvm/runtime/libdummy/Makefile2
6 files changed, 12 insertions, 2 deletions
diff --git a/llvm/Makefile.rules b/llvm/Makefile.rules
index acef6608130..4117169f3a3 100644
--- a/llvm/Makefile.rules
+++ b/llvm/Makefile.rules
@@ -357,7 +357,8 @@ endif
# Options To Invoke Tools
#----------------------------------------------------------
-CompileCommonOpts := -Wall -W -Wwrite-strings -Wno-unused
+CompileCommonOpts := -Wall -W -Wwrite-strings -Wno-unused -Wno-long-long \
+ -pedantic
ifeq ($(OS),HP-UX)
CompileCommonOpts := -D_REENTRANT -D_HPUX_SOURCE
diff --git a/llvm/lib/System/Makefile b/llvm/lib/System/Makefile
index d4fc79ce7a0..85de7369fc4 100644
--- a/llvm/lib/System/Makefile
+++ b/llvm/lib/System/Makefile
@@ -14,3 +14,6 @@ BUILD_ARCHIVE = 1
EXTRA_DIST = Unix Win32 README.txt
include $(LEVEL)/Makefile.common
+
+CompileCommonOpts := $(filter-out -pedantic,$(CompileCommonOpts))
+CompileCommonOpts := $(filter-out -Wno-long-long,$(CompileCommonOpts))
diff --git a/llvm/lib/Target/CBackend/Makefile b/llvm/lib/Target/CBackend/Makefile
index ac6ff3bb530..9b26d8b8c45 100644
--- a/llvm/lib/Target/CBackend/Makefile
+++ b/llvm/lib/Target/CBackend/Makefile
@@ -9,5 +9,4 @@
LEVEL = ../../..
LIBRARYNAME = LLVMCBackend
-CXXFLAGS += -pedantic -Wno-long-long
include $(LEVEL)/Makefile.common
diff --git a/llvm/projects/Stacker/lib/runtime/Makefile b/llvm/projects/Stacker/lib/runtime/Makefile
index d3ebf18fc55..e10b476c6b0 100644
--- a/llvm/projects/Stacker/lib/runtime/Makefile
+++ b/llvm/projects/Stacker/lib/runtime/Makefile
@@ -12,3 +12,6 @@ DONT_BUILD_RELINKED = 1
MODULE_NAME = stkr_runtime
include $(LEVEL)/Makefile.common
+
+CompileCommonOpts := $(filter-out -pedantic,$(CompileCommonOpts))
+CompileCommonOpts := $(filter-out -Wno-long-long,$(CompileCommonOpts))
diff --git a/llvm/projects/sample/lib/sample/Makefile b/llvm/projects/sample/lib/sample/Makefile
index 140d7d6703d..6b1ea05361b 100644
--- a/llvm/projects/sample/lib/sample/Makefile
+++ b/llvm/projects/sample/lib/sample/Makefile
@@ -19,3 +19,5 @@ LOADABLE_MODULE=1
#
include $(LEVEL)/Makefile.common
+CompileCommonOpts := $(filter-out -pedantic,$(CompileCommonOpts))
+CompileCommonOpts := $(filter-out -Wno-long-long,$(CompileCommonOpts))
diff --git a/llvm/runtime/libdummy/Makefile b/llvm/runtime/libdummy/Makefile
index 4fa2561b5a0..6dad7bc6093 100644
--- a/llvm/runtime/libdummy/Makefile
+++ b/llvm/runtime/libdummy/Makefile
@@ -15,3 +15,5 @@ BYTECODE_DESTINATION = $(CFERuntimeLibDir)
include $(LEVEL)/Makefile.common
+CompileCommonOpts := $(filter-out -pedantic,$(CompileCommonOpts))
+CompileCommonOpts := $(filter-out -Wno-long-long,$(CompileCommonOpts))
OpenPOWER on IntegriCloud