authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-07-16 04:41:14+02:00
committergravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-08-30 06:36:40+02:00
log008affa64559487c6886e27075bb5377ca915b4a
tree88fb362c3666f116279315f968a6a304b4af99e2
parent558bea2a76179fcc00779fdd326e5a866956fc9b
signaturebadge-check Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM

build: update to LLVM 21

Closes #20966.

5 files changed, 56 insertions(+), 52 deletions(-)

CMakeLists.txt+3-3
...@@ -133,9 +133,9 @@ else()...@@ -133,9 +133,9 @@ else()
133 set(ZIG_SYSTEM_LIBCXX "stdc++" CACHE STRING "system libcxx name for build.zig")133 set(ZIG_SYSTEM_LIBCXX "stdc++" CACHE STRING "system libcxx name for build.zig")
134endif()134endif()
135135
136find_package(llvm 20)136find_package(llvm 21)
137find_package(clang 20)137find_package(clang 21)
138find_package(lld 20)138find_package(lld 21)
139139
140if(ZIG_STATIC_ZLIB)140if(ZIG_STATIC_ZLIB)
141 if (MSVC)141 if (MSVC)
build.zig+12-10
...@@ -1176,7 +1176,6 @@ const clang_libs = [_][]const u8{...@@ -1176,7 +1176,6 @@ const clang_libs = [_][]const u8{
1176 "clangBasic",1176 "clangBasic",
1177 "clangEdit",1177 "clangEdit",
1178 "clangLex",1178 "clangLex",
1179 "clangARCMigrate",
1180 "clangRewriteFrontend",1179 "clangRewriteFrontend",
1181 "clangRewrite",1180 "clangRewrite",
1182 "clangCrossTU",1181 "clangCrossTU",
...@@ -1322,30 +1321,31 @@ const llvm_libs = [_][]const u8{...@@ -1322,30 +1321,31 @@ const llvm_libs = [_][]const u8{
1322 "LLVMOrcTargetProcess",1321 "LLVMOrcTargetProcess",
1323 "LLVMOrcShared",1322 "LLVMOrcShared",
1324 "LLVMDWP",1323 "LLVMDWP",
1324 "LLVMDWARFCFIChecker",
1325 "LLVMDebugInfoLogicalView",1325 "LLVMDebugInfoLogicalView",
1326 "LLVMDebugInfoGSYM",
1327 "LLVMOption",1326 "LLVMOption",
1328 "LLVMObjectYAML",
1329 "LLVMObjCopy",1327 "LLVMObjCopy",
1330 "LLVMMCA",1328 "LLVMMCA",
1331 "LLVMMCDisassembler",1329 "LLVMMCDisassembler",
1332 "LLVMLTO",1330 "LLVMLTO",
1331 "LLVMFrontendOpenACC",
1332 "LLVMFrontendHLSL",
1333 "LLVMFrontendDriver",
1334 "LLVMExtensions",
1333 "LLVMPasses",1335 "LLVMPasses",
1334 "LLVMHipStdPar",1336 "LLVMHipStdPar",
1335 "LLVMCFGuard",
1336 "LLVMCoroutines",1337 "LLVMCoroutines",
1338 "LLVMCFGuard",
1337 "LLVMipo",1339 "LLVMipo",
1340 "LLVMInstrumentation",
1338 "LLVMVectorize",1341 "LLVMVectorize",
1339 "LLVMSandboxIR",1342 "LLVMSandboxIR",
1340 "LLVMLinker",1343 "LLVMLinker",
1341 "LLVMInstrumentation",
1342 "LLVMFrontendOpenMP",1344 "LLVMFrontendOpenMP",
1343 "LLVMFrontendOffloading",1345 "LLVMFrontendDirective",
1344 "LLVMFrontendOpenACC",
1345 "LLVMFrontendHLSL",
1346 "LLVMFrontendDriver",
1347 "LLVMFrontendAtomic",1346 "LLVMFrontendAtomic",
1348 "LLVMExtensions",1347 "LLVMFrontendOffloading",
1348 "LLVMObjectYAML",
1349 "LLVMDWARFLinkerParallel",1349 "LLVMDWARFLinkerParallel",
1350 "LLVMDWARFLinkerClassic",1350 "LLVMDWARFLinkerClassic",
1351 "LLVMDWARFLinker",1351 "LLVMDWARFLinker",
...@@ -1374,7 +1374,9 @@ const llvm_libs = [_][]const u8{...@@ -1374,7 +1374,9 @@ const llvm_libs = [_][]const u8{
1374 "LLVMDebugInfoPDB",1374 "LLVMDebugInfoPDB",
1375 "LLVMDebugInfoMSF",1375 "LLVMDebugInfoMSF",
1376 "LLVMDebugInfoCodeView",1376 "LLVMDebugInfoCodeView",
1377 "LLVMDebugInfoGSYM",
1377 "LLVMDebugInfoDWARF",1378 "LLVMDebugInfoDWARF",
1379 "LLVMDebugInfoDWARFLowLevel",
1378 "LLVMObject",1380 "LLVMObject",
1379 "LLVMTextAPI",1381 "LLVMTextAPI",
1380 "LLVMMCParser",1382 "LLVMMCParser",
cmake/Findclang.cmake+4-5
...@@ -17,10 +17,10 @@ find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h...@@ -17,10 +17,10 @@ find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h
17if(${LLVM_LINK_MODE} STREQUAL "shared")17if(${LLVM_LINK_MODE} STREQUAL "shared")
18 find_library(CLANG_LIBRARIES18 find_library(CLANG_LIBRARIES
19 NAMES19 NAMES
20 libclang-cpp.so.2020 libclang-cpp.so.21
21 libclang-cpp.so.20.121 libclang-cpp.so.21.1
22 clang-cpp-20.022 clang-cpp-21.0
23 clang-cpp20023 clang-cpp210
24 clang-cpp24 clang-cpp
25 NAMES_PER_DIR25 NAMES_PER_DIR
26 HINTS "${LLVM_LIBDIRS}"26 HINTS "${LLVM_LIBDIRS}"
...@@ -60,7 +60,6 @@ else()...@@ -60,7 +60,6 @@ else()
60 FIND_AND_ADD_CLANG_LIB(clangBasic)60 FIND_AND_ADD_CLANG_LIB(clangBasic)
61 FIND_AND_ADD_CLANG_LIB(clangEdit)61 FIND_AND_ADD_CLANG_LIB(clangEdit)
62 FIND_AND_ADD_CLANG_LIB(clangLex)62 FIND_AND_ADD_CLANG_LIB(clangLex)
63 FIND_AND_ADD_CLANG_LIB(clangARCMigrate)
64 FIND_AND_ADD_CLANG_LIB(clangRewriteFrontend)63 FIND_AND_ADD_CLANG_LIB(clangRewriteFrontend)
65 FIND_AND_ADD_CLANG_LIB(clangRewrite)64 FIND_AND_ADD_CLANG_LIB(clangRewrite)
66 FIND_AND_ADD_CLANG_LIB(clangCrossTU)65 FIND_AND_ADD_CLANG_LIB(clangCrossTU)
cmake/Findlld.cmake+19-19
...@@ -9,23 +9,23 @@...@@ -9,23 +9,23 @@
9find_path(LLD_INCLUDE_DIRS NAMES lld/Common/Driver.h9find_path(LLD_INCLUDE_DIRS NAMES lld/Common/Driver.h
10 HINTS ${LLVM_INCLUDE_DIRS}10 HINTS ${LLVM_INCLUDE_DIRS}
11 PATHS11 PATHS
12 /usr/lib/llvm-20/include12 /usr/lib/llvm-21/include
13 /usr/local/llvm200/include13 /usr/local/llvm210/include
14 /usr/local/llvm20/include14 /usr/local/llvm21/include
15 /usr/local/opt/lld@20/include15 /usr/local/opt/lld@21/include
16 /opt/homebrew/opt/lld@20/include16 /opt/homebrew/opt/lld@21/include
17 /home/linuxbrew/.linuxbrew/opt/lld@20/include17 /home/linuxbrew/.linuxbrew/opt/lld@21/include
18 /mingw64/include)18 /mingw64/include)
1919
20find_library(LLD_LIBRARY NAMES lld-20.0 lld200 lld NAMES_PER_DIR20find_library(LLD_LIBRARY NAMES lld-21.0 lld210 lld NAMES_PER_DIR
21 HINTS ${LLVM_LIBDIRS}21 HINTS ${LLVM_LIBDIRS}
22 PATHS22 PATHS
23 /usr/lib/llvm-20/lib23 /usr/lib/llvm-21/lib
24 /usr/local/llvm200/lib24 /usr/local/llvm210/lib
25 /usr/local/llvm20/lib25 /usr/local/llvm21/lib
26 /usr/local/opt/lld@20/lib26 /usr/local/opt/lld@21/lib
27 /opt/homebrew/opt/lld@20/lib27 /opt/homebrew/opt/lld@21/lib
28 /home/linuxbrew/.linuxbrew/opt/lld@20/lib28 /home/linuxbrew/.linuxbrew/opt/lld@21/lib
29)29)
30if(EXISTS ${LLD_LIBRARY})30if(EXISTS ${LLD_LIBRARY})
31 set(LLD_LIBRARIES ${LLD_LIBRARY})31 set(LLD_LIBRARIES ${LLD_LIBRARY})
...@@ -36,12 +36,12 @@ else()...@@ -36,12 +36,12 @@ else()
36 HINTS ${LLVM_LIBDIRS}36 HINTS ${LLVM_LIBDIRS}
37 PATHS37 PATHS
38 ${LLD_LIBDIRS}38 ${LLD_LIBDIRS}
39 /usr/lib/llvm-20/lib39 /usr/lib/llvm-21/lib
40 /usr/local/llvm200/lib40 /usr/local/llvm210/lib
41 /usr/local/llvm20/lib41 /usr/local/llvm21/lib
42 /usr/local/opt/lld@20/lib42 /usr/local/opt/lld@21/lib
43 /opt/homebrew/opt/lld@20/lib43 /opt/homebrew/opt/lld@21/lib
44 /home/linuxbrew/.linuxbrew/opt/lld@20/lib44 /home/linuxbrew/.linuxbrew/opt/lld@21/lib
45 /mingw64/lib45 /mingw64/lib
46 /c/msys64/mingw64/lib46 /c/msys64/mingw64/lib
47 c:/msys64/mingw64/lib)47 c:/msys64/mingw64/lib)
cmake/Findllvm.cmake+18-15
...@@ -17,12 +17,12 @@ if(ZIG_USE_LLVM_CONFIG)...@@ -17,12 +17,12 @@ if(ZIG_USE_LLVM_CONFIG)
17 # terminate when the right LLVM version is not found.17 # terminate when the right LLVM version is not found.
18 unset(LLVM_CONFIG_EXE CACHE)18 unset(LLVM_CONFIG_EXE CACHE)
19 find_program(LLVM_CONFIG_EXE19 find_program(LLVM_CONFIG_EXE
20 NAMES llvm-config-20 llvm-config-20.0 llvm-config200 llvm-config20 llvm-config NAMES_PER_DIR20 NAMES llvm-config-21 llvm-config-21.0 llvm-config210 llvm-config21 llvm-config NAMES_PER_DIR
21 PATHS21 PATHS
22 "/mingw64/bin"22 "/mingw64/bin"
23 "/c/msys64/mingw64/bin"23 "/c/msys64/mingw64/bin"
24 "c:/msys64/mingw64/bin"24 "c:/msys64/mingw64/bin"
25 "C:/Libraries/llvm-20.0.0/bin")25 "C:/Libraries/llvm-21.0.0/bin")
2626
27 if ("${LLVM_CONFIG_EXE}" STREQUAL "LLVM_CONFIG_EXE-NOTFOUND")27 if ("${LLVM_CONFIG_EXE}" STREQUAL "LLVM_CONFIG_EXE-NOTFOUND")
28 if (NOT LLVM_CONFIG_ERROR_MESSAGES STREQUAL "")28 if (NOT LLVM_CONFIG_ERROR_MESSAGES STREQUAL "")
...@@ -40,9 +40,9 @@ if(ZIG_USE_LLVM_CONFIG)...@@ -40,9 +40,9 @@ if(ZIG_USE_LLVM_CONFIG)
40 OUTPUT_STRIP_TRAILING_WHITESPACE)40 OUTPUT_STRIP_TRAILING_WHITESPACE)
4141
42 get_filename_component(LLVM_CONFIG_DIR "${LLVM_CONFIG_EXE}" DIRECTORY)42 get_filename_component(LLVM_CONFIG_DIR "${LLVM_CONFIG_EXE}" DIRECTORY)
43 if("${LLVM_CONFIG_VERSION}" VERSION_LESS 20 OR "${LLVM_CONFIG_VERSION}" VERSION_EQUAL 21 OR "${LLVM_CONFIG_VERSION}" VERSION_GREATER 21)43 if("${LLVM_CONFIG_VERSION}" VERSION_LESS 21 OR "${LLVM_CONFIG_VERSION}" VERSION_EQUAL 22 OR "${LLVM_CONFIG_VERSION}" VERSION_GREATER 22)
44 # Save the error message, in case this is the last llvm-config we find44 # Save the error message, in case this is the last llvm-config we find
45 list(APPEND LLVM_CONFIG_ERROR_MESSAGES "expected LLVM 20.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")45 list(APPEND LLVM_CONFIG_ERROR_MESSAGES "expected LLVM 21.x but found ${LLVM_CONFIG_VERSION} using ${LLVM_CONFIG_EXE}")
4646
47 # Ignore this directory and try the search again47 # Ignore this directory and try the search again
48 list(APPEND CMAKE_IGNORE_PATH "${LLVM_CONFIG_DIR}")48 list(APPEND CMAKE_IGNORE_PATH "${LLVM_CONFIG_DIR}")
...@@ -66,9 +66,9 @@ if(ZIG_USE_LLVM_CONFIG)...@@ -66,9 +66,9 @@ if(ZIG_USE_LLVM_CONFIG)
66 if (LLVM_CONFIG_ERROR)66 if (LLVM_CONFIG_ERROR)
67 # Save the error message, in case this is the last llvm-config we find67 # Save the error message, in case this is the last llvm-config we find
68 if (ZIG_SHARED_LLVM)68 if (ZIG_SHARED_LLVM)
69 list(APPEND LLVM_CONFIG_ERROR_MESSAGES "LLVM 20.x found at ${LLVM_CONFIG_EXE} does not support linking as a shared library")69 list(APPEND LLVM_CONFIG_ERROR_MESSAGES "LLVM 21.x found at ${LLVM_CONFIG_EXE} does not support linking as a shared library")
70 else()70 else()
71 list(APPEND LLVM_CONFIG_ERROR_MESSAGES "LLVM 20.x found at ${LLVM_CONFIG_EXE} does not support linking as a static library")71 list(APPEND LLVM_CONFIG_ERROR_MESSAGES "LLVM 21.x found at ${LLVM_CONFIG_EXE} does not support linking as a static library")
72 endif()72 endif()
7373
74 # Ignore this directory and try the search again74 # Ignore this directory and try the search again
...@@ -315,30 +315,31 @@ else()...@@ -315,30 +315,31 @@ else()
315 FIND_AND_ADD_LLVM_LIB(LLVMOrcTargetProcess)315 FIND_AND_ADD_LLVM_LIB(LLVMOrcTargetProcess)
316 FIND_AND_ADD_LLVM_LIB(LLVMOrcShared)316 FIND_AND_ADD_LLVM_LIB(LLVMOrcShared)
317 FIND_AND_ADD_LLVM_LIB(LLVMDWP)317 FIND_AND_ADD_LLVM_LIB(LLVMDWP)
318 FIND_AND_ADD_LLVM_LIB(LLVMDWARFCFIChecker)
318 FIND_AND_ADD_LLVM_LIB(LLVMDebugInfoLogicalView)319 FIND_AND_ADD_LLVM_LIB(LLVMDebugInfoLogicalView)
319 FIND_AND_ADD_LLVM_LIB(LLVMDebugInfoGSYM)
320 FIND_AND_ADD_LLVM_LIB(LLVMOption)320 FIND_AND_ADD_LLVM_LIB(LLVMOption)
321 FIND_AND_ADD_LLVM_LIB(LLVMObjectYAML)
322 FIND_AND_ADD_LLVM_LIB(LLVMObjCopy)321 FIND_AND_ADD_LLVM_LIB(LLVMObjCopy)
323 FIND_AND_ADD_LLVM_LIB(LLVMMCA)322 FIND_AND_ADD_LLVM_LIB(LLVMMCA)
324 FIND_AND_ADD_LLVM_LIB(LLVMMCDisassembler)323 FIND_AND_ADD_LLVM_LIB(LLVMMCDisassembler)
325 FIND_AND_ADD_LLVM_LIB(LLVMLTO)324 FIND_AND_ADD_LLVM_LIB(LLVMLTO)
325 FIND_AND_ADD_LLVM_LIB(LLVMFrontendOpenACC)
326 FIND_AND_ADD_LLVM_LIB(LLVMFrontendHLSL)
327 FIND_AND_ADD_LLVM_LIB(LLVMFrontendDriver)
328 FIND_AND_ADD_LLVM_LIB(LLVMExtensions)
326 FIND_AND_ADD_LLVM_LIB(LLVMPasses)329 FIND_AND_ADD_LLVM_LIB(LLVMPasses)
327 FIND_AND_ADD_LLVM_LIB(LLVMHipStdPar)330 FIND_AND_ADD_LLVM_LIB(LLVMHipStdPar)
328 FIND_AND_ADD_LLVM_LIB(LLVMCFGuard)
329 FIND_AND_ADD_LLVM_LIB(LLVMCoroutines)331 FIND_AND_ADD_LLVM_LIB(LLVMCoroutines)
332 FIND_AND_ADD_LLVM_LIB(LLVMCFGuard)
330 FIND_AND_ADD_LLVM_LIB(LLVMipo)333 FIND_AND_ADD_LLVM_LIB(LLVMipo)
334 FIND_AND_ADD_LLVM_LIB(LLVMInstrumentation)
331 FIND_AND_ADD_LLVM_LIB(LLVMVectorize)335 FIND_AND_ADD_LLVM_LIB(LLVMVectorize)
332 FIND_AND_ADD_LLVM_LIB(LLVMSandboxIR)336 FIND_AND_ADD_LLVM_LIB(LLVMSandboxIR)
333 FIND_AND_ADD_LLVM_LIB(LLVMLinker)337 FIND_AND_ADD_LLVM_LIB(LLVMLinker)
334 FIND_AND_ADD_LLVM_LIB(LLVMInstrumentation)
335 FIND_AND_ADD_LLVM_LIB(LLVMFrontendOpenMP)338 FIND_AND_ADD_LLVM_LIB(LLVMFrontendOpenMP)
336 FIND_AND_ADD_LLVM_LIB(LLVMFrontendOffloading)339 FIND_AND_ADD_LLVM_LIB(LLVMFrontendDirective)
337 FIND_AND_ADD_LLVM_LIB(LLVMFrontendOpenACC)
338 FIND_AND_ADD_LLVM_LIB(LLVMFrontendHLSL)
339 FIND_AND_ADD_LLVM_LIB(LLVMFrontendDriver)
340 FIND_AND_ADD_LLVM_LIB(LLVMFrontendAtomic)340 FIND_AND_ADD_LLVM_LIB(LLVMFrontendAtomic)
341 FIND_AND_ADD_LLVM_LIB(LLVMExtensions)341 FIND_AND_ADD_LLVM_LIB(LLVMFrontendOffloading)
342 FIND_AND_ADD_LLVM_LIB(LLVMObjectYAML)
342 FIND_AND_ADD_LLVM_LIB(LLVMDWARFLinkerParallel)343 FIND_AND_ADD_LLVM_LIB(LLVMDWARFLinkerParallel)
343 FIND_AND_ADD_LLVM_LIB(LLVMDWARFLinkerClassic)344 FIND_AND_ADD_LLVM_LIB(LLVMDWARFLinkerClassic)
344 FIND_AND_ADD_LLVM_LIB(LLVMDWARFLinker)345 FIND_AND_ADD_LLVM_LIB(LLVMDWARFLinker)
...@@ -367,7 +368,9 @@ else()...@@ -367,7 +368,9 @@ else()
367 FIND_AND_ADD_LLVM_LIB(LLVMDebugInfoPDB)368 FIND_AND_ADD_LLVM_LIB(LLVMDebugInfoPDB)
368 FIND_AND_ADD_LLVM_LIB(LLVMDebugInfoMSF)369 FIND_AND_ADD_LLVM_LIB(LLVMDebugInfoMSF)
369 FIND_AND_ADD_LLVM_LIB(LLVMDebugInfoCodeView)370 FIND_AND_ADD_LLVM_LIB(LLVMDebugInfoCodeView)
371 FIND_AND_ADD_LLVM_LIB(LLVMDebugInfoGSYM)
370 FIND_AND_ADD_LLVM_LIB(LLVMDebugInfoDWARF)372 FIND_AND_ADD_LLVM_LIB(LLVMDebugInfoDWARF)
373 FIND_AND_ADD_LLVM_LIB(LLVMDebugInfoDWARFLowLevel)
371 FIND_AND_ADD_LLVM_LIB(LLVMObject)374 FIND_AND_ADD_LLVM_LIB(LLVMObject)
372 FIND_AND_ADD_LLVM_LIB(LLVMTextAPI)375 FIND_AND_ADD_LLVM_LIB(LLVMTextAPI)
373 FIND_AND_ADD_LLVM_LIB(LLVMMCParser)376 FIND_AND_ADD_LLVM_LIB(LLVMMCParser)