summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Waters <justin.waters@timesys.com>2010-03-25 17:32:45 -0400
committerJustin Waters <justin.waters@timesys.com>2010-03-25 17:32:45 -0400
commitc38da63db4d96939d77a869250c78936e25f9f17 (patch)
tree5d35c6cfe2f4e29fcaee521fb8b1199f9d882aba
parent7f09925e8f3b5bed7609a51ee981eafaf1ee2599 (diff)
Revert "ENGR00119267 revert to gcc 4.1.2 toolchain"
The old commit was meant to allow the kernel to be built with ancient toolchains. We don't need this, and it causes breakage. This reverts commit 780c087d472bcadaec4062e2ddf4036dfc7f3876.
-rw-r--r--arch/arm/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index d22dff606aac..c72dea498467 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -50,7 +50,7 @@ comma = ,
# Note that GCC does not numerically define an architecture version
# macro, but instead defines a whole series of macros which makes
# testing for a specific architecture or later rather impossible.
-arch-$(CONFIG_CPU_32v7) :=-D__LINUX_ARM_ARCH__=7 $(call cc-option,-march=armv7a,-march=armv5t -Wa$(comma)-march=armv7a)
+arch-$(CONFIG_CPU_32v7) :=-D__LINUX_ARM_ARCH__=7 $(call cc-option,-march=armv7-a,-march=armv5t -Wa$(comma)-march=armv7-a)
arch-$(CONFIG_CPU_32v6) :=-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6,-march=armv5t -Wa$(comma)-march=armv6)
# Only override the compiler option if ARMv6. The ARMv6K extensions are
# always available in ARMv7