summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/bitbake.conf4
-rw-r--r--meta/conf/machine/include/tune-arm1136jf-s.inc4
-rw-r--r--meta/conf/machine/include/tune-arm920t.inc2
-rw-r--r--meta/conf/machine/include/tune-arm926ejs.inc4
-rw-r--r--meta/conf/machine/include/tune-arm9tdmi.inc2
-rw-r--r--meta/conf/machine/include/tune-armv7.inc2
-rw-r--r--meta/conf/machine/include/tune-atom.inc2
-rw-r--r--meta/conf/machine/include/tune-c3.inc2
-rw-r--r--meta/conf/machine/include/tune-cortexa8.inc2
-rw-r--r--meta/conf/machine/include/tune-cortexm1.inc2
-rw-r--r--meta/conf/machine/include/tune-cortexm3.inc2
-rw-r--r--meta/conf/machine/include/tune-cortexr4.inc2
-rw-r--r--meta/conf/machine/include/tune-ep9312.inc2
-rw-r--r--meta/conf/machine/include/tune-i586.inc2
-rw-r--r--meta/conf/machine/include/tune-iwmmxt.inc2
-rw-r--r--meta/conf/machine/include/tune-mips32.inc2
-rw-r--r--meta/conf/machine/include/tune-ppc603e.inc2
-rw-r--r--meta/conf/machine/include/tune-ppce300c2.inc2
-rw-r--r--meta/conf/machine/include/tune-ppce500.inc2
-rw-r--r--meta/conf/machine/include/tune-ppce500mc.inc2
-rw-r--r--meta/conf/machine/include/tune-ppce500v2.inc2
-rw-r--r--meta/conf/machine/include/tune-sh3.inc2
-rw-r--r--meta/conf/machine/include/tune-sh4.inc2
-rw-r--r--meta/conf/machine/include/tune-strongarm1100.inc2
-rw-r--r--meta/conf/machine/include/tune-supersparc.inc2
-rw-r--r--meta/conf/machine/include/tune-thumb.inc2
-rw-r--r--meta/conf/machine/include/tune-x86_64.inc2
-rw-r--r--meta/conf/machine/include/tune-xscale.inc6
28 files changed, 34 insertions, 32 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index f95343f67a..2954faa5d0 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -82,12 +82,14 @@ HOST_CC_ARCH = "${TARGET_CC_ARCH}"
82HOST_EXEEXT = "" 82HOST_EXEEXT = ""
83 83
84TUNE_ARCH ??= "INVALID" 84TUNE_ARCH ??= "INVALID"
85TUNE_CCARGS ??= ""
86
85TARGET_ARCH = "${TUNE_ARCH}" 87TARGET_ARCH = "${TUNE_ARCH}"
86TARGET_OS = "INVALID" 88TARGET_OS = "INVALID"
87TARGET_VENDOR = "-oe" 89TARGET_VENDOR = "-oe"
88TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}" 90TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}"
89TARGET_PREFIX = "${TARGET_SYS}-" 91TARGET_PREFIX = "${TARGET_SYS}-"
90TARGET_CC_ARCH = "" 92TARGET_CC_ARCH = "${TUNE_CCARGS}"
91 93
92SDK_ARCH = "${BUILD_ARCH}" 94SDK_ARCH = "${BUILD_ARCH}"
93SDK_OS = "${BUILD_OS}" 95SDK_OS = "${BUILD_OS}"
diff --git a/meta/conf/machine/include/tune-arm1136jf-s.inc b/meta/conf/machine/include/tune-arm1136jf-s.inc
index bc90924e90..c1d0c0705b 100644
--- a/meta/conf/machine/include/tune-arm1136jf-s.inc
+++ b/meta/conf/machine/include/tune-arm1136jf-s.inc
@@ -1,7 +1,7 @@
1TUNE_ARCH = "arm" 1TUNE_ARCH = "arm"
2 2
3TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s" 3TUNE_CCARGS = "-march=armv6j -mtune=arm1136jf-s"
4TARGET_CC_ARCH += "${@['', '-mfloat-abi=softfp -mfpu=vfp'][(bb.data.getVar('TARGET_FPU', d, 1) == 'soft') and (bb.data.getVar('CPU_FEATURES', d, 1).find('vfp') != -1)]}" 4TUNE_CCARGS += "${@['', '-mfloat-abi=softfp -mfpu=vfp'][(bb.data.getVar('TARGET_FPU', d, 1) == 'soft') and (bb.data.getVar('CPU_FEATURES', d, 1).find('vfp') != -1)]}"
5TUNE_PKGARCH = "armv6" 5TUNE_PKGARCH = "armv6"
6 6
7ARM_INSTRUCTION_SET = "${@['thumb','arm'][bb.data.getVar('CPU_FEATURES', d, 1).find('thumb') == -1]}" 7ARM_INSTRUCTION_SET = "${@['thumb','arm'][bb.data.getVar('CPU_FEATURES', d, 1).find('thumb') == -1]}"
diff --git a/meta/conf/machine/include/tune-arm920t.inc b/meta/conf/machine/include/tune-arm920t.inc
index 2991e851d0..3f30e2ab87 100644
--- a/meta/conf/machine/include/tune-arm920t.inc
+++ b/meta/conf/machine/include/tune-arm920t.inc
@@ -1,5 +1,5 @@
1TUNE_ARCH = "arm" 1TUNE_ARCH = "arm"
2 2
3TUNE_PKGARCH = "armv4t" 3TUNE_PKGARCH = "armv4t"
4TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t" 4TUNE_CCARGS = "-march=armv4t -mtune=arm920t"
5PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t" 5PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t"
diff --git a/meta/conf/machine/include/tune-arm926ejs.inc b/meta/conf/machine/include/tune-arm926ejs.inc
index e54403b0ce..049f57cb3f 100644
--- a/meta/conf/machine/include/tune-arm926ejs.inc
+++ b/meta/conf/machine/include/tune-arm926ejs.inc
@@ -3,7 +3,7 @@ TUNE_ARCH = "arm"
3TUNE_PKGARCH = "armv5te" 3TUNE_PKGARCH = "armv5te"
4PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t armv5te" 4PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t armv5te"
5# For gcc 3.x you need: 5# For gcc 3.x you need:
6#TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs" 6#TUNE_CCARGS = "-march=armv5te -mtune=arm926ejs"
7# For gcc 4.x you need: 7# For gcc 4.x you need:
8TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ej-s" 8TUNE_CCARGS = "-march=armv5te -mtune=arm926ej-s"
9 9
diff --git a/meta/conf/machine/include/tune-arm9tdmi.inc b/meta/conf/machine/include/tune-arm9tdmi.inc
index b75de3d160..0ed2f40908 100644
--- a/meta/conf/machine/include/tune-arm9tdmi.inc
+++ b/meta/conf/machine/include/tune-arm9tdmi.inc
@@ -2,4 +2,4 @@ TUNE_ARCH = "arm"
2 2
3TUNE_PKGARCH = "armv4t" 3TUNE_PKGARCH = "armv4t"
4PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t" 4PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t"
5TARGET_CC_ARCH = "-mcpu=arm9tdmi -mtune=arm9tdmi" 5TUNE_CCARGS = "-mcpu=arm9tdmi -mtune=arm9tdmi"
diff --git a/meta/conf/machine/include/tune-armv7.inc b/meta/conf/machine/include/tune-armv7.inc
index a6cc346a51..2e32323ebf 100644
--- a/meta/conf/machine/include/tune-armv7.inc
+++ b/meta/conf/machine/include/tune-armv7.inc
@@ -3,6 +3,6 @@ TUNE_ARCH = "arm"
3# valid options for -march: `armv7', `armv7-a', `armv7-r', `armv7-m' 3# valid options for -march: `armv7', `armv7-a', `armv7-r', `armv7-m'
4# valid option for -mtune: `cortex-a8', `cortex-r4', `cortex-m3', `cortex-m1' 4# valid option for -mtune: `cortex-a8', `cortex-r4', `cortex-m3', `cortex-m1'
5# This will NOT compile programs in 'ARM' mode, which is what you really want 5# This will NOT compile programs in 'ARM' mode, which is what you really want
6TARGET_CC_ARCH = "-march=armv7 -mfpu=vfp -mfloat-abi=softfp" 6TUNE_CCARGS = "-march=armv7 -mfpu=vfp -mfloat-abi=softfp"
7TUNE_PKGARCH = "armv7" 7TUNE_PKGARCH = "armv7"
8PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t armv5te armv6 armv7" 8PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t armv5te armv6 armv7"
diff --git a/meta/conf/machine/include/tune-atom.inc b/meta/conf/machine/include/tune-atom.inc
index 8141a67285..52acd12ba8 100644
--- a/meta/conf/machine/include/tune-atom.inc
+++ b/meta/conf/machine/include/tune-atom.inc
@@ -1,7 +1,7 @@
1TUNE_ARCH = "i586" 1TUNE_ARCH = "i586"
2 2
3TUNE_PKGARCH = "core2" 3TUNE_PKGARCH = "core2"
4TARGET_CC_ARCH = "-m32 -march=core2 -msse3 -mtune=generic -mfpmath=sse" 4TUNE_CCARGS = "-m32 -march=core2 -msse3 -mtune=generic -mfpmath=sse"
5#MOBLIN_CFLAGS = "-Os -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -fasynchronous-unwind-tables" 5#MOBLIN_CFLAGS = "-Os -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -fasynchronous-unwind-tables"
6 6
7PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586 i686 core2" 7PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586 i686 core2"
diff --git a/meta/conf/machine/include/tune-c3.inc b/meta/conf/machine/include/tune-c3.inc
index dd8dce1ef3..dbe1e43abc 100644
--- a/meta/conf/machine/include/tune-c3.inc
+++ b/meta/conf/machine/include/tune-c3.inc
@@ -2,5 +2,5 @@ TUNE_ARCH = "i586"
2 2
3TUNE_PKGARCH = "i586" 3TUNE_PKGARCH = "i586"
4 4
5TARGET_CC_ARCH = "-march=c3 -mtune=c3" 5TUNE_CCARGS = "-march=c3 -mtune=c3"
6PACKAGE_EXTRA_ARCHS = "i386 i486 i586" 6PACKAGE_EXTRA_ARCHS = "i386 i486 i586"
diff --git a/meta/conf/machine/include/tune-cortexa8.inc b/meta/conf/machine/include/tune-cortexa8.inc
index cf5b418287..9be423abff 100644
--- a/meta/conf/machine/include/tune-cortexa8.inc
+++ b/meta/conf/machine/include/tune-cortexa8.inc
@@ -5,7 +5,7 @@ TUNE_ARCH = "arm"
5# [2] http://gcc.gnu.org/onlinedocs/gcc/ARM-Options.html 5# [2] http://gcc.gnu.org/onlinedocs/gcc/ARM-Options.html
6# [3] https://support.codesourcery.com/GNUToolchain/kbentry29 6# [3] https://support.codesourcery.com/GNUToolchain/kbentry29
7 7
8TARGET_CC_ARCH = "-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp -fno-tree-vectorize" 8TUNE_CCARGS = "-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp -fno-tree-vectorize"
9 9
10# Other potentially useful options 10# Other potentially useful options
11#-ftree-vectorize -ffast-math -fno-omit-frame-pointer 11#-ftree-vectorize -ffast-math -fno-omit-frame-pointer
diff --git a/meta/conf/machine/include/tune-cortexm1.inc b/meta/conf/machine/include/tune-cortexm1.inc
index 6dbfd2c796..d0d3b2cb17 100644
--- a/meta/conf/machine/include/tune-cortexm1.inc
+++ b/meta/conf/machine/include/tune-cortexm1.inc
@@ -1,4 +1,4 @@
1TUNE_ARCH = "arm" 1TUNE_ARCH = "arm"
2 2
3TARGET_CC_ARCH = "-march=armv7 -mtune=cortex-m1 -mfpu=vfp -mfloat-abi=softfp" 3TUNE_CCARGS = "-march=armv7 -mtune=cortex-m1 -mfpu=vfp -mfloat-abi=softfp"
4TUNE_PKGARCH = "armv6" 4TUNE_PKGARCH = "armv6"
diff --git a/meta/conf/machine/include/tune-cortexm3.inc b/meta/conf/machine/include/tune-cortexm3.inc
index 63959e4371..495c8f6420 100644
--- a/meta/conf/machine/include/tune-cortexm3.inc
+++ b/meta/conf/machine/include/tune-cortexm3.inc
@@ -1,5 +1,5 @@
1TUNE_ARCH = "arm" 1TUNE_ARCH = "arm"
2 2
3# valid options for -march: `armv7', `armv7-m' 3# valid options for -march: `armv7', `armv7-m'
4TARGET_CC_ARCH = "-march=armv7-m -mtune=cortex-m3 -mfpu=vfp -mfloat-abi=softfp" 4TUNE_CCARGS = "-march=armv7-m -mtune=cortex-m3 -mfpu=vfp -mfloat-abi=softfp"
5TUNE_PKGARCH = "armv7" 5TUNE_PKGARCH = "armv7"
diff --git a/meta/conf/machine/include/tune-cortexr4.inc b/meta/conf/machine/include/tune-cortexr4.inc
index 780a5101a7..c775e8309e 100644
--- a/meta/conf/machine/include/tune-cortexr4.inc
+++ b/meta/conf/machine/include/tune-cortexr4.inc
@@ -1,5 +1,5 @@
1TUNE_ARCH = "arm" 1TUNE_ARCH = "arm"
2 2
3# valid options for -march: `armv7', `armv7-r' 3# valid options for -march: `armv7', `armv7-r'
4TARGET_CC_ARCH = "-march=armv7-r -mtune=cortex-r4 -mfpu=vfp -mfloat-abi=softfp" 4TUNE_CCARGS = "-march=armv7-r -mtune=cortex-r4 -mfpu=vfp -mfloat-abi=softfp"
5TUNE_PKGARCH = "armv7" 5TUNE_PKGARCH = "armv7"
diff --git a/meta/conf/machine/include/tune-ep9312.inc b/meta/conf/machine/include/tune-ep9312.inc
index 81be6ddcfd..8c7fc5a1d8 100644
--- a/meta/conf/machine/include/tune-ep9312.inc
+++ b/meta/conf/machine/include/tune-ep9312.inc
@@ -1,6 +1,6 @@
1TUNE_ARCH = "arm" 1TUNE_ARCH = "arm"
2 2
3TARGET_CC_ARCH = "-march=ep9312 -mtune=ep9312 -mcpu=ep9312" 3TUNE_CCARGS = "-march=ep9312 -mtune=ep9312 -mcpu=ep9312"
4# add "-mfp=maverick" for newer gcc versions > 4.0 4# add "-mfp=maverick" for newer gcc versions > 4.0
5 5
6#set arch to ep9312 for all generated packages 6#set arch to ep9312 for all generated packages
diff --git a/meta/conf/machine/include/tune-i586.inc b/meta/conf/machine/include/tune-i586.inc
index 7ea8b4fbd7..1dc44dfd67 100644
--- a/meta/conf/machine/include/tune-i586.inc
+++ b/meta/conf/machine/include/tune-i586.inc
@@ -1,6 +1,6 @@
1TUNE_ARCH = "i586" 1TUNE_ARCH = "i586"
2 2
3TUNE_PKGARCH = "i586" 3TUNE_PKGARCH = "i586"
4TARGET_CC_ARCH = "-m32 -march=i586" 4TUNE_CCARGS = "-m32 -march=i586"
5 5
6PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586" 6PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586"
diff --git a/meta/conf/machine/include/tune-iwmmxt.inc b/meta/conf/machine/include/tune-iwmmxt.inc
index 68e118a61b..236cede988 100644
--- a/meta/conf/machine/include/tune-iwmmxt.inc
+++ b/meta/conf/machine/include/tune-iwmmxt.inc
@@ -2,7 +2,7 @@ TUNE_ARCH = "arm"
2 2
3# Configurations for the Intel PXA27x Appications Processor Family. 3# Configurations for the Intel PXA27x Appications Processor Family.
4# Please use tune-xscale for PXA255/PXA26x based processors. 4# Please use tune-xscale for PXA255/PXA26x based processors.
5TARGET_CC_ARCH = "-march=iwmmxt -mcpu=iwmmxt -mtune=iwmmxt" 5TUNE_CCARGS = "-march=iwmmxt -mcpu=iwmmxt -mtune=iwmmxt"
6PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t armv5te iwmmxt" 6PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t armv5te iwmmxt"
7TUNE_PKGARCH = "iwmmxt" 7TUNE_PKGARCH = "iwmmxt"
8 8
diff --git a/meta/conf/machine/include/tune-mips32.inc b/meta/conf/machine/include/tune-mips32.inc
index a7bcb5008a..182d16cf22 100644
--- a/meta/conf/machine/include/tune-mips32.inc
+++ b/meta/conf/machine/include/tune-mips32.inc
@@ -1,4 +1,4 @@
1TUNE_ARCH = "mips" 1TUNE_ARCH = "mips"
2 2
3TARGET_CC_ARCH = "-march=mips32" 3TUNE_CCARGS = "-march=mips32"
4TUNE_PKGARCH = "mips" 4TUNE_PKGARCH = "mips"
diff --git a/meta/conf/machine/include/tune-ppc603e.inc b/meta/conf/machine/include/tune-ppc603e.inc
index daa1cd37a4..ec43cfe831 100644
--- a/meta/conf/machine/include/tune-ppc603e.inc
+++ b/meta/conf/machine/include/tune-ppc603e.inc
@@ -1,5 +1,5 @@
1TUNE_ARCH = "powerpc" 1TUNE_ARCH = "powerpc"
2 2
3TARGET_CC_ARCH = "-mcpu=603e -mhard-float" 3TUNE_CCARGS = "-mcpu=603e -mhard-float"
4TUNE_PKGARCH = "ppc603e" 4TUNE_PKGARCH = "ppc603e"
5PACKAGE_EXTRA_ARCHS = "powerpc ppc603e" 5PACKAGE_EXTRA_ARCHS = "powerpc ppc603e"
diff --git a/meta/conf/machine/include/tune-ppce300c2.inc b/meta/conf/machine/include/tune-ppce300c2.inc
index a2989ae0dd..ac232424bf 100644
--- a/meta/conf/machine/include/tune-ppce300c2.inc
+++ b/meta/conf/machine/include/tune-ppce300c2.inc
@@ -1,5 +1,5 @@
1TUNE_ARCH = "powerpc" 1TUNE_ARCH = "powerpc"
2 2
3TARGET_CC_ARCH = "-mcpu=e300c2 -msoft-float" 3TUNE_CCARGS = "-mcpu=e300c2 -msoft-float"
4TUNE_PKGARCH = "ppce300" 4TUNE_PKGARCH = "ppce300"
5PACKAGE_EXTRA_ARCHS = "powerpc ppce300" 5PACKAGE_EXTRA_ARCHS = "powerpc ppce300"
diff --git a/meta/conf/machine/include/tune-ppce500.inc b/meta/conf/machine/include/tune-ppce500.inc
index 8d67b86998..a342cfba9f 100644
--- a/meta/conf/machine/include/tune-ppce500.inc
+++ b/meta/conf/machine/include/tune-ppce500.inc
@@ -1,6 +1,6 @@
1TUNE_ARCH = "powerpc" 1TUNE_ARCH = "powerpc"
2 2
3TARGET_CC_ARCH = "-mcpu=8540" 3TUNE_CCARGS = "-mcpu=8540"
4BASE_PACKAGE_ARCH = "ppce500" 4BASE_PACKAGE_ARCH = "ppce500"
5TUNE_PKGARCH = "ppce500" 5TUNE_PKGARCH = "ppce500"
6PACKAGE_EXTRA_ARCHS = "powerpc ppce500" 6PACKAGE_EXTRA_ARCHS = "powerpc ppce500"
diff --git a/meta/conf/machine/include/tune-ppce500mc.inc b/meta/conf/machine/include/tune-ppce500mc.inc
index 0cdcfa83fb..497c1a412d 100644
--- a/meta/conf/machine/include/tune-ppce500mc.inc
+++ b/meta/conf/machine/include/tune-ppce500mc.inc
@@ -1,5 +1,5 @@
1TUNE_ARCH = "powerpc" 1TUNE_ARCH = "powerpc"
2 2
3TARGET_CC_ARCH = "-mcpu=e500mc" 3TUNE_CCARGS = "-mcpu=e500mc"
4TUNE_PKGARCH = "ppce500mc" 4TUNE_PKGARCH = "ppce500mc"
5PACKAGE_EXTRA_ARCHS = "powerpc ppce500mc" 5PACKAGE_EXTRA_ARCHS = "powerpc ppce500mc"
diff --git a/meta/conf/machine/include/tune-ppce500v2.inc b/meta/conf/machine/include/tune-ppce500v2.inc
index 219bcaf9ff..1c56829795 100644
--- a/meta/conf/machine/include/tune-ppce500v2.inc
+++ b/meta/conf/machine/include/tune-ppce500v2.inc
@@ -1,5 +1,5 @@
1TUNE_ARCH = "powerpc" 1TUNE_ARCH = "powerpc"
2 2
3TARGET_CC_ARCH = "-mcpu=8548 -mabi=spe -mspe" 3TUNE_CCARGS = "-mcpu=8548 -mabi=spe -mspe"
4TUNE_PKGARCH = "ppce500v2" 4TUNE_PKGARCH = "ppce500v2"
5PACKAGE_EXTRA_ARCHS = "powerpc ppce500v2" 5PACKAGE_EXTRA_ARCHS = "powerpc ppce500v2"
diff --git a/meta/conf/machine/include/tune-sh3.inc b/meta/conf/machine/include/tune-sh3.inc
index 45ad6deb67..dd12cd4ace 100644
--- a/meta/conf/machine/include/tune-sh3.inc
+++ b/meta/conf/machine/include/tune-sh3.inc
@@ -1,4 +1,4 @@
1TUNE_ARCH = "sh3" 1TUNE_ARCH = "sh3"
2 2
3TARGET_CC_ARCH = "-ml -m3" 3TUNE_CCARGS = "-ml -m3"
4TUNE_PKGARCH = "sh3" 4TUNE_PKGARCH = "sh3"
diff --git a/meta/conf/machine/include/tune-sh4.inc b/meta/conf/machine/include/tune-sh4.inc
index 3d89d4948d..473122cb57 100644
--- a/meta/conf/machine/include/tune-sh4.inc
+++ b/meta/conf/machine/include/tune-sh4.inc
@@ -4,5 +4,5 @@ TUNE_ARCH = "sh4"
4# But it is not compatible for sh4. 4# But it is not compatible for sh4.
5# The binary optimized by m4a doesn't operate on sh4. It works on sh4a only. 5# The binary optimized by m4a doesn't operate on sh4. It works on sh4a only.
6 6
7TARGET_CC_ARCH = "-ml -m4" 7TUNE_CCARGS = "-ml -m4"
8TUNE_PKGARCH = "sh4" 8TUNE_PKGARCH = "sh4"
diff --git a/meta/conf/machine/include/tune-strongarm1100.inc b/meta/conf/machine/include/tune-strongarm1100.inc
index 2d4ce3842d..ec290532a2 100644
--- a/meta/conf/machine/include/tune-strongarm1100.inc
+++ b/meta/conf/machine/include/tune-strongarm1100.inc
@@ -5,5 +5,5 @@ TUNE_PKGARCH = "arm"
5# This machine lists common configuration options for Strongarm 1100 devices 5# This machine lists common configuration options for Strongarm 1100 devices
6# NOTE: The Zaurus Collie also has a Strongarm processor, but uses the 1110 type 6# NOTE: The Zaurus Collie also has a Strongarm processor, but uses the 1110 type
7 7
8TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm1100" 8TUNE_CCARGS = "-march=armv4 -mtune=strongarm1100"
9 9
diff --git a/meta/conf/machine/include/tune-supersparc.inc b/meta/conf/machine/include/tune-supersparc.inc
index 7eaa73640d..0faa361f18 100644
--- a/meta/conf/machine/include/tune-supersparc.inc
+++ b/meta/conf/machine/include/tune-supersparc.inc
@@ -1,4 +1,4 @@
1TUNE_ARCH = "sparc" 1TUNE_ARCH = "sparc"
2 2
3TARGET_CC_ARCH = "-mcpu=supersparc" 3TUNE_CCARGS = "-mcpu=supersparc"
4TUNE_PKGARCH = "supersparc" 4TUNE_PKGARCH = "supersparc"
diff --git a/meta/conf/machine/include/tune-thumb.inc b/meta/conf/machine/include/tune-thumb.inc
index a25cb5320c..9f6ce95a47 100644
--- a/meta/conf/machine/include/tune-thumb.inc
+++ b/meta/conf/machine/include/tune-thumb.inc
@@ -27,6 +27,6 @@ ARM_INTERWORK_M_OPT = "${@['-mno-thumb-interwork', '-mthumb-interwork'][bb.data.
27ARM_THUMB_M_OPT = "${@['-mno-thumb', '-mthumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}" 27ARM_THUMB_M_OPT = "${@['-mno-thumb', '-mthumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}"
28 28
29# 29#
30TARGET_CC_ARCH += "${ARM_INTERWORK_M_OPT} ${ARM_THUMB_M_OPT}" 30TUNE_CCARGS += "${ARM_INTERWORK_M_OPT} ${ARM_THUMB_M_OPT}"
31TARGET_CC_KERNEL_ARCH += "-mno-thumb-interwork -mno-thumb" 31TARGET_CC_KERNEL_ARCH += "-mno-thumb-interwork -mno-thumb"
32 32
diff --git a/meta/conf/machine/include/tune-x86_64.inc b/meta/conf/machine/include/tune-x86_64.inc
index d7665ecb96..08ff30a23d 100644
--- a/meta/conf/machine/include/tune-x86_64.inc
+++ b/meta/conf/machine/include/tune-x86_64.inc
@@ -1,5 +1,5 @@
1TUNE_ARCH = "x86_64" 1TUNE_ARCH = "x86_64"
2 2
3TUNE_PKGARCH = "x86_64" 3TUNE_PKGARCH = "x86_64"
4TARGET_CC_ARCH = "-m64" 4TUNE_CCARGS = "-m64"
5 5
diff --git a/meta/conf/machine/include/tune-xscale.inc b/meta/conf/machine/include/tune-xscale.inc
index 69c60f5f27..9618a8b513 100644
--- a/meta/conf/machine/include/tune-xscale.inc
+++ b/meta/conf/machine/include/tune-xscale.inc
@@ -2,12 +2,12 @@ TUNE_ARCH = "arm"
2 2
3INHERIT += "siteinfo" 3INHERIT += "siteinfo"
4 4
5TARGET_CC_ARCH = "-march=armv5te -mtune=xscale" 5TUNE_CCARGS = "-march=armv5te -mtune=xscale"
6TARGET_CC_KERNEL_ARCH = "-march=armv5te -mtune=xscale" 6TARGET_CC_KERNEL_ARCH = "-march=armv5te -mtune=xscale"
7TUNE_PKGARCH = "${@['armv5teb', 'armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}" 7TUNE_PKGARCH = "${@['armv5teb', 'armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}"
8PACKAGE_EXTRA_ARCHS = "${@['armeb armv4b armv4tb armv5teb', 'arm armv4 armv4t armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}" 8PACKAGE_EXTRA_ARCHS = "${@['armeb armv4b armv4tb armv5teb', 'arm armv4 armv4t armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}"
9 9
10# webkit-gtk has alignment issues with double instructions on armv5 so 10# webkit-gtk has alignment issues with double instructions on armv5 so
11# disable them here 11# disable them here
12TARGET_CC_ARCH_pn-webkit-gtk = "-march=armv4t" 12TUNE_CCARGS_pn-webkit-gtk = "-march=armv4t"
13TARGET_CC_ARCH_pn-cairo = "-march=armv4t" 13TUNE_CCARGS_pn-cairo = "-march=armv4t"