diff options
| author | Rod Whitby <rod@whitby.id.au> | 2007-01-23 02:03:05 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2007-01-23 02:03:05 +0000 |
| commit | 6fa394ceac34ef739434b8765ae2bb09d117d506 (patch) | |
| tree | 62797a81e83fd9671476fcfd075e49600af8b841 /conf/machine/include | |
| parent | c96ddb61ffaf0f356557ba5e18602458367bc398 (diff) | |
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.
Diffstat (limited to 'conf/machine/include')
| -rw-r--r-- | conf/machine/include/tune-thumb.conf | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/conf/machine/include/tune-thumb.conf b/conf/machine/include/tune-thumb.conf index 48003571f1..a25cb5320c 100644 --- a/conf/machine/include/tune-thumb.conf +++ b/conf/machine/include/tune-thumb.conf @@ -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 @@ 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 .= "${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" |