require llvm 6

diff --git a/src/librustc_trans/builder.rs b/src/librustc_trans/builder.rs
index b5271b25b630ca7a26f912cd26bb459d55029b29..241ee8a48283ac5b35b63997f30b3be76ed04d2f 100644 (file)
--- a/src/librustc_trans/builder.rs
+++ b/src/librustc_trans/builder.rs
@@ -920,13 +920,17 @@ pub fn call(&self, llfn: ValueRef, args: &[ValueRef],
     pub fn minnum(&self, lhs: ValueRef, rhs: ValueRef) -> ValueRef {
         self.count_insn("minnum");
         unsafe {
-            llvm::LLVMRustBuildMinNum(self.llbuilder, lhs, rhs)
+            let instr = llvm::LLVMRustBuildMinNum(self.llbuilder, lhs, rhs);
+            bug!("LLVMRustBuildMinNum is not available in LLVM version < 6.0");
+            instr
         }
     }
     pub fn maxnum(&self, lhs: ValueRef, rhs: ValueRef) -> ValueRef {
         self.count_insn("maxnum");
         unsafe {
-            llvm::LLVMRustBuildMaxNum(self.llbuilder, lhs, rhs)
+            let instr = llvm::LLVMRustBuildMaxNum(self.llbuilder, lhs, rhs);
+            bug!("LLVMRustBuildMaxNum is not available in LLVM version < 6.0");
+            instr
         }
     }
 

diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp
index 627827105cbb2891bad412e49c8f89c69f27ba1d..1b35f0adda6457d80c499da08872d4368cb39401 100644 (file)
--- a/src/rustllvm/RustWrapper.cpp
+++ b/src/rustllvm/RustWrapper.cpp
@@ -1501,6 +1501,7 @@ LLVMBuildExactUDiv(LLVMBuilderRef B, LLVMValueRef LHS,
 }
 #endif
 
+#if LLVM_VERSION_GE(6, 0)
 extern "C" LLVMValueRef
 LLVMRustBuildMinNum(LLVMBuilderRef B, LLVMValueRef LHS, LLVMValueRef RHS) {
     return wrap(unwrap(B)->CreateMinNum(unwrap(LHS),unwrap(RHS)));
@@ -1509,3 +1510,13 @@ extern "C" LLVMValueRef
 LLVMRustBuildMaxNum(LLVMBuilderRef B, LLVMValueRef LHS, LLVMValueRef RHS) {
     return wrap(unwrap(B)->CreateMaxNum(unwrap(LHS),unwrap(RHS)));
 }
+#else
+extern "C" LLVMValueRef
+LLVMRustBuildMinNum(LLVMBuilderRef, LLVMValueRef, LLVMValueRef) {
+   return nullptr;
+}
+extern "C" LLVMValueRef
+LLVMRustBuildMaxNum(LLVMBuilderRef, LLVMValueRef, LLVMValueRef) {
+   return nullptr;
+}
+#endif