From fba4ea44fba0662a0193149f514215d228d6dc98 Mon Sep 17 00:00:00 2001
From: Michael Platings <michael.platings@arm.com>
Date: Wed, 13 Mar 2024 19:04:35 +0000
Subject: [PATCH] Use LLD linker in CI

---
 .gitlab-ci.yml    | 2 +-
 docker/Dockerfile | 1 +
 scripts/ci.sh     | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5d86dd6b3..c5b101b59 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-image: registry.gitlab.arm.com/intrinsiccv/intrinsiccv:5
+image: registry.gitlab.arm.com/intrinsiccv/intrinsiccv:6
 
 # Only run CI for main branch & merge requests
 workflow:
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 61ec1571a..6aff29c9f 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -40,6 +40,7 @@ RUN wget -q https://apt.llvm.org/llvm-snapshot.gpg.key -O /etc/apt/trusted.gpg.d
         clang-tidy-${LLVM_VERSION} \
         clang-tools-${LLVM_VERSION} \
         libclang-rt-${LLVM_VERSION}-dev \
+        lld-${LLVM_VERSION} \
         llvm-${LLVM_VERSION}
 
 # Install libclang-rt-dev on an x86 host.
diff --git a/scripts/ci.sh b/scripts/ci.sh
index fe873d28d..df225ef7c 100755
--- a/scripts/ci.sh
+++ b/scripts/ci.sh
@@ -32,6 +32,7 @@ doxygen
 cmake -S . -B build -G Ninja \
   -DCMAKE_CXX_CLANG_TIDY=clang-tidy \
   -DCMAKE_CXX_FLAGS="--target=aarch64-linux-gnu --coverage" \
+  -DCMAKE_EXE_LINKER_FLAGS="--rtlib=compiler-rt -static -fuse-ld=lld" \
   -DINTRINSICCV_ENABLE_SVE2=ON \
   -DINTRINSICCV_ENABLE_SVE2_SELECTIVELY=OFF \
   -DINTRINSICCV_CHECK_BANNED_FUNCTIONS=ON
-- 
GitLab