]> Pileus Git - ~andy/linux/commitdiff
ARM: fix building with gcc 4.6.4
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 28 Jan 2014 18:31:17 +0000 (18:31 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 28 Jan 2014 18:31:17 +0000 (18:31 +0000)
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: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/Makefile

index c99b1086d83dfa8c0c407bab392ff5bb12927ab5..04aa55802ae76a2dc43dd04c7a98776e06b1fb2b 100644 (file)
@@ -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