diff options
| author | bors <bors@rust-lang.org> | 2015-06-08 11:55:04 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-06-08 11:55:04 +0000 |
| commit | 115121de3d4669a798e99aa69dfdbc7012b4181c (patch) | |
| tree | 110ed67c5a218b0208013515017879efc5e79976 /src/rustllvm/RustWrapper.cpp | |
| parent | 1ade076f62c9e8188c4fb5c888277a1673ac82cd (diff) | |
| parent | e36e97ba51f512de2fd05e3250db4a7b72caae04 (diff) | |
| download | rust-115121de3d4669a798e99aa69dfdbc7012b4181c.tar.gz rust-115121de3d4669a798e99aa69dfdbc7012b4181c.zip | |
Auto merge of #26088 - tamird:llvm35-fixes, r=alexcrichton
rebase of #25739, closes #25739. r? @alexcrichton
Diffstat (limited to 'src/rustllvm/RustWrapper.cpp')
| -rw-r--r-- | src/rustllvm/RustWrapper.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp index 66db7326d21..ad6533e5480 100644 --- a/src/rustllvm/RustWrapper.cpp +++ b/src/rustllvm/RustWrapper.cpp @@ -233,10 +233,18 @@ DIT unwrapDI(LLVMMetadataRef ref) { return DIT(ref ? unwrap<MDNode>(ref) : NULL); } -extern "C" const uint32_t LLVMRustDebugMetadataVersion() { +extern "C" uint32_t LLVMRustDebugMetadataVersion() { return DEBUG_METADATA_VERSION; } +extern "C" uint32_t LLVMVersionMinor() { + return LLVM_VERSION_MINOR; +} + +extern "C" uint32_t LLVMVersionMajor() { + return LLVM_VERSION_MAJOR; +} + extern "C" void LLVMRustAddModuleFlag(LLVMModuleRef M, const char *name, uint32_t value) { |