clang: Provide llvm/llvm-native

When using meta-clang, it makes sense to use llvm provided by clang
recipe, this ensures that we do not build llvm from oe-core but instead
offer the one from clang recipe

enable rtti and eh for native/nativesdk clang, this is needed for mesa
to build

Let clang PROVIDE llvm

Build AMDGNU and other targets, this is needed for llvm-config to work
properly, since we use llvm-config from clang-native, so its better to
build the targets that are built for clang-native atleast

create version specific symlinks for tblgen anf llvm-config

Signed-off-by: Khem Raj <raj.khem@gmail.com>

3 files changed, 21 insertions, 4 deletions

diff --git a/conf/layer.conf b/conf/layer.conf
index 2b92760..967f052 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -20,6 +20,9 @@ BBFILES_DYNAMIC += " \
 
 PREFERRED_PROVIDER_libgcc-initial = "libgcc-initial"
 #PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}compilerlibs_forcevariable = "libcxx"
+PREFERRED_PROVIDER_llvm = "clang"
+PREFERRED_PROVIDER_llvm-native = "clang-native"
+PREFERRED_PROVIDER_nativesdk-llvm = "nativesdk-clang"
 INHERIT += "clang"
 
 # include clang in SDK
diff --git a/recipes-devtools/clang/clang_git.bb b/recipes-devtools/clang/clang_git.bb
index 73becc3..63592dd 100644
--- a/recipes-devtools/clang/clang_git.bb
+++ b/recipes-devtools/clang/clang_git.bb
@@ -54,8 +54,8 @@ PACKAGECONFIG ??= "compiler-rt libcplusplus shared-libs lldb-wchar \
                    ${@bb.utils.filter('DISTRO_FEATURES', 'thin-lto full-lto', d)} \
                    rtti eh \
                    "
-PACKAGECONFIG_class-native = ""
-PACKAGECONFIG_class-nativesdk = "thin-lto"
+PACKAGECONFIG_class-native = "rtti eh"
+PACKAGECONFIG_class-nativesdk = "rtti eh thin-lto"
 
 PACKAGECONFIG[compiler-rt] = "-DCLANG_DEFAULT_RTLIB=compiler-rt,,libcxx,compiler-rt"
 PACKAGECONFIG[libcplusplus] = "-DCLANG_DEFAULT_CXX_STDLIB=libc++,,libcxx"
@@ -88,8 +88,8 @@ PYTHON_LIBRARY;PYTHON_INCLUDE_DIR;LLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN;LLDB_EDIT
 LLVM_TARGETS_TO_BUILD ?= "AArch64;ARM;BPF;Mips;PowerPC;RISCV;X86"
 LLVM_TARGETS_TO_BUILD_append = ";${@get_clang_host_arch(bb, d)};${@get_clang_target_arch(bb, d)}"
 
-LLVM_TARGETS_TO_BUILD_TARGET ?= ""
-LLVM_TARGETS_TO_BUILD_TARGET_append ?= "${@get_clang_target_arch(bb, d)}"
+LLVM_TARGETS_TO_BUILD_TARGET ?= "AMDGPU;${LLVM_TARGETS_TO_BUILD}"
+LLVM_TARGETS_TO_BUILD_TARGET_append ?= ";${@get_clang_target_arch(bb, d)}"
 
 LLVM_EXPERIMENTAL_TARGETS_TO_BUILD ?= ""
 LLVM_EXPERIMENTAL_TARGETS_TO_BUILD_append = ";${@get_clang_experimental_target_arch(bb, d)}"
@@ -177,6 +177,9 @@ do_install_append_class-native () {
                 test -n "`file $f|grep -i ELF`" && ${STRIP} $f
                 echo "stripped $f"
         done
+        ln -sf clang-tblgen ${D}${bindir}/clang-tblgen${PV}
+        ln -sf llvm-tblgen ${D}${bindir}/llvm-tblgen${PV}
+        ln -sf llvm-config ${D}${bindir}/llvm-config${PV}
 }
 
 do_install_append_class-nativesdk () {
@@ -185,6 +188,9 @@ do_install_append_class-nativesdk () {
         for f in `find ${D}${bindir} -executable -type f -not -type l`; do
                 test -n "`file $f|grep -i ELF`" && ${STRIP} $f
         done
+        ln -sf clang-tblgen ${D}${bindir}/clang-tblgen${PV}
+        ln -sf llvm-tblgen ${D}${bindir}/llvm-tblgen${PV}
+        ln -sf llvm-config ${D}${bindir}/llvm-config${PV}
         rm -rf ${D}${datadir}/llvm/cmake
         rm -rf ${D}${datadir}/llvm
 }
@@ -193,6 +199,9 @@ PACKAGE_DEBUG_SPLIT_STYLE_class-nativesdk = "debug-without-src"
 
 PACKAGES =+ "${PN}-libllvm ${PN}-lldb-python libclang"
 
+PROVIDES += "llvm llvm${PV}"
+PROVIDES_append_class-native = " llvm-native"
+
 BBCLASSEXTEND = "native nativesdk"
 
 FILES_${PN}-lldb-python = "${libdir}/python*/site-packages/lldb/*"
diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend
index fadc95c..26c6fe3 100644
--- a/recipes-graphics/mesa/mesa_%.bbappend
+++ b/recipes-graphics/mesa/mesa_%.bbappend
@@ -3,3 +3,8 @@ DEPENDS_append_toolchain-clang = " libatomic-ops"
 
 EXTRA_OECONF_append_toolchain-clang_x86 = " --disable-asm"
 EXTRA_OECONF_append_toolchain-clang_x86-64 = " --disable-asm"
+
+export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_LIBDIR}/llvm-config"
+
+PACKAGECONFIG[gallium-llvm] = "-Dllvm=true -Dshared-llvm=true, -Dllvm=false, clang clang-native \
+${@'elfutils' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}"