summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2012-03-30 19:27:58 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-04 16:17:54 (GMT)
commitd6e7ebb20934a4c4822898b4f4adfcde7f7f4049 (patch)
tree1f79149b8e634975a631a277f281e1099705d981 /meta/conf
parent62331ff46bd63067dbcdf672460a9aeda18a6e7e (diff)
downloadpoky-d6e7ebb20934a4c4822898b4f4adfcde7f7f4049.tar.gz
conf/machine/include: Cleanup IA tunings to match README
We perform a basic cleanup of the IA32 architecture and related tunings in order to match the rules and descriptions within the new tuning README file. A number of small issues were corrected in the "c3" tuning to bring it inline with the README. (From OE-Core rev: ab77d3401908964f3249c761969600b5ec1bfbd0) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/machine/include/ia32/README24
-rw-r--r--meta/conf/machine/include/ia32/arch-ia32.inc26
-rw-r--r--meta/conf/machine/include/tune-c3.inc12
-rw-r--r--meta/conf/machine/include/tune-core2.inc16
-rw-r--r--meta/conf/machine/include/tune-i586.inc8
5 files changed, 59 insertions, 27 deletions
diff --git a/meta/conf/machine/include/ia32/README b/meta/conf/machine/include/ia32/README
new file mode 100644
index 0000000..8f80a5b
--- /dev/null
+++ b/meta/conf/machine/include/ia32/README
@@ -0,0 +1,24 @@
12012/03/30 - Mark Hatle <mark.hatle@windriver.com>
2 - Initial version
3
4Most of the items for the IA architecture are defined in the single
5arch-ia32 file.
6
7Three ABIs are define, m32, mx32 and m64.
8
9The following is the list of ia32 specific variables:
10
11X86ARCH32 - This is the 32-bit architecture GNU canonical arch, TUNE_ARCH.
12
13X86ARCH64 - This is the 64-bit architecture GNU canonical arch, TUNE_ARCH.
14
15The TUNE_PKGARCH is defined as follows:
16
17TUNE_PKGARCH = ${TUNE_PKGARCH_tune-${DEFAULTTUNE}}
18
19The package architecture for 32-bit targets is historical and generally
20set to to match the core compatible processor type, i.e. i386.
21
22For 64-bit architectures, the architecture is expected to end in '_64'.
23
24If the x32 ABI is used, then the _64 is further extended with a '_x32'.
diff --git a/meta/conf/machine/include/ia32/arch-ia32.inc b/meta/conf/machine/include/ia32/arch-ia32.inc
index 0931c26..a5dae88 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 ?= ""
7X86ARCH32 ?= "i586" 7X86ARCH32 ?= "i586"
8X86ARCH64 ?= "x86_64" 8X86ARCH64 ?= "x86_64"
9 9
10TUNE_PKGARCH = "${TUNE_PKGARCH_tune-${DEFAULTTUNE}}"
11
10# ELF32 ABI 12# ELF32 ABI
11TUNEVALID[m32] = "IA32 ELF32 standard ABI" 13TUNEVALID[m32] = "IA32 ELF32 standard ABI"
12TUNECONFLICTS[m32] = "m64 mx32" 14TUNECONFLICTS[m32] = "m64 mx32"
@@ -29,21 +31,21 @@ TUNECONFLICT[m64] = "m32 mx32"
29TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m64", "${X86ARCH64}", "" ,d)}" 31TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m64", "${X86ARCH64}", "" ,d)}"
30TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-m64", "", d)}" 32TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-m64", "", d)}"
31 33
32TUNE_PKGARCH ?= "${@bb.utils.contains("TUNE_FEATURES", "m32", "x86", "x86_64", d)}"
33
34# Default Tune configurations 34# Default Tune configurations
35AVAILTUNES += "x86" 35AVAILTUNES += "x86"
36TUNE_FEATURES_tune-x86 ?= "m32" 36TUNE_FEATURES_tune-x86 = "m32"
37BASE_LIB_tune-x86 ?= "lib" 37BASE_LIB_tune-x86 = "lib"
38PACKAGE_EXTRA_ARCHS_tune-x86 = "x86" 38TUNE_PKGARCH_tune-x86 = "x86"
39PACKAGE_EXTRA_ARCHS_tune-x86 = "${TUNE_PKGARCH_tune-x86}"
39 40
40AVAILTUNES += "x86-64" 41AVAILTUNES += "x86-64"
41TUNE_FEATURES_tune-x86-64 ?= "m64" 42TUNE_FEATURES_tune-x86-64 = "m64"
42BASE_LIB_tune-x86-64 ?= "lib64" 43BASE_LIB_tune-x86-64 = "lib64"
43PACKAGE_EXTRA_ARCHS_tune-x86-64 = "x86_64" 44TUNE_PKGARCH_tune-x86-64 = "x86_64"
45PACKAGE_EXTRA_ARCHS_tune-x86-64 = "${TUNE_PKGARCH_tune-x86-64}"
44 46
45AVAILTUNES += "x86-64-x32" 47AVAILTUNES += "x86-64-x32"
46TUNE_FEATURES_tune-x86-64-x32 ?= "mx32" 48TUNE_FEATURES_tune-x86-64-x32 = "mx32"
47BASE_LIB_tune-x86-64-x32 ?= "libx32" 49BASE_LIB_tune-x86-64-x32 = "libx32"
48PACKAGE_EXTRA_ARCHS_tune-x86-64-x32 = "x86_64_x32" 50TUNE_PKGARCH_tune-x86-64-x32 = "x86_64_x32"
49TUNE_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "mx32", "_x32", "", d)}" 51PACKAGE_EXTRA_ARCHS_tune-x86-64-x32 = "${TUNE_PKGARCH_tune-x86-64-x32}"
diff --git a/meta/conf/machine/include/tune-c3.inc b/meta/conf/machine/include/tune-c3.inc
index e1569f5..06fac8f 100644
--- a/meta/conf/machine/include/tune-c3.inc
+++ b/meta/conf/machine/include/tune-c3.inc
@@ -1,6 +1,12 @@
1require conf/machine/include/ia32/arch-ia32.inc 1require conf/machine/include/ia32/arch-ia32.inc
2 2
3TUNE_PKGARCH = "i586" 3TUNEVALID[c3] = "VIA Cyrix III or VIA C3 specific optimizations"
4TUNECONFLICT[c3] = "m64 mx32"
5TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "c3", "-march=c3 -mtune=c3", "", d)}"
4 6
5TUNE_CCARGS = "-march=c3 -mtune=c3" 7AVAILTUNES += "c3"
6PACKAGE_EXTRA_ARCHS = "i386 i486 i586" 8TUNE_FEATURES_tune-c3 = "${TUNE_FEATURES_tune-x86} c3"
9BASE_LIBS_tune-c3 = "${BASE_LIB_tune-x86}"
10# The following should likely be something other then i586...
11TUNE_PKGARCH_tune-c3 = "i586"
12PACKAGE_EXTRA_ARCHS_tune-c3 = "${PACKAGE_EXTRA_ARCHS_tune-x86} i386 i486 i586"
diff --git a/meta/conf/machine/include/tune-core2.inc b/meta/conf/machine/include/tune-core2.inc
index 7cde511..338ba73 100644
--- a/meta/conf/machine/include/tune-core2.inc
+++ b/meta/conf/machine/include/tune-core2.inc
@@ -1,5 +1,4 @@
1DEFAULTTUNE ?= "core2" 1DEFAULTTUNE ?= "core2"
2TUNE_PKGARCH ?= "${@bb.utils.contains("TUNE_FEATURES", "m32", "core2", "core2_64", d)}"
3 2
4require conf/machine/include/tune-i586.inc 3require conf/machine/include/tune-i586.inc
5 4
@@ -9,16 +8,19 @@ TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "core2", "-march=core2 -ms
9 8
10# Extra tune selections 9# Extra tune selections
11AVAILTUNES += "core2" 10AVAILTUNES += "core2"
12TUNE_FEATURES_tune-core2 ?= "${TUNE_FEATURES_tune-x86} core2" 11TUNE_FEATURES_tune-core2 = "${TUNE_FEATURES_tune-x86} core2"
13BASE_LIB_tune-core2 ?= "lib" 12BASE_LIB_tune-core2 = "lib"
13TUNE_PKGARCH_tune-core2 = "core2"
14PACKAGE_EXTRA_ARCHS_tune-core2 = "${PACKAGE_EXTRA_ARCHS_tune-x86} i386 i486 i586 i686 core2" 14PACKAGE_EXTRA_ARCHS_tune-core2 = "${PACKAGE_EXTRA_ARCHS_tune-x86} i386 i486 i586 i686 core2"
15 15
16AVAILTUNES += "core2-64" 16AVAILTUNES += "core2-64"
17TUNE_FEATURES_tune-core2-64 ?= "${TUNE_FEATURES_tune-x86-64} core2" 17TUNE_FEATURES_tune-core2-64 = "${TUNE_FEATURES_tune-x86-64} core2"
18BASE_LIB_tune-core2-64 ?= "lib64" 18BASE_LIB_tune-core2-64 = "lib64"
19TUNE_PKGARCH_tune-core2-64 = "core2_64"
19PACKAGE_EXTRA_ARCHS_tune-core2-64 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64} core2_64" 20PACKAGE_EXTRA_ARCHS_tune-core2-64 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64} core2_64"
20 21
21AVAILTUNES += "core2-64-x32" 22AVAILTUNES += "core2-64-x32"
22TUNE_FEATURES_tune-core2-64-x32 ?= "${TUNE_FEATURES_tune-x86-64-x32} core2" 23TUNE_FEATURES_tune-core2-64-x32 = "${TUNE_FEATURES_tune-x86-64-x32} core2"
23BASE_LIB_tune-core2-64-x32 ?= "libx32" 24BASE_LIB_tune-core2-64-x32 = "libx32"
25TUNE_PKGARCH_tune-core2-64-x32 = "core2_64_x32"
24PACKAGE_EXTRA_ARCHS_tune-core2-64-x32 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64-x32} core2_64_x32" 26PACKAGE_EXTRA_ARCHS_tune-core2-64-x32 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64-x32} core2_64_x32"
diff --git a/meta/conf/machine/include/tune-i586.inc b/meta/conf/machine/include/tune-i586.inc
index a40ce18..afa9c92 100644
--- a/meta/conf/machine/include/tune-i586.inc
+++ b/meta/conf/machine/include/tune-i586.inc
@@ -1,6 +1,4 @@
1DEFAULTTUNE ?= "i586" 1DEFAULTTUNE ?= "i586"
2TUNE_PKGARCH_TMP = "${@bb.utils.contains("TUNE_FEATURES", "m32", "x86", "x86_64", d)}"
3TUNE_PKGARCH ?= "${@bb.utils.contains("TUNE_FEATURES", "i586", "i586", TUNE_PKGARCH_TMP, d)}"
4 2
5require conf/machine/include/ia32/arch-ia32.inc 3require conf/machine/include/ia32/arch-ia32.inc
6 4
@@ -10,7 +8,7 @@ TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "i586", "-march=i586", "",
10 8
11# Extra tune selections 9# Extra tune selections
12AVAILTUNES += "i586" 10AVAILTUNES += "i586"
13TUNE_FEATURES_tune-i586 ?= "${TUNE_FEATURES_tune-x86} i586" 11TUNE_FEATURES_tune-i586 = "${TUNE_FEATURES_tune-x86} i586"
14BASE_LIB_tune-i586 ?= "lib" 12BASE_LIB_tune-i586 = "lib"
13TUNE_PKGARCH_tune-i586 = "i586"
15PACKAGE_EXTRA_ARCHS_tune-i586 = "${PACKAGE_EXTRA_ARCHS_tune-x86} i386 i486 i586" 14PACKAGE_EXTRA_ARCHS_tune-i586 = "${PACKAGE_EXTRA_ARCHS_tune-x86} i386 i486 i586"
16