From a42b007b065bee6fadf671c2519446cb32a5b224 Mon Sep 17 00:00:00 2001 From: Pavel P Date: Tue, 21 Jan 2025 02:26:34 +0200 Subject: [PATCH] Use _M_X64 only without mixing with _M_AMD64 --- cli/xsum_arch.c | 2 +- cli/xsum_arch.h | 4 ++-- xxhash.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cli/xsum_arch.c b/cli/xsum_arch.c index 3540af48..a6ad0c57 100644 --- 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 index 79de3c7c..83a0bfb7 100644 --- 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 index 812dcb01..460d6b8e 100644 --- a/xxhash.h +++ b/xxhash.h @@ -3989,7 +3989,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__)) \