Merge remote-tracking branch 'origin/master' into xaig

diff --cc Makefile
index fd4e90c1526e8c2fba622c744226dd7bbe269759,67bcb3d154223b396dba9c1fc5a09821f01c07ca..6c5a436c1c75ef228f208d186fc8680ee5c108e6
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -681,7 -681,7 +681,8 @@@ test: $(TARGETS) $(EXTRA_TARGETS
        +cd tests/svinterfaces && bash run-test.sh $(SEEDOPT)
        +cd tests/opt && bash run-test.sh
        +cd tests/aiger && bash run-test.sh
+       +cd tests/arch && bash run-test.sh
 +      +cd tests/simple_abc9 && bash run-test.sh $(SEEDOPT)
        @echo ""
        @echo "  Passed \"make test\"."
        @echo ""