[OE-core] [RFC][PATCH] WIP: feature-arm-thumb.inc: respect ARM_INSTRUCTION_SET when adding thumb suffix

Mark Hatle mark.hatle at windriver.com
Tue Jan 13 19:20:51 UTC 2015


While I haven't tested this.  I'm fine with this change.

(It's more or less what I wanted from the beginning, but wasn't able to make
everyone happy.)

--Mark

On 1/13/15 1:02 PM, Martin Jansa wrote:
> * this means that recipes with ARM_INSTRUCTION_SET explicitly changed
>   to arm will be built in feed without thumb suffix, the same does apply
>   for workdir, e.g. after "bitbake glib-2.0" you can see:
> 
>   tmp-glibc/work/armv5e-oe-linux-gnueabi:
>   glib-2.0  glibc  glibc-initial
> 
>   tmp-glibc/work/armv5te-oe-linux-gnueabi:
>   acl              db              gdk-pixbuf     kmod  ....
> 
>   and
> 
>   tmp-glibc/deploy/ipk:
>   all  armv5e  armv5te  qemuarm
> 
> * feed config should be ok, because all default DEFAULTTUNEs always
>   include "arm" variants of all supported PACKAGE_ARCHs
> 
> * for more details see
>   http://lists.openembedded.org/pipermail/openembedded-core/2014-April/091960.html
>   the toolchain path issues were resolved in 1.8
> 
> Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
> ---
>  meta/conf/machine/include/arm/feature-arm-thumb.inc | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/conf/machine/include/arm/feature-arm-thumb.inc b/meta/conf/machine/include/arm/feature-arm-thumb.inc
> index 8e6619d..4c4eb6d 100644
> --- a/meta/conf/machine/include/arm/feature-arm-thumb.inc
> +++ b/meta/conf/machine/include/arm/feature-arm-thumb.inc
> @@ -32,7 +32,8 @@ python () {
>  TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'thumb', ' -m${ARM_M_OPT}', '', d)}"
>  OVERRIDES .= "${@bb.utils.contains('TUNE_FEATURES', 'thumb', ':thumb', '', d)}"
>  
> -ARMPKGSFX_THUMB .= "${@bb.utils.contains('TUNE_FEATURES', 'thumb', '${ARM_THUMB_SUFFIX}', '', d)}"
> +# Add suffix from ARM_THUMB_SUFFIX only if after all this we still set ARM_M_OPT to thumb
> +ARMPKGSFX_THUMB .= "${@ d.getVar('ARM_THUMB_SUFFIX', True) if d.getVar('ARM_M_OPT', True) == 'thumb' else ''}"
>  
>  # Whether to compile with code to allow interworking between the two
>  # instruction sets. This allows thumb code to be executed on a primarily
> 




More information about the Openembedded-core mailing list