diff options
| author | Paul Koning <paul_koning@dell.com> | 2018-06-08 13:26:36 -0400 |
|---|---|---|
| committer | Paul Koning <paul_koning@dell.com> | 2018-06-08 13:32:03 -0400 |
| commit | aeab512851bf6ed623d1c6c4305b6ce05e51a10c (patch) | |
| tree | c2504328dac363a27cfe91514c4d961a4cf127ee | |
| parent | 5045b3d78903d1f6faa4cb511fa801e50dfacf48 (diff) | |
| download | gdb-aeab512851bf6ed623d1c6c4305b6ce05e51a10c.zip gdb-aeab512851bf6ed623d1c6c4305b6ce05e51a10c.tar.gz gdb-aeab512851bf6ed623d1c6c4305b6ce05e51a10c.tar.bz2 | |
Fix build issue with Python 3.7
Originally reported in
https://bugzilla.redhat.com/show_bug.cgi?id=1577396 -- gdb build fails
with Python 3.7 due to references to a Python internal function whose
declaration changed in 3.7.
gdb/ChangeLog
2018-06-08 Paul Koning <paul_koning@dell.com>
PR gdb/23252
* python/python.c (do_start_initialization):
Avoid call to internal Python API.
(init__gdb_module): New function.
| -rw-r--r-- | gdb/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/python/python.c | 18 |
2 files changed, 23 insertions, 3 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index dbee2a3..12157bb 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2018-06-08 Paul Koning <paul_koning@dell.com> + + PR gdb/23252 + + * python/python.c (do_start_initialization): + Avoid call to internal Python API. + (init__gdb_module): New function. + 2018-06-08 Gary Benson <gbenson@redhat.com> * linux-thread-db.c (valprint.h): New include. diff --git a/gdb/python/python.c b/gdb/python/python.c index 1805c90..20fc674 100644 --- a/gdb/python/python.c +++ b/gdb/python/python.c @@ -1667,6 +1667,17 @@ finalize_python (void *ignore) restore_active_ext_lang (previous_active); } +#ifdef IS_PY3K +/* This is called via the PyImport_AppendInittab mechanism called + during initialization, to make the built-in _gdb module known to + Python. */ +PyMODINIT_FUNC +init__gdb_module (void) +{ + return PyModule_Create (&python_GdbModuleDef); +} +#endif + static bool do_start_initialization () { @@ -1707,6 +1718,9 @@ do_start_initialization () remain alive for the duration of the program's execution, so it is not freed after this call. */ Py_SetProgramName (progname_copy); + + /* Define _gdb as a built-in module. */ + PyImport_AppendInittab ("_gdb", init__gdb_module); #else Py_SetProgramName (progname.release ()); #endif @@ -1716,9 +1730,7 @@ do_start_initialization () PyEval_InitThreads (); #ifdef IS_PY3K - gdb_module = PyModule_Create (&python_GdbModuleDef); - /* Add _gdb module to the list of known built-in modules. */ - _PyImport_FixupBuiltin (gdb_module, "_gdb"); + gdb_module = PyImport_ImportModule ("_gdb"); #else gdb_module = Py_InitModule ("_gdb", python_GdbMethods); #endif |