Merge pull request #11360 from shuffle2/vs

msvc: remove workaround for arm64 sha1 compiler bug
dolphin-emu · Dec 24, 2022 · e0fba20 · e0fba20
2 parents 582d6b7 + 9dcae0b
commit e0fba20
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 15 deletions.
diff --git a/Source/Core/Common/CMakeLists.txt b/Source/Core/Common/CMakeLists.txt
@@ -138,14 +138,6 @@ add_library(common
   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)
   set_source_files_properties(
     Crypto/AES.cpp

diff --git a/Source/Core/DolphinLib.props b/Source/Core/DolphinLib.props
@@ -734,12 +734,7 @@
     <ClCompile Include="Common\Crypto\AES.cpp" />
     <ClCompile Include="Common\Crypto\bn.cpp" />
     <ClCompile Include="Common\Crypto\ec.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\Crypto\SHA1.cpp" />
     <ClCompile Include="Common\Debug\CodeTrace.cpp" />
     <ClCompile Include="Common\Debug\MemoryPatches.cpp" />
     <ClCompile Include="Common\Debug\Watches.cpp" />

diff --git a/Source/PCH/pch.h b/Source/PCH/pch.h
@@ -6,7 +6,7 @@
 #define STRINGIFY_HELPER(x) #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))
 #error Please update your build environment to the latest Visual Studio 2022!
 #endif