diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2011-12-07 19:04:44 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-13 12:28:11 +0000 |
commit | ebe66be93a1d62c7410c599bcc3aafa65e5fcec4 (patch) | |
tree | a25cf0d3adc80bd7bb6c37cbdea8042dad45f6d8 /meta | |
parent | 406593fdf179b0361ddbfb04da3144dbec8296e0 (diff) | |
download | poky-ebe66be93a1d62c7410c599bcc3aafa65e5fcec4.tar.gz |
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
(From OE-Core rev: e3e1fef27345e2ea923b76b1e6bcb9cd5572cec6)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/conf/machine/include/arm/arch-armv4.inc | 1 | ||||
-rw-r--r-- | meta/conf/machine/include/arm/arch-armv5.inc | 1 | ||||
-rw-r--r-- | meta/conf/machine/include/arm/arch-armv6.inc | 1 | ||||
-rw-r--r-- | meta/conf/machine/include/arm/arch-armv7.inc | 1 | ||||
-rw-r--r-- | 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 c014d20eb6..a09c32358b 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" | |||
4 | 4 | ||
5 | TUNEVALID[armv4] = "Enable instructions for ARMv4" | 5 | TUNEVALID[armv4] = "Enable instructions for ARMv4" |
6 | TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv4", "-march=armv4${ARMPKGSFX_THUMB}", "", d)}" | 6 | TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv4", "-march=armv4${ARMPKGSFX_THUMB}", "", d)}" |
7 | MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv4", ":armv4", "" ,d)}" | ||
7 | 8 | ||
8 | require conf/machine/include/arm/arch-arm.inc | 9 | require conf/machine/include/arm/arch-arm.inc |
9 | require conf/machine/include/arm/feature-arm-thumb.inc | 10 | 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 55cbe03562..fd3490f800 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" | |||
5 | TUNEVALID[armv5] = "Enable instructions for ARMv5" | 5 | TUNEVALID[armv5] = "Enable instructions for ARMv5" |
6 | TUNE_CONFLICTS[armv5] = "armv4" | 6 | TUNE_CONFLICTS[armv5] = "armv4" |
7 | TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv5", "-march=armv5${ARMPKGSFX_THUMB}${ARMPKGSFX_DSP}", "", d)}" | 7 | TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv5", "-march=armv5${ARMPKGSFX_THUMB}${ARMPKGSFX_DSP}", "", d)}" |
8 | MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv5", ":armv5", "" ,d)}" | ||
8 | 9 | ||
9 | ARMPKGSFX_DSP = "${@bb.utils.contains("TUNE_FEATURES", [ "armv5", "dsp" ], "e", "", d)}" | 10 | ARMPKGSFX_DSP = "${@bb.utils.contains("TUNE_FEATURES", [ "armv5", "dsp" ], "e", "", d)}" |
10 | 11 | ||
diff --git a/meta/conf/machine/include/arm/arch-armv6.inc b/meta/conf/machine/include/arm/arch-armv6.inc index 9f2e9ac1b9..da8274e296 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" | |||
5 | TUNEVALID[armv6] = "Enable instructions for ARMv6" | 5 | TUNEVALID[armv6] = "Enable instructions for ARMv6" |
6 | TUNE_CONFLICTS[armv6] = "armv4 armv5" | 6 | TUNE_CONFLICTS[armv6] = "armv4 armv5" |
7 | TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv6", "-march=armv6", "", d)}" | 7 | TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv6", "-march=armv6", "", d)}" |
8 | MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv6", ":armv6", "" ,d)}" | ||
8 | 9 | ||
9 | require conf/machine/include/arm/arch-armv5-dsp.inc | 10 | require conf/machine/include/arm/arch-armv5-dsp.inc |
10 | 11 | ||
diff --git a/meta/conf/machine/include/arm/arch-armv7.inc b/meta/conf/machine/include/arm/arch-armv7.inc index 8bc8d1049b..98481aa8a5 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" | |||
5 | TUNEVALID[armv7] = "Enable instructions for ARMv7" | 5 | TUNEVALID[armv7] = "Enable instructions for ARMv7" |
6 | TUNE_CONFLICTS[armv7] = "armv4 armv5 armv6" | 6 | TUNE_CONFLICTS[armv7] = "armv4 armv5 armv6" |
7 | TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv7", "-march=armv7", "", d)}" | 7 | TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv7", "-march=armv7", "", d)}" |
8 | MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv7", ":armv7", "" ,d)}" | ||
8 | 9 | ||
9 | require conf/machine/include/arm/arch-armv6.inc | 10 | require conf/machine/include/arm/arch-armv6.inc |
10 | require conf/machine/include/arm/feature-arm-neon.inc | 11 | 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 d508352fd2..de39cb56fd 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" | |||
5 | TUNEVALID[armv7-a] = "Enable instructions for ARMv7-a" | 5 | TUNEVALID[armv7-a] = "Enable instructions for ARMv7-a" |
6 | TUNE_CONFLICTS[armv7a] = "armv4 armv5 armv6 armv7" | 6 | TUNE_CONFLICTS[armv7a] = "armv4 armv5 armv6 armv7" |
7 | TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv7a", "-march=armv7-a -fno-tree-vectorize", "", d)}" | 7 | TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv7a", "-march=armv7-a -fno-tree-vectorize", "", d)}" |
8 | MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv7a", ":armv7a", "" ,d)}" | ||
8 | 9 | ||
9 | require conf/machine/include/arm/arch-armv7.inc | 10 | require conf/machine/include/arm/arch-armv7.inc |
10 | 11 | ||