gh-116116: Backport blake2 change to fix building with clang-cl on windows-i686 (GH-116117)

georgthegreat · web-flow · commit 9b9e819b5116 · 2024-03-04T16:59:57.000Z
diff --git a/Misc/NEWS.d/next/Build/2024-02-29-15-12-31.gh-issue-116117.eENkQK.rst b/Misc/NEWS.d/next/Build/2024-02-29-15-12-31.gh-issue-116117.eENkQK.rst
@@ -0,0 +1,2 @@
+Backport ``libb2``'s PR #42 to fix compiling CPython on 32-bit Windows
+with ``clang-cl``.
diff --git a/Misc/sbom.spdx.json b/Misc/sbom.spdx.json
diff --git a/Modules/_blake2/impl/blake2b.c b/Modules/_blake2/impl/blake2b.c
@@ -27,7 +27,7 @@
 #if defined(HAVE_SSE2)
 #include <emmintrin.h>
 // MSVC only defines  _mm_set_epi64x for x86_64...
-#if defined(_MSC_VER) && !defined(_M_X64)
+#if defined(_MSC_VER) && !defined(_M_X64) && !defined(__clang__)
 static inline __m128i _mm_set_epi64x( const uint64_t u1, const uint64_t u0 )
 {
   return _mm_set_epi32( u1 >> 32, u1, u0 >> 32, u0 );
diff --git a/Modules/_blake2/impl/blake2s.c b/Modules/_blake2/impl/blake2s.c
@@ -27,7 +27,7 @@
 #if defined(HAVE_SSE2)
 #include <emmintrin.h>
 // MSVC only defines  _mm_set_epi64x for x86_64...
-#if defined(_MSC_VER) && !defined(_M_X64)
+#if defined(_MSC_VER) && !defined(_M_X64) && !defined(__clang__)
 static inline __m128i _mm_set_epi64x( const uint64_t u1, const uint64_t u0 )
 {
   return _mm_set_epi32( u1 >> 32, u1, u0 >> 32, u0 );

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Backport ``libb2``'s PR #42 to fix compiling CPython on 32-bit Windows
	`2`	+with ``clang-cl``.
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`#if defined(HAVE_SSE2)`
`28`	`28`	`#include <emmintrin.h>`
`29`	`29`	`// MSVC only defines _mm_set_epi64x for x86_64...`
`30`		`-#if defined(_MSC_VER) && !defined(_M_X64)`
	`30`	`+#if defined(_MSC_VER) && !defined(_M_X64) && !defined(__clang__)`
`31`	`31`	`static inline __m128i _mm_set_epi64x( const uint64_t u1, const uint64_t u0 )`
`32`	`32`	`{`
`33`	`33`	`return _mm_set_epi32( u1 >> 32, u1, u0 >> 32, u0 );`