diff options
Diffstat (limited to 'meta/conf/machine/include/x86/arch-x86.inc')
-rw-r--r-- | meta/conf/machine/include/x86/arch-x86.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/conf/machine/include/x86/arch-x86.inc b/meta/conf/machine/include/x86/arch-x86.inc index 70814b8d4d..2edb360b7d 100644 --- a/meta/conf/machine/include/x86/arch-x86.inc +++ b/meta/conf/machine/include/x86/arch-x86.inc | |||
@@ -12,26 +12,26 @@ TUNE_PKGARCH = "${TUNE_PKGARCH_tune-${DEFAULTTUNE}}" | |||
12 | # ELF32 ABI | 12 | # ELF32 ABI |
13 | TUNEVALID[m32] = "IA32 ELF32 standard ABI" | 13 | TUNEVALID[m32] = "IA32 ELF32 standard ABI" |
14 | TUNECONFLICTS[m32] = "m64 mx32" | 14 | TUNECONFLICTS[m32] = "m64 mx32" |
15 | TUNE_ARCH .= "${@bb.utils.contains('TUNE_FEATURES', 'm32', '${X86ARCH32}', '' ,d)}" | 15 | TUNE_ARCH .= "${@bb.utils.contains('TUNE_FEATURES', 'm32', '${X86ARCH32}', '', d)}" |
16 | TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'm32', ' -m32', '', d)}" | 16 | TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'm32', ' -m32', '', d)}" |
17 | MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'm32', 'x86:', '' ,d)}" | 17 | MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'm32', 'x86:', '', d)}" |
18 | 18 | ||
19 | # x32 ABI | 19 | # x32 ABI |
20 | TUNEVALID[mx32] = "IA32e (x86_64) ELF32 standard ABI" | 20 | TUNEVALID[mx32] = "IA32e (x86_64) ELF32 standard ABI" |
21 | TUNECONFLICTS[mx32] = "m64 m32" | 21 | TUNECONFLICTS[mx32] = "m64 m32" |
22 | TUNE_ARCH .= "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '${X86ARCH64}', '' ,d)}" | 22 | TUNE_ARCH .= "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '${X86ARCH64}', '', d)}" |
23 | ABIEXTENSION .= "${@bb.utils.contains('TUNE_FEATURES', 'mx32', 'x32', '' ,d)}" | 23 | ABIEXTENSION .= "${@bb.utils.contains('TUNE_FEATURES', 'mx32', 'x32', '', d)}" |
24 | TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'mx32', ' -mx32', '', d)}" | 24 | TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'mx32', ' -mx32', '', d)}" |
25 | TUNE_LDARGS += "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '-m elf32_x86_64', '', d)}" | 25 | TUNE_LDARGS += "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '-m elf32_x86_64', '', d)}" |
26 | TUNE_ASARGS += "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '-x32', '', d)}" | 26 | TUNE_ASARGS += "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '-x32', '', d)}" |
27 | # user mode qemu doesn't support x32 | 27 | # user mode qemu doesn't support x32 |
28 | MACHINE_FEATURES_BACKFILL_CONSIDERED_append = " ${@bb.utils.contains('TUNE_FEATURES', 'mx32', 'qemu-usermode', '', d)}" | 28 | MACHINE_FEATURES_BACKFILL_CONSIDERED_append = " ${@bb.utils.contains('TUNE_FEATURES', 'mx32', 'qemu-usermode', '', d)}" |
29 | MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'mx32', 'x86-x32:', '' ,d)}" | 29 | MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'mx32', 'x86-x32:', '', d)}" |
30 | 30 | ||
31 | # ELF64 ABI | 31 | # ELF64 ABI |
32 | TUNEVALID[m64] = "IA32e (x86_64) ELF64 standard ABI" | 32 | TUNEVALID[m64] = "IA32e (x86_64) ELF64 standard ABI" |
33 | TUNECONFLICTS[m64] = "m32 mx32" | 33 | TUNECONFLICTS[m64] = "m32 mx32" |
34 | TUNE_ARCH .= "${@bb.utils.contains('TUNE_FEATURES', 'm64', '${X86ARCH64}', '' ,d)}" | 34 | TUNE_ARCH .= "${@bb.utils.contains('TUNE_FEATURES', 'm64', '${X86ARCH64}', '', d)}" |
35 | TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'm64', ' -m64', '', d)}" | 35 | TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'm64', ' -m64', '', d)}" |
36 | 36 | ||
37 | # Default Tune configurations | 37 | # Default Tune configurations |