mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 17:08:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

gh-127865: Fix build failure for systems without thread local support (GH-127866)

Browse source 
This PR fixes the build issue introduced by the commit 628f6eb from
GH-112207 on systems without thread local support.
This commit is contained in:
velemas 2024-12-12 20:07:55 +02:00 • committed by GitHub
parent f8dcb82006
commit f823910bbd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Misc/NEWS.d/next/Build/2024-12-12-17-21-45.gh-issue-127865.30GDzs.rst Normal file
View file

@ -0,0 +1 @@
Fix build failure on systems without thread-locals support.

8
Python/import.c
View file

@ -749,7 +749,7 @@ const char *
_PyImport_ResolveNameWithPackageContext(const char *name)
{
#ifndef HAVE_THREAD_LOCAL
PyThread_acquire_lock(EXTENSIONS.mutex, WAIT_LOCK);
PyMutex_Lock(&EXTENSIONS.mutex);
#endif
if (PKGCONTEXT != NULL) {
const char *p = strrchr(PKGCONTEXT, '.');
@ -759,7 +759,7 @@ _PyImport_ResolveNameWithPackageContext(const char *name)
}
}
#ifndef HAVE_THREAD_LOCAL
PyThread_release_lock(EXTENSIONS.mutex);
PyMutex_Unlock(&EXTENSIONS.mutex);
#endif
return name;
}
@ -768,12 +768,12 @@ const char *
_PyImport_SwapPackageContext(const char *newcontext)
{
#ifndef HAVE_THREAD_LOCAL
PyThread_acquire_lock(EXTENSIONS.mutex, WAIT_LOCK);
PyMutex_Lock(&EXTENSIONS.mutex);
#endif
const char *oldcontext = PKGCONTEXT;
PKGCONTEXT = newcontext;
#ifndef HAVE_THREAD_LOCAL
PyThread_release_lock(EXTENSIONS.mutex);
PyMutex_Unlock(&EXTENSIONS.mutex);
#endif
return oldcontext;
}