[PATCH 1/2] uclibc: no need for CONFIG_MIPS_ISA_xxx config options

* [PATCH 1/2] uclibc: no need for CONFIG_MIPS_ISA_xxx config options
@ 2016-06-10 15:12 André Draszik
  2016-06-10 15:12 ` [PATCH 2/2] uclibc: never build with SSP André Draszik
  0 siblings, 1 reply; 6+ messages in thread
From: André Draszik @ 2016-06-10 15:12 UTC (permalink / raw)
  To: openembedded-core

From: André Draszik <adraszik@tycoint.com>

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 <adraszik@tycoint.com>
---
 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 1d42284..71d4bdd 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
-- 
2.8.1



^ permalink raw reply related	[flat|nested] 6+ messages in thread