[PATCH] feature-arm-neon.inc: restore vfpv3-d16 support

[PATCH] feature-arm-neon.inc: restore vfpv3-d16 support

[André Draszik]

Commit 6661718 (feature-arm-{neon,vfp}.inc: refactor and fix issues)
effectively changed the gcc -mfpu= option from -mfpu=vfpv3-d16 to
-mfpu=vfpv3d16, which gcc doesn't understand.

Restore the original value.

After doing that, we also need to adjust ARMPKGSFX_FPU which should
contain the same value without dash '-' as it is used that way
throughout.

Signed-off-by: André Draszik <git@andred.net>
---
 meta/conf/machine/include/arm/feature-arm-neon.inc | 2 +-
 meta/conf/machine/include/arm/feature-arm-vfp.inc  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/conf/machine/include/arm/feature-arm-neon.inc b/meta/conf/machine/include/arm/feature-arm-neon.inc
index 50d9175..b34af8e 100644
--- a/meta/conf/machine/include/arm/feature-arm-neon.inc
+++ b/meta/conf/machine/include/arm/feature-arm-neon.inc
@@ -8,7 +8,7 @@ TUNEVALID[neon] = "Enable Neon SIMD accelerator unit."
 TUNE_CCARGS_MFPU .= "${@bb.utils.contains('TUNE_FEATURES', 'neon', ' neon', '', d)}"
 
 TUNEVALID[vfpv3d16] = "Enable Vector Floating Point Version 3 with 16 registers (vfpv3-d16) unit."
-TUNE_CCARGS_MFPU .= "${@bb.utils.contains('TUNE_FEATURES', 'vfpv3d16', ' vfpv3d16', '', d)}"
+TUNE_CCARGS_MFPU .= "${@bb.utils.contains('TUNE_FEATURES', 'vfpv3d16', ' vfpv3-d16', '', d)}"
 
 TUNEVALID[vfpv3] = "Enable Vector Floating Point Version 3 with 32 registers (vfpv3) unit."
 TUNE_CCARGS_MFPU .= "${@bb.utils.contains('TUNE_FEATURES', 'vfpv3', ' vfpv3', '' , d)}"
diff --git a/meta/conf/machine/include/arm/feature-arm-vfp.inc b/meta/conf/machine/include/arm/feature-arm-vfp.inc
index 4247255..bd366a1 100644
--- a/meta/conf/machine/include/arm/feature-arm-vfp.inc
+++ b/meta/conf/machine/include/arm/feature-arm-vfp.inc
@@ -6,7 +6,7 @@ TUNEVALID[vfp] = "Enable Vector Floating Point (vfp) unit."
 TUNE_CCARGS_MFPU .= "${@bb.utils.contains('TUNE_FEATURES', 'vfp', ' vfp', '', d)}"
 
 TUNE_CCARGS  .= "${@ (' -mfpu=%s ' % d.getVar('TUNE_CCARGS_MFPU', True).split()[-1]) if (d.getVar('TUNE_CCARGS_MFPU', True) != '') else ''}"
-ARMPKGSFX_FPU = "${@ ('-%s'        % d.getVar('TUNE_CCARGS_MFPU', True).split()[-1]) if (d.getVar('TUNE_CCARGS_MFPU', True) != '') else ''}"
+ARMPKGSFX_FPU = "${@ ('-%s'        % d.getVar('TUNE_CCARGS_MFPU', True).split()[-1].replace('-', '')) if (d.getVar('TUNE_CCARGS_MFPU', True) != '') else ''}"
 
 TUNEVALID[callconvention-hard] = "Enable EABI hard float call convention, requires VFP."
 TUNE_CCARGS_MFLOAT = "${@ bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'hard', 'softfp', d) if (d.getVar('TUNE_CCARGS_MFPU', True) != '') else '' }"
-- 
2.8.1

Re: [PATCH] feature-arm-neon.inc: restore vfpv3-d16 support

[Khem Raj]

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

This causes raspberrypi2 not parse anymore

ERROR:  OE-core's config sanity checker detected a potential misconfiguration.
    Either fix the cause of this error or at your own risk disable the checker (see sanity.conf).
    Following is the list of potential problems / advisories:

    Error, the PACKAGE_ARCHS variable (all any noarch armv5hf-vfp armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp a
rmv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp armv7vehf-neon armv7vet2hf-neon armv7vehf-neon-vf
pv4 armv7vet2hf-neon-vfpv4 cortexa7hf-vfp cortexa7hf-neon cortexa7hf-neon-vfpv4 cortexa7t2hf-vfp cortexa7t2hf-neon cort
exa7t2hf-neon-vfpv4 raspberrypi3) for DEFAULTTUNE (cortexa7thf-neon-vfpv4) does not contain TUNE_PKGARCH (cortexa7hf-ne
onvfpv4).


> On Apr 26, 2016, at 2:27 AM, André Draszik <git@andred.net> wrote:
> 
> Commit 6661718 (feature-arm-{neon,vfp}.inc: refactor and fix issues)
> effectively changed the gcc -mfpu= option from -mfpu=vfpv3-d16 to
> -mfpu=vfpv3d16, which gcc doesn't understand.
> 
> Restore the original value.
> 
> After doing that, we also need to adjust ARMPKGSFX_FPU which should
> contain the same value without dash '-' as it is used that way
> throughout.
> 
> Signed-off-by: André Draszik <git@andred.net>
> ---
> meta/conf/machine/include/arm/feature-arm-neon.inc | 2 +-
> meta/conf/machine/include/arm/feature-arm-vfp.inc  | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/conf/machine/include/arm/feature-arm-neon.inc b/meta/conf/machine/include/arm/feature-arm-neon.inc
> index 50d9175..b34af8e 100644
> --- a/meta/conf/machine/include/arm/feature-arm-neon.inc
> +++ b/meta/conf/machine/include/arm/feature-arm-neon.inc
> @@ -8,7 +8,7 @@ TUNEVALID[neon] = "Enable Neon SIMD accelerator unit."
> TUNE_CCARGS_MFPU .= "${@bb.utils.contains('TUNE_FEATURES', 'neon', ' neon', '', d)}"
> 
> TUNEVALID[vfpv3d16] = "Enable Vector Floating Point Version 3 with 16 registers (vfpv3-d16) unit."
> -TUNE_CCARGS_MFPU .= "${@bb.utils.contains('TUNE_FEATURES', 'vfpv3d16', ' vfpv3d16', '', d)}"
> +TUNE_CCARGS_MFPU .= "${@bb.utils.contains('TUNE_FEATURES', 'vfpv3d16', ' vfpv3-d16', '', d)}"
> 
> TUNEVALID[vfpv3] = "Enable Vector Floating Point Version 3 with 32 registers (vfpv3) unit."
> TUNE_CCARGS_MFPU .= "${@bb.utils.contains('TUNE_FEATURES', 'vfpv3', ' vfpv3', '' , d)}"
> diff --git a/meta/conf/machine/include/arm/feature-arm-vfp.inc b/meta/conf/machine/include/arm/feature-arm-vfp.inc
> index 4247255..bd366a1 100644
> --- a/meta/conf/machine/include/arm/feature-arm-vfp.inc
> +++ b/meta/conf/machine/include/arm/feature-arm-vfp.inc
> @@ -6,7 +6,7 @@ TUNEVALID[vfp] = "Enable Vector Floating Point (vfp) unit."
> TUNE_CCARGS_MFPU .= "${@bb.utils.contains('TUNE_FEATURES', 'vfp', ' vfp', '', d)}"
> 
> TUNE_CCARGS  .= "${@ (' -mfpu=%s ' % d.getVar('TUNE_CCARGS_MFPU', True).split()[-1]) if (d.getVar('TUNE_CCARGS_MFPU', True) != '') else ''}"
> -ARMPKGSFX_FPU = "${@ ('-%s'        % d.getVar('TUNE_CCARGS_MFPU', True).split()[-1]) if (d.getVar('TUNE_CCARGS_MFPU', True) != '') else ''}"
> +ARMPKGSFX_FPU = "${@ ('-%s'        % d.getVar('TUNE_CCARGS_MFPU', True).split()[-1].replace('-', '')) if (d.getVar('TUNE_CCARGS_MFPU', True) != '') else ''}"
> 
> TUNEVALID[callconvention-hard] = "Enable EABI hard float call convention, requires VFP."
> TUNE_CCARGS_MFLOAT = "${@ bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'hard', 'softfp', d) if (d.getVar('TUNE_CCARGS_MFPU', True) != '') else '' }"
> --
> 2.8.1
> 
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core


[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 211 bytes --]

Re: [PATCH] feature-arm-neon.inc: restore vfpv3-d16 support

[André Draszik]

OK. Any suggestions for how to best fix that?

I could be more specific and .replace('vfpv3-d16', 'vfpv3d16') only, but
that seems ugly :-)


Thanks,
André

On Mi, 2016-05-11 at 11:55 -0700, Khem Raj wrote:
> This causes raspberrypi2 not parse anymore
> 
> ERROR:  OE-core's config sanity checker detected a potential
> misconfiguration.
>     Either fix the cause of this error or at your own risk disable the
> checker (see sanity.conf).
>     Following is the list of potential problems / advisories:
> 
>     Error, the PACKAGE_ARCHS variable (all any noarch armv5hf-vfp
> armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp a
> rmv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp
> armv7vehf-neon armv7vet2hf-neon armv7vehf-neon-vf
> pv4 armv7vet2hf-neon-vfpv4 cortexa7hf-vfp cortexa7hf-neon cortexa7hf-neon-
> vfpv4 cortexa7t2hf-vfp cortexa7t2hf-neon cort
> exa7t2hf-neon-vfpv4 raspberrypi3) for DEFAULTTUNE (cortexa7thf-neon-vfpv4) 
> does not contain TUNE_PKGARCH (cortexa7hf-ne
> onvfpv4).
> 
> 
> > 
> > On Apr 26, 2016, at 2:27 AM, André Draszik <git@andred.net> wrote:
> > 
> > Commit 6661718 (feature-arm-{neon,vfp}.inc: refactor and fix issues)
> > effectively changed the gcc -mfpu= option from -mfpu=vfpv3-d16 to
> > -mfpu=vfpv3d16, which gcc doesn't understand.
> > 
> > Restore the original value.
> > 
> > After doing that, we also need to adjust ARMPKGSFX_FPU which should
> > contain the same value without dash '-' as it is used that way
> > throughout.
> > 
> > Signed-off-by: André Draszik <git@andred.net>
> > ---
> > meta/conf/machine/include/arm/feature-arm-neon.inc | 2 +-
> > meta/conf/machine/include/arm/feature-arm-vfp.inc  | 2 +-
> > 2 files changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/meta/conf/machine/include/arm/feature-arm-neon.inc
> > b/meta/conf/machine/include/arm/feature-arm-neon.inc
> > index 50d9175..b34af8e 100644
> > --- a/meta/conf/machine/include/arm/feature-arm-neon.inc
> > +++ b/meta/conf/machine/include/arm/feature-arm-neon.inc
> > @@ -8,7 +8,7 @@ TUNEVALID[neon] = "Enable Neon SIMD accelerator unit."
> > TUNE_CCARGS_MFPU .= "${@bb.utils.contains('TUNE_FEATURES', 'neon', '
> > neon', '', d)}"
> > 
> > TUNEVALID[vfpv3d16] = "Enable Vector Floating Point Version 3 with 16
> > registers (vfpv3-d16) unit."
> > -TUNE_CCARGS_MFPU .= "${@bb.utils.contains('TUNE_FEATURES', 'vfpv3d16',
> > ' vfpv3d16', '', d)}"
> > +TUNE_CCARGS_MFPU .= "${@bb.utils.contains('TUNE_FEATURES', 'vfpv3d16',
> > ' vfpv3-d16', '', d)}"
> > 
> > TUNEVALID[vfpv3] = "Enable Vector Floating Point Version 3 with 32
> > registers (vfpv3) unit."
> > TUNE_CCARGS_MFPU .= "${@bb.utils.contains('TUNE_FEATURES', 'vfpv3', '
> > vfpv3', '' , d)}"
> > diff --git a/meta/conf/machine/include/arm/feature-arm-vfp.inc
> > b/meta/conf/machine/include/arm/feature-arm-vfp.inc
> > index 4247255..bd366a1 100644
> > --- a/meta/conf/machine/include/arm/feature-arm-vfp.inc
> > +++ b/meta/conf/machine/include/arm/feature-arm-vfp.inc
> > @@ -6,7 +6,7 @@ TUNEVALID[vfp] = "Enable Vector Floating Point (vfp)
> > unit."
> > TUNE_CCARGS_MFPU .= "${@bb.utils.contains('TUNE_FEATURES', 'vfp', '
> > vfp', '', d)}"
> > 
> > TUNE_CCARGS  .= "${@ (' -mfpu=%s ' % d.getVar('TUNE_CCARGS_MFPU',
> > True).split()[-1]) if (d.getVar('TUNE_CCARGS_MFPU', True) != '') else
> > ''}"
> > -ARMPKGSFX_FPU = "${@ ('-%s'        % d.getVar('TUNE_CCARGS_MFPU',
> > True).split()[-1]) if (d.getVar('TUNE_CCARGS_MFPU', True) != '') else
> > ''}"
> > +ARMPKGSFX_FPU = "${@ ('-%s'        % d.getVar('TUNE_CCARGS_MFPU',
> > True).split()[-1].replace('-', '')) if (d.getVar('TUNE_CCARGS_MFPU',
> > True) != '') else ''}"
> > 
> > TUNEVALID[callconvention-hard] = "Enable EABI hard float call
> > convention, requires VFP."
> > TUNE_CCARGS_MFLOAT = "${@ bb.utils.contains('TUNE_FEATURES',
> > 'callconvention-hard', 'hard', 'softfp', d) if
> > (d.getVar('TUNE_CCARGS_MFPU', True) != '') else '' }"
> > --
> > 2.8.1
> > 
> > --
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [PATCH] feature-arm-neon.inc: restore vfpv3-d16 support

[Khem Raj]

On Thu, May 12, 2016 at 2:51 AM, André Draszik <git@andred.net> wrote:
> OK. Any suggestions for how to best fix that?
>
> I could be more specific and .replace('vfpv3-d16', 'vfpv3d16') only, but
> that seems ugly :-)

There seem to be no other usecase where '-' is used in fpu names so it
should be ok

>
>
> Thanks,
> André
>
> On Mi, 2016-05-11 at 11:55 -0700, Khem Raj wrote:
>> This causes raspberrypi2 not parse anymore
>>
>> ERROR:  OE-core's config sanity checker detected a potential
>> misconfiguration.
>>     Either fix the cause of this error or at your own risk disable the
>> checker (see sanity.conf).
>>     Following is the list of potential problems / advisories:
>>
>>     Error, the PACKAGE_ARCHS variable (all any noarch armv5hf-vfp
>> armv5thf-vfp armv5ehf-vfp armv5tehf-vfp armv6hf-vfp a
>> rmv6thf-vfp armv7ahf-vfp armv7at2hf-vfp armv7vehf-vfp armv7vet2hf-vfp
>> armv7vehf-neon armv7vet2hf-neon armv7vehf-neon-vf
>> pv4 armv7vet2hf-neon-vfpv4 cortexa7hf-vfp cortexa7hf-neon cortexa7hf-neon-
>> vfpv4 cortexa7t2hf-vfp cortexa7t2hf-neon cort
>> exa7t2hf-neon-vfpv4 raspberrypi3) for DEFAULTTUNE (cortexa7thf-neon-vfpv4)
>> does not contain TUNE_PKGARCH (cortexa7hf-ne
>> onvfpv4).
>>
>>
>> >
>> > On Apr 26, 2016, at 2:27 AM, André Draszik <git@andred.net> wrote:
>> >
>> > Commit 6661718 (feature-arm-{neon,vfp}.inc: refactor and fix issues)
>> > effectively changed the gcc -mfpu= option from -mfpu=vfpv3-d16 to
>> > -mfpu=vfpv3d16, which gcc doesn't understand.
>> >
>> > Restore the original value.
>> >
>> > After doing that, we also need to adjust ARMPKGSFX_FPU which should
>> > contain the same value without dash '-' as it is used that way
>> > throughout.
>> >
>> > Signed-off-by: André Draszik <git@andred.net>
>> > ---
>> > meta/conf/machine/include/arm/feature-arm-neon.inc | 2 +-
>> > meta/conf/machine/include/arm/feature-arm-vfp.inc  | 2 +-
>> > 2 files changed, 2 insertions(+), 2 deletions(-)
>> >
>> > diff --git a/meta/conf/machine/include/arm/feature-arm-neon.inc
>> > b/meta/conf/machine/include/arm/feature-arm-neon.inc
>> > index 50d9175..b34af8e 100644
>> > --- a/meta/conf/machine/include/arm/feature-arm-neon.inc
>> > +++ b/meta/conf/machine/include/arm/feature-arm-neon.inc
>> > @@ -8,7 +8,7 @@ TUNEVALID[neon] = "Enable Neon SIMD accelerator unit."
>> > TUNE_CCARGS_MFPU .= "${@bb.utils.contains('TUNE_FEATURES', 'neon', '
>> > neon', '', d)}"
>> >
>> > TUNEVALID[vfpv3d16] = "Enable Vector Floating Point Version 3 with 16
>> > registers (vfpv3-d16) unit."
>> > -TUNE_CCARGS_MFPU .= "${@bb.utils.contains('TUNE_FEATURES', 'vfpv3d16',
>> > ' vfpv3d16', '', d)}"
>> > +TUNE_CCARGS_MFPU .= "${@bb.utils.contains('TUNE_FEATURES', 'vfpv3d16',
>> > ' vfpv3-d16', '', d)}"
>> >
>> > TUNEVALID[vfpv3] = "Enable Vector Floating Point Version 3 with 32
>> > registers (vfpv3) unit."
>> > TUNE_CCARGS_MFPU .= "${@bb.utils.contains('TUNE_FEATURES', 'vfpv3', '
>> > vfpv3', '' , d)}"
>> > diff --git a/meta/conf/machine/include/arm/feature-arm-vfp.inc
>> > b/meta/conf/machine/include/arm/feature-arm-vfp.inc
>> > index 4247255..bd366a1 100644
>> > --- a/meta/conf/machine/include/arm/feature-arm-vfp.inc
>> > +++ b/meta/conf/machine/include/arm/feature-arm-vfp.inc
>> > @@ -6,7 +6,7 @@ TUNEVALID[vfp] = "Enable Vector Floating Point (vfp)
>> > unit."
>> > TUNE_CCARGS_MFPU .= "${@bb.utils.contains('TUNE_FEATURES', 'vfp', '
>> > vfp', '', d)}"
>> >
>> > TUNE_CCARGS  .= "${@ (' -mfpu=%s ' % d.getVar('TUNE_CCARGS_MFPU',
>> > True).split()[-1]) if (d.getVar('TUNE_CCARGS_MFPU', True) != '') else
>> > ''}"
>> > -ARMPKGSFX_FPU = "${@ ('-%s'        % d.getVar('TUNE_CCARGS_MFPU',
>> > True).split()[-1]) if (d.getVar('TUNE_CCARGS_MFPU', True) != '') else
>> > ''}"
>> > +ARMPKGSFX_FPU = "${@ ('-%s'        % d.getVar('TUNE_CCARGS_MFPU',
>> > True).split()[-1].replace('-', '')) if (d.getVar('TUNE_CCARGS_MFPU',
>> > True) != '') else ''}"
>> >
>> > TUNEVALID[callconvention-hard] = "Enable EABI hard float call
>> > convention, requires VFP."
>> > TUNE_CCARGS_MFLOAT = "${@ bb.utils.contains('TUNE_FEATURES',
>> > 'callconvention-hard', 'hard', 'softfp', d) if
>> > (d.getVar('TUNE_CCARGS_MFPU', True) != '') else '' }"
>> > --
>> > 2.8.1
>> >
>> > --
>> > _______________________________________________
>> > Openembedded-core mailing list
>> > Openembedded-core@lists.openembedded.org
>> > http://lists.openembedded.org/mailman/listinfo/openembedded-core
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core