From d6e7ebb20934a4c4822898b4f4adfcde7f7f4049 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Fri, 30 Mar 2012 14:27:58 -0500 Subject: conf/machine/include: Cleanup IA tunings to match README We perform a basic cleanup of the IA32 architecture and related tunings in order to match the rules and descriptions within the new tuning README file. A number of small issues were corrected in the "c3" tuning to bring it inline with the README. (From OE-Core rev: ab77d3401908964f3249c761969600b5ec1bfbd0) Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/conf/machine/include/ia32/arch-ia32.inc | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'meta/conf/machine/include/ia32/arch-ia32.inc') diff --git a/meta/conf/machine/include/ia32/arch-ia32.inc b/meta/conf/machine/include/ia32/arch-ia32.inc index 0931c26520..a5dae8811b 100644 --- a/meta/conf/machine/include/ia32/arch-ia32.inc +++ b/meta/conf/machine/include/ia32/arch-ia32.inc @@ -7,6 +7,8 @@ TARGET_FPU ?= "" X86ARCH32 ?= "i586" X86ARCH64 ?= "x86_64" +TUNE_PKGARCH = "${TUNE_PKGARCH_tune-${DEFAULTTUNE}}" + # ELF32 ABI TUNEVALID[m32] = "IA32 ELF32 standard ABI" TUNECONFLICTS[m32] = "m64 mx32" @@ -29,21 +31,21 @@ TUNECONFLICT[m64] = "m32 mx32" 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)}" - # Default Tune configurations AVAILTUNES += "x86" -TUNE_FEATURES_tune-x86 ?= "m32" -BASE_LIB_tune-x86 ?= "lib" -PACKAGE_EXTRA_ARCHS_tune-x86 = "x86" +TUNE_FEATURES_tune-x86 = "m32" +BASE_LIB_tune-x86 = "lib" +TUNE_PKGARCH_tune-x86 = "x86" +PACKAGE_EXTRA_ARCHS_tune-x86 = "${TUNE_PKGARCH_tune-x86}" AVAILTUNES += "x86-64" -TUNE_FEATURES_tune-x86-64 ?= "m64" -BASE_LIB_tune-x86-64 ?= "lib64" -PACKAGE_EXTRA_ARCHS_tune-x86-64 = "x86_64" +TUNE_FEATURES_tune-x86-64 = "m64" +BASE_LIB_tune-x86-64 = "lib64" +TUNE_PKGARCH_tune-x86-64 = "x86_64" +PACKAGE_EXTRA_ARCHS_tune-x86-64 = "${TUNE_PKGARCH_tune-x86-64}" AVAILTUNES += "x86-64-x32" -TUNE_FEATURES_tune-x86-64-x32 ?= "mx32" -BASE_LIB_tune-x86-64-x32 ?= "libx32" -PACKAGE_EXTRA_ARCHS_tune-x86-64-x32 = "x86_64_x32" -TUNE_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "mx32", "_x32", "", d)}" +TUNE_FEATURES_tune-x86-64-x32 = "mx32" +BASE_LIB_tune-x86-64-x32 = "libx32" +TUNE_PKGARCH_tune-x86-64-x32 = "x86_64_x32" +PACKAGE_EXTRA_ARCHS_tune-x86-64-x32 = "${TUNE_PKGARCH_tune-x86-64-x32}" -- cgit v1.2.3-54-g00ecf