[compiler-rt] Conditionalise the addition of Aarch64 function Multi versioning support on aarch64 target (PR #143749)

Garvit Gupta via llvm-commits llvm-commits at lists.llvm.org
Wed Jun 11 10:01:17 PDT 2025


https://github.com/quic-garvgupt created https://github.com/llvm/llvm-project/pull/143749

Currently, `ENABLE_BAREMETAL_AARCH64_FMV` is added to builtin defines for all baremetal targets though it is only needed for aarch64. This patch fixes this by adding it only for aarch64 target.

>From ea71da6c89251eb3bbfc52c55cde1f836408a7a5 Mon Sep 17 00:00:00 2001
From: Garvit Gupta <quic_garvgupt at quicinc.com>
Date: Thu, 5 Jun 2025 03:32:24 -0700
Subject: [PATCH] Conditionalise the addition of Aarch64 function Multi
 versioning support on aarch64 target

Currently, `ENABLE_BAREMETAL_AARCH64_FMV` is added to builtin defines
for all baremetal targets though it is only needed for aarch64. This
patch fixes this by adding it only for aarch64 target.

Change-Id: Ie469d01961e9d4992c1a430d7e9b089ae9549079
---
 compiler-rt/lib/builtins/CMakeLists.txt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/compiler-rt/lib/builtins/CMakeLists.txt b/compiler-rt/lib/builtins/CMakeLists.txt
index 075c4647abf69..10d0be1efd22f 100644
--- a/compiler-rt/lib/builtins/CMakeLists.txt
+++ b/compiler-rt/lib/builtins/CMakeLists.txt
@@ -884,7 +884,11 @@ else ()
   if(COMPILER_RT_DISABLE_AARCH64_FMV)
     list(APPEND BUILTIN_DEFS DISABLE_AARCH64_FMV)
   elseif(COMPILER_RT_BAREMETAL_BUILD)
-    list(APPEND BUILTIN_DEFS ENABLE_BAREMETAL_AARCH64_FMV)
+    foreach (arch ${BUILTIN_SUPPORTED_ARCH})
+      if("${arch}" STREQUAL "aarch64")
+        list(APPEND BUILTIN_DEFS ENABLE_BAREMETAL_AARCH64_FMV)
+      endif()
+    endforeach ()
   endif()
 
   append_list_if(COMPILER_RT_HAS_ASM_LSE HAS_ASM_LSE BUILTIN_DEFS)



More information about the llvm-commits mailing list