[PATCH 1/2] tune-mips64r6.inc: fix typo in mipsisa64r6-nf

[PATCH 1/2] tune-mips64r6.inc: fix typo in mipsisa64r6-nf

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/conf/machine/include/tune-mips64r6.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/conf/machine/include/tune-mips64r6.inc b/meta/conf/machine/include/tune-mips64r6.inc
index 4fe3eedf1b..e53239a38b 100644
--- a/meta/conf/machine/include/tune-mips64r6.inc
+++ b/meta/conf/machine/include/tune-mips64r6.inc
@@ -24,7 +24,7 @@ AVAILTUNES += "mipsisa64r6-nf mipsisa64r6el-nf"
 TUNE_FEATURES_tune-mipsisa64r6-nf = "bigendian r6 n64 mipsisa64r6"
 MIPSPKGSFX_VARIANT_tune-mipsisa64r6-nf = "${TUNE_ARCH}"
 BASE_LIB_tune-mipsisa64r6-nf = "lib64"
-PACKAGE_EXTRA_ARCHS_tune-mipsisa64r6-nf = "mipsisa64r6"
+PACKAGE_EXTRA_ARCHS_tune-mipsisa64r6-nf = "mipsisa64r6-nf"
 
 TUNE_FEATURES_tune-mipsisa64r6el-nf = "r6 n64 mipsisa64r6"
 MIPSPKGSFX_VARIANT_tune-mipsisa64r6el-nf = "${TUNE_ARCH}"
-- 
2.25.1

[PATCH 2/2] tune-ep9312.inc: add t suffix for thumb to PACKAGE_EXTRA_ARCHS_tune-ep9312

[Martin Jansa]

* broken since:
  commit 805dd4807d322dc70cef97edd68fdb3142b60fb1
  Author: Andre McCurdy <armccurdy@gmail.com>
  Date:   Fri Aug 23 13:51:36 2019 -0700

    feature-arm-thumb.inc: fix ARM_THUMB_SUFFIX

* since this commit the 't' suffix is set ARM_THUMB_SUFFIX by
  armv4 override (which does apply for ep9312 tune) instead of
  armv4 in TUNE_FEATURES - so the comment in the file was no
  longer correct and ep9312 wasn't usable

* fixes:
  scripts/tune/log.fake-ep9312:    Error, the PACKAGE_ARCHS variable (all any noarch arm armv4 armv4t ep9312 fake_ep9312) for DEFAULTTUNE (ep9312) does not contain TUNE_PKGARCH (ep9312t).

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/conf/machine/include/tune-ep9312.inc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/meta/conf/machine/include/tune-ep9312.inc b/meta/conf/machine/include/tune-ep9312.inc
index 11fd266ba0..5e1a0e5791 100644
--- a/meta/conf/machine/include/tune-ep9312.inc
+++ b/meta/conf/machine/include/tune-ep9312.inc
@@ -8,6 +8,5 @@ MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'ep9312', 'armv4:', '
 
 AVAILTUNES += "ep9312"
 ARMPKGARCH_tune-ep9312 = "ep9312"
-# this tune does not include TUNE_FEATURES_tune-armv4t, so there is no armv4 TUNE_FEATURES => no 't' in ARMPKGSFX_THUMB
 TUNE_FEATURES_tune-ep9312 = "thumb ep9312"
-PACKAGE_EXTRA_ARCHS_tune-ep9312 = "${PACKAGE_EXTRA_ARCHS_tune-armv4t} ep9312"
+PACKAGE_EXTRA_ARCHS_tune-ep9312 = "${PACKAGE_EXTRA_ARCHS_tune-armv4t} ep9312t"
-- 
2.25.1

Re: [OE-core] [PATCH 2/2] tune-ep9312.inc: add t suffix for thumb to PACKAGE_EXTRA_ARCHS_tune-ep9312

[Andre McCurdy]

On Fri, Oct 16, 2020 at 2:55 AM Martin Jansa <Martin.Jansa@gmail.com> wrote:
>
> * broken since:
>   commit 805dd4807d322dc70cef97edd68fdb3142b60fb1
>   Author: Andre McCurdy <armccurdy@gmail.com>
>   Date:   Fri Aug 23 13:51:36 2019 -0700
>
>     feature-arm-thumb.inc: fix ARM_THUMB_SUFFIX
>
> * since this commit the 't' suffix is set ARM_THUMB_SUFFIX by
>   armv4 override (which does apply for ep9312 tune) instead of

This doesn't sound right. The armv4 override is being added to
MACHINEOVERRIDES (it's even shown in the patch context below). Is that
somehow not working?

>   armv4 in TUNE_FEATURES - so the comment in the file was no
>   longer correct and ep9312 wasn't usable
>
> * fixes:
>   scripts/tune/log.fake-ep9312:    Error, the PACKAGE_ARCHS variable (all any noarch arm armv4 armv4t ep9312 fake_ep9312) for DEFAULTTUNE (ep9312) does not contain TUNE_PKGARCH (ep9312t).
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta/conf/machine/include/tune-ep9312.inc | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/meta/conf/machine/include/tune-ep9312.inc b/meta/conf/machine/include/tune-ep9312.inc
> index 11fd266ba0..5e1a0e5791 100644
> --- a/meta/conf/machine/include/tune-ep9312.inc
> +++ b/meta/conf/machine/include/tune-ep9312.inc
> @@ -8,6 +8,5 @@ MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'ep9312', 'armv4:', '
>
>  AVAILTUNES += "ep9312"
>  ARMPKGARCH_tune-ep9312 = "ep9312"
> -# this tune does not include TUNE_FEATURES_tune-armv4t, so there is no armv4 TUNE_FEATURES => no 't' in ARMPKGSFX_THUMB
>  TUNE_FEATURES_tune-ep9312 = "thumb ep9312"
> -PACKAGE_EXTRA_ARCHS_tune-ep9312 = "${PACKAGE_EXTRA_ARCHS_tune-armv4t} ep9312"
> +PACKAGE_EXTRA_ARCHS_tune-ep9312 = "${PACKAGE_EXTRA_ARCHS_tune-armv4t} ep9312t"
> --
> 2.25.1
>
>
> 
>

Re: [OE-core] [PATCH 2/2] tune-ep9312.inc: add t suffix for thumb to PACKAGE_EXTRA_ARCHS_tune-ep9312

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2444 bytes --]

I think you're reading it backwards (or I wrote it backwards?).

"t" wasn't added before, because "armv4" isn't in TUNE_FEATURES.

But since you have changed feature-arm-thumb.inc to use armv4 OVERRIDE, the
"t" is added and tune-ep9212 got broken.

See the removed comment in the tune file which explains why it wasn't using
"t" suffix in PACKAGE_EXTRA_ARCHS_tune-ep9312 before.

On Thu, Oct 22, 2020 at 9:26 PM Andre McCurdy <armccurdy@gmail.com> wrote:

> On Fri, Oct 16, 2020 at 2:55 AM Martin Jansa <Martin.Jansa@gmail.com>
> wrote:
> >
> > * broken since:
> >   commit 805dd4807d322dc70cef97edd68fdb3142b60fb1
> >   Author: Andre McCurdy <armccurdy@gmail.com>
> >   Date:   Fri Aug 23 13:51:36 2019 -0700
> >
> >     feature-arm-thumb.inc: fix ARM_THUMB_SUFFIX
> >
> > * since this commit the 't' suffix is set ARM_THUMB_SUFFIX by
> >   armv4 override (which does apply for ep9312 tune) instead of
>
> This doesn't sound right. The armv4 override is being added to
> MACHINEOVERRIDES (it's even shown in the patch context below). Is that
> somehow not working?
>
> >   armv4 in TUNE_FEATURES - so the comment in the file was no
> >   longer correct and ep9312 wasn't usable
> >
> > * fixes:
> >   scripts/tune/log.fake-ep9312:    Error, the PACKAGE_ARCHS variable
> (all any noarch arm armv4 armv4t ep9312 fake_ep9312) for DEFAULTTUNE
> (ep9312) does not contain TUNE_PKGARCH (ep9312t).
> >
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ---
> >  meta/conf/machine/include/tune-ep9312.inc | 3 +--
> >  1 file changed, 1 insertion(+), 2 deletions(-)
> >
> > diff --git a/meta/conf/machine/include/tune-ep9312.inc
> b/meta/conf/machine/include/tune-ep9312.inc
> > index 11fd266ba0..5e1a0e5791 100644
> > --- a/meta/conf/machine/include/tune-ep9312.inc
> > +++ b/meta/conf/machine/include/tune-ep9312.inc
> > @@ -8,6 +8,5 @@ MACHINEOVERRIDES =.
> "${@bb.utils.contains('TUNE_FEATURES', 'ep9312', 'armv4:', '
> >
> >  AVAILTUNES += "ep9312"
> >  ARMPKGARCH_tune-ep9312 = "ep9312"
> > -# this tune does not include TUNE_FEATURES_tune-armv4t, so there is no
> armv4 TUNE_FEATURES => no 't' in ARMPKGSFX_THUMB
> >  TUNE_FEATURES_tune-ep9312 = "thumb ep9312"
> > -PACKAGE_EXTRA_ARCHS_tune-ep9312 = "${PACKAGE_EXTRA_ARCHS_tune-armv4t}
> ep9312"
> > +PACKAGE_EXTRA_ARCHS_tune-ep9312 = "${PACKAGE_EXTRA_ARCHS_tune-armv4t}
> ep9312t"
> > --
> > 2.25.1
> >
> >
> > 
> >
>

[-- Attachment #2: Type: text/html, Size: 3558 bytes --]