This is an archive of the discontinued LLVM Phabricator instance.

Differential D5431

Add -lpthread to LLDB shared lib link line unconditionally
ClosedPublic

Authored by loladiro on Sep 21 2014, 2:52 PM.

Details

Reviewers
labath
Commits
rG121c1c54bf7f: Add -lpthread to LLDB shared lib link line unconditionally
rLLDB241006: Add -lpthread to LLDB shared lib link line unconditionally
rL241006: Add -lpthread to LLDB shared lib link line unconditionally
Summary

Usually -lpthread is included due to LLVM link options,
but when LLVM threading is disabled, this does not happen.
pthread is still needed however because LLDB uses threading
regardless of whether LLVM is built with threading support or not.

Diff Detail

Repository
rL LLVM

Event Timeline

loladiro updated this revision to Diff 13914.Sep 21 2014, 2:52 PM
loladiro retitled this revision from to Add -lpthread to LLDB shared lib link line unconditionally.
loladiro updated this object.
loladiro edited the test plan for this revision. (Show Details)
loladiro set the repository for this revision to rL LLVM.
loladiro added a subscriber: Unknown Object (MLST).
loladiro added a comment.Oct 24 2014, 4:41 PM

Bump, just had somebody run into this again. Does this look ok?

emaste added a subscriber: emaste.Oct 24 2014, 4:48 PM

Is the cmake build not affected?

loladiro added a comment.Oct 28 2014, 1:51 PM

I suspect it is, but I don't know enough about the CMake build system to confirm.

loladiro updated this revision to Diff 17650.Dec 28 2014, 12:45 AM
loladiro set the repository for this revision to rL LLVM.

I got around to checking with cmake and it doesn't seems to be affected. I did have to add one small fix to make it build (included here), but other than that it went through fine. If there's no further problems, I'll commit this soon then.

loladiro abandoned this revision.Apr 13 2015, 1:31 PM

This seems to have been fixed by D8991.

loladiro reclaimed this revision.Jun 11 2015, 11:03 AM

I was wrong, this is still an issue. Would like to commit this.

loladiro mentioned this in D10399: Don't link ObjCARCOpts twice. Fixes PR22543.Jun 18 2015, 12:35 PM
loladiro added a reviewer: labath.Jun 18 2015, 4:53 PM
loladiro added a subscriber: labath.

@labath Would you mind taking a look at this as well?

labath edited edge metadata.Jun 18 2015, 5:17 PM

The makefile changes can go in, but I would like more explanation on the cmake change.

scripts/CMakeLists.txt
1

What was the exact reason you needed to add this?

loladiro added inline comments.Jun 18 2015, 5:21 PM
scripts/CMakeLists.txt
1

We disable threads and LLDB_DISABLE_PYTHON and all of this disables python stuff that isn't needed (and errors if you don't use python/don't have it installed). Originally I only had the Makefile change, but I was asked to check if cmake worked in this configuration, and this was the one thing I had to change to make it work. I'll happily make this a separate commit, it was just here for convenience.

labath added a comment.Jun 18 2015, 6:07 PM

I'm just trying to understand what are the implications of this.

Right now, using LLDB_DISABLE_PYTHON will prevent lldb from linking
against python. Is that correct?

With your patch the flag will also prevent the generation of the
python SBAPI? Or what exactly?

loladiro added a comment.Jun 18 2015, 6:10 PM

Yes, that's correct. LLDB_DISABLE_PYTHON prevents LLDB from linking python (and disables python specific functionality in the source of course). This also disables the swig wrapper generation.

labath added a comment.Jun 19 2015, 1:53 PM

Currently, the description of LLDB_DISABLE_PYTHON is "Disables the
Python scripting integration". I guess we could say that the swig
wrapper falls in this category. I personally have no issue with that,
but I don't know if anyone depends on that behaviour.

emaste added a comment.Jun 19 2015, 2:24 PM
In D5431#191167, @labath wrote:

Currently, the description of LLDB_DISABLE_PYTHON is "Disables the
Python scripting integration". I guess we could say that the swig
wrapper falls in this category. I personally have no issue with that,
but I don't know if anyone depends on that behaviour.

There are plans to extend the scripting integration to other languages supported by SWIG and so we'll probably have to revisit this when that happens.

loladiro added a comment.Jun 19 2015, 3:24 PM

I don't really care what the switches are named as long as there is an option that removes any dependency on Python.

loladiro added a comment.Jun 27 2015, 10:34 AM

Bump. Is the CMake change ok or would you like to ponder it further?

loladiro added a comment.Jun 28 2015, 6:30 PM

I will go ahead with the Makefile changes and submit a separate revision for the CMake ones.

labath added a comment.Jun 29 2015, 3:42 AM

Sure, commit the makefile changes any time you like.

Sorry for the delay. I was not sure if I want this change or not, and I was hoping someone else will have a say. BTW, is the cmake change even necessary now? I just noticed that the root CMakeLists.txt has

if (NOT LLDB_DISABLE_PYTHON)
  add_subdirectory(scripts)
endif ()
Closed by commit rL241006: Add -lpthread to LLDB shared lib link line unconditionally (authored by kfischer). · Explain WhyJun 29 2015, 2:53 PM
This revision was automatically updated to reflect the committed changes.
loladiro added a comment.Jun 29 2015, 2:54 PM

Yup, seems like that would do it as well. Great, thanks!

Revision Contents

PathSize
lib/
4 lines
scripts/
86 lines
tools/
lldb-mi/
4 lines

Diff 17650

lib/Makefile

Show First 20 Lines • Show All 174 Lines • ▼ Show 20 Lines
ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux GNU GNU/kFreeBSD)) ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux GNU GNU/kFreeBSD))
# Include everything from the .a's into the shared library. # Include everything from the .a's into the shared library.
ProjLibsOptions := -Wl,--whole-archive $(ProjLibsOptions) \ ProjLibsOptions := -Wl,--whole-archive $(ProjLibsOptions) \
-Wl,--no-whole-archive -Wl,--no-whole-archive
# Don't allow unresolved symbols. # Don't allow unresolved symbols.
LLVMLibsOptions += -Wl,--no-undefined LLVMLibsOptions += -Wl,--no-undefined
# Link in python # Link in python
LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt -ledit -lncurses -lpanel LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt -ledit -lncurses -lpanel -lpthread
LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT) LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT)
endif endif
ifeq ($(HOST_OS),FreeBSD) ifeq ($(HOST_OS),FreeBSD)
# Include everything from the .a's into the shared library. # Include everything from the .a's into the shared library.
ProjLibsOptions := -Wl,--whole-archive $(ProjLibsOptions) \ ProjLibsOptions := -Wl,--whole-archive $(ProjLibsOptions) \
-Wl,--no-whole-archive -Wl,--no-whole-archive
# Allow unresolved symbols. # Allow unresolved symbols.
LLVMLibsOptions += -Wl,--allow-shlib-undefined LLVMLibsOptions += -Wl,--allow-shlib-undefined
# Link in python # Link in python
LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt -L/usr/local/lib -lexecinfo \ LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt -L/usr/local/lib -lexecinfo \
-ledit -lncurses -lpanel -ledit -lncurses -lpanel -lpthread
endif endif

scripts/CMakeLists.txt

if (NOT LLDB_DISABLE_PYTHON)
labathUnsubmitted
Not Done
ReplyInline Actions

What was the exact reason you needed to add this?

labath: What was the exact reason you needed to add this?
loladiroAuthorUnsubmitted
Not Done
ReplyInline Actions

We disable threads and LLDB_DISABLE_PYTHON and all of this disables python stuff that isn't needed (and errors if you don't use python/don't have it installed). Originally I only had the Makefile change, but I was asked to check if cmake worked in this configuration, and this was the one thing I had to change to make it work. I'll happily make this a separate commit, it was just here for convenience.

loladiro: We disable threads and LLDB_DISABLE_PYTHON and all of this disables python stuff that isn't…
set(LLVM_NO_RTTI 1) set(LLVM_NO_RTTI 1)
file(GLOB SWIG_INPUTS Python/interface/*.i) file(GLOB SWIG_INPUTS Python/interface/*.i)
if ( LLDB_ENABLE_PYTHON_SCRIPTS_SWIG_API_GENERATION ) if ( LLDB_ENABLE_PYTHON_SCRIPTS_SWIG_API_GENERATION )
find_package(SWIG REQUIRED) find_package(SWIG REQUIRED)
add_custom_command( add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/LLDBWrapPython.cpp OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/LLDBWrapPython.cpp
DEPENDS ${LLDB_SOURCE_DIR}/scripts/lldb.swig DEPENDS ${LLDB_SOURCE_DIR}/scripts/lldb.swig
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/buildSwigWrapperClasses.py DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/buildSwigWrapperClasses.py
DEPENDS ${SWIG_INPUTS} DEPENDS ${SWIG_INPUTS}
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/buildSwigWrapperClasses.py "--srcRoot=${LLDB_SOURCE_DIR}" "--targetDir=${CMAKE_CURRENT_BINARY_DIR}" "--cfgBldDir=${CMAKE_CURRENT_BINARY_DIR}" "--prefix=${CMAKE_BINARY_DIR}" "--swigExecutable=${SWIG_EXECUTABLE}" -m COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/buildSwigWrapperClasses.py "--srcRoot=${LLDB_SOURCE_DIR}" "--targetDir=${CMAKE_CURRENT_BINARY_DIR}" "--cfgBldDir=${CMAKE_CURRENT_BINARY_DIR}" "--prefix=${CMAKE_BINARY_DIR}" "--swigExecutable=${SWIG_EXECUTABLE}" -m
COMMENT "Python script building LLDB Python wrapper") COMMENT "Python script building LLDB Python wrapper")
set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/LLDBWrapPython.cpp PROPERTIES GENERATED 1) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/LLDBWrapPython.cpp PROPERTIES GENERATED 1)
ADD_CUSTOM_TARGET(swig_wrapper ALL echo -n ADD_CUSTOM_TARGET(swig_wrapper ALL echo -n
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/LLDBWrapPython.cpp DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/LLDBWrapPython.cpp
) )
# Install the LLDB python module on all operating systems (except Windows) # Install the LLDB python module on all operating systems (except Windows)
if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows") if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows")
install(DIRECTORY ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} install(DIRECTORY ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}
DESTINATION lib${LLVM_LIBDIR_SUFFIX}) DESTINATION lib${LLVM_LIBDIR_SUFFIX})
endif() endif()
else () else ()
add_custom_command( add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/LLDBWrapPython.cpp OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/LLDBWrapPython.cpp
DEPENDS ${LLDB_SOURCE_DIR}/scripts/lldb.swig DEPENDS ${LLDB_SOURCE_DIR}/scripts/lldb.swig
DEPENDS ${SWIG_INPUTS} DEPENDS ${SWIG_INPUTS}
# swig was directly invoked on Windows (where the Python API is not being generated) but on other platforms, we need to run the *swig-wrapper-classes.sh shell-scripts. # swig was directly invoked on Windows (where the Python API is not being generated) but on other platforms, we need to run the *swig-wrapper-classes.sh shell-scripts.
#COMMAND swig -c++ -shadow -python -I${LLDB_SOURCE_DIR}/include -I./. -outdir ${LLDB_SOURCE_DIR}/scripts/Python -o ${LLDB_SOURCE_DIR}/source/LLDBWrapPython.cpp ${LLDB_SOURCE_DIR}/scripts/lldb.swig #COMMAND swig -c++ -shadow -python -I${LLDB_SOURCE_DIR}/include -I./. -outdir ${LLDB_SOURCE_DIR}/scripts/Python -o ${LLDB_SOURCE_DIR}/source/LLDBWrapPython.cpp ${LLDB_SOURCE_DIR}/scripts/lldb.swig
COMMAND env PYTHON_EXECUTABLE=${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/build-swig-wrapper-classes.sh ${LLDB_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} -m COMMAND env PYTHON_EXECUTABLE=${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/build-swig-wrapper-classes.sh ${LLDB_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} -m
COMMAND env PYTHON_EXECUTABLE=${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/finish-swig-wrapper-classes.sh ${LLDB_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} -m COMMAND env PYTHON_EXECUTABLE=${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/finish-swig-wrapper-classes.sh ${LLDB_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} -m
COMMENT "Building lldb python wrapper") COMMENT "Building lldb python wrapper")
set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/LLDBWrapPython.cpp PROPERTIES GENERATED 1) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/LLDBWrapPython.cpp PROPERTIES GENERATED 1)
ADD_CUSTOM_TARGET(swig_wrapper ALL echo -n ADD_CUSTOM_TARGET(swig_wrapper ALL echo -n
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/LLDBWrapPython.cpp DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/LLDBWrapPython.cpp
) )
# Install the LLDB python module on all operating systems (except Windows) # Install the LLDB python module on all operating systems (except Windows)
if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows") if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows")
install(DIRECTORY ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} install(DIRECTORY ${CMAKE_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}
DESTINATION lib${LLVM_LIBDIR_SUFFIX}) DESTINATION lib${LLVM_LIBDIR_SUFFIX})
endif() endif()
endif () endif ()
# build Python modules # build Python modules
add_subdirectory(Python/modules) add_subdirectory(Python/modules)
endif()

tools/lldb-mi/Makefile

Show All 16 Lines
include $(LLDB_LEVEL)/Makefile include $(LLDB_LEVEL)/Makefile
ifeq ($(HOST_OS),Darwin) ifeq ($(HOST_OS),Darwin)
LLVMLibsOptions += -Wl,-rpath,@loader_path/../lib/ LLVMLibsOptions += -Wl,-rpath,@loader_path/../lib/
LLVMLibsOptions += -Wl,-sectcreate -Wl,__TEXT -Wl,__info_plist -Wl,"$(PROJ_SRC_DIR)/lldb-Info.plist" LLVMLibsOptions += -Wl,-sectcreate -Wl,__TEXT -Wl,__info_plist -Wl,"$(PROJ_SRC_DIR)/lldb-Info.plist"
endif endif
ifneq (,$(filter $(HOST_OS), Linux GNU/kFreeBSD)) ifneq (,$(filter $(HOST_OS), Linux GNU/kFreeBSD))
LLVMLibsOptions += -Wl,-rpath,$(LibDir) LLVMLibsOptions += -Wl,-rpath,$(LibDir) -lpthread
endif endif
ifeq ($(HOST_OS),FreeBSD) ifeq ($(HOST_OS),FreeBSD)
CPP.Flags += -I/usr/include/edit #-v CPP.Flags += -I/usr/include/edit #-v
LLVMLibsOptions += -Wl,-rpath,$(LibDir) LLVMLibsOptions += -Wl,-rpath,$(LibDir) -lpthread
endif endif