summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine/include/x86
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-28 23:28:15 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-02 15:44:10 +0100
commitbb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch)
tree76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/conf/machine/include/x86
parentfcc456ee4b8f619134abb4649db53c638074082c (diff)
downloadpoky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz
Convert to new override syntax
This is the result of automated script conversion: scripts/contrib/convert-overrides.py <oe-core directory> converting the metadata to use ":" as the override character instead of "_". (From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae) 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/README2
-rw-r--r--meta/conf/machine/include/x86/arch-x86.inc28
2 files changed, 15 insertions, 15 deletions
diff --git a/meta/conf/machine/include/x86/README b/meta/conf/machine/include/x86/README
index 2b6c46c7eb..05aee533a7 100644
--- a/meta/conf/machine/include/x86/README
+++ b/meta/conf/machine/include/x86/README
@@ -14,7 +14,7 @@ X86ARCH64 - This is the 64-bit architecture GNU canonical arch, TUNE_ARCH.
14 14
15The TUNE_PKGARCH is defined as follows: 15The TUNE_PKGARCH is defined as follows:
16 16
17TUNE_PKGARCH = ${TUNE_PKGARCH_tune-${DEFAULTTUNE}} 17TUNE_PKGARCH = ${TUNE_PKGARCH:tune-${DEFAULTTUNE}}
18 18
19The package architecture for 32-bit targets is historical and generally 19The package architecture for 32-bit targets is historical and generally
20set to to match the core compatible processor type, i.e. i386. 20set to to match the core compatible processor type, i.e. i386.
diff --git a/meta/conf/machine/include/x86/arch-x86.inc b/meta/conf/machine/include/x86/arch-x86.inc
index 2edb360b7d..28742e794d 100644
--- a/meta/conf/machine/include/x86/arch-x86.inc
+++ b/meta/conf/machine/include/x86/arch-x86.inc
@@ -7,7 +7,7 @@ TARGET_FPU ?= ""
7X86ARCH32 ?= "i586" 7X86ARCH32 ?= "i586"
8X86ARCH64 ?= "x86_64" 8X86ARCH64 ?= "x86_64"
9 9
10TUNE_PKGARCH = "${TUNE_PKGARCH_tune-${DEFAULTTUNE}}" 10TUNE_PKGARCH = "${TUNE_PKGARCH:tune-${DEFAULTTUNE}}"
11 11
12# ELF32 ABI 12# ELF32 ABI
13TUNEVALID[m32] = "IA32 ELF32 standard ABI" 13TUNEVALID[m32] = "IA32 ELF32 standard ABI"
@@ -25,7 +25,7 @@ TUNE_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
@@ -36,19 +36,19 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'm64', ' -m64', '', d)}"
36 36
37# Default Tune configurations 37# Default Tune configurations
38AVAILTUNES += "x86" 38AVAILTUNES += "x86"
39TUNE_FEATURES_tune-x86 = "m32" 39TUNE_FEATURES:tune-x86 = "m32"
40BASE_LIB_tune-x86 = "lib" 40BASE_LIB:tune-x86 = "lib"
41TUNE_PKGARCH_tune-x86 = "x86" 41TUNE_PKGARCH:tune-x86 = "x86"
42PACKAGE_EXTRA_ARCHS_tune-x86 = "${TUNE_PKGARCH_tune-x86}" 42PACKAGE_EXTRA_ARCHS:tune-x86 = "${TUNE_PKGARCH:tune-x86}"
43 43
44AVAILTUNES += "x86-64" 44AVAILTUNES += "x86-64"
45TUNE_FEATURES_tune-x86-64 = "m64" 45TUNE_FEATURES:tune-x86-64 = "m64"
46BASE_LIB_tune-x86-64 = "lib64" 46BASE_LIB:tune-x86-64 = "lib64"
47TUNE_PKGARCH_tune-x86-64 = "x86_64" 47TUNE_PKGARCH:tune-x86-64 = "x86_64"
48PACKAGE_EXTRA_ARCHS_tune-x86-64 = "${TUNE_PKGARCH_tune-x86-64}" 48PACKAGE_EXTRA_ARCHS:tune-x86-64 = "${TUNE_PKGARCH:tune-x86-64}"
49 49
50AVAILTUNES += "x86-64-x32" 50AVAILTUNES += "x86-64-x32"
51TUNE_FEATURES_tune-x86-64-x32 = "mx32" 51TUNE_FEATURES:tune-x86-64-x32 = "mx32"
52BASE_LIB_tune-x86-64-x32 = "libx32" 52BASE_LIB:tune-x86-64-x32 = "libx32"
53TUNE_PKGARCH_tune-x86-64-x32 = "x86_64_x32" 53TUNE_PKGARCH:tune-x86-64-x32 = "x86_64_x32"
54PACKAGE_EXTRA_ARCHS_tune-x86-64-x32 = "${TUNE_PKGARCH_tune-x86-64-x32}" 54PACKAGE_EXTRA_ARCHS:tune-x86-64-x32 = "${TUNE_PKGARCH:tune-x86-64-x32}"