[BOLT][CMAKE] Fix DYLIB build

[Amir]

Summary

Move BOLT libraries out of LLVM_LINK_COMPONENTS to target_link_libraries.
Addresses issue #55432.

[rafauler]

LGTM

[bero]

LGTM, I've backported this to the release/14.x branch at https://reviews.llvm.org/D125577 (but not sure how to make Phabricator realize that one is supposed to go on a branch).

[Amir]

In D125568#3512462, @bero wrote:

LGTM, I've backported this to the release/14.x branch at https://reviews.llvm.org/D125577 (but not sure how to make Phabricator realize that one is supposed to go on a branch).

If you submit the patch using Arcanist it sets the base commit. Pre-merge checks should then be able to apply the commit. AFAIU Phabricator doesn't know about branches, you just push it to the right remote branch.

bolt/lib/Core/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS
-  BOLTUtils
   DebugInfoDWARF
   Demangle
   MC
   Object
   Support
   )
 
 add_llvm_library(LLVMBOLTCore
add_llvm_library(LLVMBOLTCore
   JumpTable.cpp
   MCPlusBuilder.cpp
   ParallelUtilities.cpp
   Relocation.cpp
 
   LINK_LIBS
   ${LLVM_PTHREAD_LIB}
   )
+
+target_link_libraries(LLVMBOLTCore
+  PRIVATE
+  LLVMBOLTUtils
+  )

bolt/lib/Passes/CMakeLists.txt

add_llvm_library(LLVMBOLTPasses
   VeneerElimination.cpp
   RetpolineInsertion.cpp
 
   LINK_LIBS
   ${LLVM_PTHREAD_LIB}
 
   LINK_COMPONENTS
   AsmPrinter
-  BOLTCore
-  BOLTUtils
   MC
   Support
   )
+
+target_link_libraries(LLVMBOLTPasses
+  PRIVATE
+  LLVMBOLTCore
+  LLVMBOLTUtils
+  )

bolt/lib/Profile/CMakeLists.txt

 add_llvm_library(LLVMBOLTProfile
   BoltAddressTranslation.cpp
   DataAggregator.cpp
   DataReader.cpp
   Heatmap.cpp
   ProfileReaderBase.cpp
   YAMLProfileReader.cpp
   YAMLProfileWriter.cpp
 
   LINK_COMPONENTS
-  BOLTCore
-  BOLTPasses
-  BOLTUtils
   Support
   )
+
+target_link_libraries(LLVMBOLTProfile
+  PRIVATE
+  LLVMBOLTCore
+  LLVMBOLTPasses
+  LLVMBOLTUtils
+  )

bolt/lib/Rewrite/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS
-  BOLTCore
-  BOLTPasses
-  BOLTProfile
-  BOLTRuntimeLibs
-  BOLTUtils
   DebugInfoDWARF
   DWP
   ExecutionEngine
   MC
   Object
   Support
   )
 
+set(TARGET_LINK_LIBRARIES
+  LLVMBOLTCore
+  LLVMBOLTPasses
+  LLVMBOLTProfile
+  LLVMBOLTRuntimeLibs
+  LLVMBOLTUtils
+  )
+
 if ("AArch64" IN_LIST LLVM_TARGETS_TO_BUILD)
-  list(APPEND LLVM_LINK_COMPONENTS BOLTTargetAArch64)
+  list(APPEND TARGET_LINK_LIBRARIES LLVMBOLTTargetAArch64)
   set(BOLT_AArch64 On)
 endif()
 
 if ("X86" IN_LIST LLVM_TARGETS_TO_BUILD)
-  list(APPEND LLVM_LINK_COMPONENTS BOLTTargetX86)
+  list(APPEND TARGET_LINK_LIBRARIES LLVMBOLTTargetX86)
   set(BOLT_X64 On)
 endif()
 
 add_llvm_library(LLVMBOLTRewrite
   BinaryPassManager.cpp
   BoltDiff.cpp
   DWARFRewriter.cpp
   ExecutableFileMemoryManager.cpp
   MachORewriteInstance.cpp
   RewriteInstance.cpp
 
   LINK_LIBS
   ${LLVM_PTHREAD_LIB}
   )
 
+target_link_libraries(LLVMBOLTRewrite
+  PRIVATE
+  ${TARGET_LINK_LIBRARIES}
+  )
+
 if (DEFINED BOLT_AArch64)
   target_compile_definitions(LLVMBOLTRewrite PRIVATE AARCH64_AVAILABLE)
 endif()
 
 if (DEFINED BOLT_X64)
   target_compile_definitions(LLVMBOLTRewrite PRIVATE X86_AVAILABLE)
 endif()

bolt/lib/RuntimeLibs/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS
-  BOLTCore
-  BOLTPasses
-  BOLTUtils
   BinaryFormat
   MC
   Object
   RuntimeDyld
   Support
   )
 
 add_llvm_library(LLVMBOLTRuntimeLibs
   RuntimeLibrary.cpp
   HugifyRuntimeLibrary.cpp
   InstrumentationRuntimeLibrary.cpp
   )
+
+target_link_libraries(LLVMBOLTRuntimeLibs
+  PRIVATE
+  LLVMBOLTCore
+  LLVMBOLTPasses
+  LLVMBOLTUtils
+  )

bolt/tools/driver/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS
   ${LLVM_TARGETS_TO_BUILD}
-  BOLTProfile
-  BOLTRewrite
-  BOLTUtils
   MC
   Object
   Support
   )
 
 if (BOLT_ENABLE_RUNTIME)
   set(BOLT_DRIVER_DEPS "bolt_rt")
 else()
   set(BOLT_DRIVER_DEPS "")
 endif()
 
 add_llvm_tool(llvm-bolt
   llvm-bolt.cpp
 
   DEPENDS
   ${BOLT_DRIVER_DEPS}
   )
 
+target_link_libraries(llvm-bolt
+  PRIVATE
+  LLVMBOLTProfile
+  LLVMBOLTRewrite
+  LLVMBOLTUtils
+  )
+
 add_llvm_tool_symlink(perf2bolt llvm-bolt)
 add_llvm_tool_symlink(llvm-boltdiff llvm-bolt)
 
 set(BOLT_DEPENDS
   llvm-bolt
   perf2bolt
   llvm-boltdiff
   )

bolt/tools/heatmap/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS
   ${LLVM_TARGETS_TO_BUILD}
-  BOLTProfile
-  BOLTRewrite
-  BOLTUtils
   MC
   Object
   Support
   )
 
 add_llvm_tool(llvm-bolt-heatmap
   heatmap.cpp
   )
 
+target_link_libraries(llvm-bolt-heatmap
+  PRIVATE
+  LLVMBOLTProfile
+  LLVMBOLTRewrite
+  LLVMBOLTUtils
+  )
+
 set_target_properties(llvm-bolt-heatmap PROPERTIES FOLDER "BOLT")

bolt/unittests/Core/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS
-  BOLTCore
-  BOLTRewrite
   DebugInfoDWARF
   Object
   MC
   ${LLVM_TARGETS_TO_BUILD}
   )
 
 add_bolt_unittest(CoreTests
   BinaryContext.cpp
   MCPlusBuilder.cpp
   )
 
+target_link_libraries(CoreTests
+  PRIVATE
+  LLVMBOLTCore
+  LLVMBOLTRewrite
+  )
+
 if ("AArch64" IN_LIST LLVM_TARGETS_TO_BUILD)
   include_directories(
     ${LLVM_MAIN_SRC_DIR}/lib/Target/AArch64
     ${LLVM_BINARY_DIR}/lib/Target/AArch64
   )
 
   target_compile_definitions(CoreTests PRIVATE AARCH64_AVAILABLE)
 endif()