tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ARM: 9262/1: remove lazy evaluation in Makefile

arch-y and tune-y used lazy evaluation since they used to contain

cc-option checks. They don't any longer, so just eagerly evaluate these
command line flags.

Reviewed-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>

authored by

Nick Desaulniers and committed by
Russell King (Oracle) 5aa4860e 3f712c7c

+27 -33
+27 -33
arch/arm/Makefile
··· 63 63 # Note that GCC does not numerically define an architecture version 64 64 # macro, but instead defines a whole series of macros which makes 65 65 # testing for a specific architecture or later rather impossible. 66 - arch-$(CONFIG_CPU_32v7M) =-D__LINUX_ARM_ARCH__=7 -march=armv7-m 67 - arch-$(CONFIG_CPU_32v7) =-D__LINUX_ARM_ARCH__=7 -march=armv7-a 68 - arch-$(CONFIG_CPU_32v6) =-D__LINUX_ARM_ARCH__=6 -march=armv6 69 - # Only override the compiler option if ARMv6. The ARMv6K extensions are 66 + arch-$(CONFIG_CPU_32v7M) :=-D__LINUX_ARM_ARCH__=7 -march=armv7-m 67 + arch-$(CONFIG_CPU_32v7) :=-D__LINUX_ARM_ARCH__=7 -march=armv7-a 68 + arch-$(CONFIG_CPU_32v6) :=-D__LINUX_ARM_ARCH__=6 -march=armv6 69 + # Only override the compiler opt:ion if ARMv6. The ARMv6K extensions are 70 70 # always available in ARMv7 71 71 ifeq ($(CONFIG_CPU_32v6),y) 72 - arch-$(CONFIG_CPU_32v6K) =-D__LINUX_ARM_ARCH__=6 -march=armv6k 72 + arch-$(CONFIG_CPU_32v6K) :=-D__LINUX_ARM_ARCH__=6 -march=armv6k 73 73 endif 74 - arch-$(CONFIG_CPU_32v5) =-D__LINUX_ARM_ARCH__=5 -march=armv5te 75 - arch-$(CONFIG_CPU_32v4T) =-D__LINUX_ARM_ARCH__=4 -march=armv4t 76 - arch-$(CONFIG_CPU_32v4) =-D__LINUX_ARM_ARCH__=4 -march=armv4 77 - arch-$(CONFIG_CPU_32v3) =-D__LINUX_ARM_ARCH__=3 -march=armv3m 78 - 79 - # Evaluate arch cc-option calls now 80 - arch-y := $(arch-y) 74 + arch-$(CONFIG_CPU_32v5) :=-D__LINUX_ARM_ARCH__=5 -march=armv5te 75 + arch-$(CONFIG_CPU_32v4T) :=-D__LINUX_ARM_ARCH__=4 -march=armv4t 76 + arch-$(CONFIG_CPU_32v4) :=-D__LINUX_ARM_ARCH__=4 -march=armv4 77 + arch-$(CONFIG_CPU_32v3) :=-D__LINUX_ARM_ARCH__=3 -march=armv3m 81 78 82 79 # This selects how we optimise for the processor. 83 - tune-$(CONFIG_CPU_ARM7TDMI) =-mtune=arm7tdmi 84 - tune-$(CONFIG_CPU_ARM720T) =-mtune=arm7tdmi 85 - tune-$(CONFIG_CPU_ARM740T) =-mtune=arm7tdmi 86 - tune-$(CONFIG_CPU_ARM9TDMI) =-mtune=arm9tdmi 87 - tune-$(CONFIG_CPU_ARM940T) =-mtune=arm9tdmi 88 - tune-$(CONFIG_CPU_ARM946E) =-mtune=arm9e 89 - tune-$(CONFIG_CPU_ARM920T) =-mtune=arm9tdmi 90 - tune-$(CONFIG_CPU_ARM922T) =-mtune=arm9tdmi 91 - tune-$(CONFIG_CPU_ARM925T) =-mtune=arm9tdmi 92 - tune-$(CONFIG_CPU_ARM926T) =-mtune=arm9tdmi 93 - tune-$(CONFIG_CPU_FA526) =-mtune=arm9tdmi 94 - tune-$(CONFIG_CPU_SA110) =-mtune=strongarm110 95 - tune-$(CONFIG_CPU_SA1100) =-mtune=strongarm1100 96 - tune-$(CONFIG_CPU_XSCALE) =-mtune=xscale 97 - tune-$(CONFIG_CPU_XSC3) =-mtune=xscale 98 - tune-$(CONFIG_CPU_FEROCEON) =-mtune=xscale 99 - tune-$(CONFIG_CPU_V6) =-mtune=arm1136j-s 100 - tune-$(CONFIG_CPU_V6K) =-mtune=arm1136j-s 101 - 102 - # Evaluate tune cc-option calls now 103 - tune-y := $(tune-y) 80 + tune-$(CONFIG_CPU_ARM7TDMI) :=-mtune=arm7tdmi 81 + tune-$(CONFIG_CPU_ARM720T) :=-mtune=arm7tdmi 82 + tune-$(CONFIG_CPU_ARM740T) :=-mtune=arm7tdmi 83 + tune-$(CONFIG_CPU_ARM9TDMI) :=-mtune=arm9tdmi 84 + tune-$(CONFIG_CPU_ARM940T) :=-mtune=arm9tdmi 85 + tune-$(CONFIG_CPU_ARM946E) :=-mtune=arm9e 86 + tune-$(CONFIG_CPU_ARM920T) :=-mtune=arm9tdmi 87 + tune-$(CONFIG_CPU_ARM922T) :=-mtune=arm9tdmi 88 + tune-$(CONFIG_CPU_ARM925T) :=-mtune=arm9tdmi 89 + tune-$(CONFIG_CPU_ARM926T) :=-mtune=arm9tdmi 90 + tune-$(CONFIG_CPU_FA526) :=-mtune=arm9tdmi 91 + tune-$(CONFIG_CPU_SA110) :=-mtune=strongarm110 92 + tune-$(CONFIG_CPU_SA1100) :=-mtune=strongarm1100 93 + tune-$(CONFIG_CPU_XSCALE) :=-mtune=xscale 94 + tune-$(CONFIG_CPU_XSC3) :=-mtune=xscale 95 + tune-$(CONFIG_CPU_FEROCEON) :=-mtune=xscale 96 + tune-$(CONFIG_CPU_V6) :=-mtune=arm1136j-s 97 + tune-$(CONFIG_CPU_V6K) :=-mtune=arm1136j-s 104 98 105 99 ifeq ($(CONFIG_AEABI),y) 106 100 CFLAGS_ABI :=-mabi=aapcs-linux -mfpu=vfp