Skip to content

Integrate LLD for ELF and Mach-O targets too #2203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kinke merged 2 commits into from
Apr 16, 2018
Merged

Integrate LLD for ELF and Mach-O targets too #2203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fcbf99d
Integrate LLD 6.0.0+ for ELF and Mach-O targets
kinke May 29, 2017
4f4ad49
LLVM 6: Adapt to LLVM CodeModel cmdline option now exposed as llvm::O…
kinke Apr 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,14 +449,20 @@ if(NOT DEFINED LDC_WITH_LLD)
endif()
unset(CMAKE_REQUIRED_FLAGS)
unset(CMAKE_REQUIRED_INCLUDES)
# translate 1/0 to ON/OFF
if(LDC_WITH_LLD)
set(LDC_WITH_LLD ON)
else()
set(LDC_WITH_LLD OFF)
endif()
else()
set(LDC_WITH_LLD OFF)
endif()
endif()
if(LDC_WITH_LLD)
message(STATUS "Building LDC with LLD support")
append("-DLDC_WITH_LLD" LDC_CXXFLAGS)
endif()
message(STATUS "Building LDC with integrated LLD: ${LDC_WITH_LLD} (LDC_WITH_LLD=${LDC_WITH_LLD})")

#
# Enable building with riscv-llvm, for full RISC-V support.
Expand Down Expand Up @@ -560,21 +566,23 @@ add_custom_target(${LDMD_EXE} ALL DEPENDS ${LDMD_EXE_FULL})

# Figure out how to link the main LDC executable, for which we need to take the
# LLVM flags into account.
set(LDC_LINKERFLAG_LIST "${SANITIZE_LDFLAGS};${LLVM_LIBRARIES};${LLVM_LDFLAGS}")
set(LDC_LINKERFLAG_LIST ${SANITIZE_LDFLAGS} ${LLVM_LIBRARIES} ${LLVM_LDFLAGS})
if(LDC_WITH_LLD)
# ELF and Mach-O formats supported since LLD 6.0.0, otherwise just Windows COFF
if(NOT (LDC_LLVM_VER LESS 600))
if(MSVC)
list(APPEND LDC_LINKERFLAG_LIST lldCOFF.lib lldCommon.lib lldCore.lib lldDriver.lib)
elseif(APPLE)
set(LDC_LINKERFLAG_LIST "-llldCOFF;-llldCommon;-llldCore;-llldDriver;${LDC_LINKERFLAG_LIST};-lxml2")
list(APPEND LDC_LINKERFLAG_LIST lldDriver.lib lldCOFF.lib lldELF.lib lldMachO.lib lldYAML.lib lldReaderWriter.lib lldCommon.lib lldCore.lib)
else()
set(LDC_LINKERFLAG_LIST "-llldCOFF;-llldCommon;-llldCore;-llldDriver;${LDC_LINKERFLAG_LIST}")
set(LDC_LINKERFLAG_LIST -llldDriver -llldCOFF -llldELF -llldMachO -llldYAML -llldReaderWriter -llldCommon -llldCore ${LDC_LINKERFLAG_LIST})
endif()
if(APPLE) # bug, should be fixed in LLVM 6.0.1
list(APPEND LDC_LINKERFLAG_LIST -lxml2)
endif()
else()
if(MSVC)
list(APPEND LDC_LINKERFLAG_LIST lldCOFF.lib lldCore.lib lldDriver.lib)
else()
set(LDC_LINKERFLAG_LIST "-llldCOFF;-llldCore;-llldDriver;${LDC_LINKERFLAG_LIST}")
set(LDC_LINKERFLAG_LIST -llldCOFF -llldCore -llldDriver ${LDC_LINKERFLAG_LIST})
endif()
endif()
endif()
Expand All @@ -593,7 +601,7 @@ if(LDC_ENABLE_PLUGINS)
set(LDC_LINKERFLAG_LIST "${LDC_LINKERFLAG_LIST};-Wl,--export-dynamic")
endif()
endif()
message(STATUS "Building LDC with plugin support ${LDC_ENABLE_PLUGINS} (LDC_ENABLE_PLUGINS=${LDC_ENABLE_PLUGINS})")
message(STATUS "Building LDC with plugin support: ${LDC_ENABLE_PLUGINS} (LDC_ENABLE_PLUGINS=${LDC_ENABLE_PLUGINS})")

set(LDC_LINK_MANUALLY OFF)
if(UNIX AND (CMAKE_COMPILER_IS_GNUCXX OR (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")))
Expand Down
6 changes: 6 additions & 0 deletions driver/cache.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,13 @@ void outputIR2ObjRelevantCmdlineArgs(llvm::raw_ostream &hash_os) {
#else
hash_os << opts::getRelocModel();
#endif
#if LDC_LLVM_VER >= 600
const auto codeModel = opts::getCodeModel();
if (codeModel.hasValue())
hash_os << codeModel.getValue();
#else
hash_os << opts::getCodeModel();
#endif
hash_os << opts::disableFPElim();
}

Expand Down
12 changes: 11 additions & 1 deletion driver/cl_options-llvm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,11 @@ Optional<Reloc::Model> getRelocModel() { return ::getRelocModel(); }
Reloc::Model getRelocModel() { return ::RelocModel; }
#endif

#if LDC_LLVM_VER >= 600
Optional<CodeModel::Model> getCodeModel() { return ::getCodeModel(); }
#else
CodeModel::Model getCodeModel() { return ::CMModel; }
#endif

cl::boolOrDefault disableFPElim() {
return ::DisableFPElim.getNumOccurrences() == 0
Expand Down Expand Up @@ -67,6 +71,12 @@ TargetOptions InitTargetOptionsFromCodeGenFlags() {
return ::InitTargetOptionsFromCodeGenFlags();
}

CodeModel::Model GetCodeModelFromCMModel() { return CMModel; }
#if LDC_LLVM_VER >= 600
Optional<CodeModel::Model> GetCodeModelFromCMModel() {
return ::getCodeModel();
}
#else
CodeModel::Model GetCodeModelFromCMModel() { return ::CMModel; }
#endif
}
#endif // LDC_WITH_LLD && LDC_LLVM_VER >= 500
4 changes: 4 additions & 0 deletions driver/cl_options-llvm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@ llvm::Optional<llvm::Reloc::Model> getRelocModel();
#else
llvm::Reloc::Model getRelocModel();
#endif
#if LDC_LLVM_VER >= 600
llvm::Optional<llvm::CodeModel::Model> getCodeModel();
#else
llvm::CodeModel::Model getCodeModel();
#endif
llvm::cl::boolOrDefault disableFPElim();
bool disableRedZone();
bool printTargetFeaturesHelp();
Expand Down
30 changes: 29 additions & 1 deletion driver/linker-gcc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@
#include "llvm/Target/TargetMachine.h"
#include "llvm/Target/TargetOptions.h"

#if LDC_WITH_LLD && LDC_LLVM_VER >= 600
#include "lld/Common/Driver.h"
#endif

//////////////////////////////////////////////////////////////////////////////

static llvm::cl::opt<std::string>
Expand Down Expand Up @@ -594,7 +598,7 @@ void ArgsBuilder::addTargetFlags() {
}

//////////////////////////////////////////////////////////////////////////////
// (Yet unused) specialization for plain ld.
// Specialization for plain ld.

class LdArgsBuilder : public ArgsBuilder {
void addSanitizers(const llvm::Triple &triple) override {}
Expand Down Expand Up @@ -628,6 +632,30 @@ class LdArgsBuilder : public ArgsBuilder {

int linkObjToBinaryGcc(llvm::StringRef outputPath, bool useInternalLinker,
llvm::cl::boolOrDefault fullyStaticFlag) {
#if LDC_WITH_LLD && LDC_LLVM_VER >= 600
if (useInternalLinker) {
LdArgsBuilder argsBuilder;
argsBuilder.build(outputPath, fullyStaticFlag);

const auto fullArgs =
getFullArgs("ld.lld", argsBuilder.args, global.params.verbose);

bool success = false;
if (global.params.targetTriple->isOSBinFormatELF()) {
success = lld::elf::link(fullArgs, /*CanExitEarly*/ false);
} else if (global.params.targetTriple->isOSBinFormatMachO()) {
success = lld::mach_o::link(fullArgs);
} else {
error(Loc(), "unknown target binary format for internal linking");
}

if (!success)
error(Loc(), "linking with LLD failed");

return success ? 0 : 1;
}
#endif

// find gcc for linking
const std::string tool = getGcc();

Expand Down
8 changes: 6 additions & 2 deletions driver/targetmachine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,11 @@ createTargetMachine(const std::string targetTriple, const std::string arch,
#else
llvm::Reloc::Model relocModel,
#endif
const llvm::CodeModel::Model codeModel,
#if LDC_LLVM_VER >= 600
llvm::Optional<llvm::CodeModel::Model> codeModel,
#else
llvm::CodeModel::Model codeModel,
#endif
const llvm::CodeGenOpt::Level codeGenOptLevel,
const bool noLinkerStripDead) {
// Determine target triple. If the user didn't explicitly specify one, use
Expand Down Expand Up @@ -513,7 +517,7 @@ createTargetMachine(const std::string targetTriple, const std::string arch,
}

return target->createTargetMachine(triple.str(), cpu, finalFeaturesString,
targetOptions, relocModel, opts::getCodeModel(),
targetOptions, relocModel, codeModel,
codeGenOptLevel);
}

Expand Down
4 changes: 4 additions & 0 deletions driver/targetmachine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,11 @@ createTargetMachine(std::string targetTriple, std::string arch, std::string cpu,
#else
llvm::Reloc::Model relocModel,
#endif
#if LDC_LLVM_VER >= 600
llvm::Optional<llvm::CodeModel::Model> codeModel,
#else
llvm::CodeModel::Model codeModel,
#endif
llvm::CodeGenOpt::Level codeGenOptLevel,
bool noLinkerStripDead);

Expand Down
4 changes: 2 additions & 2 deletions runtime/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,9 +255,9 @@ endif()
# The installed config file doesn't use SHARED_LIBS_RPATH.
if(NOT ${BUILD_SHARED_LIBS} STREQUAL "OFF")
if(MULTILIB AND NOT "${TARGET_SYSTEM}" MATCHES "APPLE")
set(SHARED_LIBS_RPATH "\n \"-L-Wl,-rpath,${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}:${CMAKE_BINARY_DIR}/lib${MULTILIB_SUFFIX}\",")
set(SHARED_LIBS_RPATH "\n \"-L-rpath\", \"-L${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}:${CMAKE_BINARY_DIR}/lib${MULTILIB_SUFFIX}\",")
else()
set(SHARED_LIBS_RPATH "\n \"-L-Wl,-rpath,${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}\",")
set(SHARED_LIBS_RPATH "\n \"-L-rpath\", \"-L${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}\",")
endif()
endif()

Expand Down