Commit 318048b2 authored by Tanya Lattner's avatar Tanya Lattner
Browse files

Merge 81800 from mainline. 

Expose initializing the native target for the execution engine.

llvm-svn: 81975
parent dfa842c4

llvm/bindings/ocaml/executionengine/executionengine_ocaml.c

+6 −2
Original line number Diff line number Diff line
@@ -24,11 +24,15 @@ 
#include <string.h>

#include <assert.h>



/* Force the LLVM interpreter, JIT, and native target to be linked in. */

/* Force the LLVM interpreter and JIT to be linked in. */

void llvm_initialize(void) {

  LLVMLinkInInterpreter();

  LLVMLinkInJIT();

  LLVMInitializeNativeTarget();

}



/* unit -> bool */

CAMLprim value llvm_initialize_native_target(value Unit) {

  return Val_bool(LLVMInitializeNativeTarget());

}



/* Can't use the recommended caml_named_value mechanism for backwards

llvm/bindings/ocaml/executionengine/llvm_executionengine.ml

+3 −0
Original line number Diff line number Diff line
@@ -109,3 +109,6 @@ module ExecutionEngine = struct 
  

   *)

end



external initialize_native_target : unit -> bool

                                  = "llvm_initialize_native_target"

llvm/bindings/ocaml/executionengine/llvm_executionengine.mli

+3 −0
Original line number Diff line number Diff line
@@ -161,3 +161,6 @@ module ExecutionEngine: sig 
      [ee]. *)

  val target_data: t -> Llvm_target.TargetData.t

end



external initialize_native_target : unit -> bool

                                  = "llvm_initialize_native_target"

llvm/docs/tutorial/OCamlLangImpl4.html

+2 −0
Original line number Diff line number Diff line
@@ -962,6 +962,8 @@ open Llvm_target 
open Llvm_scalar_opts



let main () =

  ignore (initialize_native_target ());



  (* Install standard binary operators.

   * 1 is the lowest precedence. *)

  Hashtbl.add Parser.binop_precedence '&lt;' 10;

llvm/docs/tutorial/OCamlLangImpl5.html

+2 −0
Original line number Diff line number Diff line
@@ -1487,6 +1487,8 @@ open Llvm_target 
open Llvm_scalar_opts



let main () =

  ignore (initialize_native_target ());



  (* Install standard binary operators.

   * 1 is the lowest precedence. *)

  Hashtbl.add Parser.binop_precedence '&lt;' 10;