summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/machine/include/arm/arch-armv5.inc2
-rw-r--r--meta/conf/machine/include/arm/arch-armv6.inc2
-rw-r--r--meta/conf/machine/include/arm/arch-armv7a.inc2
-rw-r--r--meta/conf/machine/include/powerpc/arch-powerpc64.inc2
-rw-r--r--meta/conf/machine/include/tune-mips32.inc2
5 files changed, 5 insertions, 5 deletions
diff --git a/meta/conf/machine/include/arm/arch-armv5.inc b/meta/conf/machine/include/arm/arch-armv5.inc
index 4a75530bb1..98780e55c5 100644
--- a/meta/conf/machine/include/arm/arch-armv5.inc
+++ b/meta/conf/machine/include/arm/arch-armv5.inc
@@ -3,7 +3,7 @@ DEFAULTTUNE ?= "armv5"
3ARMPKGARCH ?= "armv5" 3ARMPKGARCH ?= "armv5"
4 4
5TUNEVALID[armv5] = "Enable instructions for ARMv5" 5TUNEVALID[armv5] = "Enable instructions for ARMv5"
6TUNE_CONFLICTS[armv5] = "armv4" 6TUNECONFLICTS[armv5] = "armv4"
7TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv5", "-march=armv5${ARMPKGSFX_THUMB}${ARMPKGSFX_DSP}", "", d)}" 7TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv5", "-march=armv5${ARMPKGSFX_THUMB}${ARMPKGSFX_DSP}", "", d)}"
8MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv5", ":armv5", "" ,d)}" 8MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv5", ":armv5", "" ,d)}"
9 9
diff --git a/meta/conf/machine/include/arm/arch-armv6.inc b/meta/conf/machine/include/arm/arch-armv6.inc
index da8274e296..f0fee93d3f 100644
--- a/meta/conf/machine/include/arm/arch-armv6.inc
+++ b/meta/conf/machine/include/arm/arch-armv6.inc
@@ -3,7 +3,7 @@ DEFAULTTUNE ?= "armv6"
3ARMPKGARCH ?= "armv6" 3ARMPKGARCH ?= "armv6"
4 4
5TUNEVALID[armv6] = "Enable instructions for ARMv6" 5TUNEVALID[armv6] = "Enable instructions for ARMv6"
6TUNE_CONFLICTS[armv6] = "armv4 armv5" 6TUNECONFLICTS[armv6] = "armv4 armv5"
7TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv6", "-march=armv6", "", d)}" 7TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv6", "-march=armv6", "", d)}"
8MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv6", ":armv6", "" ,d)}" 8MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv6", ":armv6", "" ,d)}"
9 9
diff --git a/meta/conf/machine/include/arm/arch-armv7a.inc b/meta/conf/machine/include/arm/arch-armv7a.inc
index c90aff5ae8..f439de7a87 100644
--- a/meta/conf/machine/include/arm/arch-armv7a.inc
+++ b/meta/conf/machine/include/arm/arch-armv7a.inc
@@ -3,7 +3,7 @@ DEFAULTTUNE ?= "armv7a"
3ARMPKGARCH ?= "armv7a" 3ARMPKGARCH ?= "armv7a"
4 4
5TUNEVALID[armv7a] = "Enable instructions for ARMv7-a" 5TUNEVALID[armv7a] = "Enable instructions for ARMv7-a"
6TUNE_CONFLICTS[armv7a] = "armv4 armv5 armv6 armv7" 6TUNECONFLICTS[armv7a] = "armv4 armv5 armv6 armv7"
7TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv7a", "-march=armv7-a -fno-tree-vectorize", "", d)}" 7TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv7a", "-march=armv7-a -fno-tree-vectorize", "", d)}"
8MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv7a", ":armv7a", "" ,d)}" 8MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv7a", ":armv7a", "" ,d)}"
9 9
diff --git a/meta/conf/machine/include/powerpc/arch-powerpc64.inc b/meta/conf/machine/include/powerpc/arch-powerpc64.inc
index a5e975574e..f9e2b2a4c4 100644
--- a/meta/conf/machine/include/powerpc/arch-powerpc64.inc
+++ b/meta/conf/machine/include/powerpc/arch-powerpc64.inc
@@ -3,7 +3,7 @@ DEFAULTTUNE ?= "powerpc64"
3require conf/machine/include/powerpc/arch-powerpc.inc 3require conf/machine/include/powerpc/arch-powerpc.inc
4 4
5TUNEVALID[m64] = "Power ELF64 standard ABI" 5TUNEVALID[m64] = "Power ELF64 standard ABI"
6TUNE_CONFLICTS[m64] = "m32 nf" 6TUNECONFLICTS[m64] = "m32 nf"
7TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-m64", "", d)}" 7TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-m64", "", d)}"
8TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", [ "m64" ], "powerpc64", "", d)}" 8TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", [ "m64" ], "powerpc64", "", d)}"
9 9
diff --git a/meta/conf/machine/include/tune-mips32.inc b/meta/conf/machine/include/tune-mips32.inc
index 93ed5ee793..03cd41123f 100644
--- a/meta/conf/machine/include/tune-mips32.inc
+++ b/meta/conf/machine/include/tune-mips32.inc
@@ -3,7 +3,7 @@ DEFAULTTUNE ?= "mips32"
3require conf/machine/include/mips/arch-mips.inc 3require conf/machine/include/mips/arch-mips.inc
4 4
5TUNEVALID[mips32] = "Enable mips32 specific processor optimizations" 5TUNEVALID[mips32] = "Enable mips32 specific processor optimizations"
6TUNE_CONFLICTS[mips32] = "n64 n32" 6TUNECONFLICTS[mips32] = "n64 n32"
7TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "mips32", "-march=mips32", "", d)}" 7TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "mips32", "-march=mips32", "", d)}"
8 8
9AVAILTUNES += "mips32 mips32el mips32-nf mips32el-nf" 9AVAILTUNES += "mips32 mips32el mips32-nf mips32el-nf"