summaryrefslogtreecommitdiff
authorMatthias Kaehlcke <mka@chromium.org>2019-04-23 19:04:25 (GMT)
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org>2019-04-27 07:34:46 (GMT)
commit6950577c4fc80f6da5f6c2e4b138d51b73b51e83 (patch)
tree77381ddb25bdffece8e5cbd0a620dd9535eeeaa0
parent8a384d38baf58f39c432e32a04a32436e0e7d9d8 (diff)
downloadcommon-6950577c4fc80f6da5f6c2e4b138d51b73b51e83.zip
common-6950577c4fc80f6da5f6c2e4b138d51b73b51e83.tar.gz
common-6950577c4fc80f6da5f6c2e4b138d51b73b51e83.tar.bz2
Revert "kbuild: use -Oz instead of -Os when using clang"
commit a75bb4eb9e565b9f5115e2e8c07377ce32cbe69a upstream. The clang option -Oz enables *aggressive* optimization for size, which doesn't necessarily result in smaller images, but can have negative impact on performance. Switch back to the less aggressive -Os. This reverts commit 6748cb3c299de1ffbe56733647b01dbcc398c419. Suggested-by: Peter Zijlstra <peterz@infradead.org> Signed-off-by: Matthias Kaehlcke <mka@chromium.org> Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat
-rw-r--r--Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 966069d..994e52b 100644
--- a/Makefile
+++ b/Makefile
@@ -655,8 +655,7 @@ KBUILD_CFLAGS += $(call cc-option,-fdata-sections,)
endif
ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
-KBUILD_CFLAGS += $(call cc-option,-Oz,-Os)
-KBUILD_CFLAGS += $(call cc-disable-warning,maybe-uninitialized,)
+KBUILD_CFLAGS += -Os $(call cc-disable-warning,maybe-uninitialized,)
else
ifdef CONFIG_PROFILE_ALL_BRANCHES
KBUILD_CFLAGS += -O2 $(call cc-disable-warning,maybe-uninitialized,)