summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-26 18:51:02 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-26 22:39:59 +0100
commit860a41bae6b863a289b06a9684d9cf6c58a307bd (patch)
tree3431cc2ef4a9511907a8bc0e63a65375ad387131 /meta/conf/machine
parent49c01a89b5183798f4bfa9079d68811dd40ca82d (diff)
downloadpoky-860a41bae6b863a289b06a9684d9cf6c58a307bd.tar.gz
arch-ia32.inc: Fix up TUNE_ARCH variable conflicts
The current approach causes duplicate values to appear in the TUNE_ARCH field and this patch addresses that. (From OE-Core rev: 02031d766f983cd7e01e468cb2c926604313cd2a) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine')
-rw-r--r--meta/conf/machine/include/ia32/arch-ia32.inc6
-rw-r--r--meta/conf/machine/include/tune-core2.inc2
2 files changed, 5 insertions, 3 deletions
diff --git a/meta/conf/machine/include/ia32/arch-ia32.inc b/meta/conf/machine/include/ia32/arch-ia32.inc
index d1d66052a1..2709440db3 100644
--- a/meta/conf/machine/include/ia32/arch-ia32.inc
+++ b/meta/conf/machine/include/ia32/arch-ia32.inc
@@ -4,17 +4,19 @@
4 4
5DEFAULTTUNE ?= "x86" 5DEFAULTTUNE ?= "x86"
6TARGET_FPU ?= "" 6TARGET_FPU ?= ""
7X86ARCH32 ?= "i586"
8X86ARCH64 ?= "x86_64"
7 9
8# ELF32 ABI 10# ELF32 ABI
9TUNEVALID[m32] = "IA32 ELF32 standard ABI" 11TUNEVALID[m32] = "IA32 ELF32 standard ABI"
10TUNECONFLICTS[m32] = "m64" 12TUNECONFLICTS[m32] = "m64"
11TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m32", "i586", "" ,d)}" 13TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m32", "${X86ARCH32}", "" ,d)}"
12TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m32", "-m32", "", d)}" 14TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m32", "-m32", "", d)}"
13 15
14# ELF64 ABI 16# ELF64 ABI
15TUNEVALID[m64] = "IA32e (x86_64) ELF64 standard ABI" 17TUNEVALID[m64] = "IA32e (x86_64) ELF64 standard ABI"
16TUNECONFLICT[m64] = "m32" 18TUNECONFLICT[m64] = "m32"
17TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m64", "x86_64", "" ,d)}" 19TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m64", "${X86ARCH64}", "" ,d)}"
18TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-m64", "", d)}" 20TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-m64", "", d)}"
19 21
20TUNE_PKGARCH ?= "${@bb.utils.contains("TUNE_FEATURES", "m32", "x86", "x86_64", d)}" 22TUNE_PKGARCH ?= "${@bb.utils.contains("TUNE_FEATURES", "m32", "x86", "x86_64", d)}"
diff --git a/meta/conf/machine/include/tune-core2.inc b/meta/conf/machine/include/tune-core2.inc
index 138ca170d0..874af8baa8 100644
--- a/meta/conf/machine/include/tune-core2.inc
+++ b/meta/conf/machine/include/tune-core2.inc
@@ -1,5 +1,5 @@
1DEFAULTTUNE ?= "core2" 1DEFAULTTUNE ?= "core2"
2TUNE_ARCH ?= "${@bb.utils.contains("TUNE_FEATURES", "m32", "i686", "x86_64", d)}" 2X86ARCH32 ?= "i686"
3TUNE_PKGARCH ?= "${@bb.utils.contains("TUNE_FEATURES", "m32", "core2", "core2-64", d)}" 3TUNE_PKGARCH ?= "${@bb.utils.contains("TUNE_FEATURES", "m32", "core2", "core2-64", d)}"
4 4
5require conf/machine/include/tune-i586.inc 5require conf/machine/include/tune-i586.inc