Adjust for Python-3.

[sivachandra]

Summary

This does not yet give us a clean testsuite run but it does help with:

1. Actually building on linux
2. Run the testsuite with over 70% tests passing on linux.

[sivachandra]

BTW, I should mention that the testsuite run with Python-2.x is still clean with this change applied.

[zturner]

Very excited to see more platforms trying to get Python 3 working.

source/API/liblldb.exports

4

I don't really know what the syntax of this file is, but the symbol is called PyInit__lldb, not PyInit__lld. Is this still correct? Does it matter that you're exporting both the Python 2 and the Python 3 symbol in both versions even when they're not defined?

[labath]

scripts/Python/modules/readline/readline.cpp

55

existing code uses PY_MAJOR_VERSION >= 3 (which also looks much nicer), so let's be consistent.

source/API/liblldb.exports

4

This just restricts the exported symbols to the ones matching the wildcards, so I don't think it matters that both are present.
OTOH, unless we know the reason why the b has to be omitted from the wildcard, then I suggest you add it.

[sivachandra]

Address comments

[sivachandra]

source/API/liblldb.exports

4

I just followed the existing "convention". Works without the "*" as well, so removed it according to the suggestion.

4

zturner: The listing here does not say what *should* be exported, but that a symbol should be exported only if matches one of these regexes.

packages/Python/lldbsuite/test/lldbtest.py

def getsource_if_available(obj):
     except:
         return repr(obj)
 
 def builder_module():
     if sys.platform.startswith("freebsd"):
         return __import__("builder_freebsd")
     if sys.platform.startswith("netbsd"):
         return __import__("builder_netbsd")
+    if sys.platform.startswith("linux"):
+        # sys.platform with Python-3.x returns 'linux', but with
+        # Python-2.x it returns 'linux2'.
+        return __import__("builder_linux")
     return __import__("builder_" + sys.platform)
 
 
 class Base(unittest2.TestCase):
     """
     Abstract base for performing lldb (see TestBase) or other generic tests (see
     BenchBase for one example).  lldbtest.Base works with the test driver to
     accomplish things.

packages/Python/lldbsuite/test/plugins/builder_linux.py

 from builder_base import *
 
 def buildDsym(sender=None, architecture=None, compiler=None, dictionary=None, clean=True):
     return False

scripts/Python/modules/readline/readline.cpp

 // in the GNU readline shared lib, which causes linkage confusion when
 // both readline and libedit's readline compatibility symbols collide.
 //
 // Currently it only installs a PyOS_ReadlineFunctionPointer, without
 // implementing any of the readline module methods. This is meant to
 // work around LLVM pr18841 to avoid seg faults in the stock Python
 // readline.so linked against GNU readline.
 
-static struct PyMethodDef moduleMethods[] =
-{
-    {nullptr, nullptr, 0, nullptr}
-};
-
 #ifndef LLDB_DISABLE_LIBEDIT
 PyDoc_STRVAR(
     moduleDocumentation,
     "Simple readline module implementation based on libedit.");
 #else
 PyDoc_STRVAR(
     moduleDocumentation,
     "Stub module meant to avoid linking GNU readline.");
 #endif
 
+#if PY_MAJOR_VERSION >= 3
+static struct PyModuleDef readline_module =
+{
+    PyModuleDef_HEAD_INIT, // m_base
+    "readline",            // m_name
+    moduleDocumentation,   // m_doc
+    -1,                    // m_size
+    nullptr,               // m_methods
+    nullptr,               // m_reload
+    nullptr,               // m_traverse
+    nullptr,               // m_clear
+    nullptr,               // m_free
+};
+#else
+static struct PyMethodDef moduleMethods[] =
+{
+    {nullptr, nullptr, 0, nullptr}
+};
+#endif
+
 #ifndef LLDB_DISABLE_LIBEDIT
 static char*
+#if PY_MAJOR_VERSION >= 3
+simple_readline(FILE *stdin, FILE *stdout, const char *prompt)
+#else
 simple_readline(FILE *stdin, FILE *stdout, char *prompt)
+#endif
 {
     rl_instream = stdin;
     rl_outstream = stdout;
     char* line = readline(prompt);
     if (!line)
     {
         char* ret = (char*)PyMem_Malloc(1);
         if (ret != NULL)

 #endif
 
 PyMODINIT_FUNC
 initreadline(void)
 {
 #ifndef LLDB_DISABLE_LIBEDIT
     PyOS_ReadlineFunctionPointer = simple_readline;
 #endif
+
+#if PY_MAJOR_VERSION >= 3
+    return PyModule_Create(&readline_module);
+#else
     Py_InitModule4(
         "readline",
         moduleMethods,
         moduleDocumentation,
         static_cast<PyObject *>(NULL),
         PYTHON_API_VERSION);
+#endif
 }

source/API/liblldb.exports

 _ZN4lldb*
 _ZNK4lldb*
 init_lld*
+PyInit__lldb