Skip to content

Commit 6e762d5

Browse files
committed
Update llvm to 20.1.1
1 parent 76495f0 commit 6e762d5

File tree

7 files changed

+12
-10
lines changed

7 files changed

+12
-10
lines changed

.cirrus.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ env:
88
RPCS3_TOKEN: ENCRYPTED[100ebb8e3552bf2021d0ef55dccda3e58d27be5b6cab0b0b92843ef490195d3c4edaefa087e4a3b425caa6392300b9b1]
99
QT_VER_MAIN: '6'
1010
QT_VER: '6.8.2'
11-
LLVM_COMPILER_VER: '19'
12-
LLVM_VER: '19.1.7'
11+
LLVM_COMPILER_VER: '20'
12+
LLVM_VER: '20.1.1'
1313

1414
# windows_task:
1515
# matrix:

.github/workflows/rpcs3.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ jobs:
108108
QT_VER: '6.8.2'
109109
QT_VER_MSVC: 'msvc2022'
110110
QT_DATE: '202501260838'
111-
LLVM_VER: '19.1.7'
111+
LLVM_VER: '20.1.1'
112112
VULKAN_VER: '1.3.268.0'
113113
VULKAN_SDK_SHA: '8459ef49bd06b697115ddd3d97c9aec729e849cd775f5be70897718a9b3b9db5'
114114
CCACHE_SHA: '6252f081876a9a9f700fae13a5aec5d0d486b28261d7f1f72ac11c7ad9df4da9'

3rdparty/llvm/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ if(WITH_LLVM)
5151

5252
set(STATIC_LINK_LLVM ON CACHE BOOL "Link against LLVM statically. This will get set to ON if you build LLVM from the submodule." FORCE)
5353

54-
find_package(LLVM 19.1 CONFIG)
54+
find_package(LLVM 20.1 CONFIG)
5555
if(NOT LLVM_FOUND)
5656
message(FATAL_ERROR "Couldn't build LLVM from the submodule. You might need to run `git submodule update --init`")
5757
endif()

3rdparty/llvm/llvm

Submodule llvm updated from cd70802 to 424c2d9

BUILDING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ Start **Visual Studio**, click on `Open a project or solution` and select the `r
130130
**NOTE:** The recommended build configuration is `Release`. (On older revisions: `Release - LLVM`)
131131

132132
To speed up the compilation time, you may want to download and extract to `<rpcs3_root>\build\lib_ext\<$(Configuration)>-x64` (e.g. `c:\rpcs3\build\lib_ext\Release-x64`; the path needs to be created) some of the following precompiled libs:
133-
- [LLVM libs](https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win-19.1.7/llvmlibs_mt.7z)
133+
- [LLVM libs](https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win-20.1.1/llvmlibs_mt.7z)
134134
- [additional libs](https://github.com/RPCS3/glslang/releases/latest/download/glslanglibs_mt.7z)
135135

136136
**NOTES:**

azure-pipelines.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
# QT_VER_MSVC: 'msvc2022'
7676
# QT_DATE: '202501260838'
7777
# QTDIR: C:\Qt\$(QT_VER)\$(QT_VER_MSVC)_64
78-
# LLVM_VER: '19.1.7'
78+
# LLVM_VER: '20.1.1'
7979
# VULKAN_VER: '1.3.268.0'
8080
# VULKAN_SDK_SHA: '8459ef49bd06b697115ddd3d97c9aec729e849cd775f5be70897718a9b3b9db5'
8181
# VULKAN_SDK: C:\VulkanSDK\$(VULKAN_VER)
@@ -149,7 +149,7 @@ jobs:
149149
ARTDIR: $(Build.ArtifactStagingDirectory)
150150
QT_VER: '6.7.3'
151151
QT_VER_MAIN: '6'
152-
LLVM_COMPILER_VER: '19'
152+
LLVM_COMPILER_VER: '20'
153153

154154
pool:
155155
vmImage: "macOS-14"
@@ -210,7 +210,7 @@ jobs:
210210
ARTDIR: $(Build.ArtifactStagingDirectory)
211211
QT_VER: '6.7.3'
212212
QT_VER_MAIN: '6'
213-
LLVM_COMPILER_VER: '19'
213+
LLVM_COMPILER_VER: '20'
214214

215215
pool:
216216
vmImage: "macOS-14"

buildfiles/msvc/rpcs3_default.props

+3-1
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
LLVMBitstreamReader.lib;
4242
LLVMBitWriter.lib;
4343
LLVMCFGuard.lib;
44+
LLVMCGData.lib;
4445
LLVMCodeGen.lib;
45-
LLVMCodeGenData.lib;
4646
LLVMCodeGenTypes.lib;
4747
LLVMCore.lib;
4848
LLVMCoroutines.lib;
@@ -64,6 +64,7 @@
6464
LLVMExecutionEngine.lib;
6565
LLVMExtensions.lib;
6666
LLVMFileCheck.lib;
67+
LLVMFrontendAtomic.lib;
6768
LLVMFrontendDriver.lib;
6869
LLVMFrontendHLSL.lib;
6970
LLVMFrontendOffloading.lib;
@@ -116,6 +117,7 @@
116117
LLVMTableGenCommon.lib;
117118
LLVMTarget.lib;
118119
LLVMTargetParser.lib;
120+
LLVMTelemetry.lib;
119121
LLVMTextAPI.lib;
120122
LLVMTextAPIBinaryReader.lib;
121123
LLVMTransformUtils.lib;

0 commit comments

Comments
 (0)