5 files changed, 169 insertions, 0 deletions
diff --git a/lldb/scripts/Python/modules/CMakeLists.txt b/lldb/scripts/Python/modules/CMakeLists.txt
new file mode 100644
index 00000000000..13e65ee53c2
--- /dev/null
+++ b/lldb/scripts/Python/modules/CMakeLists.txt
@@ -0,0 +1,4 @@
+# build the Python readline suppression module only on Linux
+if (CMAKE_SYSTEM_NAME MATCHES "Linux")
+   add_subdirectory(readline)
+endif()
diff --git a/lldb/scripts/Python/modules/Makefile b/lldb/scripts/Python/modules/Makefile
new file mode 100644
index 00000000000..90dda098ff6
--- /dev/null
+++ b/lldb/scripts/Python/modules/Makefile
@@ -0,0 +1,20 @@
+##===- scripts/Python/modules/Makefile ---------------------*- Makefile -*-===##
+#
+#                     The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+#
+##===----------------------------------------------------------------------===##
+
+LLDB_LEVEL := ../../..
+include $(LLDB_LEVEL)/../../Makefile.config
+
+DIRS:=
+
+# only build the readline suppression module on Linux
+ifeq ($(HOST_OS), Linux)
+DIRS += readline
+endif
+
+include $(LLDB_LEVEL)/Makefile
diff --git a/lldb/scripts/Python/modules/readline/CMakeLists.txt b/lldb/scripts/Python/modules/readline/CMakeLists.txt
new file mode 100644
index 00000000000..e0613a32b4f
--- /dev/null
+++ b/lldb/scripts/Python/modules/readline/CMakeLists.txt
@@ -0,0 +1,19 @@
+# FIXME: if a non-standard version of python is requested, the cmake macro
+# below will need Python_ADDITIONAL_VERSIONS set in order to find it.
+include(FindPythonInterp)
+SET(PYTHON_DIRECTORY python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages)
+
+# Build the readline python module
+include_directories(${PYTHON_INCLUDE_DIR})
+add_library(readline SHARED readline.cpp)
+
+# FIXME: the LIBRARY_OUTPUT_PATH seems to be ignored - this is not a
+# functional issue for the build dir, though, since the shared lib dir
+# for the build is in the python shared library load path, and thus
+# python finds it when loading the python readline module.
+set_target_properties(readline PROPERTIES
+                               PREFIX ""
+                               LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/lib/${PYTHON_DIRECTORY})
+
+# Install the readline module.
+install(TARGETS readline LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/${PYTHON_DIRECTORY})
diff --git a/lldb/scripts/Python/modules/readline/Makefile b/lldb/scripts/Python/modules/readline/Makefile
new file mode 100644
index 00000000000..f177ccff51f
--- /dev/null
+++ b/lldb/scripts/Python/modules/readline/Makefile
@@ -0,0 +1,99 @@
+##===- scripts/Python/modules/readline/Makefile ------------*- Makefile -*-===##
+#
+#                     The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+#
+##===----------------------------------------------------------------------===##
+
+# Skip this entire Makefile if python is disabled.
+ifeq (,$(findstring -DLLDB_DISABLE_PYTHON,$(CXXFLAGS)))
+
+LEVEL := ../../../../../..
+LLDB_LEVEL := ../../../..
+
+LIBRARYNAME = readline
+
+NO_BUILD_ARCHIVE = 1
+LINK_LIBS_IN_SHARED = 1
+SHARED_LIBRARY = 1
+LOADABLE_MODULE = 1
+
+PYTHON_INCLUDES = $(shell python-config --includes)
+
+# Include all archives in the shared lib
+USEDLIBS :=
+
+include $(LLDB_LEVEL)/../../Makefile.config
+
+LINK_COMPONENTS :=
+
+include $(LEVEL)/Makefile.common
+
+# include python headers
+CXXFLAGS += $(PYTHON_INCLUDES)
+
+ifeq ($(HOST_OS),Darwin)
+    LLVMLibsOptions += -Wl,-all_load
+    # set dylib internal version number to llvmCore submission number
+    ifdef LLDB_SUBMIT_VERSION
+        LLVMLibsOptions += -Wl,-current_version \
+                           -Wl,$(LLDB_SUBMIT_VERSION).$(LLDB_SUBMIT_SUBVERSION) \
+                           -Wl,-compatibility_version -Wl,1
+    endif
+    # extra options to override libtool defaults
+    LVMLibsOptions += -F/System/Library/Frameworks -F/System/Library/PrivateFrameworks
+    LLVMLibsOptions += -framework Foundation -framework CoreFoundation
+    LLVMLibsOptions += -framework CoreServices -framework Carbon -framework Security
+    LLVMLibsOptions += -framework DebugSymbols $(PYTHON_BUILD_FLAGS) -lobjc
+    # Mac OS X 10.4 and earlier tools do not allow a second -install_name on command line
+    DARWIN_VERS := $(shell echo $(TARGET_TRIPLE) | sed 's/.*darwin\([0-9]*\).*/\1/')
+    ifneq ($(DARWIN_VERS),8)
+       LLVMLibsOptions  += -Wl,-install_name \
+                           -Wl,"@executable_path/../lib/$(LIBRARYNAME)$(SHLIBEXT)"
+    endif
+endif
+
+ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux GNU GNU/kFreeBSD))
+    # Include everything from the .a's into the shared library.
+    ProjLibsOptions := -Wl,--whole-archive $(ProjLibsOptions) \
+                       -Wl,--no-whole-archive
+    # Link in libedit
+    # LLVMLibsOptions += -ledit
+    LLVMLibsOptions += -Wl,--soname,$(LIBRARYNAME)$(SHLIBEXT)
+endif
+
+ifeq ($(HOST_OS),FreeBSD)
+    # Include everything from the .a's into the shared library.
+    ProjLibsOptions := -Wl,--whole-archive $(ProjLibsOptions) \
+                       -Wl,--no-whole-archive
+    # Allow unresolved symbols.
+    LLVMLibsOptions += -Wl,--allow-shlib-undefined
+    # Link in libedit
+    # LLVMLibsOptions += -L/usr/local/lib -ledit
+endif
+
+# FIXME: dynamically construct the version from `python -V`
+PYTHON_VERSION:=2.7
+LLDB_PYTHON_MODULE_REL_DIR:=python$(PYTHON_VERSION)/site-packages
+LLDB_PYTHON_MODULE_DIR:=$(LibDir)/$(LLDB_PYTHON_MODULE_REL_DIR)
+
+# Target to move readline module from shared lib build location to
+# local python module directory.
+all-local:: $(LLDB_PYTHON_MODULE_DIR)/$(LIBRARYNAME)$(SHLIBEXT)
+
+$(LLDB_PYTHON_MODULE_DIR)/$(LIBRARYNAME)$(SHLIBEXT): $(SharedLibDir)/$(LIBRARYNAME)$(SHLIBEXT)
+	$(Echo) Staging $(BuildMode) $(LIBRARYNAME)$(SHLIBEXT) to $(LLDB_PYTHON_MODULE_DIR)
+	$(Verb) $(MKDIR) "$(LLDB_PYTHON_MODULE_DIR)"
+	$(Verb) $(ProgInstall) $(SharedLibDir)/$(LIBRARYNAME)$(SHLIBEXT) $(LLDB_PYTHON_MODULE_DIR)
+
+# Target to move the shared library from the build python lib dir to
+# the install python lib dir.
+install-local:: $(LLDB_PYTHON_MODULE_DIR)/$(LIBRARYNAME)$(SHLIBEXT)
+	$(Echo) Installing $(BuildMode) $(LLDB_PYTHON_MODULE_DIR)/$(LIBRARYNAME)$(SHLIBEXT) to $(DESTDIR)$(prefix)/lib/$(LLDB_PYTHON_MODULE_REL_DIR)
+	$(Verb) $(MKDIR) "$(DESTDIR)$(prefix)/lib/$(LLDB_PYTHON_MODULE_REL_DIR)"
+	$(Verb) $(ProgInstall) "$(LLDB_PYTHON_MODULE_DIR)/$(LIBRARYNAME)$(SHLIBEXT)" "$(DESTDIR)$(prefix)/lib/$(LLDB_PYTHON_MODULE_REL_DIR)"
+	$(Verb) $(RM) "$(DESTDIR)$(prefix)/lib/$(LIBRARYNAME)$(SHLIBEXT)"
+
+endif  # if !defined(LLDB_DISABLE_PYTHON)
diff --git a/lldb/scripts/Python/modules/readline/readline.cpp b/lldb/scripts/Python/modules/readline/readline.cpp
new file mode 100644
index 00000000000..e5941cc50fd
--- /dev/null
+++ b/lldb/scripts/Python/modules/readline/readline.cpp
@@ -0,0 +1,27 @@
+#include <stdio.h>
+#include "Python.h"
+
+// Python readline module intentionally built to not implement the
+// readline module interface. 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[] =
+{
+    {0, 0}
+};
+
+PyDoc_STRVAR(
+    moduleDocumentation,
+    "Stub module meant to effectively disable readline support.");
+
+PyMODINIT_FUNC
+initreadline(void)
+{
+    Py_InitModule4(
+        "readline",
+        moduleMethods,
+        moduleDocumentation,
+        static_cast<PyObject *>(NULL),
+        PYTHON_API_VERSION);
+}