summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2017-04-13 07:25:21 +0900
committerGreg Hackmann <ghackmann@google.com>2017-10-09 14:00:12 -0700
commit4b44c97fed0555b2406188ad49ac96d6be0fc329 (patch)
tree1666ada53c98511bde3152110bf91a47bb248b30
parent03e66b365eda022da0e82df4685e1aefcbdc656e (diff)
UPSTREAM: kbuild: drop -Wno-unknown-warning-option from clang options
Since commit c3f0d0bc5b01 ("kbuild, LLVMLinux: Add -Werror to cc-option to support clang"), cc-option and friends work nicely for clang. However, -Wno-unknown-warning-option makes clang happy with any unknown warning options even if -Werror is specified. Once -Wno-unknown-warning-option is added, any succeeding call of cc-disable-warning is evaluated positive, then unknown warning options are accepted. This should be dropped. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> (cherry picked from commit a0ae981eba8f07dbc74bce38fd3a462b69a5bc8e) Signed-off-by: Greg Hackmann <ghackmann@google.com> Change-Id: I0535e20fbcecc2d431e9f08b1f274c5d96626af1
-rw-r--r--Makefile1
-rw-r--r--scripts/Makefile.extrawarn1
2 files changed, 0 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 75895a4b74b8..ecc86bec38e5 100644
--- a/Makefile
+++ b/Makefile
@@ -704,7 +704,6 @@ endif
KBUILD_CFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC)
KBUILD_AFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC)
KBUILD_CPPFLAGS += $(call cc-option,-Qunused-arguments,)
-KBUILD_CPPFLAGS += $(call cc-option,-Wno-unknown-warning-option,)
KBUILD_CFLAGS += $(call cc-disable-warning, unused-variable)
KBUILD_CFLAGS += $(call cc-disable-warning, format-invalid-specifier)
KBUILD_CFLAGS += $(call cc-disable-warning, gnu)
diff --git a/scripts/Makefile.extrawarn b/scripts/Makefile.extrawarn
index da3386a9d244..abe5f47b1ab0 100644
--- a/scripts/Makefile.extrawarn
+++ b/scripts/Makefile.extrawarn
@@ -61,7 +61,6 @@ ifeq ($(cc-name),clang)
KBUILD_CFLAGS += $(call cc-disable-warning, initializer-overrides)
KBUILD_CFLAGS += $(call cc-disable-warning, unused-value)
KBUILD_CFLAGS += $(call cc-disable-warning, format)
-KBUILD_CFLAGS += $(call cc-disable-warning, unknown-warning-option)
KBUILD_CFLAGS += $(call cc-disable-warning, sign-compare)
KBUILD_CFLAGS += $(call cc-disable-warning, format-zero-length)
KBUILD_CFLAGS += $(call cc-disable-warning, uninitialized)