Merge branch 'master' into v2.1

diff --cc src/Makefile
index 702207cc9e69094bf66e5269ad482bfde6b5a3d6,ce1537a8b1d018acb67ea3257bd2e0fc3311b88e..e65b55ee412a07556ddc2fd991a56360c735a39b
--- 1/src/Makefile
--- 2/src/Makefile
+++ b/src/Makefile
@@@ -634,7 -610,7 +634,7 @@@ $(MINILUA_T): $(MINILUA_O
        $(E) "HOSTLINK  $@"
        $(Q)$(HOST_CC) $(HOST_ALDFLAGS) -o $@ $(MINILUA_O) $(MINILUA_LIBS) $(HOST_ALIBS)
  
- host/buildvm_arch.h: $(DASM_DASC) $(DASM_DEP) $(DASM_DIR)/*.lua
 -host/buildvm_arch.h: $(DASM_DASC) $(DASM_DEP) lj_arch.h lua.h luaconf.h
++host/buildvm_arch.h: $(DASM_DASC) $(DASM_DEP) $(DASM_DIR)/*.lua lj_arch.h lua.h luaconf.h
        $(E) "DYNASM    $@"
        $(Q)$(DASM) $(DASM_FLAGS) -o $@ $(DASM_DASC)