diff options
Diffstat (limited to 'bindings/ocaml')
| -rw-r--r-- | bindings/ocaml/Makefile.ocaml | 8 | ||||
| -rw-r--r-- | bindings/ocaml/llvm/META.llvm.in | 2 | ||||
| -rw-r--r-- | bindings/ocaml/llvm/Makefile | 6 | ||||
| -rw-r--r-- | bindings/ocaml/llvm/llvm.ml | 2 | ||||
| -rw-r--r-- | bindings/ocaml/llvm/llvm.mli | 1 | ||||
| -rw-r--r-- | bindings/ocaml/llvm/llvm_ocaml.c | 3 |
6 files changed, 13 insertions, 9 deletions
diff --git a/bindings/ocaml/Makefile.ocaml b/bindings/ocaml/Makefile.ocaml index 40ecc9c..a2a8b02 100644 --- a/bindings/ocaml/Makefile.ocaml +++ b/bindings/ocaml/Makefile.ocaml @@ -238,14 +238,14 @@ clean-cmis:: # Also install the .mli's (headers) as documentation. install-cmis: $(OutputsCMI) $(OcamlHeaders) $(Verb) $(MKDIR) $(PROJ_libocamldir) - $(Verb) for i in $(OutputsCMI:$(OcamlDir)/%=%); do \ - $(EchoCmd) "Installing $(BuildMode) $(PROJ_libocamldir)/$$i"; \ - $(DataInstall) $(OcamlDir)/$$i "$(PROJ_libocamldir)/$$i"; \ - done $(Verb) for i in $(OcamlHeaders:$(ObjDir)/%=%); do \ $(EchoCmd) "Installing $(BuildMode) $(PROJ_libocamldir)/$$i"; \ $(DataInstall) $(ObjDir)/$$i "$(PROJ_libocamldir)/$$i"; \ done + $(Verb) for i in $(OutputsCMI:$(OcamlDir)/%=%); do \ + $(EchoCmd) "Installing $(BuildMode) $(PROJ_libocamldir)/$$i"; \ + $(DataInstall) $(OcamlDir)/$$i "$(PROJ_libocamldir)/$$i"; \ + done uninstall-cmis:: $(Verb) for i in $(OutputsCMI:$(OcamlDir)/%=%); do \ diff --git a/bindings/ocaml/llvm/META.llvm.in b/bindings/ocaml/llvm/META.llvm.in index 29e7eb4..fdb3253 100644 --- a/bindings/ocaml/llvm/META.llvm.in +++ b/bindings/ocaml/llvm/META.llvm.in @@ -1,6 +1,6 @@ name = "llvm" version = "@PACKAGE_VERSION@" -description = "Low Level Virtual Machine OCaml bindings" +description = "LLVM OCaml bindings" archive(byte) = "llvm.cma" archive(native) = "llvm.cmxa" directory = "." diff --git a/bindings/ocaml/llvm/Makefile b/bindings/ocaml/llvm/Makefile index 673eaa2..203075a 100644 --- a/bindings/ocaml/llvm/Makefile +++ b/bindings/ocaml/llvm/Makefile @@ -30,11 +30,13 @@ copy-meta: $(OcamlDir)/META.llvm $(OcamlDir)/META.llvm: META.llvm $(Verb) $(CP) -f $< $@ -install-meta:: $(ObjDir)/META.llvm +install-meta:: $(OcamlDir)/META.llvm $(Echo) "Install $(BuildMode) $(DestMETA)" $(Verb) $(MKDIR) $(PROJ_libocamldir) - $(Verb) $(DataInstall) META.llvm "$(DestMETA)" + $(Verb) $(DataInstall) $< "$(DestMETA)" uninstall-meta:: $(Echo) "Uninstalling $(DestMETA)" -$(Verb) $(RM) -f "$(DestMETA)" + +.PHONY: copy-meta install-meta uninstall-meta diff --git a/bindings/ocaml/llvm/llvm.ml b/bindings/ocaml/llvm/llvm.ml index 40b0138..b169b85 100644 --- a/bindings/ocaml/llvm/llvm.ml +++ b/bindings/ocaml/llvm/llvm.ml @@ -20,6 +20,7 @@ type llmemorybuffer module TypeKind = struct type t = | Void + | Half | Float | Double | X86fp80 @@ -1234,5 +1235,6 @@ let rec string_of_lltype ty = | TypeKind.X86fp80 -> "x86_fp80" | TypeKind.Double -> "double" | TypeKind.Float -> "float" + | TypeKind.Half -> "half" | TypeKind.Void -> "void" | TypeKind.Metadata -> "metadata" diff --git a/bindings/ocaml/llvm/llvm.mli b/bindings/ocaml/llvm/llvm.mli index 33bbc74..96448cc 100644 --- a/bindings/ocaml/llvm/llvm.mli +++ b/bindings/ocaml/llvm/llvm.mli @@ -53,6 +53,7 @@ type llmemorybuffer module TypeKind : sig type t = Void + | Half | Float | Double | X86fp80 diff --git a/bindings/ocaml/llvm/llvm_ocaml.c b/bindings/ocaml/llvm/llvm_ocaml.c index 86cc4bd..a5985d9 100644 --- a/bindings/ocaml/llvm/llvm_ocaml.c +++ b/bindings/ocaml/llvm/llvm_ocaml.c @@ -21,7 +21,6 @@ #include "caml/memory.h" #include "caml/fail.h" #include "caml/callback.h" -#include "llvm/Config/config.h" #include <assert.h> #include <stdlib.h> #include <string.h> @@ -1164,7 +1163,7 @@ CAMLprim value llvm_instr_get_opcode(LLVMValueRef Inst) { if (!LLVMIsAInstruction(Inst)) failwith("Not an instruction"); o = LLVMGetInstructionOpcode(Inst); - assert (o <= LLVMUnwind ); + assert (o <= LLVMLandingPad); return Val_int(o); } |
