Merge branch 'master' into merge-2.064

This commit is contained in:
Kai Nacke 2014-04-05 22:23:36 +02:00
commit ecbd01a2fa

View file

@ -59,13 +59,6 @@
#endif #endif
#endif #endif
#if LDC_LLVM_VER >= 304
// FIXME: This is from driver/ldc-version.h.
namespace ldc {
extern const char * const ldc_version;
}
#endif
static llvm::cl::opt<bool> preservePaths("op", static llvm::cl::opt<bool> preservePaths("op",
llvm::cl::desc("Do not strip paths from source file"), llvm::cl::desc("Do not strip paths from source file"),
llvm::cl::ZeroOrMore); llvm::cl::ZeroOrMore);
@ -605,7 +598,7 @@ llvm::Module* Module::genLLVMModule(llvm::LLVMContext& context)
// Emit ldc version as llvm.ident metadata. // Emit ldc version as llvm.ident metadata.
llvm::NamedMDNode *IdentMetadata = ir.module->getOrInsertNamedMetadata("llvm.ident"); llvm::NamedMDNode *IdentMetadata = ir.module->getOrInsertNamedMetadata("llvm.ident");
std::string Version("ldc version "); std::string Version("ldc version ");
Version.append(ldc::ldc_version); Version.append(global.ldc_version);
llvm::Value *IdentNode[] = { llvm::Value *IdentNode[] = {
llvm::MDString::get(ir.context(), Version) llvm::MDString::get(ir.context(), Version)
}; };