summaryrefslogtreecommitdiff
path: root/meta/conf/machine/include/ia32
diff options
context:
space:
mode:
authorPeter Seebach <peter.seebach@windriver.com>2012-05-01 20:45:10 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-06 09:54:45 +0100
commit6ffe53c721a80cf156b44f59b564f2e899c6af50 (patch)
tree7af1c2c7c4c5e63892434cc2144eef1acd4ec3f6 /meta/conf/machine/include/ia32
parent22254a32f05e9212411216bf1a4e48fd86b9c3ef (diff)
downloadopenembedded-core-6ffe53c721a80cf156b44f59b564f2e899c6af50.tar.gz
openembedded-core-6ffe53c721a80cf156b44f59b564f2e899c6af50.tar.bz2
openembedded-core-6ffe53c721a80cf156b44f59b564f2e899c6af50.tar.xz
openembedded-core-6ffe53c721a80cf156b44f59b564f2e899c6af50.zip
conf/machine: Clean up configuration values.
This cleans up and/or corrects a few values from machine includes for consistency with future toolchain sanity checks, and also adds the TUNEVALID and TUNECONFLICTS to documentation.conf. Signed-off-by: Peter Seebach <peter.seebach@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine/include/ia32')
-rw-r--r--meta/conf/machine/include/ia32/arch-ia32.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/machine/include/ia32/arch-ia32.inc b/meta/conf/machine/include/ia32/arch-ia32.inc
index a5dae8811..15f67d7c6 100644
--- a/meta/conf/machine/include/ia32/arch-ia32.inc
+++ b/meta/conf/machine/include/ia32/arch-ia32.inc
@@ -27,7 +27,7 @@ TUNE_ASARGS += "${@bb.utils.contains("TUNE_FEATURES", "mx32", "-x32", "", d)}"
# ELF64 ABI
TUNEVALID[m64] = "IA32e (x86_64) ELF64 standard ABI"
-TUNECONFLICT[m64] = "m32 mx32"
+TUNECONFLICTS[m64] = "m32 mx32"
TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m64", "${X86ARCH64}", "" ,d)}"
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-m64", "", d)}"