Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6512c0d6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-kbuild-for-linus' of... 

Merge branch 'x86-kbuild-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-kbuild-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Simplify the Makefile in a minor way through use of cc-ifversion
parents 625037cc c7bd0414

arch/x86/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -32,8 +32,8 @@ ifeq ($(CONFIG_X86_32),y) 


        # Disable unit-at-a-time mode on pre-gcc-4.0 compilers, it makes gcc use

        # a lot more stack due to the lack of sharing of stacklots:

        KBUILD_CFLAGS += $(shell if [ $(call cc-version) -lt 0400 ] ; then \

                echo $(call cc-option,-fno-unit-at-a-time); fi ;)

        KBUILD_CFLAGS += $(call cc-ifversion, -lt, 0400, \

				$(call cc-option,-fno-unit-at-a-time))



        # CPU-specific tuning. Anything which can be shared with UML should go here.

        include $(srctree)/arch/x86/Makefile_32.cpu