aboutsummaryrefslogtreecommitdiffstats
path: root/bindings
diff options
context:
space:
mode:
authorPeter Zotov <whitequark@whitequark.org>2013-11-15 02:51:27 +0000
committerPeter Zotov <whitequark@whitequark.org>2013-11-15 02:51:27 +0000
commit68f4dae1c078df09c9b19a0bda9bc8b8d0aae9be (patch)
tree1033c3ce865a277b2c469eff5389f09eec53a020 /bindings
parente016a163e97d29a4c343189e678633066a3365ab (diff)
downloadexternal_llvm-68f4dae1c078df09c9b19a0bda9bc8b8d0aae9be.zip
external_llvm-68f4dae1c078df09c9b19a0bda9bc8b8d0aae9be.tar.gz
external_llvm-68f4dae1c078df09c9b19a0bda9bc8b8d0aae9be.tar.bz2
[OCaml] Fix building of stub libraries
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@194772 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'bindings')
-rw-r--r--bindings/ocaml/Makefile2
-rw-r--r--bindings/ocaml/Makefile.ocaml4
-rw-r--r--bindings/ocaml/backends/backend_ocaml.c10
3 files changed, 8 insertions, 8 deletions
diff --git a/bindings/ocaml/Makefile b/bindings/ocaml/Makefile
index 19ba302..44562fe8 100644
--- a/bindings/ocaml/Makefile
+++ b/bindings/ocaml/Makefile
@@ -9,7 +9,7 @@
LEVEL := ../..
DIRS = llvm bitreader bitwriter irreader analysis target executionengine \
- transforms linker
+ transforms linker backends
ExtraMakefiles = $(PROJ_OBJ_DIR)/Makefile.ocaml
ocamldoc:
diff --git a/bindings/ocaml/Makefile.ocaml b/bindings/ocaml/Makefile.ocaml
index 80dbf0f..98e5be9 100644
--- a/bindings/ocaml/Makefile.ocaml
+++ b/bindings/ocaml/Makefile.ocaml
@@ -142,7 +142,7 @@ OutputCMXA := $(LibraryCMXA:$(ObjDir)/%.cmxa=$(OcamlDir)/%.cmxa)
endif
ifdef OCAMLSTUBS
-SharedLib := $(OcamlDir)/dll$(LIBRARYNAME).$(SHLIBEXT)
+SharedLib := $(OcamlDir)/dll$(LIBRARYNAME)$(SHLIBEXT)
endif
ifdef TOOLNAME
@@ -163,7 +163,7 @@ DestCMXA := $(PROJ_libocamldir)/$(LIBRARYNAME).cmxa
endif
ifdef OCAMLSTUBS
-DestSharedLib := $(PROJ_libocamldir)/dll$(LIBRARYNAME).$(SHLIBEXT)
+DestSharedLib := $(PROJ_libocamldir)/dll$(LIBRARYNAME)$(SHLIBEXT)
endif
##===- Dependencies -------------------------------------------------------===##
diff --git a/bindings/ocaml/backends/backend_ocaml.c b/bindings/ocaml/backends/backend_ocaml.c
index fd6d06d..2d4ba85 100644
--- a/bindings/ocaml/backends/backend_ocaml.c
+++ b/bindings/ocaml/backends/backend_ocaml.c
@@ -19,16 +19,16 @@
#include "caml/alloc.h"
#include "caml/memory.h"
+// TODO: Figure out how to call these only for targets which support them.
+// LLVMInitialize ## target ## AsmPrinter();
+// LLVMInitialize ## target ## AsmParser();
+// LLVMInitialize ## target ## Disassembler();
+
#define INITIALIZER1(target) \
CAMLprim value llvm_initialize_ ## target(value Unit) { \
LLVMInitialize ## target ## TargetInfo(); \
LLVMInitialize ## target ## Target(); \
LLVMInitialize ## target ## TargetMC(); \
- // TODO: Figure out how to call these only for targets \
- // which support them. \
- // LLVMInitialize ## target ## AsmPrinter(); \
- // LLVMInitialize ## target ## AsmParser(); \
- // LLVMInitialize ## target ## Disassembler(); \
return Val_unit; \
}