[OE-core] [PATCH v3][krogoth] feature-arm-neon.inc: restore vfpv3-d16 support

[Khem Raj]

> On May 16, 2016, at 7:21 PM, André Draszik <git at andred.net> wrote:
> 
> On Fr, 2016-05-13 at 10:08 -0700, Khem Raj wrote:
>>> 
>>> On May 13, 2016, at 12:56 AM, André Draszik <git at 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.
>> 
>> V1 worked fine for my case. V3 doesnt even apply. Can you rebase it on top
>> of master and resend ?
> 
> V1 on krogoth should have the same issue as the original patch on master,
> i.e. should break on your raspberry pi2?
> 
> Since V1 hasn't made it onto krogoth yet, V3 contains the two patches from
> the master branch squashed into one. Maybe you need to undo the V1 patch on
> your local krogoth branch?
> 
> Or should we apply both patches (not squashed) from master onto krogoth, so
> as to have fewer diversions?


v1 is already applied. So please send your second patch separately once both
are in, then a request to pull them into krogoth should be sent.

> 
> Cheers,
> Andre
> 
>>> 
>>> Signed-off-by: André Draszik <git at 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..9ef31e7 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('vfpv3-d16', 'vfpv3d16')) 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 at lists.openembedded.org
>>> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 204 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20160516/6785d2a7/attachment-0002.sig>