| Submitter | Martin Jansa |
|---|---|
| Date | Oct. 4, 2012, 1:23 p.m. |
| Message ID | <95933d4d0d8226614433d225f106dd3b8aedb3df.1349356755.git.Martin.Jansa@gmail.com> |
| Download | mbox | patch |
| Permalink | /patch/37775/ |
| State | Accepted |
| Commit | c51643a510da6d1c3426b3de8f18ae864cb073a4 |
| Headers | show |
Comments
On Thu, Oct 4, 2012 at 6:23 AM, Martin Jansa <martin.jansa@gmail.com> wrote: > > -TUNE_CCARGS_pn-webkit-gtk = "-march=armv4t" > -TUNE_CCARGS_pn-cairo = "-march=armv4t" > +TUNE_CCARGS_pn-webkit-gtk = "${@bb.utils.contains("TUNE_FEATURES", "xscale", "-march=armv4t", "", d)}" > +TUNE_CCARGS_pn-cairo = "${@bb.utils.contains("TUNE_FEATURES", "xscale", "-march=armv4t", "", d)}" I would rather try to remove this option completely if possible. I wonder if we still need to target armv4t when building on xscale may be the reason it was added is no more relevant ?
On Thu, Oct 04, 2012 at 09:55:01AM -0700, Khem Raj wrote: > On Thu, Oct 4, 2012 at 6:23 AM, Martin Jansa <martin.jansa@gmail.com> wrote: > > > > -TUNE_CCARGS_pn-webkit-gtk = "-march=armv4t" > > -TUNE_CCARGS_pn-cairo = "-march=armv4t" > > +TUNE_CCARGS_pn-webkit-gtk = "${@bb.utils.contains("TUNE_FEATURES", "xscale", "-march=armv4t", "", d)}" > > +TUNE_CCARGS_pn-cairo = "${@bb.utils.contains("TUNE_FEATURES", "xscale", "-march=armv4t", "", d)}" > > I would rather try to remove this option completely if possible. I > wonder if we still need to target armv4t when building on xscale > may be the reason it was added is no more relevant ? I think the same (as written in commit message). Now it won't be used by default at least (only if someone asks for DEFAULTTUNE xscale for webkit-gtk or cairo). Cheers,
Patch
diff --git a/meta/conf/machine/include/tune-xscale.inc b/meta/conf/machine/include/tune-xscale.inc index 80a3683..0d5d060 100644 --- a/meta/conf/machine/include/tune-xscale.inc +++ b/meta/conf/machine/include/tune-xscale.inc @@ -15,5 +15,5 @@ PACKAGE_EXTRA_ARCHS_tune-xscale-be = "${PACKAGE_EXTRA_ARCHS_tune-armv5teb}" # webkit-gtk has alignment issues with double instructions on armv5 so # disable them here -TUNE_CCARGS_pn-webkit-gtk = "-march=armv4t" -TUNE_CCARGS_pn-cairo = "-march=armv4t" +TUNE_CCARGS_pn-webkit-gtk = "${@bb.utils.contains("TUNE_FEATURES", "xscale", "-march=armv4t", "", d)}" +TUNE_CCARGS_pn-cairo = "${@bb.utils.contains("TUNE_FEATURES", "xscale", "-march=armv4t", "", d)}"
* without this you'll get different sstate checksum for webkit-gtk and cairo even when you build them with DEFAULTTUNE == armv5te * maybe this isn't needed at all anymore or if it is then it should be applied in arm-armv5.inc for all armv5te devices, not only xscale? Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- meta/conf/machine/include/tune-xscale.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)