[llvm] [AMDGPU] Update buildbot cmake cache files (PR #222807)

Jan Patrick Lehr via llvm-commits llvm-commits at lists.llvm.org
Thu Sep 10 15:53:09 PDT 2026


https://github.com/jplehr created https://github.com/llvm/llvm-project/pull/222807

This fixes one issue where the compiler-rt entry was not propagated to the build.

We also want to select libgcc as the default unwindlib explicitly (as this is what we do downstream).

>From 30d92cda3904b111ccbbf3be231ac0d735d09a7e Mon Sep 17 00:00:00 2001
From: JP Lehr <JanPatrick.Lehr at amd.com>
Date: Thu, 10 Sep 2026 17:50:37 -0500
Subject: [PATCH] [AMDGPU] Update buildbot cmake cache files

This fixes one issue where the compiler-rt entry was not propagated to
the build.

We also want to select libgcc as the default unwindlib explicitly (as
this is what we do downstream).
---
 offload/cmake/caches/AMDGPUBot.cmake     | 3 ++-
 offload/cmake/caches/AMDGPULibcBot.cmake | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/offload/cmake/caches/AMDGPUBot.cmake b/offload/cmake/caches/AMDGPUBot.cmake
index 0b7d520dd8453..e429e290c53d8 100644
--- a/offload/cmake/caches/AMDGPUBot.cmake
+++ b/offload/cmake/caches/AMDGPUBot.cmake
@@ -20,7 +20,8 @@ set(LLVM_LIT_ARGS "-v --show-unsupported --timeout 100 --show-xfail -j 16" CACHE
 set(LIBOMPTEST_BUILD_UNITTESTS ON CACHE BOOL "")
 
 set(CLANG_DEFAULT_LINKER "lld" CACHE STRING "")
-set(CLANG_DEFAULT_RTLIB "compiler-rt" STRING "")
+set(CLANG_DEFAULT_RTLIB "compiler-rt" CACHE STRING "")
+set(CLANG_DEFAULT_UNWINDLIB "libgcc" CACHE STRING "")
 
 set(LLVM_RUNTIME_TARGETS default;amdgpu-amd-amdhsa CACHE STRING "")
 set(RUNTIMES_amdgpu-amd-amdhsa_LLVM_ENABLE_RUNTIMES "openmp" CACHE STRING "")
diff --git a/offload/cmake/caches/AMDGPULibcBot.cmake b/offload/cmake/caches/AMDGPULibcBot.cmake
index a450387c66ed7..2fdd5bc1fc63c 100644
--- a/offload/cmake/caches/AMDGPULibcBot.cmake
+++ b/offload/cmake/caches/AMDGPULibcBot.cmake
@@ -14,7 +14,8 @@ set(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR ON CACHE BOOL "")
 set(LLVM_ENABLE_ASSERTIONS ON CACHE BOOL "")
 
 set(CLANG_DEFAULT_LINKER "lld" CACHE STRING "")
-set(CLANG_DEFAULT_RTLIB "compiler-rt" STRING "")
+set(CLANG_DEFAULT_RTLIB "compiler-rt" CACHE STRING "")
+set(CLANG_DEFAULT_UNWINDLIB "libgcc" CACHE STRING "")
 
 set(LLVM_RUNTIME_TARGETS default;amdgpu-amd-amdhsa CACHE STRING "")
 set(RUNTIMES_amdgpu-amd-amdhsa_CACHE_FILES "${CMAKE_SOURCE_DIR}/../compiler-rt/cmake/caches/AMDGPU.cmake;${CMAKE_SOURCE_DIR}/../libcxx/cmake/caches/AMDGPU.cmake" CACHE STRING "")



More information about the llvm-commits mailing list