summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine/include/x86
diff options
context:
space:
mode:
authorJon Mason <jdmason@kudzu.us>2020-09-28 09:05:46 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-30 15:01:51 +0100
commitceefa75ac0836bf603c1c713af2e59f68c5a4f83 (patch)
treea9b82d97426fcd5b41ec3c15330369655817a392 /meta/conf/machine/include/x86
parent538019a320c4282130ff721d4325587361bd51fa (diff)
downloadpoky-ceefa75ac0836bf603c1c713af2e59f68c5a4f83.tar.gz
Space-comma Cleanups
Multiple files have " ," instead of ", " in expressions. This changes them to conform to the way the rest of them are done. Found and corrected via: git ls-files | xargs sed --follow-symlinks -i 's/ ,d/, d/g' (From OE-Core rev: 36c3afd2dd8bded02ea8f255e89a09ebd75c795b) Signed-off-by: Jon Mason <jon.mason@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine/include/x86')
-rw-r--r--meta/conf/machine/include/x86/arch-x86.inc12
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
13TUNEVALID[m32] = "IA32 ELF32 standard ABI" 13TUNEVALID[m32] = "IA32 ELF32 standard ABI"
14TUNECONFLICTS[m32] = "m64 mx32" 14TUNECONFLICTS[m32] = "m64 mx32"
15TUNE_ARCH .= "${@bb.utils.contains('TUNE_FEATURES', 'm32', '${X86ARCH32}', '' ,d)}" 15TUNE_ARCH .= "${@bb.utils.contains('TUNE_FEATURES', 'm32', '${X86ARCH32}', '', d)}"
16TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'm32', ' -m32', '', d)}" 16TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'm32', ' -m32', '', d)}"
17MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'm32', 'x86:', '' ,d)}" 17MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'm32', 'x86:', '', d)}"
18 18
19# x32 ABI 19# x32 ABI
20TUNEVALID[mx32] = "IA32e (x86_64) ELF32 standard ABI" 20TUNEVALID[mx32] = "IA32e (x86_64) ELF32 standard ABI"
21TUNECONFLICTS[mx32] = "m64 m32" 21TUNECONFLICTS[mx32] = "m64 m32"
22TUNE_ARCH .= "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '${X86ARCH64}', '' ,d)}" 22TUNE_ARCH .= "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '${X86ARCH64}', '', d)}"
23ABIEXTENSION .= "${@bb.utils.contains('TUNE_FEATURES', 'mx32', 'x32', '' ,d)}" 23ABIEXTENSION .= "${@bb.utils.contains('TUNE_FEATURES', 'mx32', 'x32', '', d)}"
24TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'mx32', ' -mx32', '', d)}" 24TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'mx32', ' -mx32', '', d)}"
25TUNE_LDARGS += "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '-m elf32_x86_64', '', d)}" 25TUNE_LDARGS += "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '-m elf32_x86_64', '', d)}"
26TUNE_ASARGS += "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '-x32', '', d)}" 26TUNE_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
28MACHINE_FEATURES_BACKFILL_CONSIDERED_append = " ${@bb.utils.contains('TUNE_FEATURES', 'mx32', 'qemu-usermode', '', d)}" 28MACHINE_FEATURES_BACKFILL_CONSIDERED_append = " ${@bb.utils.contains('TUNE_FEATURES', 'mx32', 'qemu-usermode', '', d)}"
29MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'mx32', 'x86-x32:', '' ,d)}" 29MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'mx32', 'x86-x32:', '', d)}"
30 30
31# ELF64 ABI 31# ELF64 ABI
32TUNEVALID[m64] = "IA32e (x86_64) ELF64 standard ABI" 32TUNEVALID[m64] = "IA32e (x86_64) ELF64 standard ABI"
33TUNECONFLICTS[m64] = "m32 mx32" 33TUNECONFLICTS[m64] = "m32 mx32"
34TUNE_ARCH .= "${@bb.utils.contains('TUNE_FEATURES', 'm64', '${X86ARCH64}', '' ,d)}" 34TUNE_ARCH .= "${@bb.utils.contains('TUNE_FEATURES', 'm64', '${X86ARCH64}', '', d)}"
35TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'm64', ' -m64', '', d)}" 35TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'm64', ' -m64', '', d)}"
36 36
37# Default Tune configurations 37# Default Tune configurations