summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-07-17 20:40:34 +0000
committerRichard Purdie <richard@openedhand.com>2008-07-17 20:40:34 +0000
commit45d0dac16ad84f9eb0264dfd662238e3913619d6 (patch)
tree6aea25e2303425228e8de373ed55293dd3d72858 /meta/conf/machine
parenta906cd2a4b8ce4910b2e577e7ea56c7ec65e810c (diff)
downloadpoky-45d0dac16ad84f9eb0264dfd662238e3913619d6.tar.gz
bitbake.conf/tune.conf: Set BASE_PACKAGE_ARCH and build PACKAGE_ARCH from this
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4857 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/conf/machine')
-rw-r--r--meta/conf/machine/include/tune-arm1136jf-s.inc2
-rw-r--r--meta/conf/machine/include/tune-arm920t.inc2
-rw-r--r--meta/conf/machine/include/tune-arm926ejs.inc2
-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-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-iwmmxt.inc2
-rw-r--r--meta/conf/machine/include/tune-ppc603e.inc2
-rw-r--r--meta/conf/machine/include/tune-ppce500.inc2
-rw-r--r--meta/conf/machine/include/tune-supersparc.inc2
-rw-r--r--meta/conf/machine/include/tune-xscale.inc2
16 files changed, 16 insertions, 16 deletions
diff --git a/meta/conf/machine/include/tune-arm1136jf-s.inc b/meta/conf/machine/include/tune-arm1136jf-s.inc
index 7a9a821047..be5aedc509 100644
--- a/meta/conf/machine/include/tune-arm1136jf-s.inc
+++ b/meta/conf/machine/include/tune-arm1136jf-s.inc
@@ -1,7 +1,7 @@
1TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s" 1TARGET_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)]}" 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)]}"
3FEED_ARCH = "armv6" 3FEED_ARCH = "armv6"
4PACKAGE_ARCH = "armv6" 4BASE_PACKAGE_ARCH = "armv6"
5 5
6ARM_INSTRUCTION_SET = "${@['thumb','arm'][bb.data.getVar('CPU_FEATURES', d, 1).find('thumb') == -1]}" 6ARM_INSTRUCTION_SET = "${@['thumb','arm'][bb.data.getVar('CPU_FEATURES', d, 1).find('thumb') == -1]}"
7 7
diff --git a/meta/conf/machine/include/tune-arm920t.inc b/meta/conf/machine/include/tune-arm920t.inc
index b142d3325a..1f7a04bb3b 100644
--- a/meta/conf/machine/include/tune-arm920t.inc
+++ b/meta/conf/machine/include/tune-arm920t.inc
@@ -1,4 +1,4 @@
1FEED_ARCH = "armv4t" 1FEED_ARCH = "armv4t"
2PACKAGE_ARCH = "armv4t" 2BASE_PACKAGE_ARCH = "armv4t"
3TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t" 3TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t"
4 4
diff --git a/meta/conf/machine/include/tune-arm926ejs.inc b/meta/conf/machine/include/tune-arm926ejs.inc
index c3e8d7aefc..e80ef10490 100644
--- a/meta/conf/machine/include/tune-arm926ejs.inc
+++ b/meta/conf/machine/include/tune-arm926ejs.inc
@@ -4,4 +4,4 @@ FEED_ARCH = "armv5te"
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:
6TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ej-s" 6TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ej-s"
7PACKAGE_ARCH = "armv5te" 7BASE_PACKAGE_ARCH = "armv5te"
diff --git a/meta/conf/machine/include/tune-arm9tdmi.inc b/meta/conf/machine/include/tune-arm9tdmi.inc
index d097b07739..39e4493014 100644
--- a/meta/conf/machine/include/tune-arm9tdmi.inc
+++ b/meta/conf/machine/include/tune-arm9tdmi.inc
@@ -1,2 +1,2 @@
1PACKAGE_ARCH = "armv4t" 1BASE_PACKAGE_ARCH = "armv4t"
2TARGET_CC_ARCH = "-mcpu=arm9tdmi -mtune=arm9tdmi" 2TARGET_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 6276fe6798..96c8c64904 100644
--- a/meta/conf/machine/include/tune-armv7.inc
+++ b/meta/conf/machine/include/tune-armv7.inc
@@ -3,4 +3,4 @@
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
4TARGET_CC_ARCH = "-march=armv7 -mfpu=vfp -mfloat-abi=softfp" 4TARGET_CC_ARCH = "-march=armv7 -mfpu=vfp -mfloat-abi=softfp"
5FEED_ARCH = "armv7" 5FEED_ARCH = "armv7"
6PACKAGE_ARCH = "armv7" 6BASE_PACKAGE_ARCH = "armv7"
diff --git a/meta/conf/machine/include/tune-c3.inc b/meta/conf/machine/include/tune-c3.inc
index e6a522af10..107341eb62 100644
--- a/meta/conf/machine/include/tune-c3.inc
+++ b/meta/conf/machine/include/tune-c3.inc
@@ -1,3 +1,3 @@
1TARGET_CC_ARCH = "-march=c3 -mtune=c3" 1TARGET_CC_ARCH = "-march=c3 -mtune=c3"
2PACKAGE_ARCH = "i586" 2BASE_PACKAGE_ARCH = "i586"
3 3
diff --git a/meta/conf/machine/include/tune-cortexa8.inc b/meta/conf/machine/include/tune-cortexa8.inc
index 0133240de4..f8ddfea710 100644
--- a/meta/conf/machine/include/tune-cortexa8.inc
+++ b/meta/conf/machine/include/tune-cortexa8.inc
@@ -6,4 +6,4 @@
6TARGET_CC_ARCH = "-march=armv7-a -mtune=cortex-a8 -mfpu=neon -ftree-vectorize -mfloat-abi=softfp" 6TARGET_CC_ARCH = "-march=armv7-a -mtune=cortex-a8 -mfpu=neon -ftree-vectorize -mfloat-abi=softfp"
7TARGET_CC_ARCH_pn-libxcursor = "-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp" 7TARGET_CC_ARCH_pn-libxcursor = "-march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp"
8FEED_ARCH = "armv7a" 8FEED_ARCH = "armv7a"
9PACKAGE_ARCH = "armv7a" 9BASE_PACKAGE_ARCH = "armv7a"
diff --git a/meta/conf/machine/include/tune-cortexm1.inc b/meta/conf/machine/include/tune-cortexm1.inc
index a0d18b69c6..6c4a70a24d 100644
--- a/meta/conf/machine/include/tune-cortexm1.inc
+++ b/meta/conf/machine/include/tune-cortexm1.inc
@@ -1,3 +1,3 @@
1TARGET_CC_ARCH = "-march=armv7 -mtune=cortex-m1 -mfpu=vfp -mfloat-abi=softfp" 1TARGET_CC_ARCH = "-march=armv7 -mtune=cortex-m1 -mfpu=vfp -mfloat-abi=softfp"
2FEED_ARCH = "armv6" 2FEED_ARCH = "armv6"
3PACKAGE_ARCH = "armv6" 3BASE_PACKAGE_ARCH = "armv6"
diff --git a/meta/conf/machine/include/tune-cortexm3.inc b/meta/conf/machine/include/tune-cortexm3.inc
index 3598998a74..6da9aeedda 100644
--- a/meta/conf/machine/include/tune-cortexm3.inc
+++ b/meta/conf/machine/include/tune-cortexm3.inc
@@ -1,4 +1,4 @@
1# valid options for -march: `armv7', `armv7-m' 1# valid options for -march: `armv7', `armv7-m'
2TARGET_CC_ARCH = "-march=armv7-m -mtune=cortex-m3 -mfpu=vfp -mfloat-abi=softfp" 2TARGET_CC_ARCH = "-march=armv7-m -mtune=cortex-m3 -mfpu=vfp -mfloat-abi=softfp"
3FEED_ARCH = "armv7" 3FEED_ARCH = "armv7"
4PACKAGE_ARCH = "armv7" 4BASE_PACKAGE_ARCH = "armv7"
diff --git a/meta/conf/machine/include/tune-cortexr4.inc b/meta/conf/machine/include/tune-cortexr4.inc
index 93c82e8607..b8bb7f50ae 100644
--- a/meta/conf/machine/include/tune-cortexr4.inc
+++ b/meta/conf/machine/include/tune-cortexr4.inc
@@ -1,4 +1,4 @@
1# valid options for -march: `armv7', `armv7-r' 1# valid options for -march: `armv7', `armv7-r'
2TARGET_CC_ARCH = "-march=armv7-r -mtune=cortex-r4 -mfpu=vfp -mfloat-abi=softfp" 2TARGET_CC_ARCH = "-march=armv7-r -mtune=cortex-r4 -mfpu=vfp -mfloat-abi=softfp"
3FEED_ARCH = "armv7" 3FEED_ARCH = "armv7"
4PACKAGE_ARCH = "armv7" 4BASE_PACKAGE_ARCH = "armv7"
diff --git a/meta/conf/machine/include/tune-ep9312.inc b/meta/conf/machine/include/tune-ep9312.inc
index 0982cf2a13..2cfdf5270f 100644
--- a/meta/conf/machine/include/tune-ep9312.inc
+++ b/meta/conf/machine/include/tune-ep9312.inc
@@ -2,5 +2,5 @@ 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
5PACKAGE_ARCH = "ep9312" 5BASE_PACKAGE_ARCH = "ep9312"
6 6
diff --git a/meta/conf/machine/include/tune-iwmmxt.inc b/meta/conf/machine/include/tune-iwmmxt.inc
index 8376faca74..49e560ea1a 100644
--- a/meta/conf/machine/include/tune-iwmmxt.inc
+++ b/meta/conf/machine/include/tune-iwmmxt.inc
@@ -1,6 +1,6 @@
1# Configurations for the Intel PXA27x Appications Processor Family. 1# Configurations for the Intel PXA27x Appications Processor Family.
2# Please use tune-xscale for PXA255/PXA26x based processors. 2# Please use tune-xscale for PXA255/PXA26x based processors.
3TARGET_CC_ARCH = "-march=iwmmxt -mcpu=iwmmxt -mtune=iwmmxt" 3TARGET_CC_ARCH = "-march=iwmmxt -mcpu=iwmmxt -mtune=iwmmxt"
4PACKAGE_ARCH = "iwmmxt" 4BASE_PACKAGE_ARCH = "iwmmxt"
5PACKAGE_EXTRA_ARCHS += "iwmmxt" 5PACKAGE_EXTRA_ARCHS += "iwmmxt"
6 6
diff --git a/meta/conf/machine/include/tune-ppc603e.inc b/meta/conf/machine/include/tune-ppc603e.inc
index 1a004d30b5..a4a68d60e3 100644
--- a/meta/conf/machine/include/tune-ppc603e.inc
+++ b/meta/conf/machine/include/tune-ppc603e.inc
@@ -1,2 +1,2 @@
1TARGET_CC_ARCH = "-mcpu=603e -mhard-float" 1TARGET_CC_ARCH = "-mcpu=603e -mhard-float"
2PACKAGE_ARCH = "ppc603e" 2BASE_PACKAGE_ARCH = "ppc603e"
diff --git a/meta/conf/machine/include/tune-ppce500.inc b/meta/conf/machine/include/tune-ppce500.inc
index 11717eba70..2482196424 100644
--- a/meta/conf/machine/include/tune-ppce500.inc
+++ b/meta/conf/machine/include/tune-ppce500.inc
@@ -1,2 +1,2 @@
1TARGET_CC_ARCH = "-mcpu=8540" 1TARGET_CC_ARCH = "-mcpu=8540"
2PACKAGE_ARCH = "ppce500" 2BASE_PACKAGE_ARCH = "ppce500"
diff --git a/meta/conf/machine/include/tune-supersparc.inc b/meta/conf/machine/include/tune-supersparc.inc
index 1b1ec1207f..10133c6c21 100644
--- a/meta/conf/machine/include/tune-supersparc.inc
+++ b/meta/conf/machine/include/tune-supersparc.inc
@@ -1,2 +1,2 @@
1TARGET_CC_ARCH = "-mcpu=supersparc" 1TARGET_CC_ARCH = "-mcpu=supersparc"
2PACKAGE_ARCH = "supersparc" 2BASE_PACKAGE_ARCH = "supersparc"
diff --git a/meta/conf/machine/include/tune-xscale.inc b/meta/conf/machine/include/tune-xscale.inc
index 4cb0b4f7c3..fc6827c532 100644
--- a/meta/conf/machine/include/tune-xscale.inc
+++ b/meta/conf/machine/include/tune-xscale.inc
@@ -2,7 +2,7 @@ FEED_ARCH = "armv5te"
2 2
3TARGET_CC_ARCH = "-march=armv5te -mtune=xscale" 3TARGET_CC_ARCH = "-march=armv5te -mtune=xscale"
4TARGET_CC_KERNEL_ARCH = "-march=armv5te -mtune=xscale" 4TARGET_CC_KERNEL_ARCH = "-march=armv5te -mtune=xscale"
5PACKAGE_ARCH = "${@['armv5teb', 'armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}" 5BASE_PACKAGE_ARCH = "${@['armv5teb', 'armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}"
6 6
7# webkit-gtk has alignment issues with double instructions on armv5 so 7# webkit-gtk has alignment issues with double instructions on armv5 so
8# disable them here 8# disable them here