summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndré Draszik <adraszik@tycoint.com>2016-06-10 16:12:12 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-12 23:47:18 +0100
commitb709c6cf15168d970e5ba95d97c7052e4d4cea1a (patch)
tree34802ef12976ed2b8752d6b38cd281a5e09b6c11
parent9ac4c8b11cd28cc1d343f9b2a91a6666febe246d (diff)
downloadpoky-b709c6cf15168d970e5ba95d97c7052e4d4cea1a.tar.gz
uclibc: no need for CONFIG_MIPS_ISA_xxx config options
The config option for the mips ISA have been completely removed from uclibc-ng. uclibc doesn't add gcc options based on those config options anymore. Hence we don't need to create them here either. (From OE-Core rev: d84af5532dca8e2d488da08a5f5dfe6d63aca773) Signed-off-by: André Draszik <adraszik@tycoint.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/uclibc/uclibc.inc11
1 files changed, 0 insertions, 11 deletions
diff --git a/meta/recipes-core/uclibc/uclibc.inc b/meta/recipes-core/uclibc/uclibc.inc
index 1d42284fb7..71d4bdda4e 100644
--- a/meta/recipes-core/uclibc/uclibc.inc
+++ b/meta/recipes-core/uclibc/uclibc.inc
@@ -88,16 +88,6 @@ python () {
88 if "${OE_DEL}": 88 if "${OE_DEL}":
89 d.setVar('configmangle_append', "${OE_DEL}" + "\n") 89 d.setVar('configmangle_append', "${OE_DEL}" + "\n")
90 90
91 # by default uclibc uses mips1 ISA for o32 ABI
92 # if we use TARGET_CC_ARCH="-march=mips32" we end up
93 # with conflicting march options to gcc. Here we
94 # ask for MIPS32 ISA to match the chosen arch
95 tune = d.getVar("DEFAULTTUNE", True)
96 if tune.startswith('mips32'):
97 import re
98 tune = re.sub('(el)*(-nf)*', '', tune)
99 d.setVar('configmangle_append',
100 "/^### MIPS32_CHECK$/a\\\nCONFIG_MIPS_ISA_%s=y\n\n" % (tune.upper()))
101 if "${OE_FEATURES}": 91 if "${OE_FEATURES}":
102 d.setVar('configmangle_append', 92 d.setVar('configmangle_append',
103 "/^### DISTRO FEATURES$/a\\\n%s\n\n" % 93 "/^### DISTRO FEATURES$/a\\\n%s\n\n" %
@@ -146,7 +136,6 @@ do_configure() {
146 echo "### FPU" >>${S}/merged.config 136 echo "### FPU" >>${S}/merged.config
147 echo "### ABI" >>${S}/merged.config 137 echo "### ABI" >>${S}/merged.config
148 echo "### DISTRO FEATURES" >>${S}/merged.config 138 echo "### DISTRO FEATURES" >>${S}/merged.config
149 echo "### MIPS32_CHECK" >>${S}/merged.config
150 139
151 # Mangle the resulting .config depending on OE variables 140 # Mangle the resulting .config depending on OE variables
152 sed -i -e '${configmangle}' ${S}/merged.config 141 sed -i -e '${configmangle}' ${S}/merged.config