On Wed, Mar 28, 2012 at 09:13:35AM +0000, g...@git.openembedded.org wrote: > Module: openembedded-core.git > Branch: master > Commit: 75b8adbc042e0f65fb1286bc550d02becd3b6aea > URL: > http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=75b8adbc042e0f65fb1286bc550d02becd3b6aea > > Author: Khem Raj <raj.k...@gmail.com> > Date: Tue Mar 27 18:37:45 2012 -0700 > > tune/armv7: Delete > > armv7 is least common denominator of armv7-a > armv7-m and armv7-r and armv7-m does not support > ARM instructions but only thumb2 instruction set > which means armv7 when chosen will complain if > code is compiled in arm mode which is default > in OE if not specified other wise > > if we chose this tuning errors like below pop up > > error: target CPU does not support ARM mode > > This tuning seems theoretical and base tune > for armv7 would be one of armv7-a, armv7-m or > armv7-r >
this breaks armv7a with thumb and probably also other variants PACKAGE_EXTRA_ARCHS_tune-armv7t is now undefined and ends unexpanded in PACKAGE_EXTRA_ARCHS_tune-armv7at ERROR: Error executing a python function in /OE/shr-core/meta-openembedded/meta-oe/recipes-core/meta/distro-feed-configs.bb: ExpansionError: Failure expanding variable CONFFILES, expression was ${@ " ".join( [ ( "/etc/opkg/%s-feed.conf" % feed ) for feed in "all om_gta04".split() ] ) } ${@ " ".join( [ ( "/etc/opkg/%s-feed.conf" % feed ) for feed in set("${PACKAGE_EXTRA_ARCHS_tune-armv7t} armv7a armv7a-vfp armv7at2-vfp armv7a-vfp-neon armv7at2-vfp-neon".split()).intersection(set("armv7a-vfp-neon".split())) ] ) } which triggered exception SyntaxError ./include/arm/arch-armv7a.inc:PACKAGE_EXTRA_ARCHS_tune-armv7at = "${PACKAGE_EXTRA_ARCHS_tune-armv7t} armv7a armv7a-vfp armv7at2-vfp" ./include/arm/arch-armv7a.inc:AVAILTUNES += "armv7hf armv7thf armv7hf-neon armv7thf-neon" ./include/arm/arch-armv7a.inc:PACKAGE_EXTRA_ARCHS_tune-armv7athf = "${PACKAGE_EXTRA_ARCHS_tune-armv7thf} armv7ahf-vfp armv7at2hf-vfp" ./include/arm/arch-armv7a.inc:PACKAGE_EXTRA_ARCHS_tune-armv7atb = "${PACKAGE_EXTRA_ARCHS_tune-armv7t} armv7ab-vfp armv7at2b-vfp" ./include/arm/arch-armv7a.inc:PACKAGE_EXTRA_ARCHS_tune-armv7athfb = "${PACKAGE_EXTRA_ARCHS_tune-armv7thfb} armv7ahfb-vfp armv7at2hfb-vfp" Cheers, > Signed-off-by: Khem Raj <raj.k...@gmail.com> > Signed-off-by: Richard Purdie <richard.pur...@linuxfoundation.org> > > --- > > meta/conf/machine/include/arm/arch-armv7.inc | 56 > ------------------------- > meta/conf/machine/include/arm/arch-armv7a.inc | 3 +- > meta/conf/machine/include/tune-armv7.inc | 2 - > 3 files changed, 2 insertions(+), 59 deletions(-) > > diff --git a/meta/conf/machine/include/arm/arch-armv7.inc > b/meta/conf/machine/include/arm/arch-armv7.inc > deleted file mode 100644 > index 33d9f0d..0000000 > --- a/meta/conf/machine/include/arm/arch-armv7.inc > +++ /dev/null > @@ -1,56 +0,0 @@ > -DEFAULTTUNE ?= "armv7" > - > -ARMPKGARCH ?= "armv7" > - > -TUNEVALID[armv7] = "Enable instructions for ARMv7" > -TUNE_CONFLICTS[armv7] = "armv4 armv5 armv6" > -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv7", > "-march=armv7", "", d)}" > -MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv7", > ":armv7", "" ,d)}" > - > -require conf/machine/include/arm/arch-armv6.inc > -require conf/machine/include/arm/feature-arm-neon.inc > - > -# Little Endian base configs > -AVAILTUNES += "armv7 armv7t armv7-neon armv7t-neon" > -TUNE_FEATURES_tune-armv7 ?= "armv7 vfp" > -TUNE_FEATURES_tune-armv7t ?= "armv7 vfp thumb" > -TUNE_FEATURES_tune-armv7-neon ?= "armv7 vfp neon" > -TUNE_FEATURES_tune-armv7t-neon ?= "armv7 vfp neon thumb" > -PACKAGE_EXTRA_ARCHS_tune-armv7 = "${PACKAGE_EXTRA_ARCHS_tune-armv6} > armv7-vfp" > -PACKAGE_EXTRA_ARCHS_tune-armv7t = "${PACKAGE_EXTRA_ARCHS_tune-armv6t} > armv7-vfp armv7t2-vfp" > -PACKAGE_EXTRA_ARCHS_tune-armv7-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7} > armv7-vfp-neon" > -PACKAGE_EXTRA_ARCHS_tune-armv7t-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7t} > armv7-vfp-neon armv7at2-vfp-neon" > - > -# VFP Tunes > -AVAILTUNES += "armv7hf armv7thf armv7hf-neon armv7thf-neon" > -TUNE_FEATURES_tune-armv7hf ?= "${TUNE_FEATURES_tune-armv7} > callconvention-hard" > -TUNE_FEATURES_tune-armv7thf ?= "${TUNE_FEATURES_tune-armv7t} > callconvention-hard" > -TUNE_FEATURES_tune-armv7hf-neon ?= "${TUNE_FEATURES_tune-armv7-neon} > callconvention-hard" > -TUNE_FEATURES_tune-armv7thf-neon ?= "${TUNE_FEATURES_tune_armv7t-neon} > callconvention-hard" > -PACKAGE_EXTRA_ARCHS_tune-armv7hf = "${PACKAGE_EXTRA_ARCHS_tune-armv6hf} > armv7hf-vfp" > -PACKAGE_EXTRA_ARCHS_tune-armv7thf = "${PACKAGE_EXTRA_ARCHS_tune-armv6thf} > armv7hf-vfp armv7t2hf-vfp" > -PACKAGE_EXTRA_ARCHS_tune-armv7hf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7hf} > armv7hf-vfp-neon" > -PACKAGE_EXTRA_ARCHS_tune-armv7thf-neon = > "${PACKAGE_EXTRA_ARCHS_tune-armv7thf} armv7hf-vfp-neon armv7at2hf-vfp-neon" > - > -# Big Endian > -AVAILTUNES += "armv7b armv7tb armv7b-neon armv7tb-neon" > -TUNE_FEATURES_tune-armv7b ?= "${TUNE_FEATURES_tune-armv7} bigendian" > -TUNE_FEATURES_tune-armv7tb ?= "${TUNE_FEATURES_tune-armv7t} bigendian" > -TUNE_FEATURES_tune-armv7b-neon ?= "${TUNE_FEATURES_tune-armv7-neon} > bigendian" > -TUNE_FEATURES_tune-armv7tb-neon ?= "${TUNE_FEATURES_tune-armv7t-neon} > bigendian" > -PACKAGE_EXTRA_ARCHS_tune-armv7b = "${PACKAGE_EXTRA_ARCHS_tune-armv6} > armv7b-vfp" > -PACKAGE_EXTRA_ARCHS_tune-armv7tb = "${PACKAGE_EXTRA_ARCHS_tune-armv6t} > armv7b-vfp armv7t2b-vfp" > -PACKAGE_EXTRA_ARCHS_tune-armv7b-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7} > armv7b-vfp-neon" > -PACKAGE_EXTRA_ARCHS_tune-armv7tb-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7t} > armv7b-vfp-neon armv7at2b-vfp-neon" > - > -# Big Endian + VFP > -AVAILTUNES += "armv7hfb armv7thfb armv7hfb-neon armv7thfb-neon" > -TUNE_FEATURES_tune-armv7hfb ?= "${TUNE_FEATURES_tune-armv7b} > callconvention-hard" > -TUNE_FEATURES_tune-armv7thfb ?= "${TUNE_FEATURES_tune-armv7tb} > callconvention-hard" > -TUNE_FEATURES_tune-armv7hfb-neon ?= "${TUNE_FEATURES_tune-armv7b-neon} > callconvention-hard" > -TUNE_FEATURES_tune-armv7thfb-neon ?= "${TUNE_FEATURES_tune_armv7tb-neon} > callconvention-hard" > -PACKAGE_EXTRA_ARCHS_tune-armv7hfb = "${PACKAGE_EXTRA_ARCHS_tune-armv6hfb} > armv7hfb-vfp" > -PACKAGE_EXTRA_ARCHS_tune-armv7thfb = "${PACKAGE_EXTRA_ARCHS_tune-armv6thfb} > armv7hfb-vfp armv7t2hfb-vfp" > -PACKAGE_EXTRA_ARCHS_tune-armv7hfb-neon = > "${PACKAGE_EXTRA_ARCHS_tune-armv7hfb} armv7hfb-vfp-neon" > -PACKAGE_EXTRA_ARCHS_tune-armv7thfb-neon = > "${PACKAGE_EXTRA_ARCHS_tune-armv7thfb} armv7hfb-vfp-neon armv7at2hfb-vfp-neon" > - > diff --git a/meta/conf/machine/include/arm/arch-armv7a.inc > b/meta/conf/machine/include/arm/arch-armv7a.inc > index de39cb5..92640e2 100644 > --- a/meta/conf/machine/include/arm/arch-armv7a.inc > +++ b/meta/conf/machine/include/arm/arch-armv7a.inc > @@ -7,7 +7,8 @@ TUNE_CONFLICTS[armv7a] = "armv4 armv5 armv6 armv7" > TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv7a", > "-march=armv7-a -fno-tree-vectorize", "", d)}" > MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv7a", > ":armv7a", "" ,d)}" > > -require conf/machine/include/arm/arch-armv7.inc > +require conf/machine/include/arm/arch-armv6.inc > +require conf/machine/include/arm/feature-arm-neon.inc > > # Little Endian base configs > AVAILTUNES += "armv7a armv7at armv7a-neon armv7at-neon" > diff --git a/meta/conf/machine/include/tune-armv7.inc > b/meta/conf/machine/include/tune-armv7.inc > deleted file mode 100644 > index 664c24b..0000000 > --- a/meta/conf/machine/include/tune-armv7.inc > +++ /dev/null > @@ -1,2 +0,0 @@ > -require conf/machine/include/arm/arch-armv7.inc > - > > > _______________________________________________ > Openembedded-commits mailing list > openembedded-comm...@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
_______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core