Commit d326b65c authored by Russell King's avatar Russell King
Browse files

ARM: fix building with gcc 4.6.4 



GCC fails to build the kernel if EABI is selected, and the default FPU
is selected.  Avoid this by explicitly stating that we want VFP with
EABI.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 4c235cb9

arch/arm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ tune-$(CONFIG_CPU_V6K) =$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm) 
tune-y := $(tune-y)



ifeq ($(CONFIG_AEABI),y)

CFLAGS_ABI	:=-mabi=aapcs-linux -mno-thumb-interwork

CFLAGS_ABI	:=-mabi=aapcs-linux -mno-thumb-interwork -mfpu=vfp

else

CFLAGS_ABI	:=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) $(call cc-option,-mno-thumb-interwork,)

endif