mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-05-23 05:42:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix regression with Python linker eaxmples

Browse source 
We can once again create 2mb statically-linked Python binaries:

    $ make -j8 m=tiny o/tiny/examples/pyapp/pyapp.com
    $ ls -hal o/tiny/examples/pyapp/pyapp.com
    -rwxr-xr-x 1 jart jart 2.1M May  1 14:04 o/tiny/examples/pyapp/pyapp.com
    $ o/tiny/examples/pyapp/pyapp.com
    cosmopolitan is cool!

The regression was caused by Python thread support in b15f9eb58
This commit is contained in:
Justine Tunney 2023-05-01 14:05:04 -07:00
parent fc82f77a46
commit 12438cce16
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
4 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
third_party/python/Modules/_threadmodule.c vendored
View file

@ -1519,8 +1519,3 @@ PyInit__thread(void)
PyThread_init_thread(); PyThread_init_thread();
return m; return m;
} }
_Section(".rodata.pytab.1") const struct _inittab _PyImport_Inittab__thread = {
"_thread",
PyInit__thread,
};

2
third_party/python/Modules/config.c vendored
View file

@ -18,6 +18,7 @@ PyObject *PyInit__ast(void);
PyObject *PyInit_gc(void); PyObject *PyInit_gc(void);
PyObject *_PyWarnings_Init(void); PyObject *_PyWarnings_Init(void);
PyObject *PyInit__string(void); PyObject *PyInit__string(void);
PyObject *PyInit__thread(void);
_Alignas(16) _Section(".rodata.pytab.0") const struct _inittab _PyImport_Inittab[0]; _Alignas(16) _Section(".rodata.pytab.0") const struct _inittab _PyImport_Inittab[0];
_Alignas(16) _Section(".rodata.pytab.2") const struct _inittab _PyImport_Inittab2[] = { _Alignas(16) _Section(".rodata.pytab.2") const struct _inittab _PyImport_Inittab2[] = {
@ -25,6 +26,7 @@ _Alignas(16) _Section(".rodata.pytab.2") const struct _inittab _PyImport_Inittab
{"_codecs", PyInit__codecs}, {"_codecs", PyInit__codecs},
{"itertools", PyInit_itertools}, {"itertools", PyInit_itertools},
{"_io", PyInit__io}, {"_io", PyInit__io},
{"_thread", PyInit__thread},
{"_weakref", PyInit__weakref}, {"_weakref", PyInit__weakref},
{"marshal", PyMarshal_Init}, {"marshal", PyMarshal_Init},
{"_imp", PyInit_imp}, {"_imp", PyInit_imp},

1
third_party/python/python.c vendored
View file

@ -167,7 +167,6 @@ STATIC_YOINK("_PyImport_Inittab__stat");
STATIC_YOINK("_PyImport_Inittab__struct"); STATIC_YOINK("_PyImport_Inittab__struct");
STATIC_YOINK("_PyImport_Inittab__symtable"); STATIC_YOINK("_PyImport_Inittab__symtable");
STATIC_YOINK("_PyImport_Inittab__testcapi"); STATIC_YOINK("_PyImport_Inittab__testcapi");
STATIC_YOINK("_PyImport_Inittab__thread");
STATIC_YOINK("_PyImport_Inittab__tracemalloc"); STATIC_YOINK("_PyImport_Inittab__tracemalloc");
STATIC_YOINK("_PyImport_Inittab_array"); STATIC_YOINK("_PyImport_Inittab_array");
STATIC_YOINK("_PyImport_Inittab_atexit"); STATIC_YOINK("_PyImport_Inittab_atexit");

2
third_party/python/python.mk vendored
View file

@ -290,7 +290,7 @@ THIRD_PARTY_PYTHON_INCS = \
third_party/python/Modules/clinic/audioop.inc third_party/python/Modules/clinic/audioop.inc
THIRD_PARTY_PYTHON_STAGE1_A_SRCS = \ THIRD_PARTY_PYTHON_STAGE1_A_SRCS = \
third_party/python/Modules/_threadmodule.c \ third_party/python/Modules/_threadmodule.c \
third_party/python/Modules/_tracemalloc.c \ third_party/python/Modules/_tracemalloc.c \
third_party/python/Modules/faulthandler.c \ third_party/python/Modules/faulthandler.c \
third_party/python/Objects/abstract.c \ third_party/python/Objects/abstract.c \