Port to LLVM 3.8, improve Makefile for example

Author: chifflier

part3/Makefile

@@ -5,13 +5,15 @@ TOOLS:=tutorial03
 #TARGET:=native
 TARGET:=byte
 
-LLVM_VERSION := 3.5
+LLVM_VERSION := 3.8
+CLANG := clang-$(LLVM_VERSION)
+LLC := llc-$(LLVM_VERSION)
 
 OCAMLBUILDFLAGS:=-classic-display -j 0 -cflags -w,@a-4
 
 export OCAMLPATH=/usr/lib/ocaml/llvm-$(LLVM_VERSION)
 
-tutorial03_OCAMLBUILDFLAGS:=-use-ocamlfind -pkgs llvm,llvm.bitreader
+tutorial03_OCAMLBUILDFLAGS:=-use-ocamlfind -pkgs llvm,llvm.bitreader -lflags -ccopt,-L/usr/lib/llvm-$(LLVM_VERSION)/lib
 
 
 
@@ -32,12 +34,23 @@ default: $(TOOLS)
 $(TOOLS):
 	$(OCAMLBUILD) $(OCAMLBUILDFLAGS) $($@_OCAMLBUILDFLAGS) $($@_OCAMLBUILDFLAGS_$(TARGET)) -I $(SRC_DIR) -build-dir build/$@ $@.$(TARGET)
 
-run: $(TOOLS)
-	CAML_LD_LIBRARY_PATH=/usr/lib/ocaml/llvm-$(LLVM_VERSION) ./build/llvmBCTargetTriple/src/llvmBCTargetTriple.byte
-
 clean: $(CLEAN_RULES)
+	-rm -f hello hello.o hello.s hello.ll
 
 $(CLEAN_RULES):
 	$(OCAMLBUILD) $(OCAMLBUILDFLAGS) -I $(SRC_DIR) -build-dir build/$(patsubst %-clean,%,$@) -clean $(patsubst %-clean,%,$@).$(TARGET)
 
+run: $(TOOLS) hello
+	./hello
+
+hello: hello.o
+	$(CLANG) -o $@ $<
+
+hello.o: hello.s
+	$(CLANG) -c hello.s
+
+hello.s: hello.ll
+	$(LLC) $<
 
+hello.ll: $(TOOLS)
+	CAML_LD_LIBRARY_PATH=/usr/lib/ocaml/llvm-$(LLVM_VERSION) ./build/tutorial03/src/tutorial03.byte $@

part3/src/tutorial03.ml

@@ -12,5 +12,7 @@ let _ =
 
   let _ = build_ret (const_int i32_t 0) llbuilder in
 
-  dump_module llm ;
+  if Array.length Sys.argv > 1
+  then print_module Sys.argv.(1) llm
+  else dump_module llm ;
   ()