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()
133133 set(ZIG_SYSTEM_LIBCXX "stdc++" CACHE STRING "system libcxx name for build.zig")
134134endif()
135135
136find_package(llvm 20)
137find_package(clang 20)
138find_package(lld 20)
136find_package(llvm 21)
137find_package(clang 21)
138find_package(lld 21)
139139
140140if(ZIG_STATIC_ZLIB)
141141 if (MSVC)
build.zig+12-10
......@@ -1176,7 +1176,6 @@ const clang_libs = [_][]const u8{
11761176 "clangBasic",
11771177 "clangEdit",
11781178 "clangLex",
1179 "clangARCMigrate",
11801179 "clangRewriteFrontend",
11811180 "clangRewrite",
11821181 "clangCrossTU",
......@@ -1322,30 +1321,31 @@ const llvm_libs = [_][]const u8{
13221321 "LLVMOrcTargetProcess",
13231322 "LLVMOrcShared",
13241323 "LLVMDWP",
1324 "LLVMDWARFCFIChecker",
13251325 "LLVMDebugInfoLogicalView",
1326 "LLVMDebugInfoGSYM",
13271326 "LLVMOption",
1328 "LLVMObjectYAML",
13291327 "LLVMObjCopy",
13301328 "LLVMMCA",
13311329 "LLVMMCDisassembler",
13321330 "LLVMLTO",
1331 "LLVMFrontendOpenACC",
1332 "LLVMFrontendHLSL",
1333 "LLVMFrontendDriver",
1334 "LLVMExtensions",
13331335 "LLVMPasses",
13341336 "LLVMHipStdPar",
1335 "LLVMCFGuard",
13361337 "LLVMCoroutines",
1338 "LLVMCFGuard",
13371339 "LLVMipo",
1340 "LLVMInstrumentation",
13381341 "LLVMVectorize",
13391342 "LLVMSandboxIR",
13401343 "LLVMLinker",
1341 "LLVMInstrumentation",
13421344 "LLVMFrontendOpenMP",
1343 "LLVMFrontendOffloading",
1344 "LLVMFrontendOpenACC",
1345 "LLVMFrontendHLSL",
1346 "LLVMFrontendDriver",
1345 "LLVMFrontendDirective",
13471346 "LLVMFrontendAtomic",
1348 "LLVMExtensions",
1347 "LLVMFrontendOffloading",
1348 "LLVMObjectYAML",
13491349 "LLVMDWARFLinkerParallel",
13501350 "LLVMDWARFLinkerClassic",
13511351 "LLVMDWARFLinker",
......@@ -1374,7 +1374,9 @@ const llvm_libs = [_][]const u8{
13741374 "LLVMDebugInfoPDB",
13751375 "LLVMDebugInfoMSF",
13761376 "LLVMDebugInfoCodeView",
1377 "LLVMDebugInfoGSYM",
13771378 "LLVMDebugInfoDWARF",
1379 "LLVMDebugInfoDWARFLowLevel",
13781380 "LLVMObject",
13791381 "LLVMTextAPI",
13801382 "LLVMMCParser",
cmake/Findclang.cmake+4-5
......@@ -17,10 +17,10 @@ find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h
1717if(${LLVM_LINK_MODE} STREQUAL "shared")
1818 find_library(CLANG_LIBRARIES
1919 NAMES
20 libclang-cpp.so.20
21 libclang-cpp.so.20.1
22 clang-cpp-20.0
23 clang-cpp200
20 libclang-cpp.so.21
21 libclang-cpp.so.21.1
22 clang-cpp-21.0
23 clang-cpp210
2424 clang-cpp
2525 NAMES_PER_DIR
2626 HINTS "${LLVM_LIBDIRS}"
......@@ -60,7 +60,6 @@ else()
6060 FIND_AND_ADD_CLANG_LIB(clangBasic)
6161 FIND_AND_ADD_CLANG_LIB(clangEdit)
6262 FIND_AND_ADD_CLANG_LIB(clangLex)
63 FIND_AND_ADD_CLANG_LIB(clangARCMigrate)
6463 FIND_AND_ADD_CLANG_LIB(clangRewriteFrontend)
6564 FIND_AND_ADD_CLANG_LIB(clangRewrite)
6665 FIND_AND_ADD_CLANG_LIB(clangCrossTU)
cmake/Findlld.cmake+19-19
......@@ -9,23 +9,23 @@
99find_path(LLD_INCLUDE_DIRS NAMES lld/Common/Driver.h
1010 HINTS ${LLVM_INCLUDE_DIRS}
1111 PATHS
12 /usr/lib/llvm-20/include
13 /usr/local/llvm200/include
14 /usr/local/llvm20/include
15 /usr/local/opt/lld@20/include
16 /opt/homebrew/opt/lld@20/include
17 /home/linuxbrew/.linuxbrew/opt/lld@20/include
12 /usr/lib/llvm-21/include
13 /usr/local/llvm210/include
14 /usr/local/llvm21/include
15 /usr/local/opt/lld@21/include
16 /opt/homebrew/opt/lld@21/include
17 /home/linuxbrew/.linuxbrew/opt/lld@21/include
1818 /mingw64/include)
1919
20find_library(LLD_LIBRARY NAMES lld-20.0 lld200 lld NAMES_PER_DIR
20find_library(LLD_LIBRARY NAMES lld-21.0 lld210 lld NAMES_PER_DIR
2121 HINTS ${LLVM_LIBDIRS}
2222 PATHS
23 /usr/lib/llvm-20/lib
24 /usr/local/llvm200/lib
25 /usr/local/llvm20/lib
26 /usr/local/opt/lld@20/lib
27 /opt/homebrew/opt/lld@20/lib
28 /home/linuxbrew/.linuxbrew/opt/lld@20/lib
23 /usr/lib/llvm-21/lib
24 /usr/local/llvm210/lib
25 /usr/local/llvm21/lib
26 /usr/local/opt/lld@21/lib
27 /opt/homebrew/opt/lld@21/lib
28 /home/linuxbrew/.linuxbrew/opt/lld@21/lib
2929)
3030if(EXISTS ${LLD_LIBRARY})
3131 set(LLD_LIBRARIES ${LLD_LIBRARY})
......@@ -36,12 +36,12 @@ else()
3636 HINTS ${LLVM_LIBDIRS}
3737 PATHS
3838 ${LLD_LIBDIRS}
39 /usr/lib/llvm-20/lib
40 /usr/local/llvm200/lib
41 /usr/local/llvm20/lib
42 /usr/local/opt/lld@20/lib
43 /opt/homebrew/opt/lld@20/lib
44 /home/linuxbrew/.linuxbrew/opt/lld@20/lib
39 /usr/lib/llvm-21/lib
40 /usr/local/llvm210/lib
41 /usr/local/llvm21/lib
42 /usr/local/opt/lld@21/lib
43 /opt/homebrew/opt/lld@21/lib
44 /home/linuxbrew/.linuxbrew/opt/lld@21/lib
4545 /mingw64/lib
4646 /c/msys64/mingw64/lib
4747 c:/msys64/mingw64/lib)
cmake/Findllvm.cmake+18-15
......@@ -17,12 +17,12 @@ if(ZIG_USE_LLVM_CONFIG)
1717 # terminate when the right LLVM version is not found.
1818 unset(LLVM_CONFIG_EXE CACHE)
1919 find_program(LLVM_CONFIG_EXE
20 NAMES llvm-config-20 llvm-config-20.0 llvm-config200 llvm-config20 llvm-config NAMES_PER_DIR
20 NAMES llvm-config-21 llvm-config-21.0 llvm-config210 llvm-config21 llvm-config NAMES_PER_DIR
2121 PATHS
2222 "/mingw64/bin"
2323 "/c/msys64/mingw64/bin"
2424 "c:/msys64/mingw64/bin"
25 "C:/Libraries/llvm-20.0.0/bin")
25 "C:/Libraries/llvm-21.0.0/bin")
2626
2727 if ("${LLVM_CONFIG_EXE}" STREQUAL "LLVM_CONFIG_EXE-NOTFOUND")
2828 if (NOT LLVM_CONFIG_ERROR_MESSAGES STREQUAL "")
......@@ -40,9 +40,9 @@ if(ZIG_USE_LLVM_CONFIG)
4040 OUTPUT_STRIP_TRAILING_WHITESPACE)
4141
4242 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)
4444 # 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
4747 # Ignore this directory and try the search again
4848 list(APPEND CMAKE_IGNORE_PATH "${LLVM_CONFIG_DIR}")
......@@ -66,9 +66,9 @@ if(ZIG_USE_LLVM_CONFIG)
6666 if (LLVM_CONFIG_ERROR)
6767 # Save the error message, in case this is the last llvm-config we find
6868 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")
7070 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")
7272 endif()
7373
7474 # Ignore this directory and try the search again
......@@ -315,30 +315,31 @@ else()
315315 FIND_AND_ADD_LLVM_LIB(LLVMOrcTargetProcess)
316316 FIND_AND_ADD_LLVM_LIB(LLVMOrcShared)
317317 FIND_AND_ADD_LLVM_LIB(LLVMDWP)
318 FIND_AND_ADD_LLVM_LIB(LLVMDWARFCFIChecker)
318319 FIND_AND_ADD_LLVM_LIB(LLVMDebugInfoLogicalView)
319 FIND_AND_ADD_LLVM_LIB(LLVMDebugInfoGSYM)
320320 FIND_AND_ADD_LLVM_LIB(LLVMOption)
321 FIND_AND_ADD_LLVM_LIB(LLVMObjectYAML)
322321 FIND_AND_ADD_LLVM_LIB(LLVMObjCopy)
323322 FIND_AND_ADD_LLVM_LIB(LLVMMCA)
324323 FIND_AND_ADD_LLVM_LIB(LLVMMCDisassembler)
325324 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)
326329 FIND_AND_ADD_LLVM_LIB(LLVMPasses)
327330 FIND_AND_ADD_LLVM_LIB(LLVMHipStdPar)
328 FIND_AND_ADD_LLVM_LIB(LLVMCFGuard)
329331 FIND_AND_ADD_LLVM_LIB(LLVMCoroutines)
332 FIND_AND_ADD_LLVM_LIB(LLVMCFGuard)
330333 FIND_AND_ADD_LLVM_LIB(LLVMipo)
334 FIND_AND_ADD_LLVM_LIB(LLVMInstrumentation)
331335 FIND_AND_ADD_LLVM_LIB(LLVMVectorize)
332336 FIND_AND_ADD_LLVM_LIB(LLVMSandboxIR)
333337 FIND_AND_ADD_LLVM_LIB(LLVMLinker)
334 FIND_AND_ADD_LLVM_LIB(LLVMInstrumentation)
335338 FIND_AND_ADD_LLVM_LIB(LLVMFrontendOpenMP)
336 FIND_AND_ADD_LLVM_LIB(LLVMFrontendOffloading)
337 FIND_AND_ADD_LLVM_LIB(LLVMFrontendOpenACC)
338 FIND_AND_ADD_LLVM_LIB(LLVMFrontendHLSL)
339 FIND_AND_ADD_LLVM_LIB(LLVMFrontendDriver)
339 FIND_AND_ADD_LLVM_LIB(LLVMFrontendDirective)
340340 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)
342343 FIND_AND_ADD_LLVM_LIB(LLVMDWARFLinkerParallel)
343344 FIND_AND_ADD_LLVM_LIB(LLVMDWARFLinkerClassic)
344345 FIND_AND_ADD_LLVM_LIB(LLVMDWARFLinker)
......@@ -367,7 +368,9 @@ else()
367368 FIND_AND_ADD_LLVM_LIB(LLVMDebugInfoPDB)
368369 FIND_AND_ADD_LLVM_LIB(LLVMDebugInfoMSF)
369370 FIND_AND_ADD_LLVM_LIB(LLVMDebugInfoCodeView)
371 FIND_AND_ADD_LLVM_LIB(LLVMDebugInfoGSYM)
370372 FIND_AND_ADD_LLVM_LIB(LLVMDebugInfoDWARF)
373 FIND_AND_ADD_LLVM_LIB(LLVMDebugInfoDWARFLowLevel)
371374 FIND_AND_ADD_LLVM_LIB(LLVMObject)
372375 FIND_AND_ADD_LLVM_LIB(LLVMTextAPI)
373376 FIND_AND_ADD_LLVM_LIB(LLVMMCParser)