This is an archive of the discontinued LLVM Phabricator instance.

Differential D7074

[lld] Boot bitrotting add_lld_library() from CMake build
ClosedPublic

Authored by garious on Jan 20 2015, 2:02 PM.

Details

Reviewers
chandlerc
• rafael
Bigcheese
Commits
rG57c29ad22343: add_lld_library -> add_llvm_library
rLLD226702: add_lld_library -> add_llvm_library
Summary

add_llvm_library calls llvm_add_library, which works better for shared libraries (sets PRIVATE instead of INTERFACE) and coincidently fixes http://llvm.org/bugs/show_bug.cgi?id=22269 as well.

Diff Detail

Repository
rL LLVM

Event Timeline

garious updated this revision to Diff 18459.Jan 20 2015, 2:02 PM
garious retitled this revision from to [lld] Boot bitrotting add_lld_library() from CMake build.
garious updated this object.
garious edited the test plan for this revision. (Show Details)
garious added reviewers: • rafael, chandlerc, Bigcheese.
garious set the repository for this revision to rL LLVM.
garious added a project: lld.
garious added a subscriber: Unknown Object (MLST).
chandlerc edited edge metadata.Jan 20 2015, 2:09 PM

If we go this route, we should just replace the usages of the macro.

garious updated this revision to Diff 18463.Jan 20 2015, 3:07 PM
garious edited edge metadata.

Per Chandler, use add_llvm_library directly. Also, fix most of the shared library build on OS X. This is as much as I can fix without splitting the ReaderWriter library. I plan to do that right after this patch lands.

chandlerc added a comment.Jan 20 2015, 3:18 PM

Interesting...

So, two high-level comments:

  1. If you're seriously looking at fixing the layering and build of LLD, please go reply to my email thread about cleaning up its layering. We need some agreed upon target library factoring / layering before trying to move LLD in any direction. I think at least Rui and Nick need to agree on that plan...
  1. This is highlighting a problem with add_llvm_library that I should have spotted before asking you to use it. Sorry for that. Namely, I don't think it makes sense to have 'LLVMlldConfig' as a library name, and that'll be the result of this approach as far as I understand it.

To address #2 I think we may need to excise some of add_llvm_library'ess logic to make it re-usable, and allow it to override the project name. Or we'll need it to pick up the project prefix from a variable maybe? That might be cleaner. Anyways, we should make it so that these libraries are LLDFoo to compliment the LLVMFoo naming.

garious added a comment.Jan 20 2015, 3:38 PM

To #1: that's why this patch stops here. We can move exactly this far before having that discussion.

To #2: No sign of libLLVMlld* libs here (building on OS X).

• rafael edited edge metadata.Jan 21 2015, 6:02 AM
  1. This is highlighting a problem with add_llvm_library that I should have spotted before asking you to use it. Sorry for that. Namely, I don't think it makes sense to have 'LLVMlldConfig' as a library name, and that'll be the result of this approach as far as I understand it.

Note that llvm_add_library is used in clang (from add_clang_library),
so I think the names are handled correctly.

Cheers,
Rafael

garious added a comment.Jan 21 2015, 10:44 AM

Rafael, now that the standalone CMake build is gone, we can assume lld is a subdirectory of the llvm source tree. I'd like to proceed as though the lld will eventually be fully integrated. We therefore do not need the feature of clang's wrapper, which is to retarget the install directory.

garious updated this revision to Diff 18537.Jan 21 2015, 10:55 AM
garious edited edge metadata.

Rebased

There will be follow-up patches to continue fixing link-time dependences, but I'd prefer to land this one first to avoid rebasing. It aims to be noncontroversial, whereas experiments in the follow-up patches are starting to look pretty insane. I think it'll have to be broken up into smaller patches as well.

• rafael accepted this revision.Jan 21 2015, 12:54 PM
• rafael edited edge metadata.

I checked that the names are correct (no LLVMlldConfig).

LGTM.

This revision is now accepted and ready to land.Jan 21 2015, 12:54 PM
chandlerc accepted this revision.Jan 21 2015, 1:10 PM
chandlerc edited edge metadata.
chandlerc added a comment.Jan 21 2015, 1:10 PM

LGTM as well.

garious closed this revision.Jan 21 2015, 1:29 PM

Committed in r226702. Thanks!

Revision Contents

PathSize
54 lines
lib/
Config/
6 lines
Core/
11 lines
Driver/
31 lines
Passes/
11 lines
ReaderWriter/
13 lines
ELF/
AArch64/
11 lines
ARM/
8 lines
24 lines
Hexagon/
11 lines
Mips/
11 lines
PPC/
11 lines
X86/
11 lines
X86_64/
11 lines
MachO/
13 lines
Native/
11 lines
PECOFF/
13 lines
YAML/
11 lines
tools/
lld/
2 lines
utils/
linker-script-test/
2 lines

Diff 18537

CMakeLists.txt

Context not available.
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
# FIXME: It may be removed when we use 2.8.12.
if(CMAKE_VERSION VERSION_LESS 2.8.12)
# Invalidate a couple of keywords.
set(cmake_2_8_12_INTERFACE)
set(cmake_2_8_12_PRIVATE)
else()
# Use ${cmake_2_8_12_KEYWORD} intead of KEYWORD in target_link_libraries().
set(cmake_2_8_12_INTERFACE INTERFACE)
set(cmake_2_8_12_PRIVATE PRIVATE)
if(POLICY CMP0022)
cmake_policy(SET CMP0022 NEW) # automatic when 2.8.12 is required
endif()
endif()
set(LLD_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) set(LLD_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
set(LLD_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) set(LLD_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
Context not available.
add_definitions(-wd4530) # Suppress 'warning C4530: C++ exception handler used, but unwind semantics are not enabled.' add_definitions(-wd4530) # Suppress 'warning C4530: C++ exception handler used, but unwind semantics are not enabled.'
endif() endif()
macro(add_lld_library name)
llvm_process_sources(srcs ${ARGN})
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/lld${dir}/*.h)
set(srcs ${srcs} ${headers})
endif()
if (MODULE)
set(libkind MODULE)
elseif (SHARED_LIBRARY)
set(libkind SHARED)
else()
set(libkind)
endif()
add_library(${name} ${libkind} ${srcs})
llvm_update_compile_flags(${name} ${srcs})
if (LLVM_COMMON_DEPENDS)
add_dependencies(${name} ${LLVM_COMMON_DEPENDS})
endif()
target_link_libraries(${name} ${LLVM_USED_LIBS})
llvm_config(${name} ${LLVM_LINK_COMPONENTS})
target_link_libraries(${name} ${LLVM_COMMON_LIBS})
if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
install(TARGETS ${name}
LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})
endif()
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)
include_directories(BEFORE include_directories(BEFORE
${CMAKE_CURRENT_BINARY_DIR}/include ${CMAKE_CURRENT_BINARY_DIR}/include
${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/include
Context not available.

lib/Config/CMakeLists.txt

set(LLVM_LINK_COMPONENTS support) add_llvm_library(lldConfig
add_lld_library(lldConfig
Version.cpp Version.cpp
LINK_LIBS
LLVMSupport
) )

lib/Core/CMakeLists.txt

set(LLVM_LINK_COMPONENTS support) add_llvm_library(lldCore
add_lld_library(lldCore
DefinedAtom.cpp DefinedAtom.cpp
Error.cpp Error.cpp
File.cpp File.cpp
LinkingContext.cpp LinkingContext.cpp
Resolver.cpp Resolver.cpp
SymbolTable.cpp SymbolTable.cpp
) LINK_LIBS
LLVMSupport
target_link_libraries(lldCore ${cmake_2_8_12_INTERFACE}
lldNative
lldYAML
) )

lib/Driver/CMakeLists.txt

Context not available.
tablegen(LLVM WinLinkOptions.inc -gen-opt-parser-defs) tablegen(LLVM WinLinkOptions.inc -gen-opt-parser-defs)
add_public_tablegen_target(DriverOptionsTableGen) add_public_tablegen_target(DriverOptionsTableGen)
set(LLVM_LINK_COMPONENTS object option support) add_llvm_library(lldDriver
add_lld_library(lldDriver
CoreDriver.cpp CoreDriver.cpp
DarwinLdDriver.cpp DarwinLdDriver.cpp
Driver.cpp Driver.cpp
Context not available.
UniversalDriver.cpp UniversalDriver.cpp
WinLinkDriver.cpp WinLinkDriver.cpp
WinLinkModuleDef.cpp WinLinkModuleDef.cpp
LINK_LIBS
lldConfig
lldPasses
lldMachO
lldPECOFF
lldELF
lldCore
lldNative
lldReaderWriter
lldYAML
LLVMObject
LLVMOption
LLVMSupport
) )
add_dependencies(lldDriver DriverOptionsTableGen) add_dependencies(lldDriver DriverOptionsTableGen)
target_link_libraries(lldDriver ${cmake_2_8_12_INTERFACE}
lldConfig
lldPasses
lldMachO
lldPECOFF
lldELF
lldCore
lldNative
lldReaderWriter
lldYAML
LLVMObject
LLVMOption
LLVMSupport
)
Context not available.

lib/Passes/CMakeLists.txt

set(LLVM_LINK_COMPONENTS support) add_llvm_library(lldPasses
add_lld_library(lldPasses
LayoutPass.cpp LayoutPass.cpp
RoundTripNativePass.cpp RoundTripNativePass.cpp
RoundTripYAMLPass.cpp RoundTripYAMLPass.cpp
) LINK_LIBS
target_link_libraries(lldPasses ${cmake_2_8_12_INTERFACE}
lldReaderWriter lldReaderWriter
LLVMSupport
) )

lib/ReaderWriter/CMakeLists.txt

Context not available.
add_subdirectory(PECOFF) add_subdirectory(PECOFF)
add_subdirectory(YAML) add_subdirectory(YAML)
set(LLVM_LINK_COMPONENTS object support)
if (MSVC) if (MSVC)
add_definitions(-wd4062) # Suppress 'warning C4062: Enumerator has no associated handler in a switch statement.' add_definitions(-wd4062) # Suppress 'warning C4062: Enumerator has no associated handler in a switch statement.'
endif() endif()
add_lld_library(lldReaderWriter add_llvm_library(lldReaderWriter
CoreLinkingContext.cpp CoreLinkingContext.cpp
FileArchive.cpp FileArchive.cpp
LinkerScript.cpp LinkerScript.cpp
Reader.cpp Reader.cpp
Writer.cpp Writer.cpp
FileArchive.cpp FileArchive.cpp
) LINK_LIBS
lldCore
target_link_libraries(lldReaderWriter ${cmake_2_8_12_INTERFACE} LLVMObject
lldCore LLVMSupport
lldPasses
) )
Context not available.

lib/ReaderWriter/ELF/AArch64/CMakeLists.txt

set(LLVM_LINK_COMPONENTS support) add_llvm_library(lldAArch64ELFTarget
add_lld_library(lldAArch64ELFTarget
AArch64LinkingContext.cpp AArch64LinkingContext.cpp
AArch64TargetHandler.cpp AArch64TargetHandler.cpp
AArch64RelocationHandler.cpp AArch64RelocationHandler.cpp
AArch64RelocationPass.cpp AArch64RelocationPass.cpp
) LINK_LIBS
target_link_libraries(lldAArch64ELFTarget ${cmake_2_8_12_INTERFACE}
lldCore lldCore
LLVMSupport
) )

lib/ReaderWriter/ELF/ARM/CMakeLists.txt

add_lld_library(lldARMELFTarget add_llvm_library(lldARMELFTarget
ARMLinkingContext.cpp ARMLinkingContext.cpp
ARMTargetHandler.cpp ARMTargetHandler.cpp
ARMRelocationHandler.cpp ARMRelocationHandler.cpp
ARMRelocationPass.cpp ARMRelocationPass.cpp
) LINK_LIBS
target_link_libraries(lldARMELFTarget ${cmake_2_8_12_INTERFACE}
lldCore lldCore
) )

lib/ReaderWriter/ELF/CMakeLists.txt

add_lld_library(lldELF add_llvm_library(lldELF
ArrayOrderPass.cpp ArrayOrderPass.cpp
ELFLinkingContext.cpp ELFLinkingContext.cpp
Reader.cpp Reader.cpp
Writer.cpp Writer.cpp
) LINK_LIBS
target_link_libraries(lldELF ${cmake_2_8_12_INTERFACE}
lldHexagonELFTarget lldHexagonELFTarget
lldMipsELFTarget lldMipsELFTarget
lldPPCELFTarget lldPPCELFTarget
lldPasses lldPasses
lldReaderWriter lldReaderWriter
lldX86ELFTarget lldX86ELFTarget
lldX86_64ELFTarget lldX86_64ELFTarget
lldAArch64ELFTarget lldAArch64ELFTarget
lldARMELFTarget lldARMELFTarget
) )
include_directories(.) include_directories(.)

lib/ReaderWriter/ELF/Hexagon/CMakeLists.txt

set(LLVM_LINK_COMPONENTS support) add_llvm_library(lldHexagonELFTarget
add_lld_library(lldHexagonELFTarget
HexagonLinkingContext.cpp HexagonLinkingContext.cpp
HexagonRelocationHandler.cpp HexagonRelocationHandler.cpp
HexagonTargetHandler.cpp HexagonTargetHandler.cpp
) LINK_LIBS
target_link_libraries(lldHexagonELFTarget ${cmake_2_8_12_INTERFACE}
lldCore lldCore
LLVMSupport
) )

lib/ReaderWriter/ELF/Mips/CMakeLists.txt

set(LLVM_LINK_COMPONENTS support) add_llvm_library(lldMipsELFTarget
add_lld_library(lldMipsELFTarget
MipsCtorsOrderPass.cpp MipsCtorsOrderPass.cpp
MipsELFFlagsMerger.cpp MipsELFFlagsMerger.cpp
MipsLinkingContext.cpp MipsLinkingContext.cpp
MipsRelocationHandler.cpp MipsRelocationHandler.cpp
MipsRelocationPass.cpp MipsRelocationPass.cpp
MipsTargetHandler.cpp MipsTargetHandler.cpp
) LINK_LIBS
target_link_libraries(lldMipsELFTarget ${cmake_2_8_12_INTERFACE}
lldCore lldCore
LLVMSupport
) )

lib/ReaderWriter/ELF/PPC/CMakeLists.txt

set(LLVM_LINK_COMPONENTS support) add_llvm_library(lldPPCELFTarget
add_lld_library(lldPPCELFTarget
PPCLinkingContext.cpp PPCLinkingContext.cpp
PPCTargetHandler.cpp PPCTargetHandler.cpp
) LINK_LIBS
target_link_libraries(lldPPCELFTarget ${cmake_2_8_12_INTERFACE}
lldCore lldCore
LLVMSupport
) )

lib/ReaderWriter/ELF/X86/CMakeLists.txt

set(LLVM_LINK_COMPONENTS support) add_llvm_library(lldX86ELFTarget
add_lld_library(lldX86ELFTarget
X86LinkingContext.cpp X86LinkingContext.cpp
X86TargetHandler.cpp X86TargetHandler.cpp
X86RelocationHandler.cpp X86RelocationHandler.cpp
) LINK_LIBS
target_link_libraries(lldX86ELFTarget ${cmake_2_8_12_INTERFACE}
lldCore lldCore
LLVMSupport
) )

lib/ReaderWriter/ELF/X86_64/CMakeLists.txt

set(LLVM_LINK_COMPONENTS support) add_llvm_library(lldX86_64ELFTarget
add_lld_library(lldX86_64ELFTarget
X86_64LinkingContext.cpp X86_64LinkingContext.cpp
X86_64TargetHandler.cpp X86_64TargetHandler.cpp
X86_64RelocationHandler.cpp X86_64RelocationHandler.cpp
X86_64RelocationPass.cpp X86_64RelocationPass.cpp
) LINK_LIBS
target_link_libraries(lldX86_64ELFTarget ${cmake_2_8_12_INTERFACE}
lldCore lldCore
LLVMSupport
) )

lib/ReaderWriter/MachO/CMakeLists.txt

set(LLVM_LINK_COMPONENTS support) add_llvm_library(lldMachO
add_lld_library(lldMachO
ArchHandler.cpp ArchHandler.cpp
ArchHandler_arm.cpp ArchHandler_arm.cpp
ArchHandler_arm64.cpp ArchHandler_arm64.cpp
Context not available.
ShimPass.cpp ShimPass.cpp
StubsPass.cpp StubsPass.cpp
WriterMachO.cpp WriterMachO.cpp
) LINK_LIBS
lldReaderWriter
target_link_libraries(lldMachO ${cmake_2_8_12_INTERFACE} lldPasses
lldReaderWriter LLVMSupport
lldPasses
) )
include_directories(.) include_directories(.)
Context not available.

lib/ReaderWriter/Native/CMakeLists.txt

set(LLVM_LINK_COMPONENTS support) add_llvm_library(lldNative
add_lld_library(lldNative
ReaderNative.cpp ReaderNative.cpp
WriterNative.cpp WriterNative.cpp
) LINK_LIBS
target_link_libraries(lldNative ${cmake_2_8_12_INTERFACE}
lldReaderWriter lldReaderWriter
LLVMSupport
) )

lib/ReaderWriter/PECOFF/CMakeLists.txt

set(LLVM_LINK_COMPONENTS object support) add_llvm_library(lldPECOFF
add_lld_library(lldPECOFF
EdataPass.cpp EdataPass.cpp
IdataPass.cpp IdataPass.cpp
LinkerGeneratedSymbolFile.cpp LinkerGeneratedSymbolFile.cpp
Context not available.
ReaderImportHeader.cpp ReaderImportHeader.cpp
WriterImportLibrary.cpp WriterImportLibrary.cpp
WriterPECOFF.cpp WriterPECOFF.cpp
) LINK_LIBS
lldReaderWriter
target_link_libraries(lldPECOFF ${cmake_2_8_12_INTERFACE} LLVMObject
lldReaderWriter LLVMSupport
lldDriver
) )
Context not available.

lib/ReaderWriter/YAML/CMakeLists.txt

set(LLVM_LINK_COMPONENTS support) add_llvm_library(lldYAML
add_lld_library(lldYAML
ReaderWriterYAML.cpp ReaderWriterYAML.cpp
) LINK_LIBS
target_link_libraries(lldYAML ${cmake_2_8_12_INTERFACE}
lldReaderWriter lldReaderWriter
LLVMSupport
) )

tools/lld/CMakeLists.txt

add_lld_executable(lld add_llvm_executable(lld
lld.cpp lld.cpp
) )

utils/linker-script-test/CMakeLists.txt

add_lld_executable(linker-script-test add_llvm_executable(linker-script-test
linker-script-test.cpp linker-script-test.cpp
) )