arm-thumb.inc: Make OVERRIDE TARGET_CC_ARCH TARGET_CC_KERNEL_ARCH conditionally apply...

* Thumb is only relevant for ARM architecture so dont override if architecture is not arm.

Signed-off-by: Khem Raj <raj.khem@gmail.com>

diff --git a/conf/distro/include/arm-thumb.inc b/conf/distro/include/arm-thumb.inc
index 84598d6..36edd4f 100644 (file)
--- a/conf/distro/include/arm-thumb.inc
+++ b/conf/distro/include/arm-thumb.inc
@@ -18,7 +18,7 @@ THUMB_INTERWORK ?= "no"
 
 OVERRIDE_THUMB = "${@['', ':thumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}"
 OVERRIDE_INTERWORK = "${@['', ':thumb-interwork'][bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes']}"
-OVERRIDES .= "${OVERRIDE_THUMB}${OVERRIDE_INTERWORK}"
+OVERRIDES_append_arm =. "${OVERRIDE_THUMB}${OVERRIDE_INTERWORK}"
 
 #    Compiler and linker options for application code and kernel code.  These
 #    options ensure that the compiler has the correct settings for the selected
@@ -26,6 +26,5 @@ OVERRIDES .= "${OVERRIDE_THUMB}${OVERRIDE_INTERWORK}"
 ARM_INTERWORK_M_OPT = "${@['-mno-thumb-interwork', '-mthumb-interwork'][bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes']}"
 ARM_THUMB_M_OPT = "${@['-mno-thumb', '-mthumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}"
 
-#
-TARGET_CC_ARCH += "${@['', '${ARM_INTERWORK_M_OPT} ${ARM_THUMB_M_OPT}'][bb.data.getVar('TARGET_ARCH', d, 1) in [ 'arm', 'armeb' ]]}"
-TARGET_CC_KERNEL_ARCH += "${@['', '-mno-thumb-interwork -mno-thumb'][bb.data.getVar('TARGET_ARCH', d, 1) in [ 'arm', 'armeb' ]]}"
+TARGET_CC_ARCH_append_arm =.  " ${ARM_INTERWORK_M_OPT} ${ARM_THUMB_M_OPT}"
+TARGET_CC_KERNEL_ARCH_append_arm  =. " -mno-thumb-interwork -mno-thumb"