Merge "ARM: Use -mcpu=cortex-a15 when targeting MSM Krait CPUs"

arch-$(CONFIG_CPU_32v4)		:=-D__LINUX_ARM_ARCH__=4 -march=armv4

arch-$(CONFIG_CPU_32v3)		:=-D__LINUX_ARM_ARCH__=3 -march=armv3

# Since 'cortex-a15' is a superset of the 'armv7-a' arch spec, we need to

# explicitly redefine the arch options to not include '-march=armv7-a' when

# generating code for Krait, which is compatible with the instruction set of the

# Cortex-A15, because GCC will warn us about ambiguous ISA restrictions caused

# by seemingly conflicting -march and -mcpu options.

# If $(CC) does not support the -mcpu=cortex-a15 option, fall back on passing

# -march=armv7-a to specify the ISA restriction, though this is suboptimal. To

# keep things simpler, we don't bother with a fallback option if the compiler

# doesn't even support -march=armv7-a, since in that situation we would have

# bigger problems.

arch-$(CONFIG_ARCH_MSM_KRAIT)	:=-D__LINUX_ARM_ARCH__=7 $(call cc-option,-mcpu=cortex-a15,-march=armv7-a)

# This selects how we optimise for the processor.

tune-$(CONFIG_CPU_ARM7TDMI)	:=-mtune=arm7tdmi

tune-$(CONFIG_CPU_ARM720T)	:=-mtune=arm7tdmi