[oe-commits] Martin Jansa : conf/machine/include/ arm add extra MACHINEOVERRIDES like x86 does
git at git.openembedded.org
git at git.openembedded.org
Tue Dec 13 12:32:59 UTC 2011
Module: openembedded-core.git
Branch: master
Commit: e3e1fef27345e2ea923b76b1e6bcb9cd5572cec6
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=e3e1fef27345e2ea923b76b1e6bcb9cd5572cec6
Author: Martin Jansa <martin.jansa at gmail.com>
Date: Wed Dec 7 19:04:44 2011 +0100
conf/machine/include/arm add extra MACHINEOVERRIDES like x86 does
* 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 at gmail.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
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
More information about the Openembedded-commits
mailing list