[oe-commits] org.oe.dev tune-thumb.conf: Default thumb interworking to on, fix the overrides definition (do not want a space in there), explicitly turn off thumb and interworking options when not requested, explicitly turn off interworking for the kernel.

[rwhitby commit]

tune-thumb.conf: Default thumb interworking to on, fix the overrides definition (do not want a space in there), explicitly turn off thumb and interworking options when not requested, explicitly turn off interworking for the kernel.

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 43b962713f444a3678179e65c233191d6a613ea8
ViewMTN: http://monotone.openembedded.org/revision.psp?id=43b962713f444a3678179e65c233191d6a613ea8
Files:
1
conf/machine/include/tune-thumb.conf
Diffs:

#
# mt diff -rfa445aac88fe63f81f248ab37379776382d214b4 -r43b962713f444a3678179e65c233191d6a613ea8
#
# 
# 
# patch "conf/machine/include/tune-thumb.conf"
#  from [5cf27eee523a1f00d95bf0472737442a5be36ecd]
#    to [f7efef4106b20e25b84121588d79864d3fe4f8c8]
# 
============================================================
--- conf/machine/include/tune-thumb.conf	5cf27eee523a1f00d95bf0472737442a5be36ecd
+++ conf/machine/include/tune-thumb.conf	f7efef4106b20e25b84121588d79864d3fe4f8c8
@@ -9,7 +9,7 @@ ARM_INSTRUCTION_SET ?= "arm"
 #    but requires more instructions (140% for 70% smaller code) so may be
 #    slower.
 
-THUMB_INTERWORK ?= "no"
+THUMB_INTERWORK ?= "yes"
 # "yes" "no"
 #    Whether to compile with code to allow interworking between the two
 #    instruction sets.  This allows thumb code to be executed on a primarily
@@ -18,15 +18,15 @@ OVERRIDE_INTERWORK = "${@['', ':thumb-in
 
 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 .= "${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
 #    instruction set and interworking.
-ARM_INTERWORK_M_OPT = "${@['', '-mthumb-interwork'][bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes']}"
-ARM_THUMB_M_OPT = "${@['', '-mthumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}"
+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}"
-TARGET_CC_KERNEL_ARCH  += "-mno-thumb"
+TARGET_CC_KERNEL_ARCH  += "-mno-thumb-interwork -mno-thumb"