mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-03-29 22:20:48 +00:00
Update LLVM to 19.1.7
This commit is contained in:
parent
449c23ba4e
commit
363a225554
@ -7,9 +7,9 @@ git submodule -q update --init --depth 1 $(awk '/path/ && !/llvm/ && !/opencv/ {
|
|||||||
|
|
||||||
# Prefer newer Clang than in base system (see also .ci/install-freebsd.sh)
|
# Prefer newer Clang than in base system (see also .ci/install-freebsd.sh)
|
||||||
# libc++ isn't in llvm* packages, so download manually
|
# libc++ isn't in llvm* packages, so download manually
|
||||||
fetch https://github.com/llvm/llvm-project/releases/download/llvmorg-18.1.8/llvm-project-18.1.8.src.tar.xz
|
fetch https://github.com/llvm/llvm-project/releases/download/llvmorg-19.1.7/llvm-project-19.1.7.src.tar.xz
|
||||||
tar xf llvm*.tar.xz
|
tar xf llvm*.tar.xz
|
||||||
export CC=clang18 CXX=clang++18
|
export CC=clang19 CXX=clang++19
|
||||||
cmake -B libcxx_build -G Ninja -S llvm*/libcxx \
|
cmake -B libcxx_build -G Ninja -S llvm*/libcxx \
|
||||||
-DLLVM_CCACHE_BUILD=ON \
|
-DLLVM_CCACHE_BUILD=ON \
|
||||||
-DLIBCXX_INCLUDE_BENCHMARKS=OFF \
|
-DLIBCXX_INCLUDE_BENCHMARKS=OFF \
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#!/bin/sh -ex
|
#!/bin/sh -ex
|
||||||
|
|
||||||
curl -fLo "./llvm.lock" "https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win-18.1.8/llvmlibs_mt.7z.sha256"
|
curl -fLo "./llvm.lock" "https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win-19.1.7/llvmlibs_mt.7z.sha256"
|
||||||
curl -fLo "./glslang.lock" "https://github.com/RPCS3/glslang/releases/download/custom-build-win/glslanglibs_mt.7z.sha256"
|
curl -fLo "./glslang.lock" "https://github.com/RPCS3/glslang/releases/download/custom-build-win/glslanglibs_mt.7z.sha256"
|
||||||
|
@ -9,7 +9,7 @@ export ASSUME_ALWAYS_YES=true
|
|||||||
pkg info # debug
|
pkg info # debug
|
||||||
|
|
||||||
# Prefer newer Clang than in base system (see also .ci/build-freebsd.sh)
|
# Prefer newer Clang than in base system (see also .ci/build-freebsd.sh)
|
||||||
pkg install llvm18
|
pkg install llvm19
|
||||||
|
|
||||||
# Mandatory dependencies (qt6-base is pulled via qt6-multimedia)
|
# Mandatory dependencies (qt6-base is pulled via qt6-multimedia)
|
||||||
pkg install git ccache cmake ninja qt6-multimedia qt6-svg glew openal-soft ffmpeg
|
pkg install git ccache cmake ninja qt6-multimedia qt6-svg glew openal-soft ffmpeg
|
||||||
|
@ -19,7 +19,7 @@ QT_DECL_URL="${QT_HOST}${QT_PREFIX}${QT_PREFIX_2}qtdeclarative${QT_SUFFIX}"
|
|||||||
QT_TOOL_URL="${QT_HOST}${QT_PREFIX}${QT_PREFIX_2}qttools${QT_SUFFIX}"
|
QT_TOOL_URL="${QT_HOST}${QT_PREFIX}${QT_PREFIX_2}qttools${QT_SUFFIX}"
|
||||||
QT_MM_URL="${QT_HOST}${QT_PREFIX}addons.qtmultimedia.${QT_PREFIX_2}qtmultimedia${QT_SUFFIX}"
|
QT_MM_URL="${QT_HOST}${QT_PREFIX}addons.qtmultimedia.${QT_PREFIX_2}qtmultimedia${QT_SUFFIX}"
|
||||||
QT_SVG_URL="${QT_HOST}${QT_PREFIX}${QT_PREFIX_2}qtsvg${QT_SUFFIX}"
|
QT_SVG_URL="${QT_HOST}${QT_PREFIX}${QT_PREFIX_2}qtsvg${QT_SUFFIX}"
|
||||||
LLVMLIBS_URL='https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win-18.1.8/llvmlibs_mt.7z'
|
LLVMLIBS_URL='https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win-19.1.7/llvmlibs_mt.7z'
|
||||||
GLSLANG_URL='https://github.com/RPCS3/glslang/releases/latest/download/glslanglibs_mt.7z'
|
GLSLANG_URL='https://github.com/RPCS3/glslang/releases/latest/download/glslanglibs_mt.7z'
|
||||||
VULKAN_SDK_URL="https://www.dropbox.com/scl/fi/sjjh0fc4ld281pjbl2xzu/VulkanSDK-1.3.268.0-Installer.exe?rlkey=f6wzc0lvms5vwkt2z3qabfv9d&dl=1"
|
VULKAN_SDK_URL="https://www.dropbox.com/scl/fi/sjjh0fc4ld281pjbl2xzu/VulkanSDK-1.3.268.0-Installer.exe?rlkey=f6wzc0lvms5vwkt2z3qabfv9d&dl=1"
|
||||||
|
|
||||||
|
2
3rdparty/llvm/CMakeLists.txt
vendored
2
3rdparty/llvm/CMakeLists.txt
vendored
@ -41,7 +41,7 @@ if(WITH_LLVM)
|
|||||||
|
|
||||||
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)
|
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)
|
||||||
|
|
||||||
find_package(LLVM 18.1 CONFIG)
|
find_package(LLVM 19.1 CONFIG)
|
||||||
if(NOT LLVM_FOUND)
|
if(NOT LLVM_FOUND)
|
||||||
message(FATAL_ERROR "Couldn't build LLVM from the submodule. You might need to run `git submodule update --init`")
|
message(FATAL_ERROR "Couldn't build LLVM from the submodule. You might need to run `git submodule update --init`")
|
||||||
endif()
|
endif()
|
||||||
|
2
3rdparty/llvm/llvm
vendored
2
3rdparty/llvm/llvm
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 3b5b5c1ec4a3095ab096dd780e84d7ab81f3d7ff
|
Subproject commit cd708029e0b2869e80abe31ddb175f7c35361f90
|
@ -128,7 +128,7 @@ Start **Visual Studio**, click on `Open a project or solution` and select the `r
|
|||||||
**NOTE:** The recommended build configuration is `Release`. (On older revisions: `Release - LLVM`)
|
**NOTE:** The recommended build configuration is `Release`. (On older revisions: `Release - LLVM`)
|
||||||
|
|
||||||
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:
|
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:
|
||||||
- [LLVM libs](https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win-18.1.8/llvmlibs_mt.7z)
|
- [LLVM libs](https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win-19.1.7/llvmlibs_mt.7z)
|
||||||
- [additional libs](https://github.com/RPCS3/glslang/releases/latest/download/glslanglibs_mt.7z)
|
- [additional libs](https://github.com/RPCS3/glslang/releases/latest/download/glslanglibs_mt.7z)
|
||||||
|
|
||||||
**NOTES:**
|
**NOTES:**
|
||||||
|
@ -134,7 +134,7 @@ jobs:
|
|||||||
ARTDIR: $(Build.ArtifactStagingDirectory)
|
ARTDIR: $(Build.ArtifactStagingDirectory)
|
||||||
QT_VER: '6.7.3'
|
QT_VER: '6.7.3'
|
||||||
QT_VER_MAIN: '6'
|
QT_VER_MAIN: '6'
|
||||||
LLVM_COMPILER_VER: '18'
|
LLVM_COMPILER_VER: '19'
|
||||||
|
|
||||||
pool:
|
pool:
|
||||||
vmImage: "macOS-13"
|
vmImage: "macOS-13"
|
||||||
@ -195,7 +195,7 @@ jobs:
|
|||||||
ARTDIR: $(Build.ArtifactStagingDirectory)
|
ARTDIR: $(Build.ArtifactStagingDirectory)
|
||||||
QT_VER: '6.7.3'
|
QT_VER: '6.7.3'
|
||||||
QT_VER_MAIN: '6'
|
QT_VER_MAIN: '6'
|
||||||
LLVM_COMPILER_VER: '18'
|
LLVM_COMPILER_VER: '19'
|
||||||
|
|
||||||
pool:
|
pool:
|
||||||
vmImage: "macOS-13"
|
vmImage: "macOS-13"
|
||||||
|
@ -26,6 +26,7 @@
|
|||||||
LLVMBitWriter.lib;
|
LLVMBitWriter.lib;
|
||||||
LLVMCFGuard.lib;
|
LLVMCFGuard.lib;
|
||||||
LLVMCodeGen.lib;
|
LLVMCodeGen.lib;
|
||||||
|
LLVMCodeGenData.lib;
|
||||||
LLVMCodeGenTypes.lib;
|
LLVMCodeGenTypes.lib;
|
||||||
LLVMCore.lib;
|
LLVMCore.lib;
|
||||||
LLVMCoroutines.lib;
|
LLVMCoroutines.lib;
|
||||||
@ -59,6 +60,7 @@
|
|||||||
LLVMInstCombine.lib;
|
LLVMInstCombine.lib;
|
||||||
LLVMInstrumentation.lib;
|
LLVMInstrumentation.lib;
|
||||||
LLVMIntelJITEvents.lib;
|
LLVMIntelJITEvents.lib;
|
||||||
|
LLVMIntelJITProfiling.lib;
|
||||||
LLVMInterfaceStub.lib;
|
LLVMInterfaceStub.lib;
|
||||||
LLVMInterpreter.lib;
|
LLVMInterpreter.lib;
|
||||||
LLVMipo.lib;
|
LLVMipo.lib;
|
||||||
@ -88,13 +90,14 @@
|
|||||||
LLVMProfileData.lib;
|
LLVMProfileData.lib;
|
||||||
LLVMRemarks.lib;
|
LLVMRemarks.lib;
|
||||||
LLVMRuntimeDyld.lib;
|
LLVMRuntimeDyld.lib;
|
||||||
|
LLVMSandboxIR.lib;
|
||||||
LLVMScalarOpts.lib;
|
LLVMScalarOpts.lib;
|
||||||
LLVMSelectionDAG.lib;
|
LLVMSelectionDAG.lib;
|
||||||
LLVMSupport.lib;
|
LLVMSupport.lib;
|
||||||
LLVMSymbolize.lib;
|
LLVMSymbolize.lib;
|
||||||
LLVMTableGen.lib;
|
LLVMTableGen.lib;
|
||||||
|
LLVMTableGenBasic.lib;
|
||||||
LLVMTableGenCommon.lib;
|
LLVMTableGenCommon.lib;
|
||||||
LLVMTableGenGlobalISel.lib;
|
|
||||||
LLVMTarget.lib;
|
LLVMTarget.lib;
|
||||||
LLVMTargetParser.lib;
|
LLVMTargetParser.lib;
|
||||||
LLVMTextAPI.lib;
|
LLVMTextAPI.lib;
|
||||||
|
@ -27,6 +27,7 @@
|
|||||||
LLVMBitWriter.lib;
|
LLVMBitWriter.lib;
|
||||||
LLVMCFGuard.lib;
|
LLVMCFGuard.lib;
|
||||||
LLVMCodeGen.lib;
|
LLVMCodeGen.lib;
|
||||||
|
LLVMCodeGenData.lib;
|
||||||
LLVMCodeGenTypes.lib;
|
LLVMCodeGenTypes.lib;
|
||||||
LLVMCore.lib;
|
LLVMCore.lib;
|
||||||
LLVMCoroutines.lib;
|
LLVMCoroutines.lib;
|
||||||
@ -60,6 +61,7 @@
|
|||||||
LLVMInstCombine.lib;
|
LLVMInstCombine.lib;
|
||||||
LLVMInstrumentation.lib;
|
LLVMInstrumentation.lib;
|
||||||
LLVMIntelJITEvents.lib;
|
LLVMIntelJITEvents.lib;
|
||||||
|
LLVMIntelJITProfiling.lib;
|
||||||
LLVMInterfaceStub.lib;
|
LLVMInterfaceStub.lib;
|
||||||
LLVMInterpreter.lib;
|
LLVMInterpreter.lib;
|
||||||
LLVMipo.lib;
|
LLVMipo.lib;
|
||||||
@ -89,13 +91,14 @@
|
|||||||
LLVMProfileData.lib;
|
LLVMProfileData.lib;
|
||||||
LLVMRemarks.lib;
|
LLVMRemarks.lib;
|
||||||
LLVMRuntimeDyld.lib;
|
LLVMRuntimeDyld.lib;
|
||||||
|
LLVMSandboxIR.lib;
|
||||||
LLVMScalarOpts.lib;
|
LLVMScalarOpts.lib;
|
||||||
LLVMSelectionDAG.lib;
|
LLVMSelectionDAG.lib;
|
||||||
LLVMSupport.lib;
|
LLVMSupport.lib;
|
||||||
LLVMSymbolize.lib;
|
LLVMSymbolize.lib;
|
||||||
LLVMTableGen.lib;
|
LLVMTableGen.lib;
|
||||||
|
LLVMTableGenBasic.lib;
|
||||||
LLVMTableGenCommon.lib;
|
LLVMTableGenCommon.lib;
|
||||||
LLVMTableGenGlobalISel.lib;
|
|
||||||
LLVMTarget.lib;
|
LLVMTarget.lib;
|
||||||
LLVMTargetParser.lib;
|
LLVMTargetParser.lib;
|
||||||
LLVMTextAPI.lib;
|
LLVMTextAPI.lib;
|
||||||
|
@ -51,6 +51,12 @@
|
|||||||
<Command>cmd.exe /c "$(SolutionDir)\Utilities\git-version-gen.cmd"</Command>
|
<Command>cmd.exe /c "$(SolutionDir)\Utilities\git-version-gen.cmd"</Command>
|
||||||
<Message>Updating git-version.h</Message>
|
<Message>Updating git-version.h</Message>
|
||||||
</PreBuildEvent>
|
</PreBuildEvent>
|
||||||
|
<Lib>
|
||||||
|
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">ntdll.lib</AdditionalDependencies>
|
||||||
|
</Lib>
|
||||||
|
<Lib>
|
||||||
|
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ntdll.lib</AdditionalDependencies>
|
||||||
|
</Lib>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="..\Utilities\cheat_info.cpp" />
|
<ClCompile Include="..\Utilities\cheat_info.cpp" />
|
||||||
|
Loading…
x
Reference in New Issue
Block a user