From b36251488c1ea5ef6f5e21ec26d87d1e820c736a Mon Sep 17 00:00:00 2001 From: Zangetsu38 Date: Wed, 5 Jul 2017 01:27:16 +0200 Subject: [PATCH] Update LLVM 5.0 --- .gitmodules | 2 +- appveyor.yml | 2 +- llvm | 2 +- rpcs3/CMakeLists.txt | 4 ++-- rpcs3_llvm.props | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index dd35ca0206..c9ac317cd2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,7 +8,7 @@ [submodule "llvm"] path = llvm url = https://github.com/llvm-mirror/llvm - branch = release_40 + branch = release_50 [submodule "GSL"] path = 3rdparty/GSL url = https://github.com/Microsoft/GSL.git diff --git a/appveyor.yml b/appveyor.yml index 36e9280df5..88699f49c2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -25,7 +25,7 @@ build_script: - cmake --build . --config Release -- /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" install: - - if not exist llvmlibs.7z appveyor DownloadFile "https://drive.google.com/uc?export=download&id=0B8A6NaxhQAGRY2k3Q2Yya05lcm8" -FileName llvmlibs.7z + - if not exist llvmlibs.7z appveyor DownloadFile "https://drive.google.com/uc?export=download&id=0B-BE73aaGDNxdG1PM1JPb0hNeHM" -FileName llvmlibs.7z - if not exist vulkan.7z appveyor DownloadFile "https://drive.google.com/uc?export=download&id=0B8A6NaxhQAGRaHYxV3VOS2d0a0U" -FileName vulkan.7z - if not exist zlib.7z appveyor DownloadFile "https://drive.google.com/uc?export=download&id=0B-HVE3xvheVFX05lRFdnZlh5aUU" -FileName zlib.7z - set QTDIR=C:\Qt\5.8\msvc2015_64 diff --git a/llvm b/llvm index 4423e35117..cbc2c76b28 160000 --- a/llvm +++ b/llvm @@ -1 +1 @@ -Subproject commit 4423e351176a92975739dd4ea43c2ff5877236ae +Subproject commit cbc2c76b286c38a1fd006543b6b224c06cd96df1 diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt index f04848a002..b85b02f93a 100644 --- a/rpcs3/CMakeLists.txt +++ b/rpcs3/CMakeLists.txt @@ -165,7 +165,7 @@ set(CMAKE_MODULE_PATH "${RPCS3_SRC_DIR}/cmake_modules") find_package(OpenGL REQUIRED) find_package(OpenAL REQUIRED) if (NOT WITHOUT_LLVM) - find_package(LLVM 4.0 CONFIG) + find_package(LLVM 5.0 CONFIG) endif() @@ -268,7 +268,7 @@ if(WIN32) endif() if(NOT LLVM_FOUND) - Message("LLVM 4.0 not found. RPCS3 will be compiled without LLVM support.") + Message("LLVM 5.0 not found. RPCS3 will be compiled without LLVM support.") else() add_definitions(${LLVM_DEFINITIONS}) add_definitions(-DLLVM_AVAILABLE) diff --git a/rpcs3_llvm.props b/rpcs3_llvm.props index 9e95717589..1e62b9ab6b 100644 --- a/rpcs3_llvm.props +++ b/rpcs3_llvm.props @@ -10,7 +10,7 @@ ..\llvm_build\Debug\lib ..\llvm_build\Release\lib - LLVMProfileData.lib;LLVMDebugInfoCodeView.lib;LLVMDebugInfoMSF.lib;LLVMInstrumentation.lib;LLVMMCJIT.lib;LLVMRuntimeDyld.lib;LLVMVectorize.lib;LLVMX86CodeGen.lib;LLVMGlobalISel.lib;LLVMX86Disassembler.lib;LLVMExecutionEngine.lib;LLVMAsmPrinter.lib;LLVMSelectionDAG.lib;LLVMCodeGen.lib;LLVMScalarOpts.lib;LLVMInstCombine.lib;LLVMTransformUtils.lib;LLVMAnalysis.lib;LLVMTarget.lib;LLVMX86Desc.lib;LLVMX86AsmPrinter.lib;LLVMObject.lib;LLVMMCParser.lib;LLVMBitReader.lib;LLVMCore.lib;LLVMX86Utils.lib;LLVMMC.lib;LLVMX86Info.lib;LLVMSupport.lib;LLVMMCDisassembler.lib;LLVMipo.lib + LLVMProfileData.lib;LLVMDebugInfoCodeView.lib;LLVMDebugInfoMSF.lib;LLVMInstrumentation.lib;LLVMMCJIT.lib;LLVMRuntimeDyld.lib;LLVMVectorize.lib;LLVMX86CodeGen.lib;LLVMGlobalISel.lib;LLVMX86Disassembler.lib;LLVMExecutionEngine.lib;LLVMAsmPrinter.lib;LLVMSelectionDAG.lib;LLVMCodeGen.lib;LLVMScalarOpts.lib;LLVMInstCombine.lib;LLVMTransformUtils.lib;LLVMAnalysis.lib;LLVMTarget.lib;LLVMX86Desc.lib;LLVMX86AsmPrinter.lib;LLVMObject.lib;LLVMMCParser.lib;LLVMBitReader.lib;LLVMCore.lib;LLVMX86Utils.lib;LLVMMC.lib;LLVMX86Info.lib;LLVMSupport.lib;LLVMMCDisassembler.lib;LLVMipo.lib;LLVMBinaryFormat.lib