From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 12 Jun 2024 15:39:54 +0000 (+0200)
Subject: [3.13] gh-120326: Include <intrin.h> on Windows with Free Threading (GH-120329) ... 
X-Git-Tag: v3.13.0b3~124
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8e5caa72c2556c4ba1fb90dfc6593bb848a6c116;p=thirdparty%2FPython%2Fcpython.git

[3.13] gh-120326: Include <intrin.h> on Windows with Free Threading (GH-120329) (#120414)

gh-120326: Include <intrin.h> on Windows with Free Threading (GH-120329)
(cherry picked from commit 939c201e00943c6dc2d515185168c30606ae522c)

Co-authored-by: Kirill Podoprigora <kirill.bast9@mail.ru>
---

diff --git a/Include/Python.h b/Include/Python.h
index e05901b9e52b..92751bb13b05 100644
--- a/Include/Python.h
+++ b/Include/Python.h
@@ -51,6 +51,10 @@
 #  error "The limited API is not currently supported in the free-threaded build"
 #endif
 
+#if defined(Py_GIL_DISABLED) && defined(_MSC_VER)
+#  include <intrin.h>             // __readgsqword()
+#endif
+
 // Include Python header files
 #include "pyport.h"
 #include "pymacro.h"
diff --git a/Misc/NEWS.d/next/Build/2024-06-11-00-38-05.gh-issue-120326.JHSDF1.rst b/Misc/NEWS.d/next/Build/2024-06-11-00-38-05.gh-issue-120326.JHSDF1.rst
new file mode 100644
index 000000000000..25cbdf6ba50a
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2024-06-11-00-38-05.gh-issue-120326.JHSDF1.rst
@@ -0,0 +1,2 @@
+On Windows, fix build error when ``--disable-gil`` and ``--experimental-jit``
+options are combined.