TF-M: Upgrades LLVM Clang version to v20.1
Change-Id: Ia919e15815f819e7492854994f42a248140a0fc3
Signed-off-by: Matthew Dalzell <matthew.dalzell@arm.com>
diff --git a/bionic-amd64-tf-m-build/Dockerfile b/bionic-amd64-tf-m-build/Dockerfile
index 154f7b7..a269bdf 100644
--- a/bionic-amd64-tf-m-build/Dockerfile
+++ b/bionic-amd64-tf-m-build/Dockerfile
@@ -24,6 +24,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_20_1_DIR=${COMPILER_DIR}/clang_20_1
+ENV CLANG_20_1_PATH=${CLANG_20_1_DIR}/bin
ENV PKG_DEPS="\
bison \
build-essential \
diff --git a/bionic-amd64-tf-m-build/tf-dependencies.install b/bionic-amd64-tf-m-build/tf-dependencies.install
index e01a5b2..b369f24 100755
--- a/bionic-amd64-tf-m-build/tf-dependencies.install
+++ b/bionic-amd64-tf-m-build/tf-dependencies.install
@@ -55,3 +55,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 v20.1 toolchain to CLANG_20_1_DIR
+mkdir -p ${CLANG_20_1_DIR}
+curl --create-dirs -fsSLo /tmp/ATfE-20.1.0-Linux-x86_64.tar.xz \
+ https://github.com/arm/arm-toolchain/releases/download/release-20.1.0-ATfE/ATfE-20.1.0-Linux-x86_64.tar.xz
+tar -xf /tmp/ATfE-20.1.0-Linux-x86_64.tar.xz -C ${CLANG_20_1_DIR} --strip-components=1
diff --git a/bionic-amd64-tf-m-build/tf-environment.install b/bionic-amd64-tf-m-build/tf-environment.install
index afe5244..d61270e 100755
--- a/bionic-amd64-tf-m-build/tf-environment.install
+++ b/bionic-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_20_1_PATH >> /etc/environment
diff --git a/jammy-amd64-tf-m-build/Dockerfile b/jammy-amd64-tf-m-build/Dockerfile
index a4bb1c8..ccbcfe8 100644
--- a/jammy-amd64-tf-m-build/Dockerfile
+++ b/jammy-amd64-tf-m-build/Dockerfile
@@ -24,8 +24,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 CLANG_20_1_DIR=${COMPILER_DIR}/clang_20_1
+ENV CLANG_20_1_PATH=${CLANG_20_1_DIR}/bin
ENV PKG_DEPS="\
bison \
build-essential \
diff --git a/jammy-amd64-tf-m-build/tf-dependencies.install b/jammy-amd64-tf-m-build/tf-dependencies.install
index 56fb8ea..b369f24 100755
--- a/jammy-amd64-tf-m-build/tf-dependencies.install
+++ b/jammy-amd64-tf-m-build/tf-dependencies.install
@@ -56,8 +56,8 @@
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
+# Install LLVM Clang v20.1 toolchain to CLANG_20_1_DIR
+mkdir -p ${CLANG_20_1_DIR}
+curl --create-dirs -fsSLo /tmp/ATfE-20.1.0-Linux-x86_64.tar.xz \
+ https://github.com/arm/arm-toolchain/releases/download/release-20.1.0-ATfE/ATfE-20.1.0-Linux-x86_64.tar.xz
+tar -xf /tmp/ATfE-20.1.0-Linux-x86_64.tar.xz -C ${CLANG_20_1_DIR} --strip-components=1
diff --git a/jammy-amd64-tf-m-build/tf-environment.install b/jammy-amd64-tf-m-build/tf-environment.install
index d6d268f..1f5fda8 100755
--- a/jammy-amd64-tf-m-build/tf-environment.install
+++ b/jammy-amd64-tf-m-build/tf-environment.install
@@ -10,4 +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
+env | grep CLANG_20_1_PATH >> /etc/environment
\ No newline at end of file