[gnome-continuous-yocto/gnomeostree-3.22-krogoth: 127/246] libgcc-common.inc: Fix broken symlinks for multilib SDK

[Emmanuele Bassi <ebassi src gnome org>]

commit 2cb87d12d2bf9ab02e7d295ecb4e17013fb9ec4f
Author: Juro Bystricky <juro bystricky intel com>
Date:   Sat Oct 8 10:53:53 2016 -0700

    libgcc-common.inc: Fix broken symlinks for multilib SDK
    
    This patch fixes broken "32" symlinks for multilib settings:
    
    MACHINE = "qemuarm64"
    require conf/multilib.conf
    MULTILIBS = "multilib:lib32"
    DEFAULTTUNE_virtclass-multilib-lib32 = "armv7a"
    
    and
    
    MACHINE = "qemux86-64"
    require conf/multilib.conf
    MULTILIBS = "multilib:libx32"
    DEFAULTTUNE_virtclass-multilib-libx32 = "x86-64-x32"
    
    [YOCTO#8642]
    [YOCTO#10380]
    
    (From OE-Core rev: 2810671a0f96776c135137f27a5ca52194ddd692)
    
    (From OE-Core rev: 1c9a1b518d4c653799d4f6ca4bc5ef191fa8a349)
    
    Signed-off-by: Juro Bystricky <juro bystricky intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>
    Signed-off-by: Armin Kuster <akuster808 gmail com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-devtools/gcc/libgcc-common.inc |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/meta/recipes-devtools/gcc/libgcc-common.inc b/meta/recipes-devtools/gcc/libgcc-common.inc
index dae07e9..0a6ea64 100644
--- a/meta/recipes-devtools/gcc/libgcc-common.inc
+++ b/meta/recipes-devtools/gcc/libgcc-common.inc
@@ -111,9 +111,15 @@ fakeroot python do_multilib_install() {
         if not tune_bitness:
             tune_bitness = '32' # /lib => 32bit lib
 
+        tune_abiextension = tune_parameters['abiextension']
+        if tune_abiextension:
+            libcextension = '-gnu' + tune_abiextension
+        else:
+            libcextension = ''
+
         src = '../../../' + tune_baselib + '/' + \
             tune_arch + d.getVar('TARGET_VENDOR', True) + 'ml' + ml + \
-            '-' + d.getVar('TARGET_OS', True) + '/' + binv + '/'
+            '-' + d.getVar('TARGET_OS', True) + libcextension +  '/' + binv + '/'
 
         dest = d.getVar('D', True) + d.getVar('libdir', True) + '/' + \
             d.getVar('TARGET_SYS', True) + '/' + binv + '/' + tune_bitness