Skip to contentSkip to conversation

ARM: pass -msoft-float to gcc earlier

PATCH New Arnd Bergmann 1 participant 1 message May 27, 2020 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: pass -msoft-float to gcc earlier

Szabolcs Nagy ran into a kernel build failure with a custom gcc toochain that sets -mfpu=auto -mfloat-abi-hard:

/tmp/ccmNdcdf.s:1898: Error: selected processor does not support `cpsid i' in ARM mode

The problem is that $(call cc-option, -march=armv7-a) fails before the kernel overrides the gcc options to also pass -msoft-float.

Move the option to the beginning the Makefile, before we call cc-option for the first time.

---
 arch/arm/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm/Makefile +3 -1
index fcd40c5bfd94..9804f8f61e67 100644
@@ -16,6 +16,8 @@ LDFLAGS_vmlinux	+= --be8
 KBUILD_LDFLAGS_MODULE	+= --be8
 endif
 
+KBUILD_CFLAGS	+= -msoft-float
+
 ifeq ($(CONFIG_CPU_32v4),y)
 LDFLAGS_vmlinux	+= $(call ld-option,--fix-v4bx)
 LDFLAGS_MODULE	+= $(call ld-option,--fix-v4bx)
@@ -138,7 +140,7 @@ AFLAGS_ISA	:=$(CFLAGS_ISA)
 endif
 
 # Need -Uarm for gcc < 3.x
-KBUILD_CFLAGS	+=$(CFLAGS_ABI) $(CFLAGS_ISA) $(arch-y) $(tune-y) $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -msoft-float -Uarm
+KBUILD_CFLAGS	+=$(CFLAGS_ABI) $(CFLAGS_ISA) $(arch-y) $(tune-y) $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -Uarm
 KBUILD_AFLAGS	+=$(CFLAGS_ABI) $(AFLAGS_ISA) $(arch-y) $(tune-y) -include asm/unified.h -msoft-float
 
 CHECKFLAGS	+= -D__arm__
Signature · 1 line
2.26.2