All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH][krogoth] feature-arm-neon.inc: restore vfpv3-d16 support
@ 2016-04-26  9:29 André Draszik
  2016-05-12 15:28 ` [PATCH v2][krogoth] " André Draszik
  0 siblings, 1 reply; 6+ messages in thread
From: André Draszik @ 2016-04-26  9:29 UTC (permalink / raw)
  To: openembedded-core

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



^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH v2][krogoth] feature-arm-neon.inc: restore vfpv3-d16 support
  2016-04-26  9:29 [PATCH][krogoth] feature-arm-neon.inc: restore vfpv3-d16 support André Draszik
@ 2016-05-12 15:28 ` André Draszik
  2016-05-13  7:56   ` [PATCH v3][krogoth] " André Draszik
  0 siblings, 1 reply; 6+ messages in thread
From: André Draszik @ 2016-05-12 15:28 UTC (permalink / raw)
  To: openembedded-core

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>

(cherry picked from commit c7f139a0538515356b27367a753882abd6c4534d)
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..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



^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH v3][krogoth] feature-arm-neon.inc: restore vfpv3-d16 support
  2016-05-12 15:28 ` [PATCH v2][krogoth] " André Draszik
@ 2016-05-13  7:56   ` André Draszik
  2016-05-13 17:08     ` Khem Raj
  0 siblings, 1 reply; 6+ messages in thread
From: André Draszik @ 2016-05-13  7:56 UTC (permalink / raw)
  To: openembedded-core

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..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



^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH v3][krogoth] feature-arm-neon.inc: restore vfpv3-d16 support
  2016-05-13  7:56   ` [PATCH v3][krogoth] " André Draszik
@ 2016-05-13 17:08     ` Khem Raj
  2016-05-17  2:21       ` André Draszik
  0 siblings, 1 reply; 6+ messages in thread
From: Khem Raj @ 2016-05-13 17:08 UTC (permalink / raw)
  To: André Draszik; +Cc: openembedded-core

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


> On May 13, 2016, at 12:56 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.


V1 worked fine for my case. V3 doesnt even apply. Can you rebase it on top of master and resend ?

> 
> 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..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@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 --]

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v3][krogoth] feature-arm-neon.inc: restore vfpv3-d16 support
  2016-05-13 17:08     ` Khem Raj
@ 2016-05-17  2:21       ` André Draszik
  2016-05-17  3:11         ` Khem Raj
  0 siblings, 1 reply; 6+ messages in thread
From: André Draszik @ 2016-05-17  2:21 UTC (permalink / raw)
  To: Khem Raj; +Cc: openembedded-core

On Fr, 2016-05-13 at 10:08 -0700, Khem Raj wrote:
> > 
> > On May 13, 2016, at 12:56 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.
> 
> 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?

Cheers,
Andre

> > 
> > 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..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@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v3][krogoth] feature-arm-neon.inc: restore vfpv3-d16 support
  2016-05-17  2:21       ` André Draszik
@ 2016-05-17  3:11         ` Khem Raj
  0 siblings, 0 replies; 6+ messages in thread
From: Khem Raj @ 2016-05-17  3:11 UTC (permalink / raw)
  To: André Draszik; +Cc: openembedded-core

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


> On May 16, 2016, at 7:21 PM, André Draszik <git@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@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@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@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 --]

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2016-05-17  3:11 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-04-26  9:29 [PATCH][krogoth] feature-arm-neon.inc: restore vfpv3-d16 support André Draszik
2016-05-12 15:28 ` [PATCH v2][krogoth] " André Draszik
2016-05-13  7:56   ` [PATCH v3][krogoth] " André Draszik
2016-05-13 17:08     ` Khem Raj
2016-05-17  2:21       ` André Draszik
2016-05-17  3:11         ` Khem Raj

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.