diff options
| author | Gary King <gking@nvidia.com> | 2009-12-08 16:12:59 -0800 |
|---|---|---|
| committer | Gary King <gking@nvidia.com> | 2009-12-08 16:12:59 -0800 |
| commit | f14a87b5d27c6fb2dd636482b7f47f4e27e5986b (patch) | |
| tree | 6973d6837cb9e0dea7e0fe993fbd6622ad6a9094 /arch/arm/Makefile | |
| parent | 18990c05b62eeaecc5ce1da5e513eeefe1de6b52 (diff) | |
ARM: add correct march option for gcc 4.2 compilers
gcc 4.2-based compilers did not have a standard way of specifying ARMv7
architecture, and often used "armv7a" rather than the "armv7-a" convention
adopted in gcc 4.3
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 9810f6885bff..45efff273681 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -51,7 +51,11 @@ comma = , # macro, but instead defines a whole series of macros which makes # testing for a specific architecture or later rather impossible. arch-$(CONFIG_CPU_32v7M) :=-D__LINUX_ARM_ARCH__=7 -march=armv7-m -Wa,-march=armv7-m +ifeq ($(cc-version),0402) +arch-$(CONFIG_CPU_32v7) :=-D__LINUX_ARM_ARCH__=7 $(call cc-option,-march=armv7a,-march=armv5t -Wa$(comma)-march=armv7a) +else arch-$(CONFIG_CPU_32v7) :=-D__LINUX_ARM_ARCH__=7 $(call cc-option,-march=armv7-a,-march=armv5t -Wa$(comma)-march=armv7-a) +endif 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 |