Skip to content

Commit a79a404

Browse files
maciej-w-rozyckitsbogend
authored andcommitted
MIPS: Fix CONFIG_CPU_DADDI_WORKAROUNDS `modules_install' regression
Remove a build-time check for the presence of the GCC `-msym32' option. This option has been there since GCC 4.1.0, which is below the minimum required as at commit 805b2e1 ("kbuild: include Makefile.compiler only when compiler is needed"), when an error message: arch/mips/Makefile:306: *** CONFIG_CPU_DADDI_WORKAROUNDS unsupported without -msym32. Stop. started to trigger for the `modules_install' target with configurations such as `decstation_64_defconfig' that set CONFIG_CPU_DADDI_WORKAROUNDS, because said commit has made `cc-option-yn' an undefined function for non-build targets. Reported-by: Jan-Benedict Glaw <jbglaw@lug-owl.de> Signed-off-by: Maciej W. Rozycki <macro@orcam.me.uk> Fixes: 805b2e1 ("kbuild: include Makefile.compiler only when compiler is needed") Cc: stable@vger.kernel.org # v5.13+ Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
1 parent 657c45b commit a79a404

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

arch/mips/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,8 +299,8 @@ ifdef CONFIG_64BIT
299299
endif
300300
endif
301301

302-
ifeq ($(KBUILD_SYM32)$(call cc-option-yn,-msym32), yy)
303-
cflags-y += -msym32 -DKBUILD_64BIT_SYM32
302+
ifeq ($(KBUILD_SYM32), y)
303+
cflags-$(KBUILD_SYM32) += -msym32 -DKBUILD_64BIT_SYM32
304304
else
305305
ifeq ($(CONFIG_CPU_DADDI_WORKAROUNDS), y)
306306
$(error CONFIG_CPU_DADDI_WORKAROUNDS unsupported without -msym32)

0 commit comments

Comments
 (0)