spot pushed to gambas3 (master). "more more llvm 3.6 fixes"

[notifications at fedoraproject.org]

>From 7bbfb0f4914c76557225d59147e9482436a8e215 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot at fedoraproject.org>
Date: Fri, 17 Apr 2015 16:21:19 -0400
Subject: more more llvm 3.6 fixes


diff --git a/gambas3-3.7.1-llvm-3.6.patch b/gambas3-3.7.1-llvm-3.6.patch
index cd70792..d605f6b 100644
--- a/gambas3-3.7.1-llvm-3.6.patch
+++ b/gambas3-3.7.1-llvm-3.6.patch
@@ -20,7 +20,7 @@ diff -up gambas3-3.7.1/gb.jit/src/jit_codegen.cpp.llvm36 gambas3-3.7.1/gb.jit/sr
  	if (llvm::Instruction* inst = llvm::dyn_cast<llvm::Instruction>(slt)){
  		llvm::Value* arr[1] = {getInteger(32, 1)};
 +#if (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 6)
-+		inst->setMetadata("unref_slt", llvm::MDNode::get(llvm_context, llvm::ArrayRef<Metadata*>(arr)));
++		inst->setMetadata("unref_slt", llvm::MDNode::get(llvm_context, llvm::ArrayRef<llvm::Metadata*>(arr)));
 +#else
  		inst->setMetadata("unref_slt", llvm::MDNode::get(llvm_context, arr));
 +#endif
@@ -32,7 +32,7 @@ diff -up gambas3-3.7.1/gb.jit/src/jit_codegen.cpp.llvm36 gambas3-3.7.1/gb.jit/sr
  	if (llvm::Instruction* inst = llvm::dyn_cast<llvm::Instruction>(slt)){
  		llvm::Value* arr[1] = {getInteger(32, 1)};
 +#if (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 6)
-+		inst->setMetadata("unref_slt", llvm::MDNode::get(llvm_context, llvm::ArrayRef<Metadata*>(arr)));
++		inst->setMetadata("unref_slt", llvm::MDNode::get(llvm_context, llvm::ArrayRef<llvm::Metadata*>(arr)));
 +#else
  		inst->setMetadata("unref_slt", llvm::MDNode::get(llvm_context, arr));
 +#endif
@@ -44,7 +44,7 @@ diff -up gambas3-3.7.1/gb.jit/src/jit_codegen.cpp.llvm36 gambas3-3.7.1/gb.jit/sr
  	if (llvm::Instruction* inst = llvm::dyn_cast<llvm::Instruction>(call)){
  		llvm::Value* arr[1] = {getInteger(32, 1)};
 +#if (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 6)
-+		inst->setMetadata("end_try", llvm::MDNode::get(llvm_context, llvm::ArrayRef<Metadata*>(arr)));
++		inst->setMetadata("end_try", llvm::MDNode::get(llvm_context, llvm::ArrayRef<llvm::Metadata*>(arr)));
 +#else
  		inst->setMetadata("end_try", llvm::MDNode::get(llvm_context, arr));
 +#endif
@@ -56,7 +56,7 @@ diff -up gambas3-3.7.1/gb.jit/src/jit_codegen.cpp.llvm36 gambas3-3.7.1/gb.jit/sr
  				if (llvm::Instruction* inst = llvm::dyn_cast<llvm::Instruction>(call)){
  					llvm::Value* arr[1] = {getInteger(32, 1)};
 +#if (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 6)
-+					inst->setMetadata("large_end_try", llvm::MDNode::get(llvm_context, llvm::ArrayRef<Metadata*>(arr)));
++					inst->setMetadata("large_end_try", llvm::MDNode::get(llvm_context, llvm::ArrayRef<llvm::Metadata*>(arr)));
 +#else
  					inst->setMetadata("large_end_try", llvm::MDNode::get(llvm_context, arr));
 +#endif
@@ -68,7 +68,7 @@ diff -up gambas3-3.7.1/gb.jit/src/jit_codegen.cpp.llvm36 gambas3-3.7.1/gb.jit/sr
  			M->setDataLayout("e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32-n8:16:32-S128");
  		}
 +#if (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 6)
-+		EE->addModule(std::unique_ptr<Module>(M));
++		EE->addModule(std::unique_ptr<llvm::Module>(M));
 +#else
  		EE->addModule(M);
 +#endif
@@ -80,13 +80,13 @@ diff -up gambas3-3.7.1/gb.jit/src/jit_codegen.cpp.llvm36 gambas3-3.7.1/gb.jit/sr
  	}
  	if (EE)
 +#if (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 6)
-+		EE->addModule(std::unique_ptr<Module>(M));
++		EE->addModule(std::unique_ptr<llvm::Module>(M));
 +#else
  		EE->addModule(M);
 +#endif
  	else
 +#if (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 6)
-+		EE = llvm::EngineBuilder(std::unique_ptr<Module>(M))/*.setOptLevel(llvm::CodeGenOpt::Aggressive)*/.create();
++		EE = llvm::EngineBuilder(std::unique_ptr<llvm::Module>(M))/*.setOptLevel(llvm::CodeGenOpt::Aggressive)*/.create();
 +#else
  		EE = llvm::EngineBuilder(M)/*.setOptLevel(llvm::CodeGenOpt::Aggressive)*/.create();
 +#endif
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/gambas3.git/commit/?h=master&id=7bbfb0f4914c76557225d59147e9482436a8e215