[PATCH][RFC] conf/machine/include/arm add extra MACHINEOVERRIDES like x86 does

[PATCH][RFC] conf/machine/include/arm add extra MACHINEOVERRIDES like x86 does

[Martin Jansa]

* motivated by this NAK
  http://patchwork.openembedded.org/patch/15777/
  and today's discussion on #yocto I hope it's worth it to send this RFC

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/conf/machine/include/arm/arch-armv4.inc  |    1 +
 meta/conf/machine/include/arm/arch-armv5.inc  |    1 +
 meta/conf/machine/include/arm/arch-armv6.inc  |    1 +
 meta/conf/machine/include/arm/arch-armv7.inc  |    1 +
 meta/conf/machine/include/arm/arch-armv7a.inc |    1 +
 5 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/meta/conf/machine/include/arm/arch-armv4.inc b/meta/conf/machine/include/arm/arch-armv4.inc
index c014d20..a09c323 100644
--- a/meta/conf/machine/include/arm/arch-armv4.inc
+++ b/meta/conf/machine/include/arm/arch-armv4.inc
@@ -4,6 +4,7 @@ ARMPKGARCH ?= "armv4"
 
 TUNEVALID[armv4] = "Enable instructions for ARMv4"
 TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv4", "-march=armv4${ARMPKGSFX_THUMB}", "", d)}"
+MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv4", ":armv4", "" ,d)}"
 
 require conf/machine/include/arm/arch-arm.inc
 require conf/machine/include/arm/feature-arm-thumb.inc
diff --git a/meta/conf/machine/include/arm/arch-armv5.inc b/meta/conf/machine/include/arm/arch-armv5.inc
index 55cbe03..fd3490f 100644
--- a/meta/conf/machine/include/arm/arch-armv5.inc
+++ b/meta/conf/machine/include/arm/arch-armv5.inc
@@ -5,6 +5,7 @@ ARMPKGARCH ?= "armv5"
 TUNEVALID[armv5] = "Enable instructions for ARMv5"
 TUNE_CONFLICTS[armv5] = "armv4"
 TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv5", "-march=armv5${ARMPKGSFX_THUMB}${ARMPKGSFX_DSP}", "", d)}"
+MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv5", ":armv5", "" ,d)}"
 
 ARMPKGSFX_DSP = "${@bb.utils.contains("TUNE_FEATURES", [ "armv5", "dsp" ], "e", "", d)}"
 
diff --git a/meta/conf/machine/include/arm/arch-armv6.inc b/meta/conf/machine/include/arm/arch-armv6.inc
index 9f2e9ac..da8274e 100644
--- a/meta/conf/machine/include/arm/arch-armv6.inc
+++ b/meta/conf/machine/include/arm/arch-armv6.inc
@@ -5,6 +5,7 @@ ARMPKGARCH ?= "armv6"
 TUNEVALID[armv6] = "Enable instructions for ARMv6"
 TUNE_CONFLICTS[armv6] = "armv4 armv5"
 TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv6", "-march=armv6", "", d)}"
+MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv6", ":armv6", "" ,d)}"
 
 require conf/machine/include/arm/arch-armv5-dsp.inc
 
diff --git a/meta/conf/machine/include/arm/arch-armv7.inc b/meta/conf/machine/include/arm/arch-armv7.inc
index 8bc8d10..98481aa 100644
--- a/meta/conf/machine/include/arm/arch-armv7.inc
+++ b/meta/conf/machine/include/arm/arch-armv7.inc
@@ -5,6 +5,7 @@ ARMPKGARCH ?= "armv7"
 TUNEVALID[armv7] = "Enable instructions for ARMv7"
 TUNE_CONFLICTS[armv7] = "armv4 armv5 armv6"
 TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv7", "-march=armv7", "", d)}"
+MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv7", ":armv7", "" ,d)}"
 
 require conf/machine/include/arm/arch-armv6.inc
 require conf/machine/include/arm/feature-arm-neon.inc
diff --git a/meta/conf/machine/include/arm/arch-armv7a.inc b/meta/conf/machine/include/arm/arch-armv7a.inc
index d508352..de39cb5 100644
--- a/meta/conf/machine/include/arm/arch-armv7a.inc
+++ b/meta/conf/machine/include/arm/arch-armv7a.inc
@@ -5,6 +5,7 @@ ARMPKGARCH ?= "armv7a"
 TUNEVALID[armv7-a] = "Enable instructions for ARMv7-a"
 TUNE_CONFLICTS[armv7a] = "armv4 armv5 armv6 armv7"
 TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv7a", "-march=armv7-a -fno-tree-vectorize", "", d)}"
+MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv7a", ":armv7a", "" ,d)}"
 
 require conf/machine/include/arm/arch-armv7.inc
 
-- 
1.7.8

Re: [PATCH][RFC] conf/machine/include/arm add extra MACHINEOVERRIDES like x86 does

[Martin Jansa]

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

On Wed, Dec 07, 2011 at 07:04:44PM +0100, Martin Jansa wrote:
> * motivated by this NAK
>   http://patchwork.openembedded.org/patch/15777/
>   and today's discussion on #yocto I hope it's worth it to send this RFC

FWIW some armv6/armv7a overrides are already used in oe-core 

meta/conf/bitbake.conf:QEMU_OPTIONS_armv6   = "-cpu arm1136"
meta/conf/bitbake.conf:QEMU_OPTIONS_armv7a   = "-cpu cortex-a8"
meta/recipes-devtools/python/python_2.7.2.bb:TARGET_CC_ARCH_append_armv6 = " -D__SOFTFP__"
meta/recipes-devtools/python/python_2.7.2.bb:TARGET_CC_ARCH_append_armv7a = " -D__SOFTFP__"
meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb:EXTRA_OECONF_armv7a = " --enable-neon "
meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb:do_compile_prepend_armv7a () {

And also armv6-vfp
meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb:QT_CONFIG_FLAGS_append_armv6-vfp = " -no-neon "
meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb:QT_CONFIG_FLAGS_append_armv6-vfp = " -no-neon "

Cheers,

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH][RFC] conf/machine/include/arm add extra MACHINEOVERRIDES like x86 does

[Martin Jansa]

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

On Wed, Dec 07, 2011 at 07:04:44PM +0100, Martin Jansa wrote:
> * motivated by this NAK
>   http://patchwork.openembedded.org/patch/15777/
>   and today's discussion on #yocto I hope it's worth it to send this RFC

ping?

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH][RFC] conf/machine/include/arm add extra MACHINEOVERRIDES like x86 does

[Richard Purdie]

On Wed, 2011-12-07 at 19:04 +0100, Martin Jansa wrote:
> * motivated by this NAK
>   http://patchwork.openembedded.org/patch/15777/
>   and today's discussion on #yocto I hope it's worth it to send this RFC
> 
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta/conf/machine/include/arm/arch-armv4.inc  |    1 +
>  meta/conf/machine/include/arm/arch-armv5.inc  |    1 +
>  meta/conf/machine/include/arm/arch-armv6.inc  |    1 +
>  meta/conf/machine/include/arm/arch-armv7.inc  |    1 +
>  meta/conf/machine/include/arm/arch-armv7a.inc |    1 +
>  5 files changed, 5 insertions(+), 0 deletions(-)

Merged to master, thanks.

I assume you'll follow up and tweak the overrides in OE-Core to match
this?

Cheers,

Richard

[PATCH][oe-core 0/3] PR bumps and arm OVERRIDE fix

[Martin Jansa]

The following changes since commit f60417055f869acb871be1f01c6900fdf685d71a:

  boost : Do not use icu when building boost. (2011-12-13 12:21:05 +0000)

are available in the git repository at:
  git://git.openembedded.org/openembedded-core-contrib jansa/pull
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/pull

Martin Jansa (3):
  qt4: use armv6 override instead of armv6-vfp
  xf86-video-omapfb: bump PR due to arm OVERRIDES change
  python: bump PR due to arm OVERRIDES change

 meta/recipes-devtools/python/python_2.7.2.bb       |    2 +-
 .../xorg-driver/xf86-video-omapfb_git.bb           |    2 +-
 meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb          |    4 ++--
 meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb          |    4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

-- 
1.7.8

[PATCH][oe-core 1/3] qt4: use armv6 override instead of armv6-vfp

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb |    4 ++--
 meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb b/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb
index 6b9f97a..1d7104c 100644
--- a/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb
+++ b/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb
@@ -1,9 +1,9 @@
 require qt-${PV}.inc
 require qt4-embedded.inc
 
-PR = "${INC_PR}.4"
+PR = "${INC_PR}.5"
 
-QT_CONFIG_FLAGS_append_armv6-vfp = " -no-neon "
+QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
 
 QT_CONFIG_FLAGS += " \
  -exceptions \
diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
index 0db090f..3263c93 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
+++ b/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
@@ -1,9 +1,9 @@
 require qt4-x11-free.inc
 require qt-${PV}.inc
 
-PR = "${INC_PR}.4"
+PR = "${INC_PR}.5"
 
-QT_CONFIG_FLAGS_append_armv6-vfp = " -no-neon "
+QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
 
 QT_CONFIG_FLAGS += " \
  -no-embedded \
-- 
1.7.8

[PATCH][oe-core 2/3] xf86-video-omapfb: bump PR due to arm OVERRIDES change

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../xorg-driver/xf86-video-omapfb_git.bb           |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
index 565ad7e..f16441e 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=63e2cbac53863f60e2f43343fb34367f"
 DEPENDS += "virtual/libx11"
 
 SRCREV = "28c006c94e57ea71df11ec4fff79d7ffcfc4860f"
-PR = "${INC_PR}.5"
+PR = "${INC_PR}.6"
 PV = "0.1.1+gitr${SRCPV}"
 
 SRC_URI = "git://git.pingu.fi/xf86-video-omapfb;protocol=http \
-- 
1.7.8

[PATCH][oe-core 3/3] python: bump PR due to arm OVERRIDES change

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-devtools/python/python_2.7.2.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-devtools/python/python_2.7.2.bb b/meta/recipes-devtools/python/python_2.7.2.bb
index 5417d5e..5e8e0d7 100644
--- a/meta/recipes-devtools/python/python_2.7.2.bb
+++ b/meta/recipes-devtools/python/python_2.7.2.bb
@@ -1,7 +1,7 @@
 require python.inc
 DEPENDS = "python-native db gdbm openssl readline sqlite3 zlib"
 DEPENDS_sharprom = "python-native db readline zlib gdbm openssl"
-PR = "${INC_PR}.3"
+PR = "${INC_PR}.4"
 
 DISTRO_SRC_URI ?= "file://sitecustomize.py"
 DISTRO_SRC_URI_linuxstdbase = ""
-- 
1.7.8

Re: [PATCH][oe-core 0/3] PR bumps and arm OVERRIDE fix

[Richard Purdie]

On Tue, 2011-12-13 at 14:59 +0100, Martin Jansa wrote:
> The following changes since commit f60417055f869acb871be1f01c6900fdf685d71a:
> 
>   boost : Do not use icu when building boost. (2011-12-13 12:21:05 +0000)
> 
> are available in the git repository at:
>   git://git.openembedded.org/openembedded-core-contrib jansa/pull
>   http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/pull
> 
> Martin Jansa (3):
>   qt4: use armv6 override instead of armv6-vfp
>   xf86-video-omapfb: bump PR due to arm OVERRIDES change
>   python: bump PR due to arm OVERRIDES change

Merged to master, thanks.

Richard

Re: [PATCH][RFC] conf/machine/include/arm add extra MACHINEOVERRIDES like x86 does

[Khem Raj]

On Thu, Dec 8, 2011 at 7:48 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
>
> meta/recipes-devtools/python/python_2.7.2.bb:TARGET_CC_ARCH_append_armv6 = " -D__SOFTFP__"
> meta/recipes-devtools/python/python_2.7.2.bb:TARGET_CC_ARCH_append_armv7a = " -D__SOFTFP__"

hmmm will this work if we have armv7-a + hard float ABI ?

> meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb:EXTRA_OECONF_armv7a = " --enable-neon "

Re: [PATCH][RFC] conf/machine/include/arm add extra MACHINEOVERRIDES like x86 does

[Koen Kooi]

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


Op 13 dec. 2011, om 21:01 heeft Khem Raj het volgende geschreven:

> On Thu, Dec 8, 2011 at 7:48 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
>> 
>> meta/recipes-devtools/python/python_2.7.2.bb:TARGET_CC_ARCH_append_armv6 = " -D__SOFTFP__"
>> meta/recipes-devtools/python/python_2.7.2.bb:TARGET_CC_ARCH_append_armv7a = " -D__SOFTFP__"
> 
> hmmm will this work if we have armv7-a + hard float ABI ?

Or a better question: is it still needed or is ffi still broken?


> 
>> meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb:EXTRA_OECONF_armv7a = " --enable-neon "
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core


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

Re: [PATCH][RFC] conf/machine/include/arm add extra MACHINEOVERRIDES like x86 does

[Martin Jansa]

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

On Thu, Dec 15, 2011 at 10:29:17AM +0100, Koen Kooi wrote:
> 
> Op 13 dec. 2011, om 21:01 heeft Khem Raj het volgende geschreven:
> 
> > On Thu, Dec 8, 2011 at 7:48 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> >> 
> >> meta/recipes-devtools/python/python_2.7.2.bb:TARGET_CC_ARCH_append_armv6 = " -D__SOFTFP__"
> >> meta/recipes-devtools/python/python_2.7.2.bb:TARGET_CC_ARCH_append_armv7a = " -D__SOFTFP__"
> > 
> > hmmm will this work if we have armv7-a + hard float ABI ?
> 
> Or a better question: is it still needed or is ffi still broken?

What exactly was the issue? I didn't have this override since starting
shr-core and I haven't noticed any issues with python/libffi on
nokia900.

Regards,

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH][RFC] conf/machine/include/arm add extra MACHINEOVERRIDES like x86 does

[Koen Kooi]

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


Op 15 dec. 2011, om 14:06 heeft Martin Jansa het volgende geschreven:

> On Thu, Dec 15, 2011 at 10:29:17AM +0100, Koen Kooi wrote:
>> 
>> Op 13 dec. 2011, om 21:01 heeft Khem Raj het volgende geschreven:
>> 
>>> On Thu, Dec 8, 2011 at 7:48 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
>>>> 
>>>> meta/recipes-devtools/python/python_2.7.2.bb:TARGET_CC_ARCH_append_armv6 = " -D__SOFTFP__"
>>>> meta/recipes-devtools/python/python_2.7.2.bb:TARGET_CC_ARCH_append_armv7a = " -D__SOFTFP__"
>>> 
>>> hmmm will this work if we have armv7-a + hard float ABI ?
>> 
>> Or a better question: is it still needed or is ffi still broken?
> 
> What exactly was the issue? I didn't have this override since starting
> shr-core and I haven't noticed any issues with python/libffi on
> nokia900.

It breaks at runtime when you try to use it, but I forget which module triggers it. I suspect numpy, maybe philip remembers it.

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