diff options
| author | Koen Kooi <koen@openembedded.org> | 2009-03-04 14:38:08 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-03-04 14:38:08 +0100 |
| commit | a607dfe046fc5eb0f20dc8f3901b8aaded42d17c (patch) | |
| tree | b92d707c3bdb26bef6bb66435c060a258fc122e3 /conf | |
| parent | 01d1763f4d02cfa2b4e7397d84428e3f30407b65 (diff) | |
| parent | 5bfe29a25496da5ea5ebc9b0314f4d38a53e6691 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/include/sane-toolchain.inc | 8 | ||||
| -rw-r--r-- | conf/machine/include/tune-arm1136-novfp.inc | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/conf/distro/include/sane-toolchain.inc b/conf/distro/include/sane-toolchain.inc index 0d859903e1..b261d635af 100644 --- a/conf/distro/include/sane-toolchain.inc +++ b/conf/distro/include/sane-toolchain.inc @@ -73,7 +73,7 @@ PREFERRED_ARM_INSTRUCTION_SET ?= "arm" PREFERRED_ARM_INSTRUCTION_SET_armv4t = "thumb" PREFERRED_ARM_INSTRUCTION_SET_armv5te = "thumb" PREFERRED_ARM_INSTRUCTION_SET_armv5teb = "thumb" -ARM_INSTRUCTION_SET = "${PREFERRED_ARM_INSTRUCTION_SET} +ARM_INSTRUCTION_SET = "${PREFERRED_ARM_INSTRUCTION_SET}" # "arm" "thumb" # The instruction set the compiler should use when generating application # code. The kernel is always compiled with arm code at present. arm code @@ -91,9 +91,6 @@ THUMB_INTERWORK = "yes" # We don't want to keep OABI compat ARM_KEEP_OABI = "0" -# Do keep OABI compat for om-gta01 to keep the gllin binary working -ARM_KEEP_OABI_pn-linux-openmoko-2.6.24_om-gta01 = "1" -ARM_KEEP_OABI_pn-linux-openmoko-2.6.28_om-gta01 = "1" # ARM EABI is softfloat by default, but let's make sure :) # make it overridable for platforms with FPU, like ep93xx or i.mx31 @@ -108,7 +105,8 @@ TARGET_FPU_armv7a ?= "hard" TARGET_FPU_ppc603e ?= "hard" # webkit-gtk and cairo have alignment issues with double instructions on armv5 so -# disable them here +# disable them here. TODO: This knowledge should rather be encoded in the actual +# recipes! TARGET_CC_ARCH_pn-webkit-gtk_armv5te = "-march=armv4t" TARGET_CC_ARCH_pn-cairo_armv5te = "-march=armv4t" diff --git a/conf/machine/include/tune-arm1136-novfp.inc b/conf/machine/include/tune-arm1136-novfp.inc index 372148e7a2..e1f7945a0f 100644 --- a/conf/machine/include/tune-arm1136-novfp.inc +++ b/conf/machine/include/tune-arm1136-novfp.inc @@ -6,3 +6,5 @@ FEED_ARCH = "armv6-novfp" BASE_PACKAGE_ARCH = "armv6-novfp" PACKAGE_EXTRA_ARCHS += "armv4 armv4t armv5te armv6-novfp" +# Include tune file for thumb support, it defaults to off so DISTROs can turn it on if they wish +require conf/machine/include/tune-thumb.inc |