ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11360 from shuffle2/vs 

msvc: remove workaround for arm64 sha1 compiler bug
This commit is contained in:
JosJuice 2022-12-24 22:55:47 +01:00 committed by GitHub
parent 582d6b738b 9dcae0b1c3
commit e0fba20f1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Common/CMakeLists.txt
View File

@ -138,14 +138,6 @@ add_library(common
WorkQueueThread.h WorkQueueThread.h
) )
if(MSVC AND _M_ARM_64)
# Workaround msvc arm64 optimizer bug
# TODO remove after updating to VS 17.4
set_source_files_properties(
Crypto/SHA1.cpp
PROPERTIES COMPILE_FLAGS "/d2ssa-peeps-post-color-")
endif()
if(NOT MSVC AND _M_ARM_64) if(NOT MSVC AND _M_ARM_64)
set_source_files_properties( set_source_files_properties(
Crypto/AES.cpp Crypto/AES.cpp

7
Source/Core/DolphinLib.props
View File

@ -734,12 +734,7 @@
<ClCompile Include="Common\Crypto\AES.cpp" /> <ClCompile Include="Common\Crypto\AES.cpp" />
<ClCompile Include="Common\Crypto\bn.cpp" /> <ClCompile Include="Common\Crypto\bn.cpp" />
<ClCompile Include="Common\Crypto\ec.cpp" /> <ClCompile Include="Common\Crypto\ec.cpp" />
<ClCompile Include="Common\Crypto\SHA1.cpp"> <ClCompile Include="Common\Crypto\SHA1.cpp" />
<!--Workaround msvc arm64 optimizer bug
TODO remove after updating to VS 17.4
-->
<AdditionalOptions Condition="'$(Platform)'=='ARM64'">/d2ssa-peeps-post-color- %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<ClCompile Include="Common\Debug\CodeTrace.cpp" /> <ClCompile Include="Common\Debug\CodeTrace.cpp" />
<ClCompile Include="Common\Debug\MemoryPatches.cpp" /> <ClCompile Include="Common\Debug\MemoryPatches.cpp" />
<ClCompile Include="Common\Debug\Watches.cpp" /> <ClCompile Include="Common\Debug\Watches.cpp" />

2
Source/PCH/pch.h
View File

@ -6,7 +6,7 @@
#define STRINGIFY_HELPER(x) #x #define STRINGIFY_HELPER(x) #x
#define STRINGIFY(x) STRINGIFY_HELPER(x) #define STRINGIFY(x) STRINGIFY_HELPER(x)
#if defined _MSC_FULL_VER && _MSC_FULL_VER < 193231329 #if defined _MSC_FULL_VER && _MSC_FULL_VER < 193431937
#pragma message("Current _MSC_FULL_VER: " STRINGIFY(_MSC_FULL_VER)) #pragma message("Current _MSC_FULL_VER: " STRINGIFY(_MSC_FULL_VER))
#error Please update your build environment to the latest Visual Studio 2022! #error Please update your build environment to the latest Visual Studio 2022!
#endif #endif