diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2014-06-04 16:53:02 -0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2014-06-04 16:53:02 -0400 |
| commit | f8647b506d7116a1a3accd8d618184096e85f50b (patch) | |
| tree | f10bc7201fda2a36c035548a0ea62210ad57adb6 /arch/mips/Makefile | |
| parent | 1d421ca9d7edbac1eb118631ee039d50ab54771e (diff) | |
| parent | f7a89f1b8eb598ac5da61c9795b3d847baa73d12 (diff) | |
Merge branch '3.15-fixes' into mips-for-linux-next
Diffstat (limited to 'arch/mips/Makefile')
| -rw-r--r-- | arch/mips/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 4852ae97e7df..a8521de14791 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile | |||
| @@ -120,7 +120,7 @@ cflags-$(CONFIG_SB1XXX_CORELIS) += $(call cc-option,-mno-sched-prolog) \ | |||
| 120 | -fno-omit-frame-pointer | 120 | -fno-omit-frame-pointer |
| 121 | 121 | ||
| 122 | ifeq ($(CONFIG_CPU_HAS_MSA),y) | 122 | ifeq ($(CONFIG_CPU_HAS_MSA),y) |
| 123 | toolchain-msa := $(call cc-option-yn,-mhard-float -mfp64 -mmsa) | 123 | toolchain-msa := $(call cc-option-yn,-mhard-float -mfp64 -Wa$(comma)-mmsa) |
| 124 | cflags-$(toolchain-msa) += -DTOOLCHAIN_SUPPORTS_MSA | 124 | cflags-$(toolchain-msa) += -DTOOLCHAIN_SUPPORTS_MSA |
| 125 | endif | 125 | endif |
| 126 | 126 | ||
| @@ -151,7 +151,7 @@ cflags-$(CONFIG_CPU_NEVADA) += $(call cc-option,-march=rm5200,-march=r5000) \ | |||
| 151 | -Wa,--trap | 151 | -Wa,--trap |
| 152 | cflags-$(CONFIG_CPU_RM7000) += $(call cc-option,-march=rm7000,-march=r5000) \ | 152 | cflags-$(CONFIG_CPU_RM7000) += $(call cc-option,-march=rm7000,-march=r5000) \ |
| 153 | -Wa,--trap | 153 | -Wa,--trap |
| 154 | cflags-$(CONFIG_CPU_SB1) += $(call cc-option,-march=sb1,-march=r5000) \ | 154 | cflags-$(CONFIG_CPU_SB1) += $(call cc-option,-march=sb1 -mno-mdmx -mno-mips3d,-march=r5000) \ |
| 155 | -Wa,--trap | 155 | -Wa,--trap |
| 156 | cflags-$(CONFIG_CPU_R8000) += -march=r8000 -Wa,--trap | 156 | cflags-$(CONFIG_CPU_R8000) += -march=r8000 -Wa,--trap |
| 157 | cflags-$(CONFIG_CPU_R10000) += $(call cc-option,-march=r10000,-march=r8000) \ | 157 | cflags-$(CONFIG_CPU_R10000) += $(call cc-option,-march=r10000,-march=r8000) \ |