clang-legacy: Adjust to clang merging to core for YP compatibility

Some of these settings are moved to OE-core and some are deferred to
distros where it belongs. This makes meta-clang compatible with YP
again.

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

1 files changed, 7 insertions, 74 deletions

diff --git a/classes/clang-legacy.bbclass b/classes/clang-legacy.bbclass
index 5f7760d..1346715 100644
--- a/classes/clang-legacy.bbclass
+++ b/classes/clang-legacy.bbclass
@@ -1,26 +1,16 @@
 # Add the necessary override
 CCACHE_COMPILERCHECK:toolchain-clang ?= "%compiler% -v"
-HOST_CC_ARCH:prepend:toolchain-clang:class-target = "-target ${HOST_SYS} "
-HOST_CC_ARCH:prepend:toolchain-clang:class-nativesdk = "-target ${HOST_SYS} "
-LD:toolchain-clang:class-target = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', '${HOST_PREFIX}ld.lld${TOOLCHAIN_OPTIONS} ${HOST_LD_ARCH}', '${HOST_PREFIX}ld${TOOLCHAIN_OPTIONS} ${HOST_LD_ARCH}', d)}"
-LD:toolchain-clang:class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', '${HOST_PREFIX}ld.lld${TOOLCHAIN_OPTIONS} ${HOST_LD_ARCH}', '${HOST_PREFIX}ld${TOOLCHAIN_OPTIONS} ${HOST_LD_ARCH}', d)}"
 
 LTO:toolchain-clang:class-target = "${@bb.utils.contains('DISTRO_FEATURES', 'thin-lto', '-flto=thin', '-flto -fuse-ld=lld', d)}"
 LTO:toolchain-clang:class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'thin-lto', '-flto=thin', '-flto -fuse-ld=lld', d)}"
 
-COMPILER_RT ??= ""
-COMPILER_RT:armeb = "-rtlib=libgcc ${UNWINDLIB}"
-COMPILER_RT:libc-klibc = "-rtlib=libgcc ${UNWINDLIB}"
+COMPILER_RT:toolchain-clang:armeb = "-rtlib=libgcc ${UNWINDLIB}"
+COMPILER_RT:toolchain-clang:libc-klibc = "-rtlib=libgcc ${UNWINDLIB}"
 
-UNWINDLIB ??= ""
-UNWINDLIB:armeb = "--unwindlib=libgcc"
-UNWINDLIB_libc-klibc = "--unwindlib=libgcc"
+UNWINDLIB:toolchain-clang:armeb = "--unwindlib=libgcc"
+UNWINDLIB:toolchain-clang:libc-klibc = "--unwindlib=libgcc"
 
-LIBCPLUSPLUS ??= ""
-LIBCPLUSPLUS:armv5 = "-stdlib=libstdc++"
-
-CXXFLAGS:append:toolchain-clang = " ${LIBCPLUSPLUS}"
-LDFLAGS:append:toolchain-clang = " ${COMPILER_RT} ${UNWINDLIB} ${LIBCPLUSPLUS}"
+LIBCPLUSPLUS::toolchain-clang:armv5 = "-stdlib=libstdc++"
 
 # Clang does not yet support big.LITTLE performance tunes, so use the LITTLE for tunes
 TUNE_CCARGS:remove:toolchain-clang = "\
@@ -49,30 +39,11 @@ TUNE_CCARGS:remove:toolchain-clang:powerpc = "-mhard-float -mno-spe"
 TUNE_CCARGS:append:toolchain-clang:libc-musl:powerpc64 = " -mlong-double-64"
 TUNE_CCARGS:append:toolchain-clang:libc-musl:powerpc64le = " -mlong-double-64"
 TUNE_CCARGS:append:toolchain-clang:libc-musl:powerpc = " -mlong-double-64"
-# usrmerge workaround
-TUNE_CCARGS:append:toolchain-clang = "${@bb.utils.contains("DISTRO_FEATURES", "usrmerge", " --dyld-prefix=/usr", "", d)}"
-
-TUNE_CCARGS:append:toolchain-clang = " -Qunused-arguments"
-
-LDFLAGS:append:toolchain-clang:class-nativesdk:x86-64 = " -Wl,-dynamic-linker,${base_libdir}/ld-linux-x86-64.so.2"
-LDFLAGS:append:toolchain-clang:class-nativesdk:x86 = " -Wl,-dynamic-linker,${base_libdir}/ld-linux.so.2"
-LDFLAGS:append:toolchain-clang:class-nativesdk:aarch64 = " -Wl,-dynamic-linker,${base_libdir}/ld-linux-aarch64.so.1"
 
-LDFLAGS:toolchain-clang:class-nativesdk = "${BUILDSDK_LDFLAGS} \
-                                           -Wl,-rpath-link,${STAGING_LIBDIR}/.. \
-                                           -Wl,-rpath,${libdir}/.. "
-
-# Enable lld globally except for ppc32 where it causes random segfaults in Qemu usermode
-LDFLAGS:append:toolchain-clang:class-target = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -fuse-ld=lld', '', d)}"
-LDFLAGS:append:toolchain-clang:class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' -fuse-ld=lld', '', d)}"
+# If lld is enabled globally then disable it for ppc32 where it causes random segfaults in Qemu usermode
 LDFLAGS:remove:toolchain-clang:powerpc = "-fuse-ld=lld"
+LDFLAGS:append:toolchain-clang:powerpc = " -fuse-ld=bfd"
 
-# Remove gcc specific -fcanon-prefix-map option, added in gcc-13+
-# clang does not support it yet
-DEBUG_PREFIX_MAP:remove:toolchain-clang = "-fcanon-prefix-map"
-
-# choose between 'gnu' 'llvm'
-TC_CXX_RUNTIME ??= "gnu"
 # Using gcc or llvm runtime is only available when using clang for compiler
 #TC_CXX_RUNTIME:toolchain-gcc = "gnu"
 TC_CXX_RUNTIME:armeb = "gnu"
@@ -97,44 +68,6 @@ YOCTO_ALTERNATE_LIBDIR:toolchain-clang:class-target = "/${BASELIB}"
 #DEPENDS:append:toolchain-clang:class-target = " clang-cross-${TARGET_ARCH} "
 #DEPENDS:remove:toolchain-clang:allarch = "clang-cross-${TARGET_ARCH}"
 
-def clang_base_deps(d):
-    if not d.getVar('INHIBIT_DEFAULT_DEPS', False):
-        if not oe.utils.inherits(d, 'allarch') :
-            ret = " ${MLPREFIX}clang-cross-${TARGET_ARCH} virtual/libc "
-            if (d.getVar('TC_CXX_RUNTIME').find('android') != -1):
-                ret += " libcxx"
-                return ret
-            if (d.getVar('TC_CXX_RUNTIME').find('llvm') != -1):
-                ret += " compiler-rt"
-            elif (d.getVar('COMPILER_RT').find('-rtlib=compiler-rt') != -1):
-                ret += " compiler-rt "
-            else:
-                ret += " libgcc "
-            if (d.getVar('TC_CXX_RUNTIME').find('llvm') != -1):
-                ret += " libcxx"
-            elif (d.getVar('COMPILER_RT').find('--unwindlib=libunwind') != -1):
-                ret += " libcxx "
-            elif (d.getVar('LIBCPLUSPLUS').find('-stdlib=libc++') != -1):
-                ret += " libcxx "
-            else:
-                ret += " virtual/${MLPREFIX}compilerlibs "
-            return ret
-    return ""
-
-BASE_DEFAULT_DEPS:append:class-target:toolchain-clang:class-target = " ${@clang_base_deps(d)}"
-BASE_DEFAULT_DEPS:append:class-native:runtime-llvm = " libcxx-native compiler-rt-native"
-BASE_DEFAULT_DEPS:append:class-nativesdk:runtime-llvm = " clang-native nativesdk-libcxx nativesdk-compiler-rt"
-
-# do_populate_sysroot needs STRIP
-POPULATESYSROOTDEPS:toolchain-clang:class-target = "${MLPREFIX}clang-cross-${TARGET_ARCH}:do_populate_sysroot"
-
-cmake_do_generate_toolchain_file:append:toolchain-clang () {
-    cat >> ${WORKDIR}/toolchain.cmake <<EOF
-set( CMAKE_CLANG_TIDY ${HOST_PREFIX}clang-tidy )
-EOF
-    sed -i 's/ -mmusl / /g' ${WORKDIR}/toolchain.cmake
-}
-
 # dump recipes which still use gcc
 #python __anonymous() {
 #    toolchain = d.getVar("TOOLCHAIN")