diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2011-01-09 09:41:33 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-10 18:18:43 +0000 |
commit | 38b25eed9581fdee528478136a932546e1f8b005 (patch) | |
tree | 84f92d71eb5e40e981f9fdd9a5573c6d32c3318d /meta/conf/machine/include | |
parent | c02f89fe245db7a45f961755b03ef176b56c251f (diff) | |
download | poky-38b25eed9581fdee528478136a932546e1f8b005.tar.gz |
machines: move PACKAGE_EXTRA_ARCHS to tune files
This gets us closer to making including tune-<arch>.inc "just work".
Moving the TARGET_ARCH definitions is something for a follup patch.
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine/include')
-rw-r--r-- | meta/conf/machine/include/tune-arm1136jf-s.inc | 1 | ||||
-rw-r--r-- | meta/conf/machine/include/tune-arm920t.inc | 2 | ||||
-rw-r--r-- | meta/conf/machine/include/tune-arm926ejs.inc | 2 | ||||
-rw-r--r-- | meta/conf/machine/include/tune-arm9tdmi.inc | 2 | ||||
-rw-r--r-- | meta/conf/machine/include/tune-armv7.inc | 1 | ||||
-rw-r--r-- | meta/conf/machine/include/tune-atom.inc | 1 | ||||
-rw-r--r-- | meta/conf/machine/include/tune-c3.inc | 3 | ||||
-rw-r--r-- | meta/conf/machine/include/tune-cortexa8.inc | 1 | ||||
-rw-r--r-- | meta/conf/machine/include/tune-ep9312.inc | 2 | ||||
-rw-r--r-- | meta/conf/machine/include/tune-iwmmxt.inc | 3 | ||||
-rw-r--r-- | meta/conf/machine/include/tune-mips32.inc | 2 | ||||
-rw-r--r-- | meta/conf/machine/include/tune-ppc603e.inc | 4 | ||||
-rw-r--r-- | meta/conf/machine/include/tune-ppce300c2.inc | 1 | ||||
-rw-r--r-- | meta/conf/machine/include/tune-ppce500.inc | 2 | ||||
-rw-r--r-- | meta/conf/machine/include/tune-sh3.inc | 2 | ||||
-rw-r--r-- | meta/conf/machine/include/tune-sh4.inc | 6 | ||||
-rw-r--r-- | meta/conf/machine/include/tune-supersparc.inc | 3 | ||||
-rw-r--r-- | meta/conf/machine/include/tune-xscale.inc | 1 |
18 files changed, 33 insertions, 6 deletions
diff --git a/meta/conf/machine/include/tune-arm1136jf-s.inc b/meta/conf/machine/include/tune-arm1136jf-s.inc index be5aedc509..a7717510e6 100644 --- a/meta/conf/machine/include/tune-arm1136jf-s.inc +++ b/meta/conf/machine/include/tune-arm1136jf-s.inc | |||
@@ -4,5 +4,6 @@ FEED_ARCH = "armv6" | |||
4 | BASE_PACKAGE_ARCH = "armv6" | 4 | BASE_PACKAGE_ARCH = "armv6" |
5 | 5 | ||
6 | ARM_INSTRUCTION_SET = "${@['thumb','arm'][bb.data.getVar('CPU_FEATURES', d, 1).find('thumb') == -1]}" | 6 | ARM_INSTRUCTION_SET = "${@['thumb','arm'][bb.data.getVar('CPU_FEATURES', d, 1).find('thumb') == -1]}" |
7 | PACKAGE_EXTRA_ARCHS += "armv4 armv4t armv5te armv6" | ||
7 | 8 | ||
8 | require conf/machine/include/tune-thumb.inc | 9 | require conf/machine/include/tune-thumb.inc |
diff --git a/meta/conf/machine/include/tune-arm920t.inc b/meta/conf/machine/include/tune-arm920t.inc index 1f7a04bb3b..fee5c586c9 100644 --- a/meta/conf/machine/include/tune-arm920t.inc +++ b/meta/conf/machine/include/tune-arm920t.inc | |||
@@ -1,4 +1,4 @@ | |||
1 | FEED_ARCH = "armv4t" | 1 | FEED_ARCH = "armv4t" |
2 | BASE_PACKAGE_ARCH = "armv4t" | 2 | BASE_PACKAGE_ARCH = "armv4t" |
3 | TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t" | 3 | TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t" |
4 | 4 | PACKAGE_EXTRA_ARCHS += "armv4 armv4t" | |
diff --git a/meta/conf/machine/include/tune-arm926ejs.inc b/meta/conf/machine/include/tune-arm926ejs.inc index e80ef10490..f41e460999 100644 --- a/meta/conf/machine/include/tune-arm926ejs.inc +++ b/meta/conf/machine/include/tune-arm926ejs.inc | |||
@@ -1,5 +1,5 @@ | |||
1 | FEED_ARCH = "armv5te" | 1 | FEED_ARCH = "armv5te" |
2 | 2 | PACKAGE_EXTRA_ARCHS += "armv4 armv4t armv5te" | |
3 | # For gcc 3.x you need: | 3 | # For gcc 3.x you need: |
4 | #TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs" | 4 | #TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs" |
5 | # For gcc 4.x you need: | 5 | # For gcc 4.x you need: |
diff --git a/meta/conf/machine/include/tune-arm9tdmi.inc b/meta/conf/machine/include/tune-arm9tdmi.inc index 39e4493014..d788b5304f 100644 --- a/meta/conf/machine/include/tune-arm9tdmi.inc +++ b/meta/conf/machine/include/tune-arm9tdmi.inc | |||
@@ -1,2 +1,4 @@ | |||
1 | FEED_ARCH = "armv4t" | ||
1 | BASE_PACKAGE_ARCH = "armv4t" | 2 | BASE_PACKAGE_ARCH = "armv4t" |
3 | PACKAGE_EXTRA_ARCHS += "armv4 armv4t" | ||
2 | TARGET_CC_ARCH = "-mcpu=arm9tdmi -mtune=arm9tdmi" | 4 | TARGET_CC_ARCH = "-mcpu=arm9tdmi -mtune=arm9tdmi" |
diff --git a/meta/conf/machine/include/tune-armv7.inc b/meta/conf/machine/include/tune-armv7.inc index 96c8c64904..379a3eb011 100644 --- a/meta/conf/machine/include/tune-armv7.inc +++ b/meta/conf/machine/include/tune-armv7.inc | |||
@@ -3,4 +3,5 @@ | |||
3 | # This will NOT compile programs in 'ARM' mode, which is what you really want | 3 | # This will NOT compile programs in 'ARM' mode, which is what you really want |
4 | TARGET_CC_ARCH = "-march=armv7 -mfpu=vfp -mfloat-abi=softfp" | 4 | TARGET_CC_ARCH = "-march=armv7 -mfpu=vfp -mfloat-abi=softfp" |
5 | FEED_ARCH = "armv7" | 5 | FEED_ARCH = "armv7" |
6 | PACKAGE_EXTRA_ARCHS += "armv4 armv4t armv5te armv6 armv7" | ||
6 | BASE_PACKAGE_ARCH = "armv7" | 7 | BASE_PACKAGE_ARCH = "armv7" |
diff --git a/meta/conf/machine/include/tune-atom.inc b/meta/conf/machine/include/tune-atom.inc index 0f09e8d56f..a401856c8b 100644 --- a/meta/conf/machine/include/tune-atom.inc +++ b/meta/conf/machine/include/tune-atom.inc | |||
@@ -2,3 +2,4 @@ BASE_PACKAGE_ARCH = "core2" | |||
2 | TARGET_CC_ARCH = "-m32 -march=core2 -msse3 -mtune=generic -mfpmath=sse" | 2 | TARGET_CC_ARCH = "-m32 -march=core2 -msse3 -mtune=generic -mfpmath=sse" |
3 | #MOBLIN_CFLAGS = "-Os -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -fasynchronous-unwind-tables" | 3 | #MOBLIN_CFLAGS = "-Os -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -fasynchronous-unwind-tables" |
4 | 4 | ||
5 | PACKAGE_EXTRA_ARCHS += "x86 i386 i486 i586 core2" | ||
diff --git a/meta/conf/machine/include/tune-c3.inc b/meta/conf/machine/include/tune-c3.inc index 107341eb62..1d636e89c6 100644 --- a/meta/conf/machine/include/tune-c3.inc +++ b/meta/conf/machine/include/tune-c3.inc | |||
@@ -1,3 +1,4 @@ | |||
1 | TARGET_CC_ARCH = "-march=c3 -mtune=c3" | 1 | TARGET_CC_ARCH = "-march=c3 -mtune=c3" |
2 | PACKAGE_EXTRA_ARCHS += "i386 i486 i586" | ||
2 | BASE_PACKAGE_ARCH = "i586" | 3 | BASE_PACKAGE_ARCH = "i586" |
3 | 4 | FEED_ARCH = "i586" | |
diff --git a/meta/conf/machine/include/tune-cortexa8.inc b/meta/conf/machine/include/tune-cortexa8.inc index 2c40b70560..3ec1c03500 100644 --- a/meta/conf/machine/include/tune-cortexa8.inc +++ b/meta/conf/machine/include/tune-cortexa8.inc | |||
@@ -10,3 +10,4 @@ TARGET_CC_ARCH = "-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp | |||
10 | 10 | ||
11 | FEED_ARCH = "armv7a" | 11 | FEED_ARCH = "armv7a" |
12 | BASE_PACKAGE_ARCH = "armv7a" | 12 | BASE_PACKAGE_ARCH = "armv7a" |
13 | PACKAGE_EXTRA_ARCHS += "armv4 armv4t armv5te armv6 armv7 armv7a" | ||
diff --git a/meta/conf/machine/include/tune-ep9312.inc b/meta/conf/machine/include/tune-ep9312.inc index 2cfdf5270f..d0c5bb2e98 100644 --- a/meta/conf/machine/include/tune-ep9312.inc +++ b/meta/conf/machine/include/tune-ep9312.inc | |||
@@ -2,5 +2,7 @@ TARGET_CC_ARCH = "-march=ep9312 -mtune=ep9312 -mcpu=ep9312" | |||
2 | # add "-mfp=maverick" for newer gcc versions > 4.0 | 2 | # add "-mfp=maverick" for newer gcc versions > 4.0 |
3 | 3 | ||
4 | #set arch to ep9312 for all generated packages | 4 | #set arch to ep9312 for all generated packages |
5 | PACKAGE_EXTRA_ARCHS += "armv4t ep9312" | ||
5 | BASE_PACKAGE_ARCH = "ep9312" | 6 | BASE_PACKAGE_ARCH = "ep9312" |
7 | FEED_ARCH = "ep9312" | ||
6 | 8 | ||
diff --git a/meta/conf/machine/include/tune-iwmmxt.inc b/meta/conf/machine/include/tune-iwmmxt.inc index 49e560ea1a..f7291be805 100644 --- a/meta/conf/machine/include/tune-iwmmxt.inc +++ b/meta/conf/machine/include/tune-iwmmxt.inc | |||
@@ -2,5 +2,6 @@ | |||
2 | # Please use tune-xscale for PXA255/PXA26x based processors. | 2 | # Please use tune-xscale for PXA255/PXA26x based processors. |
3 | TARGET_CC_ARCH = "-march=iwmmxt -mcpu=iwmmxt -mtune=iwmmxt" | 3 | TARGET_CC_ARCH = "-march=iwmmxt -mcpu=iwmmxt -mtune=iwmmxt" |
4 | BASE_PACKAGE_ARCH = "iwmmxt" | 4 | BASE_PACKAGE_ARCH = "iwmmxt" |
5 | PACKAGE_EXTRA_ARCHS += "iwmmxt" | 5 | PACKAGE_EXTRA_ARCHS += "armv4 armv4t armv5te iwmmxt" |
6 | FEED_ARCH = "iwmmxt" | ||
6 | 7 | ||
diff --git a/meta/conf/machine/include/tune-mips32.inc b/meta/conf/machine/include/tune-mips32.inc index 93da66b158..67edca2530 100644 --- a/meta/conf/machine/include/tune-mips32.inc +++ b/meta/conf/machine/include/tune-mips32.inc | |||
@@ -1 +1,3 @@ | |||
1 | TARGET_CC_ARCH = "-march=mips32" | 1 | TARGET_CC_ARCH = "-march=mips32" |
2 | FEED_ARCH = "${TARGET_ARCH}" | ||
3 | BASE_PACKAGE_ARCH = "${TARGET_ARCH}" | ||
diff --git a/meta/conf/machine/include/tune-ppc603e.inc b/meta/conf/machine/include/tune-ppc603e.inc index a4a68d60e3..15a72d10a1 100644 --- a/meta/conf/machine/include/tune-ppc603e.inc +++ b/meta/conf/machine/include/tune-ppc603e.inc | |||
@@ -1,2 +1,4 @@ | |||
1 | TARGET_CC_ARCH = "-mcpu=603e -mhard-float" | 1 | TARGET_CC_ARCH = "-mcpu=603e -mhard-float" |
2 | BASE_PACKAGE_ARCH = "ppc603e" | 2 | BASE_PACKAGE_ARCH = "ppc603e" |
3 | FEED_ARCH = "ppc603e" | ||
4 | PACKAGE_EXTRA_ARCHS += "ppc603e" | ||
diff --git a/meta/conf/machine/include/tune-ppce300c2.inc b/meta/conf/machine/include/tune-ppce300c2.inc index 067a7b100c..2956875186 100644 --- a/meta/conf/machine/include/tune-ppce300c2.inc +++ b/meta/conf/machine/include/tune-ppce300c2.inc | |||
@@ -1,2 +1,3 @@ | |||
1 | TARGET_CC_ARCH = "-mcpu=e300c2 -msoft-float" | 1 | TARGET_CC_ARCH = "-mcpu=e300c2 -msoft-float" |
2 | BASE_PACKAGE_ARCH = "ppce300" | 2 | BASE_PACKAGE_ARCH = "ppce300" |
3 | PACKAGE_EXTRA_ARCHS += "ppce300" | ||
diff --git a/meta/conf/machine/include/tune-ppce500.inc b/meta/conf/machine/include/tune-ppce500.inc index 2482196424..44f8742f9f 100644 --- a/meta/conf/machine/include/tune-ppce500.inc +++ b/meta/conf/machine/include/tune-ppce500.inc | |||
@@ -1,2 +1,4 @@ | |||
1 | TARGET_CC_ARCH = "-mcpu=8540" | 1 | TARGET_CC_ARCH = "-mcpu=8540" |
2 | BASE_PACKAGE_ARCH = "ppce500" | 2 | BASE_PACKAGE_ARCH = "ppce500" |
3 | FEED_ARCH = "ppce500" | ||
4 | PACKAGE_EXTRA_ARCHS += "ppce500" | ||
diff --git a/meta/conf/machine/include/tune-sh3.inc b/meta/conf/machine/include/tune-sh3.inc index 192dd8fd22..32801a61c3 100644 --- a/meta/conf/machine/include/tune-sh3.inc +++ b/meta/conf/machine/include/tune-sh3.inc | |||
@@ -1 +1,3 @@ | |||
1 | TARGET_CC_ARCH = "-ml -m3" | 1 | TARGET_CC_ARCH = "-ml -m3" |
2 | FEED_ARCH = "sh3" | ||
3 | BASE_PACKAGE_ARCH = "sh3" | ||
diff --git a/meta/conf/machine/include/tune-sh4.inc b/meta/conf/machine/include/tune-sh4.inc index 866f7f89d5..51b40691bc 100644 --- a/meta/conf/machine/include/tune-sh4.inc +++ b/meta/conf/machine/include/tune-sh4.inc | |||
@@ -1 +1,7 @@ | |||
1 | # NOTE: If you want to optimize to sh4a, conf/machine/include/tune-sh4a.inc. | ||
2 | # But it is not compatible for sh4. | ||
3 | # The binary optimized by m4a doesn't operate on sh4. It works on sh4a only. | ||
4 | |||
1 | TARGET_CC_ARCH = "-ml -m4" | 5 | TARGET_CC_ARCH = "-ml -m4" |
6 | FEED_ARCH = "sh4" | ||
7 | BASE_PACKAGE_ARCH = "sh4" | ||
diff --git a/meta/conf/machine/include/tune-supersparc.inc b/meta/conf/machine/include/tune-supersparc.inc index 10133c6c21..a402e7cd2b 100644 --- a/meta/conf/machine/include/tune-supersparc.inc +++ b/meta/conf/machine/include/tune-supersparc.inc | |||
@@ -1,2 +1,3 @@ | |||
1 | TARGET_CC_ARCH = "-mcpu=supersparc" | 1 | TARGET_CC_ARCH = "-mcpu=supersparc" |
2 | BASE_PACKAGE_ARCH = "supersparc" | 2 | BASE_PACKAGE_ARCH = "supersparc" |
3 | FEED_ARCH = "supersparc" | ||
diff --git a/meta/conf/machine/include/tune-xscale.inc b/meta/conf/machine/include/tune-xscale.inc index 4f96814a72..f1ef3d46af 100644 --- a/meta/conf/machine/include/tune-xscale.inc +++ b/meta/conf/machine/include/tune-xscale.inc | |||
@@ -5,6 +5,7 @@ INHERIT += "siteinfo" | |||
5 | TARGET_CC_ARCH = "-march=armv5te -mtune=xscale" | 5 | TARGET_CC_ARCH = "-march=armv5te -mtune=xscale" |
6 | TARGET_CC_KERNEL_ARCH = "-march=armv5te -mtune=xscale" | 6 | TARGET_CC_KERNEL_ARCH = "-march=armv5te -mtune=xscale" |
7 | BASE_PACKAGE_ARCH = "${@['armv5teb', 'armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}" | 7 | BASE_PACKAGE_ARCH = "${@['armv5teb', 'armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}" |
8 | PACKAGE_EXTRA_ARCHS += "${@['armv4b armv4tb armv5teb', 'armv4 armv4t armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}" | ||
8 | 9 | ||
9 | # webkit-gtk has alignment issues with double instructions on armv5 so | 10 | # webkit-gtk has alignment issues with double instructions on armv5 so |
10 | # disable them here | 11 | # disable them here |