From: Nitin A Kamble <[email protected]> And also make some of the variable (DEFAULTTUNE, TUNE_PKGARCH) assignments weak, so that these vars can be overridden in the local.conf file.
Signed-off-by: Nitin A Kamble <[email protected]> --- meta/conf/machine/include/ia32/arch-ia32.inc | 22 +++++++++++++++++----- meta/conf/machine/include/tune-core2.inc | 8 ++++++-- meta/conf/machine/include/tune-i586.inc | 4 ++-- meta/conf/machine/include/tune-x86_64.inc | 2 +- 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/meta/conf/machine/include/ia32/arch-ia32.inc b/meta/conf/machine/include/ia32/arch-ia32.inc index 3a9d0bc..a282aa9 100644 --- a/meta/conf/machine/include/ia32/arch-ia32.inc +++ b/meta/conf/machine/include/ia32/arch-ia32.inc @@ -2,18 +2,25 @@ # IA32 Architecture definition # -DEFAULTTUNE = "x86" -TARGET_FPU = "hard" +DEFAULTTUNE ?= "x86_64-x32" +TARGET_FPU ?= "hard" +TUNE_PKGARCH ?= "${@bb.utils.contains("TUNE_FEATURES", "m32", "x86", "x86_64", d)}" # ELF32 ABI TUNEVALID[m32] = "IA32 ELF32 standard ABI" -TUNECONFLICTS[m32] = "m64" +TUNECONFLICTS[m32] = "m64 mx32" TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m32", "i586", "" ,d)}" TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m32", "-m32", "", d)}" +# x32 ABI +TUNEVALID[mx32] = "IA32 ELF32 standard ABI" +TUNECONFLICTS[mx32] = "m64 m32" +TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "mx32", "x86_64", "" ,d)}" +TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "mx32", "-mx32", "", d)}" + # ELF64 ABI TUNEVALID[m64] = "IA32e (x86_64) ELF64 standard ABI" -TUNECONFLICT[m64] = "m32" +TUNECONFLICT[m64] = "m32 mx32" TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m64", "x86_64", "" ,d)}" TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-m64", "", d)}" @@ -26,4 +33,9 @@ PACKAGE_EXTRA_ARCHS_tune-x86 = "x86" AVAILTUNES += "x86-64" TUNE_FEATURES_tune-x86-64 ?= "m64" BASE_LIB_tune-x86-64 = "lib64" -PACKAGE_EXTRA_ARCHS_tune-x86-64 = "x86_64" \ No newline at end of file +PACKAGE_EXTRA_ARCHS_tune-x86-64 = "x86_64" + +AVAILTUNES += "x86-64-x32" +TUNE_FEATURES_tune-x86-64-x32 ?= "mx32" +BASE_LIB_tune-x86-64-x32 = "lib" +PACKAGE_EXTRA_ARCHS_tune-x86-64-x32 = "x86_64-x32" diff --git a/meta/conf/machine/include/tune-core2.inc b/meta/conf/machine/include/tune-core2.inc index e94c290..0eb74ba 100644 --- a/meta/conf/machine/include/tune-core2.inc +++ b/meta/conf/machine/include/tune-core2.inc @@ -1,8 +1,8 @@ require conf/machine/include/tune-i586.inc -DEFAULTTUNE = "core2" +DEFAULTTUNE ?= "core2" TUNE_ARCH = "${@bb.utils.contains("TUNE_FEATURES", "m32", "i686", "x86_64", d)}" -TUNE_PKGARCH = "${@bb.utils.contains("TUNE_FEATURES", "m32", "core2", "core2-64", d)}" +TUNE_PKGARCH ?= "${@bb.utils.contains("TUNE_FEATURES", "m32", "core2", "core2-64", d)}" # Extra tune features TUNEVALID[core2] = "Enable core2 specific processor optimizations" @@ -19,3 +19,7 @@ TUNE_FEATURES_tune-core2-64 ?= "${TUNE_FEATURES_tune-x86-64} core2" BASE_LIB_tune-core2-64 = "lib64" PACKAGE_EXTRA_ARCHS_tune-core2-64 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64} core2-64" +AVAILTUNES += "core2-x32" +TUNE_FEATURES_tune-core2-x32 ?= "${TUNE_FEATURES_tune-x86-64-x32} core2" +BASE_LIB_tune-core2-x32 = "lib" +PACKAGE_EXTRA_ARCHS_tune-core2-x32 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64-x32} core2-x32" diff --git a/meta/conf/machine/include/tune-i586.inc b/meta/conf/machine/include/tune-i586.inc index 88c9221..a5e1950 100644 --- a/meta/conf/machine/include/tune-i586.inc +++ b/meta/conf/machine/include/tune-i586.inc @@ -1,7 +1,7 @@ require conf/machine/include/ia32/arch-ia32.inc -DEFAULTTUNE = "i586" -TUNE_PKGARCH = "i586" +DEFAULTTUNE ?= "i586" +TUNE_PKGARCH ?= "i586" # Extra tune features TUNEVALID[i586] = "Enable i586 specific processor optimizations" diff --git a/meta/conf/machine/include/tune-x86_64.inc b/meta/conf/machine/include/tune-x86_64.inc index 04b0f96..50f20ba 100644 --- a/meta/conf/machine/include/tune-x86_64.inc +++ b/meta/conf/machine/include/tune-x86_64.inc @@ -1,3 +1,3 @@ require conf/machine/include/ia32/arch-ia32.inc -DEFAULTTUNE = "x86-64" +DEFAULTTUNE ?= "x86-64" -- 1.7.6 _______________________________________________ Openembedded-core mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
