Skip to content

Commit 1d485dd

Browse files
nathanchancegregkh
authored andcommitted
MIPS: Move '-Wa,-msoft-float' check from as-option to cc-option
This patch is for linux-6.1.y and earlier, it has no direct mainline equivalent. In order to backport commit d5c8d6e ("kbuild: Update assembler calls to use proper flags and language target") to resolve a separate issue regarding PowerPC, the problem noticed and fixed by commit 80a20d2 ("MIPS: Always use -Wa,-msoft-float and eliminate GAS_HAS_SET_HARDFLOAT") needs to be addressed. Unfortunately, 6.1 and earlier do not contain commit e441273 ("Documentation: raise minimum supported version of binutils to 2.25"), so it cannot be assumed that all supported versions of GNU as have support for -msoft-float. In order to switch from KBUILD_CFLAGS to KBUILD_AFLAGS in as-option without consequence, move the '-Wa,-msoft-float' check to cc-option, including '$(cflags-y)' directly to avoid the issue mentioned in commit 80a20d2 ("MIPS: Always use -Wa,-msoft-float and eliminate GAS_HAS_SET_HARDFLOAT"). Signed-off-by: Nathan Chancellor <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent d51d258 commit 1d485dd

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/mips/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ endif
109109
# (specifically newer than 2.24.51.20140728) we then also need to explicitly
110110
# set ".set hardfloat" in all files which manipulate floating point registers.
111111
#
112-
ifneq ($(call as-option,-Wa$(comma)-msoft-float,),)
112+
ifneq ($(call cc-option,$(cflags-y) -Wa$(comma)-msoft-float,),)
113113
cflags-y += -DGAS_HAS_SET_HARDFLOAT -Wa,-msoft-float
114114
endif
115115

0 commit comments

Comments
 (0)