diff options
Diffstat (limited to 'poky/meta/conf/machine/include/x86')
-rw-r--r-- | poky/meta/conf/machine/include/x86/README | 2 | ||||
-rw-r--r-- | poky/meta/conf/machine/include/x86/arch-x86.inc | 28 |
2 files changed, 15 insertions, 15 deletions
diff --git a/poky/meta/conf/machine/include/x86/README b/poky/meta/conf/machine/include/x86/README index 2b6c46c7e..05aee533a 100644 --- a/poky/meta/conf/machine/include/x86/README +++ b/poky/meta/conf/machine/include/x86/README @@ -14,7 +14,7 @@ X86ARCH64 - This is the 64-bit architecture GNU canonical arch, TUNE_ARCH. The TUNE_PKGARCH is defined as follows: -TUNE_PKGARCH = ${TUNE_PKGARCH_tune-${DEFAULTTUNE}} +TUNE_PKGARCH = ${TUNE_PKGARCH:tune-${DEFAULTTUNE}} The package architecture for 32-bit targets is historical and generally set to to match the core compatible processor type, i.e. i386. diff --git a/poky/meta/conf/machine/include/x86/arch-x86.inc b/poky/meta/conf/machine/include/x86/arch-x86.inc index 2edb360b7..28742e794 100644 --- a/poky/meta/conf/machine/include/x86/arch-x86.inc +++ b/poky/meta/conf/machine/include/x86/arch-x86.inc @@ -7,7 +7,7 @@ TARGET_FPU ?= "" X86ARCH32 ?= "i586" X86ARCH64 ?= "x86_64" -TUNE_PKGARCH = "${TUNE_PKGARCH_tune-${DEFAULTTUNE}}" +TUNE_PKGARCH = "${TUNE_PKGARCH:tune-${DEFAULTTUNE}}" # ELF32 ABI TUNEVALID[m32] = "IA32 ELF32 standard ABI" @@ -25,7 +25,7 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'mx32', ' -mx32', '', d)}" TUNE_LDARGS += "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '-m elf32_x86_64', '', d)}" TUNE_ASARGS += "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '-x32', '', d)}" # user mode qemu doesn't support x32 -MACHINE_FEATURES_BACKFILL_CONSIDERED_append = " ${@bb.utils.contains('TUNE_FEATURES', 'mx32', 'qemu-usermode', '', d)}" +MACHINE_FEATURES_BACKFILL_CONSIDERED:append = " ${@bb.utils.contains('TUNE_FEATURES', 'mx32', 'qemu-usermode', '', d)}" MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'mx32', 'x86-x32:', '', d)}" # ELF64 ABI @@ -36,19 +36,19 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'm64', ' -m64', '', d)}" # Default Tune configurations AVAILTUNES += "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}" +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" -TUNE_PKGARCH_tune-x86-64 = "x86_64" -PACKAGE_EXTRA_ARCHS_tune-x86-64 = "${TUNE_PKGARCH_tune-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" -TUNE_PKGARCH_tune-x86-64-x32 = "x86_64_x32" -PACKAGE_EXTRA_ARCHS_tune-x86-64-x32 = "${TUNE_PKGARCH_tune-x86-64-x32}" +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}" |