summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorAristov Maxim <aristovmax@gmail.com>2012-10-20 06:57:07 +0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-23 12:28:33 +0100
commit616642f09448ecbb506dd061f61126dbde7e2f75 (patch)
tree792934f0c17c207580ae6ec8b01b429ef621e04e /meta/recipes-core
parent72d7f8dc2736518a6f1f1d3538b20615ef43505e (diff)
downloadpoky-616642f09448ecbb506dd061f61126dbde7e2f75.tar.gz
uClibc: Resolve conflicting options when building for mips32
(From OE-Core rev: c096d57d7c55f97897956c192c9ccef2c9cbbe44) Signed-off-by: Aristov Maxim <m@ximilian.ru> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/uclibc/uclibc-0.9.33/mips/uClibc.machine16
-rw-r--r--meta/recipes-core/uclibc/uclibc-git/mips/uClibc.machine16
-rw-r--r--meta/recipes-core/uclibc/uclibc.inc10
3 files changed, 10 insertions, 32 deletions
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.33/mips/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.33/mips/uClibc.machine
deleted file mode 100644
index 7d7ab3f418..0000000000
--- a/meta/recipes-core/uclibc/uclibc-0.9.33/mips/uClibc.machine
+++ /dev/null
@@ -1,16 +0,0 @@
1# in OE we use TARGET_CC_ARCH="-march=mips32" but by
2# default uclibc uses mips1 ISA for o32 ABI which ends
3# up with conflicting march options to gcc. Here we
4# ask for MIPS32 ISA to match the OE defaults
5
6CONFIG_MIPS_ISA_MIPS32=y
7
8# Below options are exact copy of general
9# uClibc.machine file
10#
11FORCE_OPTIONS_FOR_ARCH=y
12ARCH_HAS_MMU=y
13ARCH_USE_MMU=y
14KERNEL_HEADERS="/usr/include"
15HAVE_DOT_CONFIG=y
16
diff --git a/meta/recipes-core/uclibc/uclibc-git/mips/uClibc.machine b/meta/recipes-core/uclibc/uclibc-git/mips/uClibc.machine
deleted file mode 100644
index 7d7ab3f418..0000000000
--- a/meta/recipes-core/uclibc/uclibc-git/mips/uClibc.machine
+++ /dev/null
@@ -1,16 +0,0 @@
1# in OE we use TARGET_CC_ARCH="-march=mips32" but by
2# default uclibc uses mips1 ISA for o32 ABI which ends
3# up with conflicting march options to gcc. Here we
4# ask for MIPS32 ISA to match the OE defaults
5
6CONFIG_MIPS_ISA_MIPS32=y
7
8# Below options are exact copy of general
9# uClibc.machine file
10#
11FORCE_OPTIONS_FOR_ARCH=y
12ARCH_HAS_MMU=y
13ARCH_USE_MMU=y
14KERNEL_HEADERS="/usr/include"
15HAVE_DOT_CONFIG=y
16
diff --git a/meta/recipes-core/uclibc/uclibc.inc b/meta/recipes-core/uclibc/uclibc.inc
index 6c980902f7..707b14efdd 100644
--- a/meta/recipes-core/uclibc/uclibc.inc
+++ b/meta/recipes-core/uclibc/uclibc.inc
@@ -85,6 +85,15 @@ OE_DEL := "${@features_to_uclibc_del(d)}"
85python () { 85python () {
86 if "${OE_DEL}": 86 if "${OE_DEL}":
87 d.setVar('configmangle_append', "${OE_DEL}" + "\n") 87 d.setVar('configmangle_append', "${OE_DEL}" + "\n")
88
89 # by default uclibc uses mips1 ISA for o32 ABI
90 # if we use TARGET_CC_ARCH="-march=mips32" we end up
91 # with conflicting march options to gcc. Here we
92 # ask for MIPS32 ISA to match the chosen arch
93
94 if "mips32" in d.getVar("TUNE_FEATURES",True):
95 d.setVar('configmangle_append',
96 "/^### MIPS32_CHECK$/a\\\nCONFIG_MIPS_ISA_MIPS32=y\n\n")
88 if "${OE_FEATURES}": 97 if "${OE_FEATURES}":
89 d.setVar('configmangle_append', 98 d.setVar('configmangle_append',
90 "/^### DISTRO FEATURES$/a\\\n%s\n\n" % 99 "/^### DISTRO FEATURES$/a\\\n%s\n\n" %
@@ -133,6 +142,7 @@ do_configure() {
133 echo "### FPU" >>${S}/merged.config 142 echo "### FPU" >>${S}/merged.config
134 echo "### ABI" >>${S}/merged.config 143 echo "### ABI" >>${S}/merged.config
135 echo "### DISTRO FEATURES" >>${S}/merged.config 144 echo "### DISTRO FEATURES" >>${S}/merged.config
145 echo "### MIPS32_CHECK" >>${S}/merged.config
136 146
137 # Mangle the resulting .config depending on OE variables 147 # Mangle the resulting .config depending on OE variables
138 sed -i -e '${configmangle}' ${S}/merged.config 148 sed -i -e '${configmangle}' ${S}/merged.config