Merge tag 'cleanup-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[firefly-linux-kernel-4.4.55.git] / arch / mips / Makefile

diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index 60a359cfa328f5e4a6cc96f1a90ec20a184447f9..9336509f47ad61b129598d3f1ed6ee4a99aabefa 100644 (file)
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -120,7 +120,7 @@ cflags-$(CONFIG_SB1XXX_CORELIS)     += $(call cc-option,-mno-sched-prolog) \
                                   -fno-omit-frame-pointer
 
 ifeq ($(CONFIG_CPU_HAS_MSA),y)
-toolchain-msa                  := $(call cc-option-yn,-mhard-float -mfp64 -mmsa)
+toolchain-msa  := $(call cc-option-yn,-mhard-float -mfp64 -Wa$(comma)-mmsa)
 cflags-$(toolchain-msa)                += -DTOOLCHAIN_SUPPORTS_MSA
 endif
 
@@ -151,8 +151,10 @@ cflags-$(CONFIG_CPU_NEVADA)        += $(call cc-option,-march=rm5200,-march=r5000) \
                        -Wa,--trap
 cflags-$(CONFIG_CPU_RM7000)    += $(call cc-option,-march=rm7000,-march=r5000) \
                        -Wa,--trap
-cflags-$(CONFIG_CPU_SB1)       += $(call cc-option,-march=sb1 -mno-mdmx -mno-mips3d,-march=r5000) \
+cflags-$(CONFIG_CPU_SB1)       += $(call cc-option,-march=sb1,-march=r5000) \
                        -Wa,--trap
+cflags-$(CONFIG_CPU_SB1)       += $(call cc-option,-mno-mdmx)
+cflags-$(CONFIG_CPU_SB1)       += $(call cc-option,-mno-mips3d)
 cflags-$(CONFIG_CPU_R8000)     += -march=r8000 -Wa,--trap
 cflags-$(CONFIG_CPU_R10000)    += $(call cc-option,-march=r10000,-march=r8000) \
                        -Wa,--trap
@@ -251,6 +253,7 @@ OBJCOPYFLAGS                += --remove-section=.reginfo
 head-y := arch/mips/kernel/head.o
 
 libs-y                 += arch/mips/lib/
+libs-y                 += arch/mips/math-emu/
 
 # See arch/mips/Kbuild for content of core part of the kernel
 core-y += arch/mips/