From d84af5532dca8e2d488da08a5f5dfe6d63aca773 Mon Sep 17 00:00:00 2001 From: André Draszik Date: Fri, 10 Jun 2016 16:12:12 +0100 Subject: uclibc: no need for CONFIG_MIPS_ISA_xxx config options MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. Signed-off-by: André Draszik Signed-off-by: Ross Burton --- meta/recipes-core/uclibc/uclibc.inc | 11 ----------- 1 file changed, 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 () { if "${OE_DEL}": d.setVar('configmangle_append', "${OE_DEL}" + "\n") - # by default uclibc uses mips1 ISA for o32 ABI - # if we use TARGET_CC_ARCH="-march=mips32" we end up - # with conflicting march options to gcc. Here we - # ask for MIPS32 ISA to match the chosen arch - tune = d.getVar("DEFAULTTUNE", True) - if tune.startswith('mips32'): - import re - tune = re.sub('(el)*(-nf)*', '', tune) - d.setVar('configmangle_append', - "/^### MIPS32_CHECK$/a\\\nCONFIG_MIPS_ISA_%s=y\n\n" % (tune.upper())) if "${OE_FEATURES}": d.setVar('configmangle_append', "/^### DISTRO FEATURES$/a\\\n%s\n\n" % @@ -146,7 +136,6 @@ do_configure() { echo "### FPU" >>${S}/merged.config echo "### ABI" >>${S}/merged.config echo "### DISTRO FEATURES" >>${S}/merged.config - echo "### MIPS32_CHECK" >>${S}/merged.config # Mangle the resulting .config depending on OE variables sed -i -e '${configmangle}' ${S}/merged.config -- cgit 1.2.3-korg