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

miss-islington · velemas · web-flow · commit f21b38c1a28e · 2024-12-12T18:32:10.000Z
This PR fixes the build issue introduced by the commit 628f6eb from GH-112207 on systems without thread local support. (cherry picked from commit f823910) Co-authored-by: velemas <10437413+velemas@users.noreply.github.com>
diff --git a/Misc/NEWS.d/next/Build/2024-12-12-17-21-45.gh-issue-127865.30GDzs.rst b/Misc/NEWS.d/next/Build/2024-12-12-17-21-45.gh-issue-127865.30GDzs.rst
@@ -0,0 +1 @@
+Fix build failure on systems without thread-locals support.
diff --git a/Python/import.c b/Python/import.c
@@ -747,7 +747,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, '.');
@@ -757,7 +757,7 @@ _PyImport_ResolveNameWithPackageContext(const char *name)
         }
     }
 #ifndef HAVE_THREAD_LOCAL
-    PyThread_release_lock(EXTENSIONS.mutex);
+    PyMutex_Unlock(&EXTENSIONS.mutex);
 #endif
     return name;
 }
@@ -766,12 +766,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;
 }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Fix build failure on systems without thread-locals support.`
Original file line number	Diff line number	Diff line change
`@@ -747,7 +747,7 @@ const char *`
`747`	`747`	`_PyImport_ResolveNameWithPackageContext(const char *name)`
`748`	`748`	`{`
`749`	`749`	`#ifndef HAVE_THREAD_LOCAL`
`750`		`- PyThread_acquire_lock(EXTENSIONS.mutex, WAIT_LOCK);`
	`750`	`+ PyMutex_Lock(&EXTENSIONS.mutex);`
`751`	`751`	`#endif`
`752`	`752`	`if (PKGCONTEXT != NULL) {`
`753`	`753`	`const char *p = strrchr(PKGCONTEXT, '.');`
`@@ -757,7 +757,7 @@ _PyImport_ResolveNameWithPackageContext(const char *name)`
`757`	`757`	`}`
`758`	`758`	`}`
`759`	`759`	`#ifndef HAVE_THREAD_LOCAL`
`760`		`- PyThread_release_lock(EXTENSIONS.mutex);`
	`760`	`+ PyMutex_Unlock(&EXTENSIONS.mutex);`
`761`	`761`	`#endif`
`762`	`762`	`return name;`
`763`	`763`	`}`
`@@ -766,12 +766,12 @@ const char *`
`766`	`766`	`_PyImport_SwapPackageContext(const char *newcontext)`
`767`	`767`	`{`
`768`	`768`	`#ifndef HAVE_THREAD_LOCAL`
`769`		`- PyThread_acquire_lock(EXTENSIONS.mutex, WAIT_LOCK);`
	`769`	`+ PyMutex_Lock(&EXTENSIONS.mutex);`
`770`	`770`	`#endif`
`771`	`771`	`const char *oldcontext = PKGCONTEXT;`
`772`	`772`	`PKGCONTEXT = newcontext;`
`773`	`773`	`#ifndef HAVE_THREAD_LOCAL`
`774`		`- PyThread_release_lock(EXTENSIONS.mutex);`
	`774`	`+ PyMutex_Unlock(&EXTENSIONS.mutex);`
`775`	`775`	`#endif`
`776`	`776`	`return oldcontext;`
`777`	`777`	`}`