summary refs log tree commit diff
path: root/src/rustllvm/RustWrapper.cpp
diff options
context:
space:
mode:
authorLuca Bruno <lucab@debian.org>2015-01-24 12:00:35 +0100
committerTamir Duberstein <tamird@gmail.com>2015-06-07 22:47:00 -0400
commitce32f6412e1937c0844aa48e5b4e876b96dcd66d (patch)
treeb960990a3ca6b969d0abb87af279e207751e4636 /src/rustllvm/RustWrapper.cpp
parent1be9e6f055fbcd6bfcf0a1f9e9ef0e86abe54f02 (diff)
downloadrust-ce32f6412e1937c0844aa48e5b4e876b96dcd66d.tar.gz
rust-ce32f6412e1937c0844aa48e5b4e876b96dcd66d.zip
rustc_trans: don't hardcode llvm version for conditional intrinsics
This commit introduce a third parameter for compatible_ifn!, as new
intrinsics are being added in recent LLVM releases and there is no
need to hardcode a specific case.

Signed-off-by: Luca Bruno <lucab@debian.org>
Diffstat (limited to 'src/rustllvm/RustWrapper.cpp')
-rw-r--r--src/rustllvm/RustWrapper.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp
index b1e2d2f9fc8..ad6533e5480 100644
--- a/src/rustllvm/RustWrapper.cpp
+++ b/src/rustllvm/RustWrapper.cpp
@@ -237,6 +237,14 @@ 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) {