summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine/include
diff options
context:
space:
mode:
Diffstat (limited to 'meta/conf/machine/include')
-rw-r--r--meta/conf/machine/include/ia32/arch-ia32.inc19
-rw-r--r--meta/conf/machine/include/tune-core2.inc4
-rw-r--r--meta/conf/machine/include/tune-x86_64.inc2
3 files changed, 22 insertions, 3 deletions
diff --git a/meta/conf/machine/include/ia32/arch-ia32.inc b/meta/conf/machine/include/ia32/arch-ia32.inc
index 2709440db3..96980d28fb 100644
--- a/meta/conf/machine/include/ia32/arch-ia32.inc
+++ b/meta/conf/machine/include/ia32/arch-ia32.inc
@@ -9,13 +9,22 @@ X86ARCH64 ?= "x86_64"
9 9
10# ELF32 ABI 10# ELF32 ABI
11TUNEVALID[m32] = "IA32 ELF32 standard ABI" 11TUNEVALID[m32] = "IA32 ELF32 standard ABI"
12TUNECONFLICTS[m32] = "m64" 12TUNECONFLICTS[m32] = "m64 mx32"
13TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m32", "${X86ARCH32}", "" ,d)}" 13TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m32", "${X86ARCH32}", "" ,d)}"
14TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m32", "-m32", "", d)}" 14TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m32", "-m32", "", d)}"
15 15
16# x32 ABI
17TUNEVALID[mx32] = "IA32e (x86_64) ELF32 standard ABI"
18TUNECONFLICTS[mx32] = "m64 m32"
19TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "mx32", "${X86ARCH64}", "" ,d)}"
20ABIEXTENSION .= "${@bb.utils.contains("TUNE_FEATURES", "mx32", "x32", "" ,d)}"
21TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "mx32", "-mx32", "", d)}"
22TUNE_LDARGS += "${@bb.utils.contains("TUNE_FEATURES", "mx32", "-m elf32_x86_64", "", d)}"
23TUNE_ASARGS += "${@bb.utils.contains("TUNE_FEATURES", "mx32", "-x32", "", d)}"
24
16# ELF64 ABI 25# ELF64 ABI
17TUNEVALID[m64] = "IA32e (x86_64) ELF64 standard ABI" 26TUNEVALID[m64] = "IA32e (x86_64) ELF64 standard ABI"
18TUNECONFLICT[m64] = "m32" 27TUNECONFLICT[m64] = "m32 mx32"
19TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m64", "${X86ARCH64}", "" ,d)}" 28TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m64", "${X86ARCH64}", "" ,d)}"
20TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-m64", "", d)}" 29TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-m64", "", d)}"
21 30
@@ -31,3 +40,9 @@ AVAILTUNES += "x86-64"
31TUNE_FEATURES_tune-x86-64 ?= "m64" 40TUNE_FEATURES_tune-x86-64 ?= "m64"
32BASE_LIB_tune-x86-64 ?= "lib64" 41BASE_LIB_tune-x86-64 ?= "lib64"
33PACKAGE_EXTRA_ARCHS_tune-x86-64 = "x86_64" 42PACKAGE_EXTRA_ARCHS_tune-x86-64 = "x86_64"
43
44AVAILTUNES += "x86-64-x32"
45TUNE_FEATURES_tune-x86-64-x32 ?= "mx32"
46BASE_LIB_tune-x86-64-x32 ?= "lib"
47PACKAGE_EXTRA_ARCHS_tune-x86-64-x32 = "x86_64-x32"
48TUNE_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "mx32", "-x32", "", d)}"
diff --git a/meta/conf/machine/include/tune-core2.inc b/meta/conf/machine/include/tune-core2.inc
index 25c2226c27..78f8f4d430 100644
--- a/meta/conf/machine/include/tune-core2.inc
+++ b/meta/conf/machine/include/tune-core2.inc
@@ -18,3 +18,7 @@ TUNE_FEATURES_tune-core2-64 ?= "${TUNE_FEATURES_tune-x86-64} core2"
18BASE_LIB_tune-core2-64 ?= "lib64" 18BASE_LIB_tune-core2-64 ?= "lib64"
19PACKAGE_EXTRA_ARCHS_tune-core2-64 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64} core2-64" 19PACKAGE_EXTRA_ARCHS_tune-core2-64 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64} core2-64"
20 20
21AVAILTUNES += "core2-64-x32"
22TUNE_FEATURES_tune-core2-64-x32 ?= "${TUNE_FEATURES_tune-x86-64-x32} core2"
23BASE_LIB_tune-core2-64-x32 ?= "lib"
24PACKAGE_EXTRA_ARCHS_tune-core2-64-x32 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64-x32} core2-64-x32"
diff --git a/meta/conf/machine/include/tune-x86_64.inc b/meta/conf/machine/include/tune-x86_64.inc
index 04b0f96678..50f20baf5f 100644
--- a/meta/conf/machine/include/tune-x86_64.inc
+++ b/meta/conf/machine/include/tune-x86_64.inc
@@ -1,3 +1,3 @@
1require conf/machine/include/ia32/arch-ia32.inc 1require conf/machine/include/ia32/arch-ia32.inc
2 2
3DEFAULTTUNE = "x86-64" 3DEFAULTTUNE ?= "x86-64"