mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-11-23 19:23:23 +01:00
28bf7f3536
Summary: Most libraries are defined in the lib/ directory but there are also a few libraries defined in tools/ e.g. libLLVM, libLTO. I'm defining "Component Libraries" as libraries defined in lib/ that may be included in libLLVM.so. Explicitly marking the libraries in lib/ as component libraries allows us to remove some fragile checks that attempt to differentiate between lib/ libraries and tools/ libraires: 1. In tools/llvm-shlib, because llvm_map_components_to_libnames(LIB_NAMES "all") returned a list of all libraries defined in the whole project, there was custom code needed to filter out libraries defined in tools/, none of which should be included in libLLVM.so. This code assumed that any library defined as static was from lib/ and everything else should be excluded. With this change, llvm_map_components_to_libnames(LIB_NAMES, "all") only returns libraries that have been added to the LLVM_COMPONENT_LIBS global cmake property, so this custom filtering logic can be removed. Doing this also fixes the build with BUILD_SHARED_LIBS=ON and LLVM_BUILD_LLVM_DYLIB=ON. 2. There was some code in llvm_add_library that assumed that libraries defined in lib/ would not have LLVM_LINK_COMPONENTS or ARG_LINK_COMPONENTS set. This is only true because libraries defined lib lib/ use LLVMBuild.txt and don't set these values. This code has been fixed now to check if the library has been explicitly marked as a component library, which should now make it easier to remove LLVMBuild at some point in the future. I have tested this patch on Windows, MacOS and Linux with release builds and the following combinations of CMake options: - "" (No options) - -DLLVM_BUILD_LLVM_DYLIB=ON - -DLLVM_LINK_LLVM_DYLIB=ON - -DBUILD_SHARED_LIBS=ON - -DBUILD_SHARED_LIBS=ON -DLLVM_BUILD_LLVM_DYLIB=ON - -DBUILD_SHARED_LIBS=ON -DLLVM_LINK_LLVM_DYLIB=ON Reviewers: beanz, smeenai, compnerd, phosek Reviewed By: beanz Subscribers: wuzish, jholewinski, arsenm, dschuff, jyknight, dylanmckay, sdardis, nemanjai, jvesely, nhaehnle, mgorny, mehdi_amini, sbc100, jgravelle-google, hiraditya, aheejin, fedor.sergeev, asb, rbar, johnrusso, simoncook, apazos, sabuasal, niosHD, jrtc27, MaskRay, zzheng, edward-jones, atanasyan, steven_wu, rogfer01, MartinMosbeck, brucehoult, the_o, dexonsmith, PkmX, jocewei, jsji, dang, Jim, lenary, s.egerton, pzheng, sameer.abuasal, llvm-commits Tags: #llvm Differential Revision: https://reviews.llvm.org/D70179
39 lines
805 B
CMake
39 lines
805 B
CMake
|
|
|
|
add_llvm_component_library(LLVMExecutionEngine
|
|
ExecutionEngine.cpp
|
|
ExecutionEngineBindings.cpp
|
|
GDBRegistrationListener.cpp
|
|
SectionMemoryManager.cpp
|
|
TargetSelect.cpp
|
|
|
|
ADDITIONAL_HEADER_DIRS
|
|
${LLVM_MAIN_INCLUDE_DIR}/llvm/ExecutionEngine
|
|
|
|
DEPENDS
|
|
intrinsics_gen
|
|
)
|
|
|
|
if(BUILD_SHARED_LIBS)
|
|
target_link_libraries(LLVMExecutionEngine PUBLIC LLVMRuntimeDyld)
|
|
endif()
|
|
|
|
add_subdirectory(Interpreter)
|
|
add_subdirectory(JITLink)
|
|
add_subdirectory(MCJIT)
|
|
add_subdirectory(OrcError)
|
|
add_subdirectory(Orc)
|
|
add_subdirectory(RuntimeDyld)
|
|
|
|
if( LLVM_USE_OPROFILE )
|
|
add_subdirectory(OProfileJIT)
|
|
endif( LLVM_USE_OPROFILE )
|
|
|
|
if( LLVM_USE_INTEL_JITEVENTS )
|
|
add_subdirectory(IntelJITEvents)
|
|
endif( LLVM_USE_INTEL_JITEVENTS )
|
|
|
|
if( LLVM_USE_PERF )
|
|
add_subdirectory(PerfJITEvents)
|
|
endif( LLVM_USE_PERF )
|