| From 8b6fa8bc8a05ea110475e603ae1a29d79302a8b2 Mon Sep 17 00:00:00 2001 |
| From: Matthias Kaehlcke <mka@chromium.org> |
| Date: Tue, 23 Apr 2019 12:04:25 -0700 |
| Subject: 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> |
| --- |
| Makefile | 3 +-- |
| 1 file changed, 1 insertion(+), 2 deletions(-) |
| |
| diff --git a/Makefile b/Makefile |
| index 966069dab768..994e52be8685 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,) |
| -- |
| 2.19.1 |
| |
