From: Victor Stinner <vstinner@python.org>
Date: Thu, 10 Dec 2020 17:39:17 +0000 (+0100)
Subject: bpo-42591: Export missing Py_FrozenMain() symbol (GH-23730)
X-Git-Tag: v3.10.0a4~199
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b5c7b38f5ebbc84b5b80192db1743d3e1cdcf4c5;p=thirdparty%2FPython%2Fcpython.git

bpo-42591: Export missing Py_FrozenMain() symbol (GH-23730)

Export the Py_FrozenMain() function: fix a Python 3.9.0 regression.
Python 3.9 uses -fvisibility=hidden and the function was not exported
explicitly and so not exported.

Add also Py_FrozenMain to the stable ABI on Windows.
---

diff --git a/Include/pylifecycle.h b/Include/pylifecycle.h
index c5368b3c5eda..783fcb455eb5 100644
--- a/Include/pylifecycle.h
+++ b/Include/pylifecycle.h
@@ -32,6 +32,8 @@ PyAPI_FUNC(void) _Py_NO_RETURN Py_Exit(int);
 /* Bootstrap __main__ (defined in Modules/main.c) */
 PyAPI_FUNC(int) Py_Main(int argc, wchar_t **argv);
 
+PyAPI_FUNC(int) Py_FrozenMain(int argc, char **argv);
+
 PyAPI_FUNC(int) Py_BytesMain(int argc, char **argv);
 
 /* In pathconfig.c */
diff --git a/Misc/NEWS.d/next/C API/2020-12-10-10-43-03.bpo-42591.CXNY8G.rst b/Misc/NEWS.d/next/C API/2020-12-10-10-43-03.bpo-42591.CXNY8G.rst
new file mode 100644
index 000000000000..3519859f7be8
--- /dev/null
+++ b/Misc/NEWS.d/next/C API/2020-12-10-10-43-03.bpo-42591.CXNY8G.rst	
@@ -0,0 +1,3 @@
+Export the :c:func:`Py_FrozenMain` function: fix a Python 3.9.0 regression.
+Python 3.9 uses ``-fvisibility=hidden`` and the function was not exported
+explicitly and so not exported.
diff --git a/PC/python3dll.c b/PC/python3dll.c
index 27cc315de2dd..9eb81e36af00 100644
--- a/PC/python3dll.c
+++ b/PC/python3dll.c
@@ -49,6 +49,7 @@ EXPORT_FUNC(Py_Exit)
 EXPORT_FUNC(Py_FatalError)
 EXPORT_FUNC(Py_Finalize)
 EXPORT_FUNC(Py_FinalizeEx)
+EXPORT_FUNC(Py_FrozenMain)
 EXPORT_FUNC(Py_GenericAlias)
 EXPORT_FUNC(Py_GenericAliasType)
 EXPORT_FUNC(Py_GetArgcArgv)