trim some obsolete/bitrotted make stuff.

3 files changed, 4 insertions, 91 deletions

diff --git a/src/Makefile b/src/Makefile
index 46405620..b5f5302d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -11,73 +11,16 @@ interpreter:
 	ocamlbuild lem_interp/extract.cmxa
 	ocamlbuild lem_interp/extract.cma
 
-elf:
-	ocamlbuild -use-ocamlfind -pkgs batteries,uint,unix,zarith src_elf/main_elf.native
-	ocamlbuild -use-ocamlfind -pkgs batteries,uint,unix,zarith src_elf/abis/power64/abi_power64.cmxa
-	ocamlbuild -use-ocamlfind -pkgs batteries,uint,unix,zarith src_elf/abis/power64/abi_power64.cma
-	ocamlbuild -use-ocamlfind -pkgs batteries,uint,unix,zarith src_elf/abis/aarch64/abi_aarch64_le.cmxa
-	ocamlbuild -use-ocamlfind -pkgs batteries,uint,unix,zarith src_elf/abis/aarch64/abi_aarch64_le.cma
-
 test: sail interpreter
 	ocamlbuild test/run_tests.native
 	./run_tests.native
 
 LEM = ~/bitbucket/lem/lem
 LEMLIBOCAML = ~/bitbucket/lem/ocaml-lib/
+ELFDIR= ~/bitbucket/linksem
 
-ELFDIR= ../../../bitbucket/linksem
-
-get_elf:
-	-chmod u+w src_elf/*.ml*
-	-chmod u+w src_elf/abis/*.ml*	
-	-chmod u+w src_elf/abis/amd64/*.ml*
-	-chmod u+w src_elf/abis/power64/*.ml*
-	-chmod u+w src_elf/abis/aarch64/*.ml*
-	-chmod u+w src_elf/abis/x86/*.ml*
-	-chmod u+w src_elf/abis/mips64/*.ml*
-	-chmod u+w src_elf/adaptors/*.ml*
-	-chmod u+w src_elf/gnu_extensions/*.ml*
-	rm -rf src_elf/*.ml*
-	rm -rf src_elf/abis/*.ml*
-	rm -rf src_elf/abis/amd64/*.ml*
-	rm -rf src_elf/abis/power64/*.ml*
-	rm -rf src_elf/abis/aarch64/*.ml*
-	rm -rf src_elf/abis/x86/*.ml*
-	rm -rf src_elf/abis/mips64/*.ml*
-	rm -rf src_elf/adaptors/*.ml*
-	rm -rf src_elf/gnu_extensions/*.ml*
-	$(MAKE) -C $(ELFDIR)/src clean
-	$(MAKE) -C $(ELFDIR)/src lem-all-ocaml
-	mkdir -p src_elf/{abis,adaptors,gnu_extensions}
-	mkdir -p src_elf/abis/{aarch64,amd64,power64,x86,mips64}
-	cp -a $(ELFDIR)/src/*.ml src_elf
-	cp -a $(ELFDIR)/src/abis/*.ml src_elf/abis
-	cp -a $(ELFDIR)/src/abis/amd64/*.ml src_elf/abis/amd64
-	cp -a $(ELFDIR)/src/abis/power64/*.ml src_elf/abis/power64
-	cp -a $(ELFDIR)/src/abis/aarch64/*.ml src_elf/abis/aarch64
-	cp -a $(ELFDIR)/src/abis/x86/*.ml src_elf/abis/x86
-	cp -a $(ELFDIR)/src/abis/mips64/*.ml src_elf/abis/mips64
-	cp -a $(ELFDIR)/src/adaptors/*.ml src_elf/adaptors
-	cp -a $(ELFDIR)/src/gnu_extensions/*.ml* src_elf/gnu_extensions
-	chmod ugo-w src_elf/*.ml*
-	chmod ugo-w src_elf/abis/*.ml*
-	chmod ugo-w src_elf/abis/amd64/*.ml*
-	chmod ugo-w src_elf/abis/power64/*.ml*
-	chmod ugo-w src_elf/abis/aarch64/*.ml*
-	chmod ugo-w src_elf/abis/x86/*.ml*
-	chmod ugo-w src_elf/abis/mips64/*.ml*
-	chmod ugo-w src_elf/adaptors/*.ml*
-	chmod ugo-w src_elf/gnu_extensions/*.ml*
-
-
-power: sail interpreter elf
-	mkdir -p _build/test
-	cp -p test/* _build/test/
-	cd _build/test ;\
-	../../sail.native -lem_ast power.sail ;\
-	$(LEM) -ocaml -only_changed_output -lib ../lem_interp/ power.lem;\
-	env OCAMLRUNPARAM=l=100M ocamlfind ocamlopt -package num -package bitstring -package batteries -package uint -I $(LEMLIBOCAML) -I ../lem_interp/ -I ../elf_model/ -linkpkg $(LEMLIBOCAML)extract.cmxa ../pprint/src/PPrintLib.cmxa ../lem_interp/extract.cmxa elf_extract.cmxa power.ml run_power.ml -o run_power.native
-	ln -fs _build/test/run_power.native run_power.native
+elf:
+	make -C $(ELFDIR)
 
 _build/mips_extras.lem: ../mips/mips_extras.lem
 	mkdir -p _build
@@ -102,31 +45,7 @@ _build/mips.lem: _build/mips.sail sail
 run_mips.native: _build/mips.ml _build/mips_extras.ml _build/run_with_elf.ml interpreter
 	env OCAMLRUNPARAM=l=100M ocamlfind ocamlopt -package zarith -package num -package batteries -package uint -I $(LEMLIBOCAML) -I _build/lem_interp/ -I $(ELFDIR)/src  -I $(ELFDIR)/src/adaptors -I $(ELFDIR)/src/abis/mips64 -I _build -linkpkg $(LEMLIBOCAML)extract.cmxa $(ELFDIR)/src/linksem.cmxa _build/pprint/src/PPrintLib.cmxa _build/lem_interp/extract.cmxa _build/mips.ml _build/mips_extras.ml _build/run_with_elf.ml  -o run_mips.native
 
-#	env OCAMLRUNPARAM=l=100M ocamlfind ocamlopt -package num -package bitstring -package batteries -package uint -I $(LEMLIBOCAML) -I ../lem_interp/ -I ../elf_model/ -linkpkg $(LEMLIBOCAML)extract.cmxa ../pprint/src/PPrintLib.cmxa ../lem_interp/extract.cmxa elf_extract.cmxa power.ml run_power.ml -o run_power.native
-mips: sail interpreter elf
-	mkdir -p _build/test
-	cp -p test/* _build/test/
-	cd _build/test ;\
-	../../sail.native -lem_ast mips.sail ;\
-	$(LEM) -ocaml -only_changed_output -lib ../lem_interp/ power.lem;\
-	ln -fs _build/test/run_power.native run_power.native
-
-test_power: power
-	./run_power.native --file ../../../rsem/idl/power/binary/main.bin
-
-test_power_interactive: power
-	./run_power.native --interactive --file ../../../rsem/idl/power/binary/main.bin
-
-test_power_interactive_srcs:
-	ebig ~/rsem/idl/power/generated/power.sail ../../../rsem/idl/power/binary/hello.c  ../../../rsem/idl/power/binary/hello.s 
-
-# or test/power.sail for cut-down one
-
-
-test_idempotence: sail
-	@cd test; for file in *.sail; do \
-		./idempotence.sh $$file; echo ;\
-	done
+mips: elf run_mips.native
 
 clean:
 	-ocamlbuild -clean
diff --git a/src/_tags b/src/_tags
index 2005f826..a90c5e30 100644
--- a/src/_tags
+++ b/src/_tags
@@ -2,16 +2,11 @@ true: -traverse, debug
 <**/*.ml>: bin_annot, annot
 <lem_interp> or <test>:  include
 <sail.{byte,native}>: use_pprint, use_nums
-<src_elf/main_elf.{byte,native}>: use_lem
 <pprint> or <pprint/src>: include
-<{src_elf,src_elf/abis,src_elf/abis/power64,src_elf/abis/amd64,src_elf/abis/aarch64,src_elf/abis/x86,src_elf/adaptors,src_elf/gnu_extensions}> : include
 
 # see http://caml.inria.fr/mantis/view.php?id=4943
 <lem_interp/*> and not <lem_interp/*.cmxa>: use_nums, use_lem
 <test/*> and not <test/*.cmxa>: use_nums, use_lem, use_str, use_batteries
-<src_elf/*.ml> : use_batteries, use_lem, use_nums,use_unix
-<src_elf/*/*.ml> : use_batteries, use_lem, use_nums,use_unix
-<src_elf/*/*/*.ml> : use_batteries, use_lem, use_nums,use_unix
 
 # disable partial match and unused variable warnings
 <**/*.ml>: warn_y
diff --git a/src/myocamlbuild.ml b/src/myocamlbuild.ml
index c0172700..2be63ad7 100644
--- a/src/myocamlbuild.ml
+++ b/src/myocamlbuild.ml
@@ -37,7 +37,6 @@ dispatch begin function
     (* ocaml_lib "lem_interp/interp"; *)
     ocaml_lib ~extern:true ~dir:lem_libdir  ~tag_name:"use_lem" lem_lib;
     ocaml_lib ~extern:false ~dir:"pprint/src" ~tag_name:"use_pprint" "pprint/src/PPrintLib";
-    ocaml_lib ~extern:true ~dir:"src_elf_libraries/batteries/_build/src" ~tag_name:"use_batteries" "src_elf_libraries/batteries";
     
     rule "lem -> ml"
     ~prod: "%.ml"