meta-arm/trusted-services: Use GCC toolchain for specific TS recipes only.

This commit also enables clang CI pipelines for TS.

Signed-off-by: Anton Antonov <Anton.Antonov@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>

.gitlab-ci.yml

@@ -157,7 +157,8 @@ qemuarm64-secureboot-ts:
   extends: .build
   parallel:
     matrix:
-      - TCLIBC: [glibc, musl]
+      - TOOLCHAINS: [gcc, clang]
+        TCLIBC: [glibc, musl]
         TESTING: testimage
 
 qemuarm64:

meta-arm/recipes-security/trusted-services/trusted-services.inc

@@ -50,5 +50,3 @@ EXTRA_OECMAKE += "${@oe.utils.conditional('TS_ENV', 'opteesp', \
 EXTRA_OECMAKE += "-Dlibts_DIR=${STAGING_DIR_HOST}${TS_INSTALL}/lib/cmake/ \
                   -DNEWLIB_INSTALL_DIR=${STAGING_DIR_HOST}${TS_INSTALL}/newlib_install \
                  "
-# Newlib does not compile with clang
-TOOLCHAIN = "gcc"

meta-arm/recipes-security/trusted-services/ts-demo_git.bb

@@ -11,6 +11,10 @@ RDEPENDS:${PN} += "libts"
 
 OECMAKE_SOURCEPATH="${S}/deployments/ts-demo/${TS_ENV}"
 
+# Mbedtls 3.1.0 does not compile with clang.
+# This can be removed after TS updated required mbedtls version
+TOOLCHAIN = "gcc"
+
 FILES:${PN} = "${bindir}/ts-demo"
 
 do_install:append () {

meta-arm/recipes-security/trusted-services/ts-newlib_4.1.0.bb

@@ -13,6 +13,9 @@ SRC_URI += "git://sourceware.org/git/newlib-cygwin.git;name=newlib;protocol=http
 SRCREV_newlib = "415fdd4279b85eeec9d54775ce13c5c412451e08"
 LIC_FILES_CHKSUM += "file://../newlib/COPYING.NEWLIB;md5=b8dda70da54e0efb49b1074f349d7749"
 
+# Newlib does not compile with clang
+TOOLCHAIN = "gcc"
+
 EXTRA_OECMAKE += '-DNEWLIB_SOURCE_DIR=${WORKDIR}/git/newlib \
                   -DNEWLIB_EXTRA="CFLAGS=--sysroot=${STAGING_DIR_HOST}" \
                  '

meta-arm/recipes-security/trusted-services/ts-psa-iat-api-test_git.bb

@@ -17,3 +17,7 @@ SRCREV_psaqcbor = "42272e466a8472948bf8fca076d113b81b99f0e0"
 
 EXTRA_OECMAKE += "-DPSA_TARGET_QCBOR=${WORKDIR}/git/psaqcbor \
                  "
+
+# Mbedtls 3.1.0 does not compile with clang.
+# This can be removed after TS updated required mbedtls version
+TOOLCHAIN = "gcc"

meta-arm/recipes-security/trusted-services/ts-sp-common.inc

@@ -27,3 +27,6 @@ EXTRA_OECMAKE += '-DCMAKE_ASM_FLAGS="${DEBUG_PREFIX_MAP}"'
 # Ignore that SP stripped.elf does not have GNU_HASH
 # Older versions of optee support SYSV hash only.
 INSANE_SKIP:${PN}-dev += "ldflags"
+
+# Trusted Services SPs do not compile with clang
+TOOLCHAIN = "gcc"