@@ -790,13 +790,25 @@ build-llvm:

 build-llvm-for-check:

 	+$(GMAKE) -C llvm OPTIMIZE_OPTION=-O2 tools-only

+# Don't use make -C here, otherwise there's a racecondition between distclean

+# and clean (distclean removes all Makefiles in llvm/)

 clean-local:

-	+$(GMAKE) -C llvm/test clean

+	rm -rf `find llvm/test -name Output -type d -print`

 	rm -rf llvm/Release llvm/Debug

 	rm -f *.inc

 	rm -f llvm/include/llvm/Intrinsics.gen

 	rm -f llvm/test/site.exp llvm/test/site.bak llvm/test/*.out llvm/test/*.sum llvm/test/*.log

+distclean-local:

+	rm -f llvm/lib/Makefile llvm/docs/doxygen.cfg llvm/test/Unit/.dir llvm/test/Unit/lit.site.cfg

+	rm -f llvm/test/Makefile llvm/test/lit.site.cfg llvm/test/Makefile.tests llvm/Makefile llvm/config.status

+	rm -f llvm/mklib llvm/tools/Makefile llvm/tools/llvmc/llvm-config.in llvm/utils/Makefile

+	rm -f llvm/Makefile.common llvm/Makefile.config llvm/config.log llvm/unittests/Makefile

+	rm -f llvm/llvm.spec llvm/include/llvm/Config/AsmPrinters.def llvm/include/llvm/Config/config.h

+	rm -f llvm/include/llvm/Support/DataTypes.h llvm/include/llvm/Config/Targets.def

+	rm -f llvm/tools/llvmc/plugins/Base/Base.td llvm/tools/llvm-config/llvm-config.in

+	rm -f llvm/include/llvm/Config/AsmParsers.def

+

 check-llvm: build-llvm-for-check

 	+$(GMAKE) -C llvm check

 	+$(GMAKE) -C llvm unittests

@@ -6231,7 +6231,7 @@ distclean: distclean-am

 	-rm -rf ./$(DEPDIR)

 	-rm -f Makefile

 distclean-am: clean-am distclean-compile distclean-generic \

-	distclean-hdr distclean-libtool distclean-tags

+	distclean-hdr distclean-libtool distclean-local distclean-tags

 dvi: dvi-am

@@ -6303,17 +6303,17 @@ uninstall-am:

 	clean-noinstPROGRAMS ctags dist dist-all dist-bzip2 dist-gzip \

 	dist-hook dist-lzma dist-shar dist-tarZ dist-xz dist-zip \

 	distcheck distclean distclean-compile distclean-generic \

-	distclean-hdr distclean-libtool distclean-tags distcleancheck \

-	distdir distuninstallcheck dvi dvi-am html html-am info \

-	info-am install install-am install-data install-data-am \

-	install-dvi install-dvi-am install-exec install-exec-am \

-	install-html install-html-am install-info install-info-am \

-	install-man install-pdf install-pdf-am install-ps \

-	install-ps-am install-strip installcheck installcheck-am \

-	installdirs maintainer-clean maintainer-clean-generic \

-	mostlyclean mostlyclean-compile mostlyclean-generic \

-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \

-	uninstall-am

+	distclean-hdr distclean-libtool distclean-local distclean-tags \

+	distcleancheck distdir distuninstallcheck dvi dvi-am html \

+	html-am info info-am install install-am install-data \

+	install-data-am install-dvi install-dvi-am install-exec \

+	install-exec-am install-html install-html-am install-info \

+	install-info-am install-man install-pdf install-pdf-am \

+	install-ps install-ps-am install-strip installcheck \

+	installcheck-am installdirs maintainer-clean \

+	maintainer-clean-generic mostlyclean mostlyclean-compile \

+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \

+	tags uninstall uninstall-am

 llvm/include/llvm/Intrinsics.gen: llvm/include/llvm/Intrinsics.td $(TBLGEN)

 	$(TBLGEN_V) $(TBLGEN_FLAGS) -gen-intrinsic -o $@ $<

@@ -6422,13 +6422,25 @@ build-llvm:

 build-llvm-for-check:

 	+$(GMAKE) -C llvm OPTIMIZE_OPTION=-O2 tools-only

+# Don't use make -C here, otherwise there's a racecondition between distclean

+# and clean (distclean removes all Makefiles in llvm/)

 clean-local:

-	+$(GMAKE) -C llvm/test clean

+	rm -rf `find llvm/test -name Output -type d -print`

 	rm -rf llvm/Release llvm/Debug

 	rm -f *.inc

 	rm -f llvm/include/llvm/Intrinsics.gen

 	rm -f llvm/test/site.exp llvm/test/site.bak llvm/test/*.out llvm/test/*.sum llvm/test/*.log

+distclean-local:

+	rm -f llvm/lib/Makefile llvm/docs/doxygen.cfg llvm/test/Unit/.dir llvm/test/Unit/lit.site.cfg

+	rm -f llvm/test/Makefile llvm/test/lit.site.cfg llvm/test/Makefile.tests llvm/Makefile llvm/config.status

+	rm -f llvm/mklib llvm/tools/Makefile llvm/tools/llvmc/llvm-config.in llvm/utils/Makefile

+	rm -f llvm/Makefile.common llvm/Makefile.config llvm/config.log llvm/unittests/Makefile

+	rm -f llvm/llvm.spec llvm/include/llvm/Config/AsmPrinters.def llvm/include/llvm/Config/config.h

+	rm -f llvm/include/llvm/Support/DataTypes.h llvm/include/llvm/Config/Targets.def

+	rm -f llvm/tools/llvmc/plugins/Base/Base.td llvm/tools/llvm-config/llvm-config.in

+	rm -f llvm/include/llvm/Config/AsmParsers.def

+

 check-llvm: build-llvm-for-check

 	+$(GMAKE) -C llvm check

 	+$(GMAKE) -C llvm unittests

@@ -144,11 +144,11 @@ Suite *test_bytecode_suite(void)

     TCase *tc_cli_arith = tcase_create("arithmetic");

     suite_add_tcase(s, tc_cli_arith);

-/*    tcase_add_test(tc_cli_arith, test_retmagic);

+    tcase_add_test(tc_cli_arith, test_retmagic);

     tcase_add_test(tc_cli_arith, test_arith);

     tcase_add_test(tc_cli_arith, test_apicalls);

     tcase_add_test(tc_cli_arith, test_apicalls2);

-    tcase_add_test(tc_cli_arith, test_div0);*/

+    tcase_add_test(tc_cli_arith, test_div0);

     tcase_add_test(tc_cli_arith, test_lsig);

     return s;

 }

@@ -522,7 +522,6 @@ int main(void)

     int nf;

     Suite *s = test_cl_suite();

     SRunner *sr = srunner_create(s);

-    /*

 #ifdef CHECK_HAVE_LOOPS

     srunner_add_suite(sr, test_cli_suite());

 #else

@@ -534,7 +533,7 @@ int main(void)

     srunner_add_suite(sr, test_disasm_suite());

     srunner_add_suite(sr, test_uniq_suite());

     srunner_add_suite(sr, test_matchers_suite());

-    srunner_add_suite(sr, test_htmlnorm_suite());*/

+    srunner_add_suite(sr, test_htmlnorm_suite());

     srunner_add_suite(sr, test_bytecode_suite());

     srunner_set_log(sr, "test.log");