summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/classes/sanity.bbclass10
-rw-r--r--meta/conf/bitbake.conf7
-rw-r--r--meta/conf/machine/include/tune-arm1136jf-s.inc5
-rw-r--r--meta/conf/machine/include/tune-arm920t.inc5
-rw-r--r--meta/conf/machine/include/tune-arm926ejs.inc6
-rw-r--r--meta/conf/machine/include/tune-arm9tdmi.inc5
-rw-r--r--meta/conf/machine/include/tune-armv7.inc5
-rw-r--r--meta/conf/machine/include/tune-atom.inc4
-rw-r--r--meta/conf/machine/include/tune-c3.inc6
-rw-r--r--meta/conf/machine/include/tune-cortexa8.inc5
-rw-r--r--meta/conf/machine/include/tune-cortexm1.inc5
-rw-r--r--meta/conf/machine/include/tune-cortexm3.inc5
-rw-r--r--meta/conf/machine/include/tune-cortexr4.inc5
-rw-r--r--meta/conf/machine/include/tune-ep9312.inc5
-rw-r--r--meta/conf/machine/include/tune-i586.inc6
-rw-r--r--meta/conf/machine/include/tune-iwmmxt.inc5
-rw-r--r--meta/conf/machine/include/tune-mips32.inc5
-rw-r--r--meta/conf/machine/include/tune-ppc603e.inc5
-rw-r--r--meta/conf/machine/include/tune-ppce300c2.inc4
-rw-r--r--meta/conf/machine/include/tune-ppce500.inc4
-rw-r--r--meta/conf/machine/include/tune-ppce500mc.inc5
-rw-r--r--meta/conf/machine/include/tune-ppce500v2.inc5
-rw-r--r--meta/conf/machine/include/tune-sh3.inc5
-rw-r--r--meta/conf/machine/include/tune-sh4.inc5
-rw-r--r--meta/conf/machine/include/tune-strongarm1100.inc4
-rw-r--r--meta/conf/machine/include/tune-supersparc.inc5
-rw-r--r--meta/conf/machine/include/tune-x86_64.inc5
-rw-r--r--meta/conf/machine/include/tune-xscale.inc4
-rw-r--r--meta/conf/machine/qemuarm.conf2
-rw-r--r--meta/conf/machine/qemumips.conf2
-rw-r--r--meta/conf/machine/qemuppc.conf2
-rw-r--r--meta/conf/machine/qemux86-64.conf3
-rw-r--r--meta/conf/machine/qemux86.conf4
33 files changed, 98 insertions, 60 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index acda1a9e46..b054146bd1 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -147,9 +147,13 @@ def check_sanity(e):
147 if (LooseVersion(__version__) < LooseVersion(minversion)): 147 if (LooseVersion(__version__) < LooseVersion(minversion)):
148 messages = messages + 'Bitbake version %s is required and version %s was found\n' % (minversion, __version__) 148 messages = messages + 'Bitbake version %s is required and version %s was found\n' % (minversion, __version__)
149 149
150 # Check TARGET_ARCH is set 150 # Check TUNE_ARCH is set
151 if data.getVar('TARGET_ARCH', e.data, True) == 'INVALID': 151 if data.getVar('TUNE_ARCH', e.data, True) == 'INVALID':
152 messages = messages + 'Please set TARGET_ARCH directly, or choose a MACHINE or DISTRO that does so.\n' 152 messages = messages + 'TUNE_ARCH is unset. Please ensure your MACHINE configuration includes a valid tune configuration file which will set this correctly.\n'
153
154 # Check TARGET_ARCH is set correctly
155 if data.getVar('TARGE_ARCH', e.data, False) == '${TUNE_ARCH}':
156 messages = messages + 'TARGET_ARCH is being overwritten, likely by your MACHINE configuration files.\nPlease use a valid tune configuration file which should set this correctly automatically\nand avoid setting this in the machine configuration. See the OE-Core mailing list for more information.\n'
153 157
154 # Check TARGET_OS is set 158 # Check TARGET_OS is set
155 if data.getVar('TARGET_OS', e.data, True) == 'INVALID': 159 if data.getVar('TARGET_OS', e.data, True) == 'INVALID':
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index e768df5f7f..f95343f67a 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -81,7 +81,8 @@ HOST_PREFIX = "${TARGET_PREFIX}"
81HOST_CC_ARCH = "${TARGET_CC_ARCH}" 81HOST_CC_ARCH = "${TARGET_CC_ARCH}"
82HOST_EXEEXT = "" 82HOST_EXEEXT = ""
83 83
84TARGET_ARCH = "INVALID" 84TUNE_ARCH ??= "INVALID"
85TARGET_ARCH = "${TUNE_ARCH}"
85TARGET_OS = "INVALID" 86TARGET_OS = "INVALID"
86TARGET_VENDOR = "-oe" 87TARGET_VENDOR = "-oe"
87TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}" 88TARGET_SYS = "${TARGET_ARCH}${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]}"
@@ -95,9 +96,9 @@ SDK_SYS = "${SDK_ARCH}${SDK_VENDOR}${@['-' + bb.data.getVar('SDK_OS', d, 1), '']
95SDK_PREFIX = "${SDK_SYS}-" 96SDK_PREFIX = "${SDK_SYS}-"
96SDK_CC_ARCH = "${BUILD_CC_ARCH}" 97SDK_CC_ARCH = "${BUILD_CC_ARCH}"
97 98
98BASE_PACKAGE_ARCH = "${HOST_ARCH}" 99BASE_PACKAGE_ARCH = "${TUNE_PKGARCH}"
99PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}" 100PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}"
100MACHINE_ARCH = "${@[bb.data.getVar('BASE_PACKAGE_ARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))].replace('-', '_')}" 101MACHINE_ARCH = "${@[bb.data.getVar('TUNE_PKGARCH', d, 1), bb.data.getVar('MACHINE', d, 1)][bool(bb.data.getVar('MACHINE', d, 1))].replace('-', '_')}"
101PACKAGE_EXTRA_ARCHS ??= "${TARGET_ARCH}" 102PACKAGE_EXTRA_ARCHS ??= "${TARGET_ARCH}"
102PACKAGE_ARCHS = "all any noarch ${PACKAGE_EXTRA_ARCHS} ${MACHINE_ARCH}" 103PACKAGE_ARCHS = "all any noarch ${PACKAGE_EXTRA_ARCHS} ${MACHINE_ARCH}"
103# MACHINE_ARCH shouldn't be included here as a variable dependency 104# MACHINE_ARCH shouldn't be included here as a variable dependency
diff --git a/meta/conf/machine/include/tune-arm1136jf-s.inc b/meta/conf/machine/include/tune-arm1136jf-s.inc
index 2ea3c9d792..bc90924e90 100644
--- a/meta/conf/machine/include/tune-arm1136jf-s.inc
+++ b/meta/conf/machine/include/tune-arm1136jf-s.inc
@@ -1,7 +1,8 @@
1TUNE_ARCH = "arm"
2
1TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s" 3TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s"
2TARGET_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)]}" 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)]}"
3FEED_ARCH = "armv6" 5TUNE_PKGARCH = "armv6"
4BASE_PACKAGE_ARCH = "armv6"
5 6
6ARM_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]}"
7PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t armv5te armv6" 8PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t armv5te armv6"
diff --git a/meta/conf/machine/include/tune-arm920t.inc b/meta/conf/machine/include/tune-arm920t.inc
index 564b5572aa..2991e851d0 100644
--- a/meta/conf/machine/include/tune-arm920t.inc
+++ b/meta/conf/machine/include/tune-arm920t.inc
@@ -1,4 +1,5 @@
1FEED_ARCH = "armv4t" 1TUNE_ARCH = "arm"
2BASE_PACKAGE_ARCH = "armv4t" 2
3TUNE_PKGARCH = "armv4t"
3TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t" 4TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t"
4PACKAGE_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 9d546c9fda..e54403b0ce 100644
--- a/meta/conf/machine/include/tune-arm926ejs.inc
+++ b/meta/conf/machine/include/tune-arm926ejs.inc
@@ -1,7 +1,9 @@
1FEED_ARCH = "armv5te" 1TUNE_ARCH = "arm"
2
3TUNE_PKGARCH = "armv5te"
2PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t armv5te" 4PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t armv5te"
3# For gcc 3.x you need: 5# For gcc 3.x you need:
4#TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs" 6#TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs"
5# For gcc 4.x you need: 7# For gcc 4.x you need:
6TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ej-s" 8TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ej-s"
7BASE_PACKAGE_ARCH = "armv5te" 9
diff --git a/meta/conf/machine/include/tune-arm9tdmi.inc b/meta/conf/machine/include/tune-arm9tdmi.inc
index 5446ce8ecc..b75de3d160 100644
--- a/meta/conf/machine/include/tune-arm9tdmi.inc
+++ b/meta/conf/machine/include/tune-arm9tdmi.inc
@@ -1,4 +1,5 @@
1FEED_ARCH = "armv4t" 1TUNE_ARCH = "arm"
2BASE_PACKAGE_ARCH = "armv4t" 2
3TUNE_PKGARCH = "armv4t"
3PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t" 4PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t"
4TARGET_CC_ARCH = "-mcpu=arm9tdmi -mtune=arm9tdmi" 5TARGET_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 979d6fedb7..a6cc346a51 100644
--- a/meta/conf/machine/include/tune-armv7.inc
+++ b/meta/conf/machine/include/tune-armv7.inc
@@ -1,7 +1,8 @@
1TUNE_ARCH = "arm"
2
1# valid options for -march: `armv7', `armv7-a', `armv7-r', `armv7-m' 3# valid options for -march: `armv7', `armv7-a', `armv7-r', `armv7-m'
2# 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'
3# 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
4TARGET_CC_ARCH = "-march=armv7 -mfpu=vfp -mfloat-abi=softfp" 6TARGET_CC_ARCH = "-march=armv7 -mfpu=vfp -mfloat-abi=softfp"
5FEED_ARCH = "armv7" 7TUNE_PKGARCH = "armv7"
6PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t armv5te armv6 armv7" 8PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t armv5te armv6 armv7"
7BASE_PACKAGE_ARCH = "armv7"
diff --git a/meta/conf/machine/include/tune-atom.inc b/meta/conf/machine/include/tune-atom.inc
index 399ea542d4..8141a67285 100644
--- a/meta/conf/machine/include/tune-atom.inc
+++ b/meta/conf/machine/include/tune-atom.inc
@@ -1,4 +1,6 @@
1BASE_PACKAGE_ARCH = "core2" 1TUNE_ARCH = "i586"
2
3TUNE_PKGARCH = "core2"
2TARGET_CC_ARCH = "-m32 -march=core2 -msse3 -mtune=generic -mfpmath=sse" 4TARGET_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" 5#MOBLIN_CFLAGS = "-Os -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -fasynchronous-unwind-tables"
4 6
diff --git a/meta/conf/machine/include/tune-c3.inc b/meta/conf/machine/include/tune-c3.inc
index d33df5f1e3..dd8dce1ef3 100644
--- a/meta/conf/machine/include/tune-c3.inc
+++ b/meta/conf/machine/include/tune-c3.inc
@@ -1,4 +1,6 @@
1TUNE_ARCH = "i586"
2
3TUNE_PKGARCH = "i586"
4
1TARGET_CC_ARCH = "-march=c3 -mtune=c3" 5TARGET_CC_ARCH = "-march=c3 -mtune=c3"
2PACKAGE_EXTRA_ARCHS = "i386 i486 i586" 6PACKAGE_EXTRA_ARCHS = "i386 i486 i586"
3BASE_PACKAGE_ARCH = "i586"
4FEED_ARCH = "i586"
diff --git a/meta/conf/machine/include/tune-cortexa8.inc b/meta/conf/machine/include/tune-cortexa8.inc
index a5b982ab78..cf5b418287 100644
--- a/meta/conf/machine/include/tune-cortexa8.inc
+++ b/meta/conf/machine/include/tune-cortexa8.inc
@@ -1,3 +1,5 @@
1TUNE_ARCH = "arm"
2
1# Instead of using -mfpu=vfp[2] we can use -mfpu=neon to make use of gcc intrinsics[1] and vectorize loops with -ftree-vectorize[3] 3# Instead of using -mfpu=vfp[2] we can use -mfpu=neon to make use of gcc intrinsics[1] and vectorize loops with -ftree-vectorize[3]
2# [1] http://gcc.gnu.org/onlinedocs/gcc/ARM-NEON-Intrinsics.html 4# [1] http://gcc.gnu.org/onlinedocs/gcc/ARM-NEON-Intrinsics.html
3# [2] http://gcc.gnu.org/onlinedocs/gcc/ARM-Options.html 5# [2] http://gcc.gnu.org/onlinedocs/gcc/ARM-Options.html
@@ -8,6 +10,5 @@ TARGET_CC_ARCH = "-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp
8# Other potentially useful options 10# Other potentially useful options
9#-ftree-vectorize -ffast-math -fno-omit-frame-pointer 11#-ftree-vectorize -ffast-math -fno-omit-frame-pointer
10 12
11FEED_ARCH = "armv7a" 13TUNE_PKGARCH = "armv7a"
12BASE_PACKAGE_ARCH = "armv7a"
13PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t armv5te armv6 armv7 armv7a" 14PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t armv5te armv6 armv7 armv7a"
diff --git a/meta/conf/machine/include/tune-cortexm1.inc b/meta/conf/machine/include/tune-cortexm1.inc
index 6c4a70a24d..6dbfd2c796 100644
--- a/meta/conf/machine/include/tune-cortexm1.inc
+++ b/meta/conf/machine/include/tune-cortexm1.inc
@@ -1,3 +1,4 @@
1TUNE_ARCH = "arm"
2
1TARGET_CC_ARCH = "-march=armv7 -mtune=cortex-m1 -mfpu=vfp -mfloat-abi=softfp" 3TARGET_CC_ARCH = "-march=armv7 -mtune=cortex-m1 -mfpu=vfp -mfloat-abi=softfp"
2FEED_ARCH = "armv6" 4TUNE_PKGARCH = "armv6"
3BASE_PACKAGE_ARCH = "armv6"
diff --git a/meta/conf/machine/include/tune-cortexm3.inc b/meta/conf/machine/include/tune-cortexm3.inc
index 6da9aeedda..63959e4371 100644
--- a/meta/conf/machine/include/tune-cortexm3.inc
+++ b/meta/conf/machine/include/tune-cortexm3.inc
@@ -1,4 +1,5 @@
1TUNE_ARCH = "arm"
2
1# valid options for -march: `armv7', `armv7-m' 3# valid options for -march: `armv7', `armv7-m'
2TARGET_CC_ARCH = "-march=armv7-m -mtune=cortex-m3 -mfpu=vfp -mfloat-abi=softfp" 4TARGET_CC_ARCH = "-march=armv7-m -mtune=cortex-m3 -mfpu=vfp -mfloat-abi=softfp"
3FEED_ARCH = "armv7" 5TUNE_PKGARCH = "armv7"
4BASE_PACKAGE_ARCH = "armv7"
diff --git a/meta/conf/machine/include/tune-cortexr4.inc b/meta/conf/machine/include/tune-cortexr4.inc
index b8bb7f50ae..780a5101a7 100644
--- a/meta/conf/machine/include/tune-cortexr4.inc
+++ b/meta/conf/machine/include/tune-cortexr4.inc
@@ -1,4 +1,5 @@
1TUNE_ARCH = "arm"
2
1# valid options for -march: `armv7', `armv7-r' 3# valid options for -march: `armv7', `armv7-r'
2TARGET_CC_ARCH = "-march=armv7-r -mtune=cortex-r4 -mfpu=vfp -mfloat-abi=softfp" 4TARGET_CC_ARCH = "-march=armv7-r -mtune=cortex-r4 -mfpu=vfp -mfloat-abi=softfp"
3FEED_ARCH = "armv7" 5TUNE_PKGARCH = "armv7"
4BASE_PACKAGE_ARCH = "armv7"
diff --git a/meta/conf/machine/include/tune-ep9312.inc b/meta/conf/machine/include/tune-ep9312.inc
index e1515a01a8..81be6ddcfd 100644
--- a/meta/conf/machine/include/tune-ep9312.inc
+++ b/meta/conf/machine/include/tune-ep9312.inc
@@ -1,8 +1,9 @@
1TUNE_ARCH = "arm"
2
1TARGET_CC_ARCH = "-march=ep9312 -mtune=ep9312 -mcpu=ep9312" 3TARGET_CC_ARCH = "-march=ep9312 -mtune=ep9312 -mcpu=ep9312"
2# add "-mfp=maverick" for newer gcc versions > 4.0 4# add "-mfp=maverick" for newer gcc versions > 4.0
3 5
4#set arch to ep9312 for all generated packages 6#set arch to ep9312 for all generated packages
5PACKAGE_EXTRA_ARCHS = "arm armv4t ep9312" 7PACKAGE_EXTRA_ARCHS = "arm armv4t ep9312"
6BASE_PACKAGE_ARCH = "ep9312" 8TUNE_PKGARCH = "ep9312"
7FEED_ARCH = "ep9312"
8 9
diff --git a/meta/conf/machine/include/tune-i586.inc b/meta/conf/machine/include/tune-i586.inc
new file mode 100644
index 0000000000..7ea8b4fbd7
--- /dev/null
+++ b/meta/conf/machine/include/tune-i586.inc
@@ -0,0 +1,6 @@
1TUNE_ARCH = "i586"
2
3TUNE_PKGARCH = "i586"
4TARGET_CC_ARCH = "-m32 -march=i586"
5
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 7191ab0b36..68e118a61b 100644
--- a/meta/conf/machine/include/tune-iwmmxt.inc
+++ b/meta/conf/machine/include/tune-iwmmxt.inc
@@ -1,7 +1,8 @@
1TUNE_ARCH = "arm"
2
1# Configurations for the Intel PXA27x Appications Processor Family. 3# Configurations for the Intel PXA27x Appications Processor Family.
2# Please use tune-xscale for PXA255/PXA26x based processors. 4# Please use tune-xscale for PXA255/PXA26x based processors.
3TARGET_CC_ARCH = "-march=iwmmxt -mcpu=iwmmxt -mtune=iwmmxt" 5TARGET_CC_ARCH = "-march=iwmmxt -mcpu=iwmmxt -mtune=iwmmxt"
4BASE_PACKAGE_ARCH = "iwmmxt"
5PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t armv5te iwmmxt" 6PACKAGE_EXTRA_ARCHS = "arm armv4 armv4t armv5te iwmmxt"
6FEED_ARCH = "iwmmxt" 7TUNE_PKGARCH = "iwmmxt"
7 8
diff --git a/meta/conf/machine/include/tune-mips32.inc b/meta/conf/machine/include/tune-mips32.inc
index 67edca2530..a7bcb5008a 100644
--- a/meta/conf/machine/include/tune-mips32.inc
+++ b/meta/conf/machine/include/tune-mips32.inc
@@ -1,3 +1,4 @@
1TUNE_ARCH = "mips"
2
1TARGET_CC_ARCH = "-march=mips32" 3TARGET_CC_ARCH = "-march=mips32"
2FEED_ARCH = "${TARGET_ARCH}" 4TUNE_PKGARCH = "mips"
3BASE_PACKAGE_ARCH = "${TARGET_ARCH}"
diff --git a/meta/conf/machine/include/tune-ppc603e.inc b/meta/conf/machine/include/tune-ppc603e.inc
index dc95d0d77d..daa1cd37a4 100644
--- a/meta/conf/machine/include/tune-ppc603e.inc
+++ b/meta/conf/machine/include/tune-ppc603e.inc
@@ -1,4 +1,5 @@
1TUNE_ARCH = "powerpc"
2
1TARGET_CC_ARCH = "-mcpu=603e -mhard-float" 3TARGET_CC_ARCH = "-mcpu=603e -mhard-float"
2BASE_PACKAGE_ARCH = "ppc603e" 4TUNE_PKGARCH = "ppc603e"
3FEED_ARCH = "ppc603e"
4PACKAGE_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 3e552e60d6..a2989ae0dd 100644
--- a/meta/conf/machine/include/tune-ppce300c2.inc
+++ b/meta/conf/machine/include/tune-ppce300c2.inc
@@ -1,3 +1,5 @@
1TUNE_ARCH = "powerpc"
2
1TARGET_CC_ARCH = "-mcpu=e300c2 -msoft-float" 3TARGET_CC_ARCH = "-mcpu=e300c2 -msoft-float"
2BASE_PACKAGE_ARCH = "ppce300" 4TUNE_PKGARCH = "ppce300"
3PACKAGE_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 45e1f0d494..8d67b86998 100644
--- a/meta/conf/machine/include/tune-ppce500.inc
+++ b/meta/conf/machine/include/tune-ppce500.inc
@@ -1,4 +1,6 @@
1TUNE_ARCH = "powerpc"
2
1TARGET_CC_ARCH = "-mcpu=8540" 3TARGET_CC_ARCH = "-mcpu=8540"
2BASE_PACKAGE_ARCH = "ppce500" 4BASE_PACKAGE_ARCH = "ppce500"
3FEED_ARCH = "ppce500" 5TUNE_PKGARCH = "ppce500"
4PACKAGE_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 763ec1a775..0cdcfa83fb 100644
--- a/meta/conf/machine/include/tune-ppce500mc.inc
+++ b/meta/conf/machine/include/tune-ppce500mc.inc
@@ -1,4 +1,5 @@
1TUNE_ARCH = "powerpc"
2
1TARGET_CC_ARCH = "-mcpu=e500mc" 3TARGET_CC_ARCH = "-mcpu=e500mc"
2BASE_PACKAGE_ARCH = "ppce500mc" 4TUNE_PKGARCH = "ppce500mc"
3FEED_ARCH = "ppce500mc"
4PACKAGE_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 d76dbc9a20..219bcaf9ff 100644
--- a/meta/conf/machine/include/tune-ppce500v2.inc
+++ b/meta/conf/machine/include/tune-ppce500v2.inc
@@ -1,4 +1,5 @@
1TUNE_ARCH = "powerpc"
2
1TARGET_CC_ARCH = "-mcpu=8548 -mabi=spe -mspe" 3TARGET_CC_ARCH = "-mcpu=8548 -mabi=spe -mspe"
2BASE_PACKAGE_ARCH = "ppce500v2" 4TUNE_PKGARCH = "ppce500v2"
3FEED_ARCH = "ppce500v2"
4PACKAGE_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 32801a61c3..45ad6deb67 100644
--- a/meta/conf/machine/include/tune-sh3.inc
+++ b/meta/conf/machine/include/tune-sh3.inc
@@ -1,3 +1,4 @@
1TUNE_ARCH = "sh3"
2
1TARGET_CC_ARCH = "-ml -m3" 3TARGET_CC_ARCH = "-ml -m3"
2FEED_ARCH = "sh3" 4TUNE_PKGARCH = "sh3"
3BASE_PACKAGE_ARCH = "sh3"
diff --git a/meta/conf/machine/include/tune-sh4.inc b/meta/conf/machine/include/tune-sh4.inc
index 51b40691bc..3d89d4948d 100644
--- a/meta/conf/machine/include/tune-sh4.inc
+++ b/meta/conf/machine/include/tune-sh4.inc
@@ -1,7 +1,8 @@
1TUNE_ARCH = "sh4"
2
1# NOTE: If you want to optimize to sh4a, conf/machine/include/tune-sh4a.inc. 3# NOTE: If you want to optimize to sh4a, conf/machine/include/tune-sh4a.inc.
2# But it is not compatible for sh4. 4# But it is not compatible for sh4.
3# 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.
4 6
5TARGET_CC_ARCH = "-ml -m4" 7TARGET_CC_ARCH = "-ml -m4"
6FEED_ARCH = "sh4" 8TUNE_PKGARCH = "sh4"
7BASE_PACKAGE_ARCH = "sh4"
diff --git a/meta/conf/machine/include/tune-strongarm1100.inc b/meta/conf/machine/include/tune-strongarm1100.inc
index f136710409..2d4ce3842d 100644
--- a/meta/conf/machine/include/tune-strongarm1100.inc
+++ b/meta/conf/machine/include/tune-strongarm1100.inc
@@ -1,3 +1,7 @@
1TUNE_ARCH = "arm"
2
3TUNE_PKGARCH = "arm"
4
1# This machine lists common configuration options for Strongarm 1100 devices 5# This machine lists common configuration options for Strongarm 1100 devices
2# 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
3 7
diff --git a/meta/conf/machine/include/tune-supersparc.inc b/meta/conf/machine/include/tune-supersparc.inc
index a402e7cd2b..7eaa73640d 100644
--- a/meta/conf/machine/include/tune-supersparc.inc
+++ b/meta/conf/machine/include/tune-supersparc.inc
@@ -1,3 +1,4 @@
1TUNE_ARCH = "sparc"
2
1TARGET_CC_ARCH = "-mcpu=supersparc" 3TARGET_CC_ARCH = "-mcpu=supersparc"
2BASE_PACKAGE_ARCH = "supersparc" 4TUNE_PKGARCH = "supersparc"
3FEED_ARCH = "supersparc"
diff --git a/meta/conf/machine/include/tune-x86_64.inc b/meta/conf/machine/include/tune-x86_64.inc
new file mode 100644
index 0000000000..d7665ecb96
--- /dev/null
+++ b/meta/conf/machine/include/tune-x86_64.inc
@@ -0,0 +1,5 @@
1TUNE_ARCH = "x86_64"
2
3TUNE_PKGARCH = "x86_64"
4TARGET_CC_ARCH = "-m64"
5
diff --git a/meta/conf/machine/include/tune-xscale.inc b/meta/conf/machine/include/tune-xscale.inc
index cfdcc99434..69c60f5f27 100644
--- a/meta/conf/machine/include/tune-xscale.inc
+++ b/meta/conf/machine/include/tune-xscale.inc
@@ -1,10 +1,10 @@
1FEED_ARCH = "armv5te" 1TUNE_ARCH = "arm"
2 2
3INHERIT += "siteinfo" 3INHERIT += "siteinfo"
4 4
5TARGET_CC_ARCH = "-march=armv5te -mtune=xscale" 5TARGET_CC_ARCH = "-march=armv5te -mtune=xscale"
6TARGET_CC_KERNEL_ARCH = "-march=armv5te -mtune=xscale" 6TARGET_CC_KERNEL_ARCH = "-march=armv5te -mtune=xscale"
7BASE_PACKAGE_ARCH = "${@['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
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf
index 9fb18932ca..526d713f50 100644
--- a/meta/conf/machine/qemuarm.conf
+++ b/meta/conf/machine/qemuarm.conf
@@ -2,8 +2,6 @@
2#@NAME: arm_versaile_926ejs 2#@NAME: arm_versaile_926ejs
3#@DESCRIPTION: arm_versaile_926ejs 3#@DESCRIPTION: arm_versaile_926ejs
4 4
5TARGET_ARCH = "arm"
6
7require conf/machine/include/qemu.inc 5require conf/machine/include/qemu.inc
8require conf/machine/include/tune-arm926ejs.inc 6require conf/machine/include/tune-arm926ejs.inc
9#require conf/machine/include/tune-arm1136jf-s.inc 7#require conf/machine/include/tune-arm1136jf-s.inc
diff --git a/meta/conf/machine/qemumips.conf b/meta/conf/machine/qemumips.conf
index 283ae1e1d4..ce1c419d1e 100644
--- a/meta/conf/machine/qemumips.conf
+++ b/meta/conf/machine/qemumips.conf
@@ -2,8 +2,6 @@
2#@NAME: mti_malta32_be MIPS 2#@NAME: mti_malta32_be MIPS
3#@DESCRIPTION: mti_malta32_be 3#@DESCRIPTION: mti_malta32_be
4 4
5TARGET_ARCH = "mips"
6
7require conf/machine/include/qemu.inc 5require conf/machine/include/qemu.inc
8require conf/machine/include/tune-mips32.inc 6require conf/machine/include/tune-mips32.inc
9 7
diff --git a/meta/conf/machine/qemuppc.conf b/meta/conf/machine/qemuppc.conf
index bfbcc7f1aa..dacc802ef0 100644
--- a/meta/conf/machine/qemuppc.conf
+++ b/meta/conf/machine/qemuppc.conf
@@ -2,8 +2,6 @@
2#@NAME: qemu PPC Emulator setup 2#@NAME: qemu PPC Emulator setup
3#@DESCRIPTION: Machine configuration for running an PPC system under qemu emulation 3#@DESCRIPTION: Machine configuration for running an PPC system under qemu emulation
4 4
5TARGET_ARCH = "powerpc"
6
7PREFERRED_PROVIDER_virtual/libgl = "mesa-xlib" 5PREFERRED_PROVIDER_virtual/libgl = "mesa-xlib"
8 6
9require conf/machine/include/qemu.inc 7require conf/machine/include/qemu.inc
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index ca91388978..46d7d1270d 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -10,6 +10,7 @@ PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
10PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite" 10PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
11PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite" 11PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
12 12
13require conf/machine/include/tune-x86_64.inc
13require conf/machine/include/qemu.inc 14require conf/machine/include/qemu.inc
14 15
15MACHINE_FEATURES += "x86" 16MACHINE_FEATURES += "x86"
@@ -31,5 +32,3 @@ GLIBC_ADDONS = "nptl"
31GLIBC_EXTRA_OECONF = "--with-tls" 32GLIBC_EXTRA_OECONF = "--with-tls"
32 33
33MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" 34MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"
34
35TARGET_CC_ARCH = "-m64"
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index 8b14731436..5d0d03e827 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -2,13 +2,12 @@
2#@NAME: common_pc 2#@NAME: common_pc
3#@DESCRIPTION: Machine configuration for running a common x86 3#@DESCRIPTION: Machine configuration for running a common x86
4 4
5TARGET_ARCH = "i586"
6
7PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" 5PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
8PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" 6PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
9PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite" 7PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
10PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite" 8PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
11 9
10require conf/machine/include/tune-i586.inc
12require conf/machine/include/qemu.inc 11require conf/machine/include/qemu.inc
13 12
14MACHINE_FEATURES += "x86" 13MACHINE_FEATURES += "x86"
@@ -31,4 +30,3 @@ GLIBC_EXTRA_OECONF = "--with-tls"
31 30
32MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" 31MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d"
33 32
34TARGET_CC_ARCH = "-march=i586"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-04 23:50:28 +0000