Merge pull request #1000 from pps83/dev-x64test

Use _M_X64 only without mixing with _M_AMD64
Cyan4973 · Jan 24, 2025 · e4e33f1 · e4e33f1
2 parents f5b53f1 + a42b007
commit e4e33f1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/cli/xsum_arch.c b/cli/xsum_arch.c
@@ -25,7 +25,7 @@
 
 int g_xsumarch_avoid_empty_unit = 0;
 
-#if ((defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64)) && !defined(_M_ARM64EC)) || defined(__i386__) || defined(_M_IX86) || defined(_M_IX86_FP)
+#if ((defined(__x86_64__) || defined(_M_X64)) && !defined(_M_ARM64EC)) || defined(__i386__) || defined(_M_IX86) || defined(_M_IX86_FP)
 #if defined(XXHSUM_DISPATCH)
 
 #include "../xxh_x86dispatch.h"

diff --git a/cli/xsum_arch.h b/cli/xsum_arch.h
@@ -79,7 +79,7 @@
 #endif
 
 /* makes the next part easier */
-#if (defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64)) && !defined(_M_ARM64EC)
+#if (defined(__x86_64__) || defined(_M_X64)) && !defined(_M_ARM64EC)
 #   define XSUM_ARCH_X64 1
 #   define XSUM_ARCH_X86 "x86_64"
 #elif defined(__i386__) || defined(_M_IX86) || defined(_M_IX86_FP)
@@ -97,7 +97,7 @@
 #    define XSUM_ARCH XSUM_ARCH_X86 " + AVX2"
 #  elif defined(__AVX__)
 #    define XSUM_ARCH XSUM_ARCH_X86 " + AVX"
-#  elif defined(_M_X64) || defined(_M_AMD64) || defined(__x86_64__) \
+#  elif defined(_M_X64) || defined(__x86_64__) \
       || defined(__SSE2__) || (defined(_M_IX86_FP) && _M_IX86_FP == 2)
 #     define XSUM_ARCH XSUM_ARCH_X86 " + SSE2"
 #  else

diff --git a/xxhash.h b/xxhash.h
@@ -3991,7 +3991,7 @@ XXH_PUBLIC_API XXH64_hash_t XXH64_hashFromCanonical(XXH_NOESCAPE const XXH64_can
 #    define XXH_VECTOR XXH_AVX512
 #  elif defined(__AVX2__)
 #    define XXH_VECTOR XXH_AVX2
-#  elif defined(__SSE2__) || defined(_M_AMD64) || defined(_M_X64) || (defined(_M_IX86_FP) && (_M_IX86_FP == 2))
+#  elif defined(__SSE2__) || defined(_M_X64) || (defined(_M_IX86_FP) && (_M_IX86_FP == 2))
 #    define XXH_VECTOR XXH_SSE2
 #  elif (defined(__PPC64__) && defined(__POWER8_VECTOR__)) \
      || (defined(__s390x__) && defined(__VEC__)) \