summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2014-01-28 18:31:17 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2014-01-28 18:31:17 +0000
commitd326b65c57d64208646206d0bfd4e2d19d6df38c (patch)
treebb084785898d245456a94f2ba7b3144a30e3e2ba
parent4c235cb9e35407bdb4a2debeef4dc8721e8f91f2 (diff)
downloadlinux-d326b65c57d64208646206d0bfd4e2d19d6df38c.tar.bz2
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>
-rw-r--r--arch/arm/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index c99b1086d83d..04aa55802ae7 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