diff options
Diffstat (limited to 'meta/conf/machine/include/ia32/arch-ia32.inc')
-rw-r--r-- | meta/conf/machine/include/ia32/arch-ia32.inc | 26 |
1 files changed, 14 insertions, 12 deletions
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 ?= "" | |||
7 | X86ARCH32 ?= "i586" | 7 | X86ARCH32 ?= "i586" |
8 | X86ARCH64 ?= "x86_64" | 8 | X86ARCH64 ?= "x86_64" |
9 | 9 | ||
10 | TUNE_PKGARCH = "${TUNE_PKGARCH_tune-${DEFAULTTUNE}}" | ||
11 | |||
10 | # ELF32 ABI | 12 | # ELF32 ABI |
11 | TUNEVALID[m32] = "IA32 ELF32 standard ABI" | 13 | TUNEVALID[m32] = "IA32 ELF32 standard ABI" |
12 | TUNECONFLICTS[m32] = "m64 mx32" | 14 | TUNECONFLICTS[m32] = "m64 mx32" |
@@ -29,21 +31,21 @@ TUNECONFLICT[m64] = "m32 mx32" | |||
29 | TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m64", "${X86ARCH64}", "" ,d)}" | 31 | TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m64", "${X86ARCH64}", "" ,d)}" |
30 | TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-m64", "", d)}" | 32 | TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-m64", "", d)}" |
31 | 33 | ||
32 | TUNE_PKGARCH ?= "${@bb.utils.contains("TUNE_FEATURES", "m32", "x86", "x86_64", d)}" | ||
33 | |||
34 | # Default Tune configurations | 34 | # Default Tune configurations |
35 | AVAILTUNES += "x86" | 35 | AVAILTUNES += "x86" |
36 | TUNE_FEATURES_tune-x86 ?= "m32" | 36 | TUNE_FEATURES_tune-x86 = "m32" |
37 | BASE_LIB_tune-x86 ?= "lib" | 37 | BASE_LIB_tune-x86 = "lib" |
38 | PACKAGE_EXTRA_ARCHS_tune-x86 = "x86" | 38 | TUNE_PKGARCH_tune-x86 = "x86" |
39 | PACKAGE_EXTRA_ARCHS_tune-x86 = "${TUNE_PKGARCH_tune-x86}" | ||
39 | 40 | ||
40 | AVAILTUNES += "x86-64" | 41 | AVAILTUNES += "x86-64" |
41 | TUNE_FEATURES_tune-x86-64 ?= "m64" | 42 | TUNE_FEATURES_tune-x86-64 = "m64" |
42 | BASE_LIB_tune-x86-64 ?= "lib64" | 43 | BASE_LIB_tune-x86-64 = "lib64" |
43 | PACKAGE_EXTRA_ARCHS_tune-x86-64 = "x86_64" | 44 | TUNE_PKGARCH_tune-x86-64 = "x86_64" |
45 | PACKAGE_EXTRA_ARCHS_tune-x86-64 = "${TUNE_PKGARCH_tune-x86-64}" | ||
44 | 46 | ||
45 | AVAILTUNES += "x86-64-x32" | 47 | AVAILTUNES += "x86-64-x32" |
46 | TUNE_FEATURES_tune-x86-64-x32 ?= "mx32" | 48 | TUNE_FEATURES_tune-x86-64-x32 = "mx32" |
47 | BASE_LIB_tune-x86-64-x32 ?= "libx32" | 49 | BASE_LIB_tune-x86-64-x32 = "libx32" |
48 | PACKAGE_EXTRA_ARCHS_tune-x86-64-x32 = "x86_64_x32" | 50 | TUNE_PKGARCH_tune-x86-64-x32 = "x86_64_x32" |
49 | TUNE_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "mx32", "_x32", "", d)}" | 51 | PACKAGE_EXTRA_ARCHS_tune-x86-64-x32 = "${TUNE_PKGARCH_tune-x86-64-x32}" |