Replace JIT bindings with MCJIT bindings

The former is deprecated and is on track to be removed before LLVM 3.6.

examples/factorial/factorial.go

@@ -6,8 +6,9 @@ import "fmt"
 import "github.com/go-llvm/llvm"
 
 func test() {
-	llvm.LinkInJIT()
+	llvm.LinkInMCJIT()
 	llvm.InitializeNativeTarget()
+	llvm.InitializeNativeAsmPrinter()
 
 	mod := llvm.NewModule("fac_module")
 
@@ -56,7 +57,7 @@ func test() {
 		return
 	}
 
-	engine, err := llvm.NewJITCompiler(mod, 2)
+	engine, err := llvm.NewMCJITCompiler(mod, llvm.MCJITCompilerOptions{OptLevel: 2})
 	if err != nil {
 		fmt.Println(err)
 		return

executionengine.go

@@ -8,7 +8,7 @@ import "C"
 import "unsafe"
 import "errors"
 
-func LinkInJIT()         { C.LLVMLinkInJIT() }
+func LinkInMCJIT()       { C.LLVMLinkInMCJIT() }
 func LinkInInterpreter() { C.LLVMLinkInInterpreter() }
 
 type (
@@ -18,6 +18,12 @@ type (
 	ExecutionEngine struct {
 		C C.LLVMExecutionEngineRef
 	}
+	MCJITCompilerOptions struct {
+		OptLevel           uint
+		CodeModel          CodeModel
+		NoFramePointerElim bool
+		EnableFastISel     bool
+	}
 )
 
 // helpers
@@ -82,9 +88,16 @@ func NewInterpreter(m Module) (ee ExecutionEngine, err error) {
 	}
 	return
 }
-func NewJITCompiler(m Module, optLevel int) (ee ExecutionEngine, err error) {
+
+func NewMCJITCompiler(m Module, options MCJITCompilerOptions) (ee ExecutionEngine, err error) {
 	var cmsg *C.char
-	fail := C.LLVMCreateJITCompilerForModule(&ee.C, m.C, C.unsigned(optLevel), &cmsg)
+	copts := C.struct_LLVMMCJITCompilerOptions{
+		OptLevel:           C.unsigned(options.OptLevel),
+		CodeModel:          C.LLVMCodeModel(options.CodeModel),
+		NoFramePointerElim: boolToLLVMBool(options.NoFramePointerElim),
+		EnableFastISel:     boolToLLVMBool(options.EnableFastISel),
+	}
+	fail := C.LLVMCreateMCJITCompilerForModule(&ee.C, m.C, &copts, C.size_t(unsafe.Sizeof(copts)), &cmsg)
 	if fail != 0 {
 		ee.C = nil
 		err = errors.New(C.GoString(cmsg))

executionengine_test.go

@@ -5,8 +5,9 @@ import (
 )
 
 func TestFactorial(t *testing.T) {
-	LinkInJIT()
+	LinkInMCJIT()
 	InitializeNativeTarget()
+	InitializeNativeAsmPrinter()
 
 	mod := NewModule("fac_module")
 
@@ -52,7 +53,7 @@ func TestFactorial(t *testing.T) {
 		return
 	}
 
-	engine, err := NewJITCompiler(mod, 2)
+	engine, err := NewMCJITCompiler(mod, MCJITCompilerOptions{OptLevel: 2})
 	if err != nil {
 		t.Errorf("Error creating JIT: %s", err)
 		return

target.go

@@ -86,6 +86,14 @@ func InitializeNativeTarget() error {
 	return nil
 }
 
+func InitializeNativeAsmPrinter() error {
+	fail := C.LLVMInitializeNativeAsmPrinter()
+	if fail != 0 {
+		return initializeNativeTargetError
+	}
+	return nil
+}
+
 //-------------------------------------------------------------------------
 // llvm.TargetData
 //-------------------------------------------------------------------------

update_llvm.sh

@@ -15,9 +15,9 @@ instrumentation \
 interpreter \
 ipo \
 irreader \
-jit \
 linker \
 mc \
+mcjit \
 objcarcopts \
 option \
 profiledata \