Merged revision(s) 22845 from trunk/OpenMPT:

[Fix] UnRAR: Work-around MSVC compiler hang on ARM64EC. ........ git-svn-id: https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.31@22847 56274372-70c3-4bfc-bfc3-4c3a0b034d27
OpenMPT · Jan 7, 2025 · 5016c80 · 5016c80
1 parent 0799385
commit 5016c80
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/include/unrar/OpenMPT.txt b/include/unrar/OpenMPT.txt
@@ -4,6 +4,7 @@ All modifications to existing files have been done in a manner so that no
 existing lines were edited; only new lines were added.
 os.hpp has been modified to support Clang/LLVM for Windows.
 Work-arounds for tiny problems with Clang/C2 have been implemented.
+Work-arounds for ARM64EC compiler bugs have been implemented.
 Added lines can be found by looking for "// OPENMPT ADDITION" comments.
 
 Optimizations have been done to elimiate effectively dead code that would

diff --git a/include/unrar/os.hpp b/include/unrar/os.hpp
@@ -78,11 +78,14 @@
 
 // Use SSE only for x86/x64, not ARM Windows.
 #if !defined(__clang__) // OPENMPT ADDITION
+#if !defined(_M_ARM64EC) // OPENMPT ADDITION
+// MSVC enters an infinite loop when compiling blake2s.cpp in ARM64EC mode with SSE intrinsics enabled. // OPENMPT ADDITION
 #if defined(_M_IX86) || defined(_M_X64)
   #define USE_SSE
   #define SSE_ALIGNMENT 16
 #endif
 #endif // OPENMPT ADDITION
+#endif // OPENMPT ADDITION
 
 #include <stdio.h>
 #include <stdlib.h>