Patchwork [1/3] gcc: Fix gcc-multilib-config comparison

login
register
mail settings
Submitter Mark Hatle
Date July 31, 2014, 1:16 a.m.
Message ID <08049828f89080256784461ab0ccb3327d626a10.1406769215.git.mark.hatle@windriver.com>
Download mbox | patch
Permalink /patch/76997/
State Accepted
Commit ced919f6013fc0dbb8b8f75f87a8c0a4f416b1fe
Headers show

Comments

Mark Hatle - July 31, 2014, 1:16 a.m.
Fix an issue on a multilib configuration that contains more then 1 multilib.

I.e. on MIPS64:

DEFAULTTUNE = "mips64"
MULTILIBS = "lib32n:mips64_n32 lib32:mips32"

While normally you'd use 'libn32', the above is legal.

With the startswith code, the system will look to expand the 'lib32' element
and find the 'lib32n' instead, and will result in a warning:

lib32 doesn't have a corresponding tune. Skipping...

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
 meta/recipes-devtools/gcc/gcc-multilib-config.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/meta/recipes-devtools/gcc/gcc-multilib-config.inc b/meta/recipes-devtools/gcc/gcc-multilib-config.inc
index b8c705a..6134097 100644
--- a/meta/recipes-devtools/gcc/gcc-multilib-config.inc
+++ b/meta/recipes-devtools/gcc/gcc-multilib-config.inc
@@ -152,7 +152,7 @@  python gcc_multilib_setup() {
     if mlprefix:
         mlindex = 0
         for ml in multilibs:
-            if mlprefix.startswith(ml):
+            if mlprefix == ml + '-':
                 break
             mlindex += 1