commit d89051f0fe6bc8bba2d6e273c8f9e45fbbea6e2b
author Matthias Kaehlcke <mka@chromium.org> Thu Apr 13 10:26:09 2017 -0700
committer Greg Hackmann <ghackmann@google.com> Mon Oct 16 15:30:37 2017 -0700
tree 476b9bbc5ac8ce2c461b9dcc84d0fa996eadc4e0
parent 27836ce36ad7106bfabb7d48b6ac4053bbd29001

UPSTREAM: x86/kbuild: Use cc-option to enable -falign-{jumps/loops}

clang currently does not support these optimizations, only enable them
when they are available.

Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
Cc: Greg Hackmann <ghackmann@google.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Michael Davidson <md@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: grundler@chromium.org
Link: http://lkml.kernel.org/r/20170413172609.118122-1-mka@chromium.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
(cherry picked from commit 2c4fd1ac3ff167c91272dc43c7bfd2269ef61557)

arch/x86/Makefile

diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 75725dc..af0735e 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -88,10 +88,10 @@
         KBUILD_CFLAGS += -m64
 
         # Align jump targets to 1 byte, not the default 16 bytes:
-        KBUILD_CFLAGS += -falign-jumps=1
+        KBUILD_CFLAGS += $(call cc-option,-falign-jumps=1)
 
         # Pack loops tightly as well:
-        KBUILD_CFLAGS += -falign-loops=1
+        KBUILD_CFLAGS += $(call cc-option,-falign-loops=1)
 
         # Don't autogenerate traditional x87 instructions
         KBUILD_CFLAGS += $(call cc-option,-mno-80387)