Merge pull request #266 from YoeDistro/kraj/zeus

Zeus sync from master

1 files changed, 19 insertions, 1 deletions

diff --git a/recipes-devtools/clang/clang.inc b/recipes-devtools/clang/clang.inc
index 248ff28..3fd0723 100644
--- a/recipes-devtools/clang/clang.inc
+++ b/recipes-devtools/clang/clang.inc
@@ -8,7 +8,7 @@ MAJOR_VER = "9"
 MINOR_VER = "0"
 PATCH_VER = "1"
 
-SRCREV ?= "aa0ed8dac77bf205f2b376a44a0d161f4dafcb5a"
+SRCREV ?= "c1a0a213378a458fbea1a5c77b315c7dce08fd05"
 
 PV = "${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}"
 BRANCH = "release/${MAJOR_VER}.x"
@@ -18,4 +18,22 @@ CLANGMD5SUM = "ff42885ed2ab98f1ecb8c1fc41205343"
 LLDMD5SUM = "ae7dc7c027b1fa89b5b013d391d3ee2b"
 LLDBMD5SUM = "2e0d44968471fcde980034dbb826bea9"
 
+def get_libdir_suffix(d, arch_var):
+    import re
+    multilibs = (d.getVar("MULTILIB_VARIANTS") or "").split()
+    if multilibs:
+        a = d.getVar(arch_var, True)
+        if   re.match('(i.86|athlon)$', a):          return '32'
+        elif re.match('x86.64$', a):                 return '64'
+        elif re.match('(arm|armbe)$', a):            return '32'
+        elif re.match('(aarch64|aarch64_be)$', a):   return '64'
+        elif re.match('mips(isa|)32(r6|)(el|)$', a): return '32'
+        elif re.match('mips(isa|)64(r6|)(el|)$', a): return '64'
+        elif re.match('p(pc|owerpc)', a):            return '32'
+        elif re.match('p(pc|owerpc)64', a):          return '64'
+    else:
+        return ''
+
+LLVM_LIBDIR_SUFFIX="${@get_libdir_suffix(d, 'TARGET_ARCH')}"
+
 require common.inc