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

Commit 5941fe3b 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 commit that simplifies the no-FPU-ops build options"

* 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/kbuild: Eliminate duplicate command line options
parents 19e00d59 5c630089

arch/x86/Makefile

+2 −6
Original line number Diff line number Diff line
@@ -50,9 +50,6 @@ ifeq ($(CONFIG_X86_32),y) 


        KBUILD_CFLAGS += -msoft-float -mregparm=3 -freg-struct-return



        # Don't autogenerate MMX or SSE instructions

        KBUILD_CFLAGS += -mno-mmx -mno-sse



        # Never want PIC in a 32-bit kernel, prevent breakage with GCC built

        # with nonstandard options

        KBUILD_CFLAGS += -fno-pic
@@ -80,8 +77,7 @@ else 
        KBUILD_AFLAGS += -m64

        KBUILD_CFLAGS += -m64



        # Don't autogenerate traditional x87, MMX or SSE instructions

        KBUILD_CFLAGS += -mno-mmx -mno-sse

        # Don't autogenerate traditional x87 instructions

        KBUILD_CFLAGS += $(call cc-option,-mno-80387)

        KBUILD_CFLAGS += $(call cc-option,-mno-fp-ret-in-387)
@@ -168,7 +164,7 @@ KBUILD_CFLAGS += -Wno-sign-compare 
#

KBUILD_CFLAGS += -fno-asynchronous-unwind-tables

# prevent gcc from generating any FP code by mistake

KBUILD_CFLAGS += $(call cc-option,-mno-sse -mno-mmx -mno-sse2 -mno-3dnow,)

KBUILD_CFLAGS += -mno-sse -mno-mmx -mno-sse2 -mno-3dnow

KBUILD_CFLAGS += $(call cc-option,-mno-avx,)



KBUILD_CFLAGS += $(mflags-y)