From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 28 Jan 2014 18:31:17 +0000 (+0000)
Subject: ARM: fix building with gcc 4.6.4
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d326b65c57d64208646206d0bfd4e2d19d6df38c;p=linux.git

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: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index c99b1086d83df..04aa55802ae76 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -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