commit ac6bfb72bf88a42b9a7f80384b7a6a7abf0fb31f
author Matthew Dalzell <matthew.dalzell@arm.com> Mon Jun 09 15:45:24 2025 +0100
committer Matt Dalzell <matthew.dalzell@arm.com> Wed Jun 11 09:05:56 2025 +0000
tree 69f5d746b0e4e6c46a57cfd99a7c20693cdd35c4
parent bc75df5f8d8db397baba8c8a8857b8c43378cbd0

TF-M: Adds LLVM Clang toolchain

LLVM Clang v18.1.3 added to jammy-amd64-tf-m-build

Change-Id: I8b9fac52979dd5917fd4b4454fe892e411acdd71
Signed-off-by: Matthew Dalzell <matthew.dalzell@arm.com>

jammy-amd64-tf-m-build/Dockerfile

diff --git a/jammy-amd64-tf-m-build/Dockerfile b/jammy-amd64-tf-m-build/Dockerfile
index 589b46a..72a09a0 100644
--- a/jammy-amd64-tf-m-build/Dockerfile
+++ b/jammy-amd64-tf-m-build/Dockerfile
@@ -22,6 +22,8 @@
 ENV ARMCLANG_6_20_PATH=${ARMCLANG_6_20_DIR}/bin
 ENV ARMCLANG_6_21_DIR=${COMPILER_DIR}/armclang-6-21
 ENV ARMCLANG_6_21_PATH=${ARMCLANG_6_21_DIR}/bin
+ENV CLANG_18_1_3_DIR=${COMPILER_DIR}/clang_18_1_3
+ENV CLANG_18_1_3_PATH=${CLANG_18_1_3_DIR}/bin
 ENV PKG_DEPS="\
     bison \
     build-essential \

jammy-amd64-tf-m-build/tf-dependencies.install

diff --git a/jammy-amd64-tf-m-build/tf-dependencies.install b/jammy-amd64-tf-m-build/tf-dependencies.install
index 2471ea3..d3735bc 100755
--- a/jammy-amd64-tf-m-build/tf-dependencies.install
+++ b/jammy-amd64-tf-m-build/tf-dependencies.install
@@ -49,3 +49,9 @@
 mkdir -p /tmp/armclang-6.21
 tar -xf /tmp/ARMCompiler6.21_standalone_linux-x86_64.tar.gz -C /tmp/armclang-6.21
 /tmp/armclang-6.21/install_x86_64.sh --no-interactive --i-agree-to-the-contained-eula -d ${ARMCLANG_6_21_DIR}
+
+# Install LLVM Clang v18.1.3 toolchain to CLANG_18_1_3_DIR
+mkdir -p ${CLANG_18_1_3_DIR}
+curl --create-dirs -fsSLo /tmp/LLVM-ET-Arm-18.1.3-Linux-x86_64.tar.xz \
+  https://github.com/ARM-software/LLVM-embedded-toolchain-for-Arm/releases/download/release-18.1.3/LLVM-ET-Arm-18.1.3-Linux-x86_64.tar.xz
+tar -xf /tmp/LLVM-ET-Arm-18.1.3-Linux-x86_64.tar.xz -C ${CLANG_18_1_3_DIR} --strip-components=1
\ No newline at end of file

jammy-amd64-tf-m-build/tf-environment.install

diff --git a/jammy-amd64-tf-m-build/tf-environment.install b/jammy-amd64-tf-m-build/tf-environment.install
index afe5244..d6d268f 100755
--- a/jammy-amd64-tf-m-build/tf-environment.install
+++ b/jammy-amd64-tf-m-build/tf-environment.install
@@ -10,3 +10,4 @@
 env | grep PATH >> /etc/environment
 env | grep GCC_7_3_1_PATH >> /etc/environment
 env | grep GCC_10_3_PATH >> /etc/environment
+env | grep CLANG_18_1_3_PATH >> /etc/environment
\ No newline at end of file