greg/cpython
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

gh-124609: Fix _Py_ThreadId for Windows builds using MinGW (#124663)

Browse Source
This commit is contained in:
Tony Roberts
2024-09-27 19:52:23 +01:00
committed by GitHub
parent 2e155536ca
commit 0881e2d3b1
4 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Include/Python.h
View File

@@ -55,6 +55,10 @@
# include <intrin.h> // __readgsqword() # include <intrin.h> // __readgsqword()
#endif #endif
#if defined(Py_GIL_DISABLED) && defined(__MINGW32__)
# include <intrin.h> // __readgsqword()
#endif
// Include Python header files // Include Python header files
#include "pyport.h" #include "pyport.h"
#include "pymacro.h" #include "pymacro.h"

6
Include/object.h
View File

@@ -180,6 +180,12 @@ _Py_ThreadId(void)
tid = __readfsdword(24); tid = __readfsdword(24);
#elif defined(_MSC_VER) && defined(_M_ARM64) #elif defined(_MSC_VER) && defined(_M_ARM64)
tid = __getReg(18); tid = __getReg(18);
#elif defined(__MINGW32__) && defined(_M_X64)
tid = __readgsqword(48);
#elif defined(__MINGW32__) && defined(_M_IX86)
tid = __readfsdword(24);
#elif defined(__MINGW32__) && defined(_M_ARM64)
tid = __getReg(18);
#elif defined(__i386__) #elif defined(__i386__)
__asm__("movl %%gs:0, %0" : "=r" (tid)); // 32-bit always uses GS __asm__("movl %%gs:0, %0" : "=r" (tid)); // 32-bit always uses GS
#elif defined(__MACH__) && defined(__x86_64__) #elif defined(__MACH__) && defined(__x86_64__)

1
Misc/ACKS
View File

@@ -1552,6 +1552,7 @@ Lisa Roach
Carl Robben Carl Robben
Ben Roberts Ben Roberts
Mark Roberts Mark Roberts
Tony Roberts
Andy Robinson Andy Robinson
Izan "TizzySaurus" Robinson Izan "TizzySaurus" Robinson
Jim Robinson Jim Robinson

1
Misc/NEWS.d/next/Windows/2024-09-27-13-40-25.gh-issue-124609.WaKk8G.rst Normal file
View File

@@ -0,0 +1 @@
Fix ``_Py_ThreadId`` for Windows builds using MinGW. Patch by Tony Roberts.