This is an archive of the discontinued LLVM Phabricator instance.

Differential D125577

[14.x][BOLT][CMAKE] Fix DYLIB build
AcceptedPublic

Authored by bero on May 13 2022, 12:12 PM.

Details

Reviewers
Amir
rafauler
maksfb
Summary

Move BOLT libraries out of LLVM_LINK_COMPONENTS to target_link_libraries.
Backport of https://reviews.llvm.org/D125568 to release/14.x branch
Addresses issue #55432.

Diff Detail

Event Timeline

bero created this revision.May 13 2022, 12:12 PM
Herald added a reviewer: maksfb. · View Herald TranscriptMay 13 2022, 12:12 PM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: ayermolo, mgorny. · View Herald Transcript
bero requested review of this revision.May 13 2022, 12:12 PM
Herald added subscribers: llvm-commits, yota9. · View Herald TranscriptMay 13 2022, 12:12 PM
Harbormaster completed remote builds in B164367: Diff 429321.May 13 2022, 12:12 PM
bero mentioned this in D125568: [BOLT][CMAKE] Fix DYLIB build.May 13 2022, 12:13 PM
Amir accepted this revision.May 13 2022, 1:37 PM
This revision is now accepted and ready to land.May 13 2022, 1:37 PM

Revision Contents

PathSize
bolt/
lib/
Core/
6 lines
Passes/
8 lines
Profile/
10 lines
Rewrite/
22 lines
RuntimeLibs/
10 lines
tools/
driver/
10 lines
unittests/
Core/
9 lines

Diff 429321

bolt/lib/Core/CMakeLists.txt

set(LLVM_LINK_COMPONENTS set(LLVM_LINK_COMPONENTS
BOLTUtils
DebugInfoDWARF DebugInfoDWARF
Demangle Demangle
MC MC
Context not available.
LINK_LIBS LINK_LIBS
${LLVM_PTHREAD_LIB} ${LLVM_PTHREAD_LIB}
) )
target_link_libraries(LLVMBOLTCore
PRIVATE
LLVMBOLTUtils
)
Context not available.

bolt/lib/Passes/CMakeLists.txt

Context not available.
LINK_COMPONENTS LINK_COMPONENTS
AsmPrinter AsmPrinter
BOLTCore
BOLTUtils
MC MC
Support Support
) )
target_link_libraries(LLVMBOLTPasses
PRIVATE
LLVMBOLTCore
LLVMBOLTUtils
)
Context not available.

bolt/lib/Profile/CMakeLists.txt

Context not available.
YAMLProfileWriter.cpp YAMLProfileWriter.cpp
LINK_COMPONENTS LINK_COMPONENTS
BOLTCore
BOLTPasses
BOLTUtils
Support Support
) )
target_link_libraries(LLVMBOLTProfile
PRIVATE
LLVMBOLTCore
LLVMBOLTPasses
LLVMBOLTUtils
)
Context not available.

bolt/lib/Rewrite/CMakeLists.txt

set(LLVM_LINK_COMPONENTS set(LLVM_LINK_COMPONENTS
BOLTCore
BOLTPasses
BOLTProfile
BOLTRuntimeLibs
BOLTUtils
DebugInfoDWARF DebugInfoDWARF
DWP DWP
ExecutionEngine ExecutionEngine
Context not available.
Support Support
) )
set(TARGET_LINK_LIBRARIES
LLVMBOLTCore
LLVMBOLTPasses
LLVMBOLTProfile
LLVMBOLTRuntimeLibs
LLVMBOLTUtils
)
if ("AArch64" IN_LIST LLVM_TARGETS_TO_BUILD) if ("AArch64" IN_LIST LLVM_TARGETS_TO_BUILD)
list(APPEND LLVM_LINK_COMPONENTS BOLTTargetAArch64) list(APPEND TARGET_LINK_LIBRARIES LLVMBOLTTargetAArch64)
set(BOLT_AArch64 On) set(BOLT_AArch64 On)
endif() endif()
if ("X86" IN_LIST LLVM_TARGETS_TO_BUILD) if ("X86" IN_LIST LLVM_TARGETS_TO_BUILD)
list(APPEND LLVM_LINK_COMPONENTS BOLTTargetX86) list(APPEND TARGET_LINK_LIBRARIES LLVMBOLTTargetX86)
set(BOLT_X64 On) set(BOLT_X64 On)
endif() endif()
Context not available.
${LLVM_PTHREAD_LIB} ${LLVM_PTHREAD_LIB}
) )
target_link_libraries(LLVMBOLTRewrite
PRIVATE
${TARGET_LINK_LIBRARIES}
)
if (DEFINED BOLT_AArch64) if (DEFINED BOLT_AArch64)
target_compile_definitions(LLVMBOLTRewrite PRIVATE AARCH64_AVAILABLE) target_compile_definitions(LLVMBOLTRewrite PRIVATE AARCH64_AVAILABLE)
endif() endif()
Context not available.

bolt/lib/RuntimeLibs/CMakeLists.txt

set(LLVM_LINK_COMPONENTS set(LLVM_LINK_COMPONENTS
BOLTCore
BOLTPasses
BOLTUtils
BinaryFormat BinaryFormat
MC MC
Object Object
Context not available.
HugifyRuntimeLibrary.cpp HugifyRuntimeLibrary.cpp
InstrumentationRuntimeLibrary.cpp InstrumentationRuntimeLibrary.cpp
) )
target_link_libraries(LLVMBOLTRuntimeLibs
PRIVATE
LLVMBOLTCore
LLVMBOLTPasses
LLVMBOLTUtils
)
Context not available.

bolt/tools/driver/CMakeLists.txt

set(LLVM_LINK_COMPONENTS set(LLVM_LINK_COMPONENTS
${LLVM_TARGETS_TO_BUILD} ${LLVM_TARGETS_TO_BUILD}
BOLTProfile
BOLTRewrite
BOLTUtils
MC MC
Object Object
Support Support
Context not available.
${BOLT_DRIVER_DEPS} ${BOLT_DRIVER_DEPS}
) )
target_link_libraries(llvm-bolt
PRIVATE
LLVMBOLTProfile
LLVMBOLTRewrite
LLVMBOLTUtils
)
add_llvm_tool_symlink(perf2bolt llvm-bolt) add_llvm_tool_symlink(perf2bolt llvm-bolt)
add_llvm_tool_symlink(llvm-boltdiff llvm-bolt) add_llvm_tool_symlink(llvm-boltdiff llvm-bolt)
add_llvm_tool_symlink(llvm-bolt-heatmap llvm-bolt) add_llvm_tool_symlink(llvm-bolt-heatmap llvm-bolt)
Context not available.

bolt/unittests/Core/CMakeLists.txt

set(LLVM_LINK_COMPONENTS
BOLTRewrite
)
add_bolt_unittest(CoreTests add_bolt_unittest(CoreTests
MCPlusBuilder.cpp MCPlusBuilder.cpp
) )
target_link_libraries(CoreTests
PRIVATE
LLVMBOLTRewrite
)
string(FIND "${LLVM_TARGETS_TO_BUILD}" "AArch64" POSITION) string(FIND "${LLVM_TARGETS_TO_BUILD}" "AArch64" POSITION)
if (NOT ${POSITION} EQUAL -1) if (NOT ${POSITION} EQUAL -1)
include_directories( include_directories(