[lld][cmake] Fix LLVM_LINK_LLVM_DYLIB build

[labath]

Summary

Lld's build had a couple of issues which prevented a successfull
LLVM_LINK_LLVM_DYLIB compilation.

• add_llvm_library vs llvm_add_library: One adds a library to libLLVM.so, other one doesn't. Lld was using the wrong one, causing symbols to be mupltiply defined in things linking to libLLVM.
• confusion when to use LINK_LIBS vs LINK_COMPONENTS in llvm_add_library
• not using LLVM_LINK_COMPONENTS for add_lld_tool

With these fixes lld compiles and it's test suite passes both in
LLVM_LINK_LLVM_DYLIB mode and without it.

[sylvestre.ledru]

I confirmed that this fixed the issue I was experiencing with Debian:
https://llvm.org/bugs/show_bug.cgi?id=27685

[ruiu]

LGTM. Thank you for doing this! This is what we do in other LLVM subprojects, so I think this is correct.

[sylvestre.ledru]

But look like we regressed with lldb: https://llvm.org/bugs/show_bug.cgi?id=31571

[labath]

The lldb problem is unrelated to this. I am going to try to fix that one separately.

[davidlt]

TL;DR This broke lld.

I was trying to build an RPM for LLVM/Clang 4.0.0 RC1 toolchain and noticed issues, which at first looks a caused by this change.

With this change you are no more installing required shared libraries:
error: Failed dependencies:

liblldCOFF.so.4()(64bit) is needed by external+llvm+4.0.0-cms-1-1.x86_64
liblldDriver.so.4()(64bit) is needed by external+llvm+4.0.0-cms-1-1.x86_64
liblldELF.so.4()(64bit) is needed by external+llvm+4.0.0-cms-1-1.x86_64

I checked CMake install logs and they were not listed as installed.

Looking at packages (thus installed) lld binary it depends on them.

[EricWF]

In D28397#651770, @davidlt wrote:

TL;DR This broke lld.

I was trying to build an RPM for LLVM/Clang 4.0.0 RC1 toolchain and noticed issues, which at first looks a caused by this change.

With this change you are no more installing required shared libraries:
error: Failed dependencies:

liblldCOFF.so.4()(64bit) is needed by external+llvm+4.0.0-cms-1-1.x86_64
liblldDriver.so.4()(64bit) is needed by external+llvm+4.0.0-cms-1-1.x86_64
liblldELF.so.4()(64bit) is needed by external+llvm+4.0.0-cms-1-1.x86_64

I checked CMake install logs and they were not listed as installed.

Looking at packages (thus installed) lld binary it depends on them.

+1

I'm running into the same problems trying to use lld.

[dtzWill]

+1, I've been using trunk with this revision reverted since I need liblldELF as well. Would it fix all use cases if we added bits to install the libraries to add_lld_library?

[labath]

Sorry about the breakage.

In D28397#652446, @dtzWill wrote:

+1, I've been using trunk with this revision reverted since I need liblldELF as well. Would it fix all use cases if we added bits to install the libraries to add_lld_library?

Yes, I believe the install bits will fix your issue. I'll create a patch for that today.. I'd appreciate it if one of you could check that this fixes your problems

cmake/modules/AddLLD.cmake

 macro(add_lld_library name)
-  add_llvm_library(${name} ${ARGN})
+  llvm_add_library(${name} ${ARGN})
   set_target_properties(${name} PROPERTIES FOLDER "lld libraries")
 endmacro(add_lld_library)
 
 macro(add_lld_executable name)
   add_llvm_executable(${name} ${ARGN})
   set_target_properties(${name} PROPERTIES FOLDER "lld executables")
 endmacro(add_lld_executable)
 

lib/Config/CMakeLists.txt

 add_lld_library(lldConfig
   Version.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${LLD_INCLUDE_DIR}/lld/Config
 
-  LINK_LIBS
-    LLVMSupport
+  LINK_COMPONENTS
+    Support
   )

lib/Core/CMakeLists.txt

 add_lld_library(lldCore
   DefinedAtom.cpp
   Error.cpp
   File.cpp
   LinkingContext.cpp
   Reader.cpp
   Reproduce.cpp
   Resolver.cpp
   SymbolTable.cpp
   Writer.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${LLD_INCLUDE_DIR}/lld/Core
 
-  LINK_LIBS
-    LLVMSupport
+  LINK_COMPONENTS
+    Support
   )

lib/Driver/CMakeLists.txt

 set(LLVM_TARGET_DEFINITIONS DarwinLdOptions.td)
 tablegen(LLVM DarwinLdOptions.inc -gen-opt-parser-defs)
 add_public_tablegen_target(DriverOptionsTableGen)
 
 add_lld_library(lldDriver
   DarwinLdDriver.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${LLD_INCLUDE_DIR}/lld/Driver
 
+  LINK_COMPONENTS
+    Object
+    Option
+    Support
+
   LINK_LIBS
     lldConfig
     lldMachO
     lldCore
     lldReaderWriter
     lldYAML
-    LLVMObject
-    LLVMOption
-    LLVMSupport
   )
 
 add_dependencies(lldDriver DriverOptionsTableGen)

lib/ReaderWriter/CMakeLists.txt

 add_subdirectory(MachO)
 add_subdirectory(YAML)
 
 if (MSVC)
   add_definitions(-wd4062) # Suppress 'warning C4062: Enumerator has no associated handler in a switch statement.'
 endif()
 
 add_lld_library(lldReaderWriter
   FileArchive.cpp
 
   ADDITIONAL_HEADER_DIRS
   ${LLD_INCLUDE_DIR}/lld/ReaderWriter
 
+  LINK_COMPONENTS
+    Object
+    Support
+
   LINK_LIBS
     lldCore
     lldYAML
-    LLVMObject
-    LLVMSupport
   )

lib/ReaderWriter/MachO/CMakeLists.txt

add_lld_library(lldMachO
   MachONormalizedFileFromAtoms.cpp
   MachONormalizedFileToAtoms.cpp
   MachONormalizedFileYAML.cpp
   ObjCPass.cpp
   ShimPass.cpp
   StubsPass.cpp
   TLVPass.cpp
   WriterMachO.cpp
+
+  LINK_COMPONENTS
+    DebugInfoDWARF
+    Object
+    Support
+    Demangle
+
   LINK_LIBS
     lldCore
     lldYAML
-    LLVMDebugInfoDWARF
-    LLVMObject
-    LLVMSupport
-    LLVMDemangle
     ${PTHREAD_LIB}
   )
 
 include_directories(.)

lib/ReaderWriter/YAML/CMakeLists.txt

 add_lld_library(lldYAML
   ReaderWriterYAML.cpp
+
+  LINK_COMPONENTS
+    Support
+
   LINK_LIBS
     lldCore
-    LLVMSupport
   )

tools/lld/CMakeLists.txt

+set(LLVM_LINK_COMPONENTS
+  Support
+  )
+
 add_lld_tool(lld
   lld.cpp
   )
 
 target_link_libraries(lld
   lldDriver
   lldCOFF
   lldELF
-  LLVMSupport
   )
 
 install(TARGETS lld
   RUNTIME DESTINATION bin)
 
 if(NOT LLD_SYMLINKS_TO_CREATE)
   set(LLD_SYMLINKS_TO_CREATE lld-link ld.lld)
 endif()
 
 foreach(link ${LLD_SYMLINKS_TO_CREATE})
   add_lld_symlink(${link} lld)
 endforeach()