summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-05-02 07:33:43 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2017-05-02 07:33:43 +0200
commit66acd7fc9415bc05482b829e7de4073c1072b1de (patch)
tree82ac11d3e6ba3d5feb8d97f82ba767b98ae6cc00
parentMerge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... (diff)
parentx86/kbuild: Use cc-option to enable -falign-{jumps/loops} (diff)
downloadlinux-66acd7fc9415bc05482b829e7de4073c1072b1de.tar.xz
linux-66acd7fc9415bc05482b829e7de4073c1072b1de.zip
Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 build update from Ingo Molnar: "A single CLang support related fix" * 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/kbuild: Use cc-option to enable -falign-{jumps/loops}
-rw-r--r--arch/x86/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 49d160b781f0..4430dd489620 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -88,10 +88,10 @@ else
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)