mirrors/ldc
1
0
Fork 0
mirror of https://github.com/ldc-developers/ldc.git synced 2025-05-07 03:16:05 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix LLVM 5.0 build (#2173)

Browse source 
* Fix LLVM 5.0 compilation.

* Fix adding linker option metadata to LLVM module.

See https://reviews.llvm.org/D31349

* Version the SPIRV cache dir on travis.
This commit is contained in:
Johan Engelen 2017-07-02 11:35:40 +02:00 • committed by GitHub
parent 76ebf6476c
commit fdd66e5ea7
6 changed files with 81 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

28
driver/codegenerator.cpp
View file

@ -73,7 +73,8 @@ createAndSetDiagnosticsOutputFile(IRState &irs, llvm::LLVMContext &ctx,
namespace {
/// Add the linker options metadata flag.
#if LDC_LLVM_VER < 500
/// Add the Linker Options module flag.
/// If the flag is already present, merge it with the new data.
void emitLinkerOptions(IRState &irs, llvm::Module &M, llvm::LLVMContext &ctx) {
if (!M.getModuleFlag("Linker Options")) {
@ -119,6 +120,31 @@ void emitLinkerOptions(IRState &irs, llvm::Module &M, llvm::LLVMContext &ctx) {
#endif
}
}
#else
/// Add the "llvm.linker.options" metadata.
/// If the metadata is already present, merge it with the new data.
void emitLinkerOptions(IRState &irs, llvm::Module &M, llvm::LLVMContext &ctx) {
auto *linkerOptionsMD = M.getOrInsertNamedMetadata("llvm.linker.options");
// Add the new operands in front of the existing ones, such that linker
// options of .bc files passed on the cmdline are put _after_ the compiled .d
// file.
// Temporarily store metadata nodes that are already present
llvm::SmallVector<llvm::MDNode *, 5> oldMDNodes;
for (auto *MD : linkerOptionsMD->operands())
oldMDNodes.push_back(MD);
// Clear the list and add the new metadata nodes.
linkerOptionsMD->clearOperands();
for (auto *MD : irs.LinkerMetadataArgs)
linkerOptionsMD->addOperand(MD);
// Re-add metadata nodes that were already present
for (auto *MD : oldMDNodes)
linkerOptionsMD->addOperand(MD);
}
#endif
void emitLLVMUsedArray(IRState &irs) {
if (irs.usedArray.empty()) {