Merge pull request #1195 from Freescale/backport-1194-to-kirkstone

[Backport kirkstone] imx-atf: Use clang when using toolchain-clang defaults

3 files changed, 12 insertions, 0 deletions

diff --git a/recipes-bsp/imx-atf/imx-atf_2.6.bb b/recipes-bsp/imx-atf/imx-atf_2.6.bb
index b0426f0b..ec943fa5 100644
--- a/recipes-bsp/imx-atf/imx-atf_2.6.bb
+++ b/recipes-bsp/imx-atf/imx-atf_2.6.bb
@@ -37,6 +37,9 @@ LD[unexport] = "1"
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS = "virtual/${HOST_PREFIX}gcc"
 
+# Bring in clang compiler if using clang as default
+DEPENDS:append:toolchain-clang = " clang-cross-${TARGET_ARCH}"
+
 BUILD_OPTEE = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'true', 'false', d)}"
 
 # CC and LD introduce arguments which conflict with those otherwise provided by
diff --git a/recipes-graphics/cairo/cairo_%.bbappend b/recipes-graphics/cairo/cairo_%.bbappend
index 2c73c7f3..245adb59 100644
--- a/recipes-graphics/cairo/cairo_%.bbappend
+++ b/recipes-graphics/cairo/cairo_%.bbappend
@@ -1,2 +1,8 @@
 PACKAGECONFIG:append:imxgpu3d = " egl glesv2"
 PACKAGECONFIG:remove:imxgpu3d = "opengl"
+
+# links with imx-gpu libs which are pre-built for glibc
+# gcompat will address it during runtime
+LDFLAGS:append:imxgpu3d:libc-musl = " -Wl,--allow-shlib-undefined"
+LDFLAGS:append:imxgpu:libc-musl = " -Wl,--allow-shlib-undefined"
+
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.2-aarch64.bb b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.2-aarch64.bb
index de527cda..bd584dbe 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.2-aarch64.bb
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv_6.4.3.p4.2-aarch64.bb
@@ -1,5 +1,8 @@
 require imx-gpu-viv-6.inc
 
+DEPENDS:append:libc-musl = " gcompat"
+INSANE_SKIP:append:libc-musl = " file-rdeps"
+
 SRC_URI[md5sum] = "22de8a5f59a56a7ef499f590d1659b6f"
 SRC_URI[sha256sum] = "52921c0b59529f1598084e991eda1863100754f28a7744ba958158dff8074b3b"