summaryrefslogtreecommitdiff
path: root/meta
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:49 +0100
commit02031d766f983cd7e01e468cb2c926604313cd2a (patch)
tree40ebccc05793163d0cdeab7b798a2e118729e4b8 /meta
parentdad2169cfb331b7af5c6d380347ea279a59bd716 (diff)
downloadopenembedded-core-02031d766f983cd7e01e468cb2c926604313cd2a.tar.gz
openembedded-core-02031d766f983cd7e01e468cb2c926604313cd2a.tar.bz2
openembedded-core-02031d766f983cd7e01e468cb2c926604313cd2a.tar.xz
openembedded-core-02031d766f983cd7e01e468cb2c926604313cd2a.zip
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. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 d1d66052a..2709440db 100644
--- a/meta/conf/machine/include/ia32/arch-ia32.inc
+++ b/meta/conf/machine/include/ia32/arch-ia32.inc
@@ -4,17 +4,19 @@
DEFAULTTUNE ?= "x86"
TARGET_FPU ?= ""
+X86ARCH32 ?= "i586"
+X86ARCH64 ?= "x86_64"
# ELF32 ABI
TUNEVALID[m32] = "IA32 ELF32 standard ABI"
TUNECONFLICTS[m32] = "m64"
-TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m32", "i586", "" ,d)}"
+TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m32", "${X86ARCH32}", "" ,d)}"
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m32", "-m32", "", d)}"
# ELF64 ABI
TUNEVALID[m64] = "IA32e (x86_64) ELF64 standard ABI"
TUNECONFLICT[m64] = "m32"
-TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m64", "x86_64", "" ,d)}"
+TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m64", "${X86ARCH64}", "" ,d)}"
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-m64", "", d)}"
TUNE_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 138ca170d..874af8baa 100644
--- a/meta/conf/machine/include/tune-core2.inc
+++ b/meta/conf/machine/include/tune-core2.inc
@@ -1,5 +1,5 @@
DEFAULTTUNE ?= "core2"
-TUNE_ARCH ?= "${@bb.utils.contains("TUNE_FEATURES", "m32", "i686", "x86_64", d)}"
+X86ARCH32 ?= "i686"
TUNE_PKGARCH ?= "${@bb.utils.contains("TUNE_FEATURES", "m32", "core2", "core2-64", d)}"
require conf/machine/include/tune-i586.inc