Fix bug 21670

[vharron]

Summary

Fixes compilation error when BUILD_SHARED_LIBS is turned on for Linux x86_64.

[ismail]

Fix works for me.

[vharron]

Thanks Andy!

[zturner]

source/CMakeLists.txt

34–36

Should this go into add_lldb_library instead?

In other words, change this:

if (MODULE)
  set(libkind MODULE)
elseif (SHARED_LIBRARY)
  set(libkind SHARED)
else()
  set(libkind STATIC)
endif()

to this:

if (MODULE)
  set(libkind MODULE)
elseif (BUILD_SHARED_LIBS)
  set(libkind SHARED)
else()
  set(libkind STATIC)
endif()

tools/lldb-gdbserver/CMakeLists.txt

20–23

I would rather call add_lldb_executable() and target_link_libraries() in one place. Instead use the if statement to build the source file list and the link library list. Then after the if statement, call each one.

41–44

We don't need any of these 3 lines when BUILD_SHARED_LIBS is true?

[zturner]

What's the status of this? If it has been committed, can we close this? If not, is it abandoned?

[ismail]

This is still not committed and without this shared build would be broken
again.

[vharron]

I'll look at this today if possible.

[vharron]

Fixes compilation/run error with BUILD_SHARED_LIBS=TRUE

Summary:
BUILD_SHARED_LIBS=TRUE currently isn't working for Linux x86_64
This patch fixes the link errors and also some runtime errors

Test Plan:
CC=clang CXX=clang++ cmake -GNinja -DBUILD_SHARED_LIBS=TRUE -DCMAKE_LINKER=ld.gold -DCMAKE_BUILD_TYPE=Debug ../../llvm
ninja
ninja check-lldb

[vharron]

Removed some debug code

[vharron]

Committed r226039

CMakeLists.txt

if (CMAKE_VERSION VERSION_LESS 2.8.12)
   set(cmake_2_8_12_PUBLIC)
 else ()
   set(cmake_2_8_12_INTERFACE INTERFACE)
   set(cmake_2_8_12_PRIVATE PRIVATE)
   set(cmake_2_8_12_PUBLIC PUBLIC)
 endif ()
 
 macro(add_lldb_library name)
-  llvm_process_sources(srcs ${ARGN})
+  # only supported parameters to this macro are the optional 
+  # MODULE;SHARED;STATIC library type and source files
+  cmake_parse_arguments(PARAM
+    "MODULE;SHARED;STATIC"
+    ""
+    ""
+    ${ARGN})
+  llvm_process_sources(srcs ${PARAM_UNPARSED_ARGUMENTS})
+  
   if (MSVC_IDE OR XCODE)
     string(REGEX MATCHALL "/[^/]+" split_path ${CMAKE_CURRENT_SOURCE_DIR})
     list(GET split_path -1 dir)
     file(GLOB_RECURSE headers
       ../../include/lldb${dir}/*.h)
     set(srcs ${srcs} ${headers})
   endif()
-  if (MODULE)
+  if (PARAM_MODULE)
     set(libkind MODULE)
-  elseif (SHARED_LIBRARY)
+  elseif (PARAM_SHARED)
     set(libkind SHARED)
-  else()
+  elseif (PARAM_STATIC)
     set(libkind STATIC)
+  else ()
+    # library type unspecified - controlled by BUILD_SHARED_LIBS
+    unset(libkind)
   endif()
+
   #PIC not needed on Win
   if (NOT MSVC)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
   endif()
   llvm_add_library(${name} ${libkind} ${srcs})
   #if (LLVM_COMMON_DEPENDS)
   ##add_dependencies(${name} ${LLVM_COMMON_DEPENDS})
   #endif()

cmake/LLDBDependencies.cmake

set( LLDB_USED_LIBS
   # Plugins
   lldbPluginDisassemblerLLVM
   lldbPluginSymbolFileDWARF
   lldbPluginSymbolFileSymtab
   lldbPluginDynamicLoaderStatic
   lldbPluginDynamicLoaderPosixDYLD
   lldbPluginDynamicLoaderHexagonDYLD
 
-  lldbPluginObjectFileMachO
   lldbPluginObjectFileELF
   lldbPluginObjectFileJIT
   lldbPluginSymbolVendorELF
   lldbPluginObjectContainerBSDArchive
   lldbPluginObjectContainerMachOArchive
   lldbPluginProcessGDBRemote
-  lldbPluginProcessMachCore
   lldbPluginProcessUtility
   lldbPluginPlatformGDB
   lldbPluginPlatformFreeBSD
   lldbPluginPlatformKalimba
   lldbPluginPlatformLinux
   lldbPluginPlatformPOSIX
   lldbPluginPlatformWindows
-  lldbPluginObjectFileMachO
   lldbPluginObjectContainerMachOArchive
   lldbPluginObjectContainerBSDArchive
   lldbPluginPlatformMacOSX
   lldbPluginDynamicLoaderMacOSXDYLD
   lldbPluginUnwindAssemblyInstEmulation
   lldbPluginUnwindAssemblyX86
   lldbPluginAppleObjCRuntime
   lldbPluginCXXItaniumABI
if ( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
   add_custom_command(OUTPUT ${LLDB_VERS_GENERATED_FILE}
     COMMAND ${LLDB_SOURCE_DIR}/scripts/generate-vers.pl
             ${LLDB_SOURCE_DIR}/lldb.xcodeproj/project.pbxproj liblldb_core
             > ${LLDB_VERS_GENERATED_FILE})
 
   set_source_files_properties(${LLDB_VERS_GENERATED_FILE} PROPERTIES GENERATED 1)
   list(APPEND LLDB_USED_LIBS
     lldbPluginDynamicLoaderDarwinKernel
+    lldbPluginObjectFileMachO
+    lldbPluginProcessMachCore
     lldbPluginProcessMacOSXKernel
     lldbPluginSymbolVendorMacOSX
     lldbPluginSystemRuntimeMacOSX
     lldbPluginProcessElfCore
     lldbPluginJITLoaderGDB
     )
 endif()
 
set( LLVM_LINK_COMPONENTS
   selectiondag
   bitreader
   mc
   mcjit
   core
   mcdisassembler
   executionengine
   option
+  support
   )
 
 if ( NOT LLDB_DISABLE_PYTHON )
   set(LLDB_WRAP_PYTHON ${LLDB_BINARY_DIR}/scripts/LLDBWrapPython.cpp)
 
   set_source_files_properties(${LLDB_WRAP_PYTHON} PROPERTIES GENERATED 1)
   if (LLVM_COMPILER_IS_GCC_COMPATIBLE AND
       NOT "${CMAKE_SYSTEM_NAME}" MATCHES "Darwin")
     set_property(SOURCE ${LLDB_WRAP_PYTHON}
                  APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-sequence-point")
   endif ()
 endif()

source/CMakeLists.txt

include_directories(
   )
 endif ()
 
 # Need to export the API in the liblldb.dll for Windows
 # The lldbAPI source files are added directly in liblldb
 if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows" )
   add_subdirectory(API)
 endif ()
+
 add_subdirectory(Breakpoint)
 add_subdirectory(Commands)
 add_subdirectory(Core)
 add_subdirectory(DataFormatters)
 add_subdirectory(Expression)
 add_subdirectory(Host)
 add_subdirectory(Interpreter)
 add_subdirectory(Plugins)
 add_subdirectory(Symbol)
 add_subdirectory(Target)
 add_subdirectory(Utility)
 
 include(../cmake/LLDBDependencies.cmake)
 
-set(SHARED_LIBRARY 1)
-
 if ( CMAKE_SYSTEM_NAME MATCHES "Windows" )
 add_definitions( -DEXPORT_LIBLLDB )
 endif()
 
 # Need to export the API in the liblldb.dll for Windows
 # The lldbAPI source files are added directly in liblldb
 if ( CMAKE_SYSTEM_NAME MATCHES "Windows" )
 # On Non-Windows, the corresponding file list is maintained in
 # source\API\CMakeLists.txt.  When editing this list, do not forget to make a
 # corresponding change in that file as well (when appropriate).
-add_lldb_library(liblldb
+add_lldb_library(liblldb SHARED
   lldb.cpp
   lldb-log.cpp
   API/SBAddress.cpp
   API/SBBlock.cpp
   API/SBBreakpoint.cpp
   API/SBBreakpointLocation.cpp
   API/SBBroadcaster.cpp
   API/SBCommandInterpreter.cpp

tools/lldb-gdbserver/CMakeLists.txt

include_directories(
   ../../source/Plugins/Process/FreeBSD
   ../../source/Plugins/Process/POSIX
   )
 endif ()
 include_directories(../../source)
 
 include(../../cmake/LLDBDependencies.cmake)
 
+if ( BUILD_SHARED_LIBS )
+  add_lldb_executable(lldb-gdbserver
+    lldb-gdbserver.cpp
+    )
+
+  target_link_libraries(lldb-gdbserver liblldb)
+else()
   # have to include lldb and lldb-log files since those are not libraries and llgs depends on them
   add_lldb_executable(lldb-gdbserver
     lldb-gdbserver.cpp
     ../../source/lldb-log.cpp
     ../../source/lldb.cpp
     )
 
   # The Darwin linker doesn't understand --start-group/--end-group.
   if (LLVM_COMPILER_IS_GCC_COMPATIBLE AND NOT "${CMAKE_SYSTEM_NAME}" MATCHES "Darwin")
     target_link_libraries(lldb-gdbserver
                           -Wl,--start-group ${LLDB_USED_LIBS} -Wl,--end-group)
   else()
     target_link_libraries(lldb-gdbserver ${LLDB_USED_LIBS})
   endif()
   target_link_libraries(lldb-gdbserver ${CLANG_USED_LIBS})
   llvm_config(lldb-gdbserver ${LLVM_LINK_COMPONENTS})
 
   target_link_libraries(lldb-gdbserver ${LLDB_SYSTEM_LIBS})
+endif()
 
 set_target_properties(lldb-gdbserver PROPERTIES VERSION ${LLDB_VERSION})
-
 install(TARGETS lldb-gdbserver
   RUNTIME DESTINATION bin)

tools/lldb-mi/CMakeLists.txt

add_lldb_executable(lldb-mi
   MIUtilSystemWindows.cpp
   MIUtilTermios.cpp
   MIUtilThreadBaseStd.cpp
   MIUtilVariant.cpp
   Platform.cpp
   )
 endif ()
 
-target_link_libraries(lldb-mi liblldb)
+target_link_libraries(lldb-mi liblldb pthread)
 # TODO: why isn't this done by add_lldb_executable?
 #target_link_libraries(lldb-mi ${LLDB_USED_LIBS})
 #llvm_config(lldb-mi ${LLVM_LINK_COMPONENTS})
 
 set_target_properties(lldb-mi PROPERTIES VERSION ${LLDB_VERSION})
 
 install(TARGETS lldb-mi
   RUNTIME DESTINATION bin)