Commit 66acd7fc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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}
parents 3fb9268e 2c4fd1ac

arch/x86/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -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)