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

Commit 32098ec7 authored by Markos Chandras's avatar Markos Chandras Committed by Ralf Baechle
Browse files

MIPS: Makefile: Move the ASEs checks after setting the core's CFLAGS 



We need to check the ASEs support against the core's CFLAGS instead
of depending to the default -march option from the toolchain.

Signed-off-by: default avatarMarkos Chandras <markos.chandras@imgtec.com>
Cc: Maciej W. Rozycki <macro@linux-mips.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/9180/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent a8140f36

arch/mips/Makefile

+17 −18
Original line number Diff line number Diff line
@@ -122,26 +122,8 @@ predef-le += -DMIPSEL -D_MIPSEL -D__MIPSEL -D__MIPSEL__ 
cflags-$(CONFIG_CPU_BIG_ENDIAN)		+= $(shell $(CC) -dumpmachine |grep -q 'mips.*el-.*' && echo -EB $(undef-all) $(predef-be))

cflags-$(CONFIG_CPU_LITTLE_ENDIAN)	+= $(shell $(CC) -dumpmachine |grep -q 'mips.*el-.*' || echo -EL $(undef-all) $(predef-le))



# For smartmips configurations, there are hundreds of warnings due to ISA overrides

# in assembly and header files. smartmips is only supported for MIPS32r1 onwards

# and there is no support for 64-bit. Various '.set mips2' or '.set mips3' or

# similar directives in the kernel will spam the build logs with the following warnings:

# Warning: the `smartmips' extension requires MIPS32 revision 1 or greater

# or

# Warning: the 64-bit MIPS architecture does not support the `smartmips' extension

# Pass -Wa,--no-warn to disable all assembler warnings until the kernel code has

# been fixed properly.

cflags-$(CONFIG_CPU_HAS_SMARTMIPS)	+= $(call cc-option,-msmartmips) -Wa,--no-warn

cflags-$(CONFIG_CPU_MICROMIPS) += $(call cc-option,-mmicromips)



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 -Wa$(comma)-mmsa)

cflags-$(toolchain-msa)		+= -DTOOLCHAIN_SUPPORTS_MSA

endif



#

# CPU-dependent compiler/assembler options for optimization.

#
@@ -204,6 +186,23 @@ KBUILD_CFLAGS_MODULE += -msb1-pass1-workarounds 
endif

endif



# For smartmips configurations, there are hundreds of warnings due to ISA overrides

# in assembly and header files. smartmips is only supported for MIPS32r1 onwards

# and there is no support for 64-bit. Various '.set mips2' or '.set mips3' or

# similar directives in the kernel will spam the build logs with the following warnings:

# Warning: the `smartmips' extension requires MIPS32 revision 1 or greater

# or

# Warning: the 64-bit MIPS architecture does not support the `smartmips' extension

# Pass -Wa,--no-warn to disable all assembler warnings until the kernel code has

# been fixed properly.

mips-cflags				:= "$(cflags-y)"

cflags-$(CONFIG_CPU_HAS_SMARTMIPS)	+= $(call cc-option,$(mips-cflags),-msmartmips) -Wa,--no-warn

cflags-$(CONFIG_CPU_MICROMIPS)		+= $(call cc-option,$(mips-cflags),-mmicromips)

ifeq ($(CONFIG_CPU_HAS_MSA),y)

toolchain-msa				:= $(call cc-option-yn,-$(mips-cflags),mhard-float -mfp64 -Wa$(comma)-mmsa)

cflags-$(toolchain-msa)			+= -DTOOLCHAIN_SUPPORTS_MSA

endif



#

# Firmware support

#